Merge remote-tracking branch 'me/no-stringly-typed-derivation-output' into validPathInfo-ca-proper-datatype

2020-06-19 15:26:59 +00:00
parent 3fc58a9638 fb39a5e00c
commit 2f0e395c99
14 changed files with 108 additions and 42 deletions
@@ -137,8 +137,9 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
    auto shellOutPath = store->makeOutputPath("out", h, drvName);
    drv.outputs.insert_or_assign("out", DerivationOutput {
        .path = shellOutPath,
-        .hash = FileSystemHash {
-            FileIngestionMethod::Flat, Hash { }
+        .hash = FixedOutputHash {
+            .method = FileIngestionMethod::Flat,
+            .hash = Hash { },
        },
    });
    drv.env["out"] = store->printStorePath(shellOutPath);