qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #4350 from NixOS/ca/fix-build-with-nix-command

Browse source 
Fix the `nix` command with CA derivations
This commit is contained in:
Eelco Dolstra 2020-12-11 15:01:49 +01:00 committed by GitHub
parent c6a1bcd0ec eb45308109
commit 9c143c411b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/nix/installables.cc
View file

@ -409,7 +409,7 @@ std::vector<InstallableValue::DerivationInfo> InstallableAttrPath::toDerivations
for (auto & drvInfo : drvInfos) { for (auto & drvInfo : drvInfos) {
res.push_back({ res.push_back({
state->store->parseStorePath(drvInfo.queryDrvPath()), state->store->parseStorePath(drvInfo.queryDrvPath()),
state->store->parseStorePath(drvInfo.queryOutPath()), state->store->maybeParseStorePath(drvInfo.queryOutPath()),
drvInfo.queryOutputName() drvInfo.queryOutputName()
}); });
} }

6
tests/content-addressed.sh
View file

@ -50,7 +50,13 @@ testGC () {
nix-collect-garbage --experimental-features ca-derivations --option keep-derivations true nix-collect-garbage --experimental-features ca-derivations --option keep-derivations true
} }
testNixCommand () {
clearStore
nix build --experimental-features 'nix-command ca-derivations' --file ./content-addressed.nix --no-link
}
testRemoteCache testRemoteCache
testDeterministicCA testDeterministicCA
testCutoff testCutoff
testGC testGC
testNixCommand