mirror of
https://github.com/NixOS/nix.git
synced 2025-11-22 02:09:36 +01:00
Test derivation options with content-addressing too
Now, both the unit and functional tests relating to derivation options
are tested both ways -- with input addressing and content-addressing
derivations.
(cherry picked from commit 307dbe9914)
This commit is contained in:
parent
37bcd29e5f
commit
f19184191e
37 changed files with 560 additions and 94 deletions
|
|
@ -1368,7 +1368,7 @@ Derivation Derivation::fromJSON(
|
|||
for (auto & [outputName, output] : getObject(valueAt(json, "outputs"))) {
|
||||
res.outputs.insert_or_assign(
|
||||
outputName,
|
||||
DerivationOutput::fromJSON(store, res.name, outputName, output));
|
||||
DerivationOutput::fromJSON(store, res.name, outputName, output, xpSettings));
|
||||
}
|
||||
} catch (Error & e) {
|
||||
e.addTrace({}, "while reading key 'outputs'");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue