diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 15:18:19 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-06-19 15:26:59 +0000 |
commit | 2f0e395c99f926b9f0a65e37ea644a40ec5dddfa (patch) | |
tree | f9d8d6e0ae6e4b945f296484358d84e889a2ef11 /src/nix/make-content-addressable.cc | |
parent | 3fc58a96387f55226ad78a0d8e765a0f041e8da0 (diff) | |
parent | fb39a5e00c03c8fb3b893263e1d2b151c3ba11aa (diff) |
Merge remote-tracking branch 'me/no-stringly-typed-derivation-output' into validPathInfo-ca-proper-datatype
Diffstat (limited to 'src/nix/make-content-addressable.cc')
-rw-r--r-- | src/nix/make-content-addressable.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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, }; |