Merge branch 'multi-output-hashDerivationModulo' of github.com:Ericson2314/nix into misc-ca

2020-07-17 10:28:33 -04:00
parent 745a03cef5 bf9f040112
commit 5cb840541b
6 changed files with 1895 additions and 38 deletions
@@ -800,7 +800,9 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
                });
        }

-        Hash h = hashDerivationModulo(*state.store, Derivation(drv), true);
+        // Regular, non-CA derivation should always return a single hash and not
+        // hash per output.
+        Hash h = std::get<0>(hashDerivationModulo(*state.store, Derivation(drv), true));

        for (auto & i : outputs) {
            auto outPath = state.store->makeOutputPath(i, h, drvName);