store: Add 'references*'.
* guix/store.scm (references*): New procedure.
* guix/profiles.scm (manifest-lookup-package)[references*]: Remove.
* guix/scripts/system.scm (references*): Remove.
* tests/gexp.scm ("gexp->file", "gexp->file + file-append")
("gexp->derivation", "gexp->derivation, cross-compilation")
("gexp->derivation, ungexp + ungexp-native")
("scheme-file", "text-file*", "mixed-text-file"): Remove 'references*'
instead of (store-lift references).
This commit is contained in:
Ludovic Courtès
parent
713335fa61
commit
e74f64b9e5
|
|
@ -501,10 +501,6 @@ if not found."
|
|||
#t))))
|
||||
items))
|
||||
|
||||
;; TODO: Factorize.
|
||||
(define references*
|
||||
(store-lift references))
|
||||
|
||||
(with-monad %store-monad
|
||||
(match (manifest-entry-item entry)
|
||||
((? package? package)
|
||||
|
|
|
|||
|
|
@ -77,9 +77,6 @@
|
|||
;;; Installation.
|
||||
;;;
|
||||
|
||||
;; TODO: Factorize.
|
||||
(define references*
|
||||
(store-lift references))
|
||||
(define topologically-sorted*
|
||||
(store-lift topologically-sorted))
|
||||
|
||||
|
|
|
|||
|
|
@ -98,6 +98,7 @@
|
|||
built-in-builders
|
||||
references
|
||||
references/substitutes
|
||||
references*
|
||||
requisites
|
||||
referrers
|
||||
optimize-store
|
||||
|
|
@ -1170,6 +1171,9 @@ where FILE is the entry's absolute file name and STAT is the result of
|
|||
(define set-build-options*
|
||||
(store-lift set-build-options))
|
||||
|
||||
(define references*
|
||||
(store-lift references))
|
||||
|
||||
(define-inlinable (current-system)
|
||||
;; Consult the %CURRENT-SYSTEM fluid at bind time. This is equivalent to
|
||||
;; (lift0 %current-system %store-monad), but inlinable, thus avoiding
|
||||
|
|
|
|||
|
|
@ -375,7 +375,7 @@
|
|||
(drv (gexp->file "foo" exp))
|
||||
(out -> (derivation->output-path drv))
|
||||
(done (built-derivations (list drv)))
|
||||
(refs ((store-lift references) out)))
|
||||
(refs (references* out)))
|
||||
(return (and (equal? sexp (call-with-input-file out read))
|
||||
(equal? (list guile) refs)))))
|
||||
|
||||
|
|
@ -386,7 +386,7 @@
|
|||
(drv (gexp->file "foo" exp))
|
||||
(out -> (derivation->output-path drv))
|
||||
(done (built-derivations (list drv)))
|
||||
(refs ((store-lift references) out)))
|
||||
(refs (references* out)))
|
||||
(return (and (equal? (string-append guile "/bin/guile")
|
||||
(call-with-input-file out read))
|
||||
(equal? (list guile) refs)))))
|
||||
|
|
@ -407,8 +407,8 @@
|
|||
(out -> (derivation->output-path drv))
|
||||
(out2 -> (derivation->output-path drv "2nd"))
|
||||
(done (built-derivations (list drv)))
|
||||
(refs ((store-lift references) out))
|
||||
(refs2 ((store-lift references) out2))
|
||||
(refs (references* out))
|
||||
(refs2 (references* out2))
|
||||
(guile (package-file %bootstrap-guile "bin/guile")))
|
||||
(return (and (string=? (readlink (string-append out "/foo")) guile)
|
||||
(string=? (readlink out2) file)
|
||||
|
|
@ -481,7 +481,7 @@
|
|||
(ungexp output))))
|
||||
(xdrv (gexp->derivation "foo" exp
|
||||
#:target target))
|
||||
(refs ((store-lift references)
|
||||
(refs (references*
|
||||
(derivation-file-name xdrv)))
|
||||
(xcu (package->cross-derivation coreutils
|
||||
target))
|
||||
|
|
@ -506,7 +506,7 @@
|
|||
(ungexp output))))
|
||||
(xdrv (gexp->derivation "foo" exp
|
||||
#:target target))
|
||||
(refs ((store-lift references)
|
||||
(refs (references*
|
||||
(derivation-file-name xdrv)))
|
||||
(xglibc (package->cross-derivation glibc target))
|
||||
(cu (package->derivation coreutils)))
|
||||
|
|
@ -808,13 +808,12 @@
|
|||
(out -> (derivation->output-path drv)))
|
||||
(mbegin %store-monad
|
||||
(built-derivations (list drv))
|
||||
(mlet %store-monad ((refs ((store-lift references) out)))
|
||||
(mlet %store-monad ((refs (references* out)))
|
||||
(return (and (equal? refs (list text))
|
||||
(equal? `(list "foo" ,text)
|
||||
(call-with-input-file out read)))))))))
|
||||
|
||||
(test-assert "text-file*"
|
||||
(let ((references (store-lift references)))
|
||||
(run-with-store %store
|
||||
(mlet* %store-monad
|
||||
((drv (package->derivation %bootstrap-guile))
|
||||
|
|
@ -827,7 +826,7 @@
|
|||
file))
|
||||
(done (built-derivations (list text)))
|
||||
(out -> (derivation->output-path text))
|
||||
(refs (references out)))
|
||||
(refs (references* out)))
|
||||
;; Make sure we get the right references and the right content.
|
||||
(return (and (lset= string=? refs (list guile file))
|
||||
(equal? (call-with-input-file out get-string-all)
|
||||
|
|
@ -835,7 +834,7 @@
|
|||
guile "/bin/guile "
|
||||
guile "/bin/guile "
|
||||
file)))))
|
||||
#:guile-for-build (package-derivation %store %bootstrap-guile))))
|
||||
#:guile-for-build (package-derivation %store %bootstrap-guile)))
|
||||
|
||||
(test-assertm "mixed-text-file"
|
||||
(mlet* %store-monad ((file -> (mixed-text-file "mixed"
|
||||
|
|
@ -847,7 +846,7 @@
|
|||
(guile -> (derivation->output-path guile-drv)))
|
||||
(mbegin %store-monad
|
||||
(built-derivations (list drv))
|
||||
(mlet %store-monad ((refs ((store-lift references) out)))
|
||||
(mlet %store-monad ((refs (references* out)))
|
||||
(return (and (string=? (string-append "export PATH=" guile "/bin")
|
||||
(call-with-input-file out get-string-all))
|
||||
(equal? refs (list guile))))))))
|
||||
|
|
|
|||
Loading…
Reference in New Issue