wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Merge remote-tracking branch 'obsidian/misc-ca' into derivation-primop-floating-output

Browse source
This commit is contained in:
John Ericson 2020-08-05 14:51:41 +00:00
commit 92ad550e96
74 changed files with 1200 additions and 624 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/derivations.cc
View file

@ -33,7 +33,7 @@ bool derivationIsCA(DerivationType dt) {
};
// Since enums can have non-variant values, but making a `default:` would
// disable exhaustiveness warnings.
abort();
assert(false);
}
bool derivationIsFixed(DerivationType dt) {
@ -42,7 +42,7 @@ bool derivationIsFixed(DerivationType dt) {
case DerivationType::CAFixed: return true;
case DerivationType::CAFloating: return false;
};
abort();
assert(false);
}
bool derivationIsImpure(DerivationType dt) {
@ -51,7 +51,7 @@ bool derivationIsImpure(DerivationType dt) {
case DerivationType::CAFixed: return true;
case DerivationType::CAFloating: return false;
};
abort();
assert(false);
}
@ -159,7 +159,7 @@ static DerivationOutput parseDerivationOutput(const Store & store, std::istrings
.output = DerivationOutputCAFixed {
.hash = FixedOutputHash {
.method = std::move(method),
.hash = Hash(hash, hashType),
.hash = Hash::parseNonSRIUnprefixed(hash, hashType),
},
}
}
@ -556,7 +556,7 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
.output = DerivationOutputCAFixed {
.hash = FixedOutputHash {
.method = std::move(method),
.hash = Hash(hash, hashType),
.hash = Hash::parseNonSRIUnprefixed(hash, hashType),
},
}
}