Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.

This commit is contained in:
Ludovic Courtès 2015-01-04 23:27:34 +01:00
parent 828c0bec6b
commit 15ddeff532
10 changed files with 133 additions and 24 deletions

View file

@ -59,8 +59,8 @@ class StoreAPI;
Path writeDerivation(StoreAPI & store,
const Derivation & drv, const string & name, bool repair = false);
/* Parse a derivation. */
Derivation parseDerivation(const string & s);
/* Read a derivation from a file. */
Derivation readDerivation(const Path & drvPath);
/* Print a derivation. */
string unparseDerivation(const Derivation & drv);