guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

259/376: Export realiseContext in libnixexpr


From: Ludovic Courtès
Subject: 259/376: Export realiseContext in libnixexpr
Date: Wed, 28 Jan 2015 22:05:28 +0000

civodul pushed a commit to tag 1.8
in repository guix.

commit d16e3c7f091b0ecc4975368575c71d69ce7a9bc7
Author: Shea Levy <address@hidden>
Date:   Fri Oct 17 22:15:09 2014 -0400

    Export realiseContext in libnixexpr
    
    Useful for importNative plugins
---
 src/libexpr/eval.hh    |    8 ++++++++
 src/libexpr/primops.cc |   12 +++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 38d7377..daf5384 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -336,5 +336,13 @@ string showType(const Value & v);
 /* If `path' refers to a directory, then append "/default.nix". */
 Path resolveExprPath(Path path);
 
+struct InvalidPathError : EvalError
+{
+    Path path;
+    InvalidPathError(const Path & path);
+};
+
+/* Realise all paths in `context' */
+void realiseContext(const PathSet & context);
 
 }
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index a1374a0..50d03f3 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -39,16 +39,10 @@ std::pair<string, string> decodeContext(const string & s)
 }
 
 
-struct InvalidPathError : EvalError
-{
-    Path path;
-    InvalidPathError(const Path & path) :
-        EvalError(format("path ‘%1%’ is not valid") % path), path(path) {};
-    ~InvalidPathError() throw () { };
-};
-
+InvalidPathError::InvalidPathError(const Path & path) :
+    EvalError(format("path ‘%1%’ is not valid") % path), path(path) {}
 
-static void realiseContext(const PathSet & context)
+void realiseContext(const PathSet & context)
 {
     PathSet drvs;
     for (auto & i : context) {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]