From dd79a490bfd68a4642733038944b2d1ee79c49c5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 5 Dec 2024 16:19:21 +0100
Subject: [PATCH] nix hash convert: Don't fail on uppercase base-16 hashes

(cherry picked from commit 33b645cedfabd4f275644ac4df0eac220f444278)
---
 src/nix/hash.cc                  | 10 +++++++---
 tests/functional/hash-convert.sh |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index f2761e1cf..4f2d8eef0 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -222,14 +222,18 @@ struct CmdHashConvert : Command
     Category category() override { return catUtility; }
 
     void run() override {
-        for (const auto & s: hashStrings) {
+        for (const auto & s : hashStrings) {
             Hash h =
                 from == HashFormat::SRI
                 ? Hash::parseSRI(s)
                 : Hash::parseAny(s, algo);
-            if (from && from != HashFormat::SRI && h.to_string(*from, false) != s) {
+            if (from
+                && from != HashFormat::SRI
+                && h.to_string(*from, false) !=
+                    (from == HashFormat::Base16 ? toLower(s) : s))
+            {
                 auto from_as_string = printHashFormat(*from);
-                throw BadHash("input hash '%s' does not have the expected format '--from %s'", s, from_as_string);
+                throw BadHash("input hash '%s' does not have the expected format for '--from %s'", s, from_as_string);
             }
             logger->cout(h.to_string(to, to == HashFormat::SRI));
         }
diff --git a/tests/functional/hash-convert.sh b/tests/functional/hash-convert.sh
index 1cbe864f3..c40cb469c 100755
--- a/tests/functional/hash-convert.sh
+++ b/tests/functional/hash-convert.sh
@@ -98,6 +98,8 @@ try3() {
     expectStderr 1 nix hash convert --hash-algo "$1" --from base16 "$3" | grepQuiet "input hash"
     expectStderr 1 nix hash convert --hash-algo "$1" --from nix32 "$4" | grepQuiet "input hash"
 
+    # Base-16 hashes can be in uppercase.
+    nix hash convert --hash-algo "$1" --from base16 "$(echo $2 | tr [a-z] [A-Z])"
 }
 
 try3 sha1 "800d59cfcd3c05e900cb4e214be48f6b886a08df" "vw46m23bizj4n8afrc0fj19wrp7mj3c0" "gA1Zz808BekAy04hS+SPa4hqCN8="