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

Merge remote-tracking branch 'upstream/master' into ca-floating-upstream

Browse source
This commit is contained in:
John Ericson 2020-09-16 17:50:40 +00:00
commit c5ccebae00
19 changed files with 118 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/derivations.hh
View file

@ -52,7 +52,7 @@ struct DerivationOutput
/* Note, when you use this function you should make sure that you're passing
the right derivation name. When in doubt, you should use the safer
interface provided by BasicDerivation::outputsAndOptPaths */
std::optional<StorePath> pathOpt(const Store & store, std::string_view drvName, std::string_view outputName) const;
std::optional<StorePath> path(const Store & store, std::string_view drvName, std::string_view outputName) const;
};
typedef std::map<string, DerivationOutput> DerivationOutputs;