From c664e68b87a3e9e41c4471276886da71793b2d85 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 2 Jun 2020 18:25:32 +0000
Subject: [PATCH] Fix to-base --type handler to correctly set std::optional
 flag

Now that we have a separate flag function, also describe why it is
optional.
---
 src/libutil/args.cc | 12 ++++++++++++
 src/libutil/args.hh |  1 +
 src/nix/hash.cc     |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index c4035ab85..4fe9539e4 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -166,6 +166,18 @@ Args::Flag Args::Flag::mkHashTypeFlag(std::string && longName, HashType * ht)
     };
 }
 
+Args::Flag Args::Flag::mkHashTypeOptFlag(std::string && longName, std::optional<HashType> * oht)
+{
+    return Flag {
+        .longName = std::move(longName),
+        .description = "hash algorithm ('md5', 'sha1', 'sha256', or 'sha512'). Optional as can also be gotten from SRI hash itself.",
+        .labels = {"hash-algo"},
+        .handler = {[oht](std::string s) {
+            *oht = std::optional<HashType> { parseHashType(s) };
+        }}
+    };
+}
+
 Strings argvToStrings(int argc, char * * argv)
 {
     Strings args;
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index fc8f82af5..f2315f67a 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -85,6 +85,7 @@ protected:
         Handler handler;
 
         static Flag mkHashTypeFlag(std::string && longName, HashType * ht);
+        static Flag mkHashTypeOptFlag(std::string && longName, std::optional<HashType> * oht);
     };
 
     std::map<std::string, Flag::ptr> longFlags;
diff --git a/src/nix/hash.cc b/src/nix/hash.cc
index 0e24bbaed..d1b5cca72 100644
--- a/src/nix/hash.cc
+++ b/src/nix/hash.cc
@@ -84,7 +84,7 @@ struct CmdToBase : Command
 
     CmdToBase(Base base) : base(base)
     {
-        addFlag(Flag::mkHashTypeFlag("type", &*ht));
+        addFlag(Flag::mkHashTypeOptFlag("type", &ht));
         expectArgs("strings", &args);
     }