mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
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'.
This commit is contained in:
parent
0c21d92b1c
commit
ada3df03e3
6 changed files with 17 additions and 22 deletions
|
@ -57,9 +57,7 @@
|
|||
text-file*
|
||||
package-file
|
||||
package->derivation
|
||||
built-derivations
|
||||
derivation-expression
|
||||
lower-inputs)
|
||||
built-derivations)
|
||||
#:replace (imported-modules
|
||||
compiled-modules))
|
||||
|
||||
|
@ -356,6 +354,7 @@ and store file names; the resulting store file holds references to all these."
|
|||
(lambda (port)
|
||||
(display ,(computed-text text inputs) port))))
|
||||
|
||||
;; TODO: Rewrite using 'gexp->derivation'.
|
||||
(mlet %store-monad ((inputs (lower-inputs inputs)))
|
||||
(derivation-expression name (builder inputs)
|
||||
#:inputs inputs)))
|
||||
|
@ -376,7 +375,7 @@ OUTPUT directory of PACKAGE."
|
|||
(define (lower-inputs inputs)
|
||||
"Turn any package from INPUTS into a derivation; return the corresponding
|
||||
input list as a monadic value."
|
||||
;; XXX: Should probably be in (guix packages).
|
||||
;; XXX: This procedure is bound to disappear with 'derivation-expression'.
|
||||
(with-monad %store-monad
|
||||
(sequence %store-monad
|
||||
(map (match-lambda
|
||||
|
@ -390,6 +389,7 @@ input list as a monadic value."
|
|||
inputs))))
|
||||
|
||||
(define derivation-expression
|
||||
;; XXX: This procedure is superseded by 'gexp->derivation'.
|
||||
(store-lift build-expression->derivation))
|
||||
|
||||
(define package->derivation
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue