wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Merge branch 'master' of github.com:NixOS/nix into derivation-header-include-order

Browse source
This commit is contained in:
Carlo Nucera 2020-07-15 17:58:30 -04:00
commit 455bdee205
48 changed files with 616 additions and 415 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/derivations.hh
View file

@ -76,7 +76,7 @@ StorePath writeDerivation(ref<Store> store,
const Derivation & drv, std::string_view name, RepairFlag repair = NoRepair);
/* Read a derivation from a file. */
Derivation parseDerivation(const Store & store, const string & s);
Derivation parseDerivation(const Store & store, string && s);
// FIXME: remove
bool isDerivation(const string & fileName);