diff options
author | Ludovic Courtès <ludo@gnu.org> | 2014-04-27 23:19:11 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-28 23:41:12 +0200 |
commit | ada3df03e33f686467ce4e887381e8753a3e603b (patch) | |
tree | 2843b5569e78938c3259c2bdb390518adf157012 /guix/ui.scm | |
parent | 0c21d92b1cb0f7fa2b2d43cae1d84d32ccfc1393 (diff) | |
download | gnu-guix-ada3df03e33f686467ce4e887381e8753a3e603b.tar gnu-guix-ada3df03e33f686467ce4e887381e8753a3e603b.tar.gz |
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 'guix/ui.scm')
-rw-r--r-- | guix/ui.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/ui.scm b/guix/ui.scm index 944c9f87fa..259dddd481 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -241,7 +241,7 @@ interpreted." str args))))) (catch #t (lambda () - (eval exp the-scm-module)) + (eval exp the-root-module)) (lambda args (leave (_ "failed to evaluate expression `~a': ~s~%") exp args))))) |