mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
guix-package: Extract version strings when installing a direct store path.
* guix-package.in (guix-package)[process-actions]: Extract the version string from store paths. * tests/guix-package.sh: Adjust accordingly.
This commit is contained in:
parent
ef1ee6b221
commit
5075e28305
2 changed files with 12 additions and 6 deletions
|
@ -338,8 +338,11 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@"))
|
|||
(install* (append
|
||||
(filter-map (match-lambda
|
||||
(('install . (? store-path? path))
|
||||
`(,(store-path-package-name path)
|
||||
#f #f ,path))
|
||||
(let-values (((name version)
|
||||
(package-name->name+version
|
||||
(store-path-package-name
|
||||
path))))
|
||||
`(,name ,version #f ,path)))
|
||||
(_ #f))
|
||||
opts)
|
||||
(map (lambda (tuple drv)
|
||||
|
|
|
@ -42,12 +42,15 @@ test -f "$profile/bin/make" && test -f "$profile/bin/guile"
|
|||
# name and version string.
|
||||
installed="`guix-package -p "$profile" --list-installed | cut -f1 | xargs echo | sort`"
|
||||
case "x$installed" in
|
||||
"guile* make*") true;;
|
||||
"make* guile*") true;;
|
||||
"*") false;;
|
||||
"guile-bootstrap make-boot0")
|
||||
true;;
|
||||
"make-boot0 guile-bootstrap")
|
||||
true;;
|
||||
"*")
|
||||
false;;
|
||||
esac
|
||||
|
||||
test "`guix-package -p "$profile" -I 'g.*e' | cut -f1`" = "guile-bootstrap-2.0"
|
||||
test "`guix-package -p "$profile" -I 'g.*e' | cut -f1`" = "guile-bootstrap"
|
||||
|
||||
# Remove a package.
|
||||
guix-package -b -p "$profile" -r "guile-bootstrap-2.0"
|
||||
|
|
Loading…
Reference in a new issue