Merge remote-tracking branch 'origin/master' into flakes

2020-01-21 21:18:52 +01:00
parent 62f712c8ae aef635da78
commit 6fadb3fc03
20 changed files with 217 additions and 181 deletions
@@ -732,6 +732,8 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
           the hash. */
        for (auto & i : outputs) {
            if (!jsonObject) drv.env[i] = "";
+            drv.outputs.insert_or_assign(i,
+                DerivationOutput(StorePath::dummy.clone(), "", ""));
        }

        Hash h = hashDerivationModulo(*state.store, Derivation(drv), true);