diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-01-06 12:57:15 -0500 |
| commit | 23800e47361304682914314b99cfd4f3926f28e3 (patch) | |
| tree | e67d984ab5961a81c8b8c6396c79cb218fecda85 /nix/libstore/derivations.hh | |
| parent | 9b1bf33081652210502c6ef34506e27a9bc60f06 (diff) | |
| parent | aebb05b09502be00fb121f9c6cd74a190fb12a1c (diff) | |
| download | patches-23800e47361304682914314b99cfd4f3926f28e3.tar patches-23800e47361304682914314b99cfd4f3926f28e3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/libstore/derivations.hh')
| -rw-r--r-- | nix/libstore/derivations.hh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nix/libstore/derivations.hh b/nix/libstore/derivations.hh index 703410b925..04b64dfc88 100644 --- a/nix/libstore/derivations.hh +++ b/nix/libstore/derivations.hh @@ -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); |