nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gexp: Add identity compiler for derivations. 

* guix/gexp.scm (derivation-compiler): New procedure.
  (lower-inputs): Remove 'derivation?' case.
  (gexp-inputs)[add-reference-inputs]: Likewise.
  (gexp->sexp)[reference->sexp]: Likewise.
This commit is contained in:
Ludovic Courtès 2015-03-21 23:13:02 +01:00
parent a9a8f0637d
commit 2924f0d6ce
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
guix/gexp.scm
View File

@ -127,6 +127,12 @@ cross-compiling.)"
body ...))) body ...)))
(register-compiler! name))) (register-compiler! name)))
(define-gexp-compiler (derivation-compiler (drv derivation?) system target)
;; Derivations are the lowest-level representation, so this is the identity
;; compiler.
(with-monad %store-monad
(return drv)))
;;; ;;;
;;; Inputs & outputs. ;;; Inputs & outputs.
@ -165,8 +171,6 @@ the cross-compilation target triplet."
(with-monad %store-monad (with-monad %store-monad
(sequence %store-monad (sequence %store-monad
(map (match-lambda (map (match-lambda
((and ((? derivation?) sub-drv ...) input)
(return input))
((and ((? struct? thing) sub-drv ...) input) ((and ((? struct? thing) sub-drv ...) input)
(mlet* %store-monad ((lower -> (lookup-compiler thing)) (mlet* %store-monad ((lower -> (lookup-compiler thing))
(drv (lower thing system target))) (drv (lower thing system target)))
@ -262,6 +266,7 @@ The other arguments are as for 'derivation'."
(define (graphs-file-names graphs) (define (graphs-file-names graphs)
;; Return a list of (FILE-NAME . STORE-PATH) pairs made from GRAPHS. ;; Return a list of (FILE-NAME . STORE-PATH) pairs made from GRAPHS.
(map (match-lambda (map (match-lambda
;; TODO: Remove 'derivation?' special cases.
((file-name (? derivation? drv)) ((file-name (? derivation? drv))
(cons file-name (derivation->output-path drv))) (cons file-name (derivation->output-path drv)))
((file-name (? derivation? drv) sub-drv) ((file-name (? derivation? drv) sub-drv)
@ -348,8 +353,6 @@ The other arguments are as for 'derivation'."
references." references."
(define (add-reference-inputs ref result) (define (add-reference-inputs ref result)
(match ref (match ref
(($ <gexp-input> (? derivation? drv) output)
(cons `(,drv ,output) result))
(($ <gexp-input> (? gexp? exp)) (($ <gexp-input> (? gexp? exp))
(append (gexp-inputs exp references) result)) (append (gexp-inputs exp references) result))
(($ <gexp-input> (? string? str)) (($ <gexp-input> (? string? str))
@ -411,8 +414,6 @@ and in the current monad setting (system type, etc.)"
(define* (reference->sexp ref #:optional native?) (define* (reference->sexp ref #:optional native?)
(with-monad %store-monad (with-monad %store-monad
(match ref (match ref
(($ <gexp-input> (? derivation? drv) output)
(return (derivation->output-path drv output)))
(($ <gexp-output> output) (($ <gexp-output> output)
;; Output file names are not known in advance but the daemon defines ;; Output file names are not known in advance but the daemon defines
;; an environment variable for each of them at build time, so use ;; an environment variable for each of them at build time, so use