summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2014-04-27 23:19:11 +0200
committerLudovic Courtès <ludo@gnu.org>2014-04-28 23:41:12 +0200
commitada3df03e33f686467ce4e887381e8753a3e603b (patch)
tree2843b5569e78938c3259c2bdb390518adf157012 /tests
parent0c21d92b1cb0f7fa2b2d43cae1d84d32ccfc1393 (diff)
monads: Hide 'derivation-expression' and 'lower-inputs'.
* guix/monads.scm: Unexport 'lower-inputs' and 'derivation-expression'. (text-file*): Add comment about the switch to 'gexp->derivation'. (lower-inputs): Add comment about its doom. (derivation-expression): Likewise. * guix/gexp.scm (lower-inputs*): Rename to... (lower-inputs): ... this. Update callers. * tests/monads.scm (derivation-expression): New procedure. * doc/guix.texi (The Store Monad): Use 'gexp->derivation' instead of 'derivation-expression'. Remove documentation of 'derivation-expression'. * guix/ui.scm (read/eval): Use THE-ROOT-MODULE so that macros are properly expanded. * tests/guix-build.sh: Use 'gexp->derivation' instead of 'derivation-expression'.monads: Hide 'derivation-expression' and 'lower-inputs'.
Diffstat (limited to 'tests')
-rw-r--r--tests/guix-build.sh7
-rw-r--r--tests/monads.scm3
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/guix-build.sh b/tests/guix-build.sh
index d66e132c1f..e0c774d055 100644
--- a/tests/guix-build.sh
+++ b/tests/guix-build.sh
@@ -1,5 +1,5 @@
# GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
#
# This file is part of GNU Guix.
#
@@ -75,7 +75,8 @@ then false; else true; fi
# Invoking a monadic procedure.
guix build -e "(begin
- (use-modules (guix monads) (guix utils))
+ (use-modules (guix gexp))
(lambda ()
- (derivation-expression \"test\" '(mkdir %output))))" \
+ (gexp->derivation \"test\"
+ (gexp (mkdir (ungexp output))))))" \
--dry-run
diff --git a/tests/monads.scm b/tests/monads.scm
index b51e705f01..82f4b9989c 100644
--- a/tests/monads.scm
+++ b/tests/monads.scm
@@ -108,6 +108,9 @@
guile)))
#:guile-for-build (package-derivation %store %bootstrap-guile)))
+(define derivation-expression
+ (@@ (guix monads) derivation-expression))
+
(test-assert "mlet* + derivation-expression"
(run-with-store %store
(mlet* %store-monad ((guile (package-file %bootstrap-guile "bin/guile"))