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

2020-06-26 08:46:46 +02:00
parent 09fc06daab b7ccf7ae2a
commit adf2fbbdc2
66 changed files with 751 additions and 359 deletions
@@ -135,7 +135,13 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
    drv.inputSrcs.insert(std::move(getEnvShPath));
    Hash h = hashDerivationModulo(*store, drv, true);
    auto shellOutPath = store->makeOutputPath("out", h, drvName);
-    drv.outputs.insert_or_assign("out", DerivationOutput { shellOutPath, "", "" });
+    drv.outputs.insert_or_assign("out", DerivationOutput {
+        .path = shellOutPath,
+        .hash = FixedOutputHash {
+            .method = FileIngestionMethod::Flat,
+            .hash = Hash { },
+        },
+    });
    drv.env["out"] = store->printStorePath(shellOutPath);
    auto shellDrvPath2 = writeDerivation(store, drv, drvName);