wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 02:11:15 +02:00
Code Activity

Merge remote-tracking branch 'upstream/master' into more-rust-ffi

Browse source
This commit is contained in:
John Ericson 2020-05-28 10:31:46 -04:00
commit ef71caba29
34 changed files with 921 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/derivations.hh
View file

@ -25,7 +25,7 @@ struct DerivationOutput
DerivationOutput(const DerivationOutput &) = default;
DerivationOutput(DerivationOutput &&) = default;
DerivationOutput & operator = (const DerivationOutput &) = default;
void parseHashInfo(bool & recursive, Hash & hash) const;
void parseHashInfo(FileIngestionMethod & recursive, Hash & hash) const;
};
typedef std::map<string, DerivationOutput> DerivationOutputs;