From 6a8e9736e0806ef69df9d793352b9843b8679085 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Dec 2024 16:25:05 +0100
Subject: [PATCH] nix hash: Don't print 'nix hash' deprecation message

Fixes #11997.

(cherry picked from commit 408c2faf9365ab1b6f9e28551429d9352f9e7f1a)

# Conflicts:
#	src/nix/hash.cc
---
 src/nix/hash.cc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index 4f2d8eef0..61601f21e 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -163,8 +163,11 @@ struct CmdToBase : Command
     HashFormat hashFormat;
     std::optional<HashAlgorithm> hashAlgo;
     std::vector<std::string> args;
+    bool legacyCli;
 
-    CmdToBase(HashFormat hashFormat) : hashFormat(hashFormat)
+    CmdToBase(HashFormat hashFormat, bool legacyCli = false)
+        : hashFormat(hashFormat)
+        , legacyCli(legacyCli)
     {
         addFlag(flag::hashAlgoOpt("type", &hashAlgo));
         expectArgs("strings", &args);
@@ -181,8 +184,14 @@ struct CmdToBase : Command
 
     void run() override
     {
+<<<<<<< HEAD
         warn("The old format conversion sub commands of `nix hash` were deprecated in favor of `nix hash convert`.");
         for (auto s : args)
+=======
+        if (!legacyCli)
+            warn("The old format conversion subcommands of `nix hash` were deprecated in favor of `nix hash convert`.");
+        for (const auto & s : args)
+>>>>>>> 408c2faf9 (nix hash: Don't print 'nix hash' deprecation message)
             logger->cout(Hash::parseAny(s, hashAlgo).to_string(hashFormat, hashFormat == HashFormat::SRI));
     }
 };
@@ -328,7 +337,7 @@ static int compatNixHash(int argc, char * * argv)
     }
 
     else {
-        CmdToBase cmd(hashFormat);
+        CmdToBase cmd(hashFormat, true);
         cmd.args = ss;
         if (hashAlgo.has_value()) cmd.hashAlgo = hashAlgo;
         cmd.run();