diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-21 16:43:17 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-21 16:43:17 +0000 |
commit | fdeabf71601e4ec9ff797e0283d06f9b5b9d8aa5 (patch) | |
tree | 51cfb1a7b05b0641fc7c3bb755210f6cd053c395 /src/libfetchers | |
parent | 02928f76fdf8ab991da404d4216e97d54af19976 (diff) | |
parent | 984e521392b3f41f7cdab203e5c00f3e00e27a28 (diff) |
Merge remote-tracking branch 'upstream/master' into multi-output-hashDerivationModulo
Diffstat (limited to 'src/libfetchers')
-rw-r--r-- | src/libfetchers/fetchers.cc | 2 | ||||
-rw-r--r-- | src/libfetchers/tarball.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libfetchers/fetchers.cc b/src/libfetchers/fetchers.cc index 11cac4c55..9174c3de4 100644 --- a/src/libfetchers/fetchers.cc +++ b/src/libfetchers/fetchers.cc @@ -36,7 +36,7 @@ std::unique_ptr<Input> inputFromAttrs(const Attrs & attrs) if (res) { if (auto narHash = maybeGetStrAttr(attrs, "narHash")) // FIXME: require SRI hash. - res->narHash = newHashAllowEmpty(*narHash, htUnknown); + res->narHash = newHashAllowEmpty(*narHash, {}); return res; } } diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc index 7966da314..ac83d52b9 100644 --- a/src/libfetchers/tarball.cc +++ b/src/libfetchers/tarball.cc @@ -264,7 +264,7 @@ struct TarballInputScheme : InputScheme auto input = std::make_unique<TarballInput>(parseURL(getStrAttr(attrs, "url"))); if (auto hash = maybeGetStrAttr(attrs, "hash")) - input->hash = newHashAllowEmpty(*hash, htUnknown); + input->hash = newHashAllowEmpty(*hash, {}); return input; } |