[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) {
- 302/376: Don't claim FreeBSD support, (continued)
- 302/376: Don't claim FreeBSD support, Ludovic Courtès, 2015/01/28
- 274/376: Don't pull in git when doing a nix-shell, Ludovic Courtès, 2015/01/28
- 247/376: mkList: Scrub better, Ludovic Courtès, 2015/01/28
- 248/376: Improved error message when encountering unsupported file types, Ludovic Courtès, 2015/01/28
- 295/376: nix-daemon: Call exit(), not _exit(), Ludovic Courtès, 2015/01/28
- 242/376: Add primop ‘attrValues’, Ludovic Courtès, 2015/01/28
- 254/376: nix-store -q: Check for conflicting flags, Ludovic Courtès, 2015/01/28
- 265/376: Merge pull request #380 from shlevy/temp-disable-darwin, Ludovic Courtès, 2015/01/28
- 253/376: nix-channel: Add --rollback flag, Ludovic Courtès, 2015/01/28
- 289/376: Document functors, Ludovic Courtès, 2015/01/28
- 259/376: Export realiseContext in libnixexpr,
Ludovic Courtès <=
- 284/376: SSH.pm: Print a friendlier message if connecting fails, Ludovic Courtès, 2015/01/28
- 278/376: Typo, Ludovic Courtès, 2015/01/28
- 292/376: Add a test for the binary tarball installer, Ludovic Courtès, 2015/01/28
- 296/376: Disable vacuuming the DB after garbage collection, Ludovic Courtès, 2015/01/28
- 298/376: Fix bad operator, Ludovic Courtès, 2015/01/28
- 270/376: Revert "Temporarily disable darwin builds while hydra's darwin is borked", Ludovic Courtès, 2015/01/28
- 283/376: Doh, Ludovic Courtès, 2015/01/28
- 300/376: import derivation: cleanup, Ludovic Courtès, 2015/01/28
- 264/376: Temporarily disable darwin builds while hydra's darwin is borked, Ludovic Courtès, 2015/01/28
- 291/376: Fix message, Ludovic Courtès, 2015/01/28