max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-14 02:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7465 from edolstra/impure-derivations-dry-run

Browse source 
Fix a crash in DerivedPath::Built::toJSON() with impure derivations
This commit is contained in:
Eelco Dolstra 2022-12-15 18:15:23 +01:00 committed by GitHub
commit 26c7602c39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/derived-path.cc
View file

@ -20,11 +20,12 @@ nlohmann::json DerivedPath::Built::toJSON(ref<Store> store) const {
// Fallback for the input-addressed derivation case: We expect to always be // Fallback for the input-addressed derivation case: We expect to always be
// able to print the output paths, so let’s do it // able to print the output paths, so let’s do it
const auto knownOutputs = store->queryPartialDerivationOutputMap(drvPath); const auto knownOutputs = store->queryPartialDerivationOutputMap(drvPath);
for (const auto& output : outputs) { for (const auto & output : outputs) {
auto knownOutput = get(knownOutputs, output); auto knownOutput = get(knownOutputs, output);
res["outputs"][output] = (knownOutput && *knownOutput) if (knownOutput && *knownOutput)
? store->printStorePath(**knownOutput) res["outputs"][output] = store->printStorePath(**knownOutput);
: nullptr; else
res["outputs"][output] = nullptr;
} }
return res; return res;
} }

1
tests/impure-derivations.sh
View file

@ -12,6 +12,7 @@ clearStore
# Basic test of impure derivations: building one a second time should not use the previous result. # Basic test of impure derivations: building one a second time should not use the previous result.
printf 0 > $TEST_ROOT/counter printf 0 > $TEST_ROOT/counter
nix build --dry-run --json --file ./impure-derivations.nix impure.all
json=$(nix build -L --no-link --json --file ./impure-derivations.nix impure.all) json=$(nix build -L --no-link --json --file ./impure-derivations.nix impure.all)
path1=$(echo $json | jq -r .[].outputs.out) path1=$(echo $json | jq -r .[].outputs.out)
path1_stuff=$(echo $json | jq -r .[].outputs.stuff) path1_stuff=$(echo $json | jq -r .[].outputs.stuff)