From a6ff66b658b61aef80d936f0183447fe4cb46000 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 2 Apr 2020 19:04:33 +0200
Subject: Respect the narHash attribute in more input types

call-flake.nix now passes node.info.narHash to fetchTree. This ensures
that dirty Git trees work even in pure mode.
---
 src/libfetchers/fetchers.cc  | 4 +++-
 src/libfetchers/git.cc       | 2 +-
 src/libfetchers/github.cc    | 2 +-
 src/libfetchers/mercurial.cc | 2 +-
 src/libfetchers/tarball.cc   | 6 ++----
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/libfetchers')

diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc
index 765a6585f..83268b4bf 100644
--- a/src/libfetchers/fetchers.cc
+++ b/src/libfetchers/fetchers.cc
@@ -29,8 +29,10 @@ std::unique_ptr<Input> inputFromURL(const std::string & url)
 
 std::unique_ptr<Input> inputFromAttrs(const Attrs & attrs)
 {
+    auto attrs2(attrs);
+    attrs2.erase("narHash");
     for (auto & inputScheme : *inputSchemes) {
-        auto res = inputScheme->inputFromAttrs(attrs);
+        auto res = inputScheme->inputFromAttrs(attrs2);
         if (res) {
             if (auto narHash = maybeGetStrAttr(attrs, "narHash"))
                 // FIXME: require SRI hash.
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
index e578ed731..dbf57aa33 100644
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -39,7 +39,7 @@ struct GitInput : Input
 
     bool isImmutable() const override
     {
-        return (bool) rev;
+        return (bool) rev || narHash;
     }
 
     std::optional<std::string> getRef() const override { return ref; }
diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index 505af8af1..f50c927eb 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -33,7 +33,7 @@ struct GitHubInput : Input
 
     bool isImmutable() const override
     {
-        return (bool) rev;
+        return (bool) rev || narHash;
     }
 
     std::optional<std::string> getRef() const override { return ref; }
diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc
index 4b73fbcbe..5abb00172 100644
--- a/src/libfetchers/mercurial.cc
+++ b/src/libfetchers/mercurial.cc
@@ -33,7 +33,7 @@ struct MercurialInput : Input
 
     bool isImmutable() const override
     {
-        return (bool) rev;
+        return (bool) rev || narHash;
     }
 
     std::optional<std::string> getRef() const override { return ref; }
diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index b0a83001e..4c4e5828e 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -205,9 +205,7 @@ struct TarballInput : Input
     {
         Attrs attrs;
         attrs.emplace("url", url.to_string());
-        if (narHash)
-            attrs.emplace("narHash", narHash->to_string(SRI));
-        else if (hash)
+        if (hash)
             attrs.emplace("hash", hash->to_string(SRI));
         return attrs;
     }
@@ -260,7 +258,7 @@ struct TarballInputScheme : InputScheme
         if (maybeGetStrAttr(attrs, "type") != "tarball") return {};
 
         for (auto & [name, value] : attrs)
-            if (name != "type" && name != "url" && name != "hash" && name != "narHash")
+            if (name != "type" && name != "url" && name != "hash")
                 throw Error("unsupported tarball input attribute '%s'", name);
 
         auto input = std::make_unique<TarballInput>(parseURL(getStrAttr(attrs, "url")));
-- 
cgit v1.2.3