From 442e665d6d3fcbdee7dece2f62a597142f8784b1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 11 Feb 2020 23:50:16 +0100
Subject: [PATCH] nix path-info --json: Print hash in SRI format

---
 src/libstore/store-api.cc | 6 ++++--
 src/libstore/store-api.hh | 1 +
 src/nix/path-info.cc      | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index e37829b17..5ca77b563 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -442,7 +442,9 @@ string Store::makeValidityRegistration(const StorePathSet & paths,
 
 
 void Store::pathInfoToJSON(JSONPlaceholder & jsonOut, const StorePathSet & storePaths,
-    bool includeImpureInfo, bool showClosureSize, AllowInvalidFlag allowInvalid)
+    bool includeImpureInfo, bool showClosureSize,
+    Base hashBase,
+    AllowInvalidFlag allowInvalid)
 {
     auto jsonList = jsonOut.list();
 
@@ -454,7 +456,7 @@ void Store::pathInfoToJSON(JSONPlaceholder & jsonOut, const StorePathSet & store
             auto info = queryPathInfo(storePath);
 
             jsonPath
-                .attr("narHash", info->narHash.to_string())
+                .attr("narHash", info->narHash.to_string(hashBase))
                 .attr("narSize", info->narSize);
 
             {
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 0aaec20d1..85851e211 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -541,6 +541,7 @@ public:
        each path is included. */
     void pathInfoToJSON(JSONPlaceholder & jsonOut, const StorePathSet & storePaths,
         bool includeImpureInfo, bool showClosureSize,
+        Base hashBase = Base32,
         AllowInvalidFlag allowInvalid = DisallowInvalid);
 
     /* Return the size of the closure of the specified path, that is,
diff --git a/src/nix/path-info.cc b/src/nix/path-info.cc
index bffa7b356..45ec297d2 100644
--- a/src/nix/path-info.cc
+++ b/src/nix/path-info.cc
@@ -89,7 +89,7 @@ struct CmdPathInfo : StorePathsCommand, MixJSON
             store->pathInfoToJSON(jsonRoot,
                 // FIXME: preserve order?
                 storePathsToSet(storePaths),
-                true, showClosureSize, AllowInvalid);
+                true, showClosureSize, SRI, AllowInvalid);
         }
 
         else {