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

gexp: Rename <output-ref> to <gexp-output>. 

* guix/gexp.scm (<output-ref>): Rename to...
  (<gexp-output>): ... this.  Adjust constructor/accessor names and
  users accordingly.
This commit is contained in:
Ludovic Courtès 2015-03-16 22:31:14 +01:00
parent 1f9760339e
commit 1e87da58a1
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
guix/gexp.scm
View File

@ -81,10 +81,10 @@
;; Reference to one of the derivation's outputs, for gexps used in ;; Reference to one of the derivation's outputs, for gexps used in
;; derivations. ;; derivations.
(define-record-type <output-ref> (define-record-type <gexp-output>
(output-ref name) (gexp-output name)
output-ref? gexp-output?
(name output-ref-name)) (name gexp-output-name))
(define raw-derivation (define raw-derivation
(store-lift derivation)) (store-lift derivation))
@ -310,7 +310,7 @@ references."
"Return the outputs referred to by EXP as a list of strings." "Return the outputs referred to by EXP as a list of strings."
(define (add-reference-output ref result) (define (add-reference-output ref result)
(match ref (match ref
(($ <output-ref> name) (($ <gexp-output> name)
(cons name result)) (cons name result))
((? gexp? exp) ((? gexp? exp)
(append (gexp-outputs exp) result)) (append (gexp-outputs exp) result))
@ -340,7 +340,7 @@ and in the current monad setting (system type, etc.)"
(((? origin? o) (? string? output)) (((? origin? o) (? string? output))
(mlet %store-monad ((drv (origin->derivation o))) (mlet %store-monad ((drv (origin->derivation o)))
(return (derivation->output-path drv output)))) (return (derivation->output-path drv output))))
(($ <output-ref> 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
;; that trick. ;; that trick.
@ -441,9 +441,9 @@ package/derivation references."
ungexp-native ungexp-native-splicing ungexp-native ungexp-native-splicing
output) output)
((ungexp output) ((ungexp output)
#'(output-ref "out")) #'(gexp-output "out"))
((ungexp output name) ((ungexp output name)
#'(output-ref name)) #'(gexp-output name))
((ungexp thing) ((ungexp thing)
#'thing) #'thing)
((ungexp drv-or-pkg out) ((ungexp drv-or-pkg out)