From 15ddeff532b517843668eef8f615838d15b4f75c Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 4 Jan 2015 23:27:34 +0100
Subject: Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch
'nix'.
---
nix/libstore/derivations.hh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'nix/libstore/derivations.hh')
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);
--
cgit v1.2.3