package: Store the output path of packages installed with `-e'.
* guix/scripts/package.scm (guix-package)[process-actions](package->tuple): Put the output path in the tuple, not the derivation path. * tests/guix-package.sh: Add test.master
parent
94a4b3b9f2
commit
741c70c63e
|
@ -648,15 +648,15 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
|
|||
(delete-duplicates deps same?))
|
||||
|
||||
(define (package->tuple p)
|
||||
(let ((path (package-derivation (%store) p))
|
||||
(deps (package-transitive-propagated-inputs p)))
|
||||
;; Convert package P to a tuple.
|
||||
;; When given a package via `-e', install the first of its
|
||||
;; outputs (XXX).
|
||||
(let* ((out (car (package-outputs p)))
|
||||
(path (package-output (%store) p out))
|
||||
(deps (package-transitive-propagated-inputs p)))
|
||||
`(,(package-name p)
|
||||
,(package-version p)
|
||||
|
||||
;; When given a package via `-e', install the first of its
|
||||
;; outputs (XXX).
|
||||
,(car (package-outputs p))
|
||||
|
||||
,out
|
||||
,path
|
||||
,(canonicalize-deps deps))))
|
||||
|
||||
|
|
|
@ -117,6 +117,7 @@ then
|
|||
guix package --bootstrap -p "$profile" -e "$boot_make"
|
||||
test "`readlink_base "$profile"`" = "$profile-2-link"
|
||||
test -x "$profile/bin/guile" && test -x "$profile/bin/make"
|
||||
grep "`guix build -e "$boot_make"`" "$profile/manifest"
|
||||
|
||||
# Make a "hole" in the list of generations, and make sure we can
|
||||
# roll back "over" it.
|
||||
|
|
Reference in New Issue