diff options
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/add-to-store.cc | 2 | ||||
| -rw-r--r-- | src/nix/develop.cc | 5 | ||||
| -rw-r--r-- | src/nix/make-content-addressable.cc | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc index d1764167e..6d90e93e8 100644 --- a/src/nix/add-to-store.cc +++ b/src/nix/add-to-store.cc @@ -48,7 +48,7 @@ struct CmdAddToStore : MixDryRun, StoreCommand ValidPathInfo info(store->makeFixedOutputPath(FileIngestionMethod::Recursive, narHash, *namePart)); info.narHash = narHash; info.narSize = sink.s->size(); - info.ca = std::optional { FileSystemHash { + info.ca = std::optional { FixedOutputHash { FileIngestionMethod::Recursive, info.narHash, } }; diff --git a/src/nix/develop.cc b/src/nix/develop.cc index 8abb710c2..037987313 100644 --- a/src/nix/develop.cc +++ b/src/nix/develop.cc @@ -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); diff --git a/src/nix/make-content-addressable.cc b/src/nix/make-content-addressable.cc index 8d55171fc..c506eabd8 100644 --- a/src/nix/make-content-addressable.cc +++ b/src/nix/make-content-addressable.cc @@ -82,7 +82,7 @@ struct CmdMakeContentAddressable : StorePathsCommand, MixJSON if (hasSelfReference) info.references.insert(info.path); info.narHash = narHash; info.narSize = sink.s->size(); - info.ca = FileSystemHash { + info.ca = FixedOutputHash { FileIngestionMethod::Recursive, info.narHash, }; |