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

gexp: Remove special meaning of forms (PACKAGE OUTPUT) in ungexp. 

* guix/gexp.scm (gexp-inputs)[add-reference-inputs]: Remove clause for
  inputs of the form (PACKAGE OUTPUT).
  (gexp->sexp)[reference->sexp]: Likewise.
* tests/gexp.scm ("input list splicing"): Change 'list' to 'gexp-input'
  for glibc:debug.
  ("text-file*"): Likewise for %bootstrap-guile:out.
  ("input list splicing + gexp-input + ungexp-native-splicing"): Remove,
  now redundant.
This commit is contained in:
Ludovic Courtès 2015-03-15 21:59:19 +01:00
parent b4a4bec01a
commit a482cfdcae
2 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
guix/gexp.scm
View File

@ -312,10 +312,6 @@ references."
(if (direct-store-path? str) (if (direct-store-path? str)
(cons `(,str) result) (cons `(,str) result)
result)) result))
(($ <gexp-input> ((? package? p) (? string? output)) _ native?)
;; XXX: For now, for backward-compatibility, automatically convert a
;; pair like this to an gexp-input for OUTPUT of P.
(add-reference-inputs (gexp-input p output native?) result))
(($ <gexp-input> (lst ...) output native?) (($ <gexp-input> (lst ...) output native?)
(fold-right add-reference-inputs result (fold-right add-reference-inputs result
;; XXX: For now, automatically convert LST to a list of ;; XXX: For now, automatically convert LST to a list of
@ -373,13 +369,6 @@ and in the current monad setting (system type, etc.)"
#:output output #:output output
#:system system #:system system
#:target (if (or n? native?) #f target))) #:target (if (or n? native?) #f target)))
(($ <gexp-input> ((? package? p) (? string? output)) _ n?)
;; XXX: For backward compatibility, automatically interpret such a
;; pair.
(package-file p
#:output output
#:system system
#:target (if (or n? native?) #f target)))
(($ <gexp-input> (? origin? o) output) (($ <gexp-input> (? origin? o) 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))))

14
tests/gexp.scm
View File

@ -196,7 +196,7 @@
(gexp->sexp* exp target))))) (gexp->sexp* exp target)))))
(test-assert "input list splicing" (test-assert "input list splicing"
(let* ((inputs (list (list glibc "debug") %bootstrap-guile)) (let* ((inputs (list (gexp-input glibc "debug") %bootstrap-guile))
(outputs (list (derivation->output-path (outputs (list (derivation->output-path
(package-derivation %store glibc) (package-derivation %store glibc)
"debug") "debug")
@ -210,16 +210,6 @@
`(list ,@(cons 5 outputs)))))) `(list ,@(cons 5 outputs))))))
(test-assert "input list splicing + ungexp-native-splicing" (test-assert "input list splicing + ungexp-native-splicing"
(let* ((inputs (list (list glibc "debug") %bootstrap-guile))
(exp (gexp (list (ungexp-native-splicing (cons (+ 2 3) inputs))))))
(and (lset= equal?
`((,glibc "debug") (,%bootstrap-guile "out"))
(gexp-native-inputs exp))
(null? (gexp-inputs exp))
(equal? (gexp->sexp* exp) ;native
(gexp->sexp* exp "mips64el-linux")))))
(test-assert "input list splicing + gexp-input + ungexp-native-splicing"
(let* ((inputs (list (gexp-input glibc "debug") %bootstrap-guile)) (let* ((inputs (list (gexp-input glibc "debug") %bootstrap-guile))
(exp (gexp (list (ungexp-native-splicing (cons (+ 2 3) inputs)))))) (exp (gexp (list (ungexp-native-splicing (cons (+ 2 3) inputs))))))
(and (lset= equal? (and (lset= equal?
@ -553,7 +543,7 @@
(file (text-file "bar" "This is bar.")) (file (text-file "bar" "This is bar."))
(text (text-file* "foo" (text (text-file* "foo"
%bootstrap-guile "/bin/guile " %bootstrap-guile "/bin/guile "
`(,%bootstrap-guile "out") "/bin/guile " (gexp-input %bootstrap-guile "out") "/bin/guile "
drv "/bin/guile " drv "/bin/guile "
file)) file))
(done (built-derivations (list text))) (done (built-derivations (list text)))