nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 06:22:42 +01:00
Code Activity

Remove references from fixed output derivation ab syntax

Browse source 
In other words, use a plain `ContentAddress` not
`ContentAddressWithReferences` for `DerivationOutput::CAFixed`.

Supporting fixed output derivations with (fixed) references would be a
cool feature, but it is out of scope at this moment.
This commit is contained in:
John Ericson 2023-04-19 14:48:53 -04:00
parent aba8a8a83a
commit 7103c6da70
9 changed files with 55 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/libstore/derivations.cc
View file

@ -38,7 +38,7 @@ StorePath DerivationOutput::CAFixed::path(const Store & store, std::string_view
{
return store.makeFixedOutputPathFromCA(
outputPathName(drvName, outputName),
ca);
ContentAddressWithReferences::withoutRefs(ca));
}
@ -230,11 +230,9 @@ static DerivationOutput parseDerivationOutput(const Store & store,
validatePath(pathS);
auto hash = Hash::parseNonSRIUnprefixed(hashS, hashType);
return DerivationOutput::CAFixed {
.ca = ContentAddressWithReferences::fromParts(
.ca = ContentAddress::fromParts(
std::move(method),
std::move(hash),
// FIXME non-trivial fixed refs set
{}),
std::move(hash)),
};
} else {
experimentalFeatureSettings.require(Xp::CaDerivations);
@ -1020,10 +1018,9 @@ DerivationOutput DerivationOutput::fromJSON(
else if (keys == (std::set<std::string_view> { "path", "hashAlgo", "hash" })) {
auto [method, hashType] = methodAlgo();
auto dof = DerivationOutput::CAFixed {
.ca = ContentAddressWithReferences::fromParts(
.ca = ContentAddress::fromParts(
std::move(method),
Hash::parseNonSRIUnprefixed((std::string) json["hash"], hashType),
{}),
Hash::parseNonSRIUnprefixed((std::string) json["hash"], hashType)),
};
if (dof.path(store, drvName, outputName) != store.parseStorePath((std::string) json["path"]))
throw Error("Path doesn't match derivation output");