diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-05 14:37:42 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-08-05 14:40:01 +0000 |
| commit | 839f0fe0956cf4434b64e81a0966e780051901ad (patch) | |
| tree | d7413e1f0bf42a42bfb83490e0e462b6dc8b6066 /src/libstore/derivations.cc | |
| parent | 03f4fafc27bd9f8def1df6a229a17fc2c3f0e0a0 (diff) | |
| parent | b91dc7ebad733f557dd812f285095b700c267fa2 (diff) | |
Merge remote-tracking branch 'upstream/master' into misc-ca
Diffstat (limited to 'src/libstore/derivations.cc')
| -rw-r--r-- | src/libstore/derivations.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 3fa93e24d..8f2339885 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -159,7 +159,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, std::istrings .output = DerivationOutputFixed { .hash = FixedOutputHash { .method = std::move(method), - .hash = Hash(hash, hashType), + .hash = Hash::parseNonSRIUnprefixed(hash, hashType), }, } } @@ -555,7 +555,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store) .output = DerivationOutputFixed { .hash = FixedOutputHash { .method = std::move(method), - .hash = Hash(hash, hashType), + .hash = Hash::parseNonSRIUnprefixed(hash, hashType), }, } } |