guix package: Add '--list-profiles'.

* guix/scripts/package.scm (show-help, %options): Add '--list-profiles'.
(process-query): Honor it.
* tests/guix-package.sh: Add test.
This commit is contained in:
Ludovic Courtès 2019-09-24 17:50:48 +02:00
parent 71339070a9
commit 3972dc5d43
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 39 additions and 1 deletions

View File

@ -2933,6 +2933,19 @@ siblings that point to specific generations:
$ rm ~/code/my-profile ~/code/my-profile-*-link $ rm ~/code/my-profile ~/code/my-profile-*-link
@end example @end example
@item --list-profiles
List all the user's profiles:
@example
$ guix package --list-profiles
/home/charlie/.guix-profile
/home/charlie/code/my-profile
/home/charlie/code/devel-profile
/home/charlie/tmp/test
@end example
When running as root, list all the profiles of all the users.
@cindex collisions, in a profile @cindex collisions, in a profile
@cindex colliding packages in profiles @cindex colliding packages in profiles
@cindex profile collisions @cindex profile collisions

View File

@ -39,6 +39,7 @@
#:use-module (guix scripts) #:use-module (guix scripts)
#:use-module (guix scripts build) #:use-module (guix scripts build)
#:autoload (guix describe) (package-provenance) #:autoload (guix describe) (package-provenance)
#:autoload (guix store roots) (gc-roots)
#:use-module ((guix build utils) #:use-module ((guix build utils)
#:select (directory-exists? mkdir-p)) #:select (directory-exists? mkdir-p))
#:use-module (ice-9 format) #:use-module (ice-9 format)
@ -359,6 +360,8 @@ Install, remove, or upgrade packages in a single transaction.\n"))
switch to a generation matching PATTERN")) switch to a generation matching PATTERN"))
(display (G_ " (display (G_ "
-p, --profile=PROFILE use PROFILE instead of the user's default profile")) -p, --profile=PROFILE use PROFILE instead of the user's default profile"))
(display (G_ "
--list-profiles list the user's profiles"))
(newline) (newline)
(display (G_ " (display (G_ "
--allow-collisions do not treat collisions in the profile as an error")) --allow-collisions do not treat collisions in the profile as an error"))
@ -458,6 +461,11 @@ command-line option~%")
(values (cons `(query list-generations ,arg) (values (cons `(query list-generations ,arg)
result) result)
#f))) #f)))
(option '("list-profiles") #f #f
(lambda (opt name arg result arg-handler)
(values (cons `(query list-profiles #t)
result)
#f)))
(option '(#\d "delete-generations") #f #t (option '(#\d "delete-generations") #f #t
(lambda (opt name arg result arg-handler) (lambda (opt name arg result arg-handler)
(values (alist-cons 'delete-generations arg (values (alist-cons 'delete-generations arg
@ -750,6 +758,19 @@ processed, #f otherwise."
(string<? name1 name2)))))) (string<? name1 name2))))))
#t)) #t))
(('list-profiles _)
(let ((profiles (delete-duplicates
(filter-map (lambda (root)
(and (or (zero? (getuid))
(user-owned? root))
(generation-profile root)))
(gc-roots)))))
(leave-on-EPIPE
(for-each (lambda (profile)
(display (user-friendly-profile profile))
(newline))
(sort profiles string<?)))))
(('search _) (('search _)
(let* ((patterns (filter-map (match-lambda (let* ((patterns (filter-map (match-lambda
(('query 'search rx) rx) (('query 'search rx) rx)

View File

@ -438,7 +438,7 @@ cat > "$module_dir/foo.scm"<<EOF
(version "dummy-version") (version "dummy-version")
(outputs '("out" "dummy-output")) (outputs '("out" "dummy-output"))
(source #f) (source #f)
;; Without a real build system, the "guix pacakge -s" command will fail. ;; Without a real build system, the "guix package -s" command will fail.
(build-system trivial-build-system) (build-system trivial-build-system)
(synopsis "dummy-synopsis") (synopsis "dummy-synopsis")
(description "dummy-description") (description "dummy-description")
@ -448,3 +448,7 @@ EOF
guix package -L "$module_dir" -s dummy-output > /tmp/out guix package -L "$module_dir" -s dummy-output > /tmp/out
test "`guix package -L "$module_dir" -s dummy-output | grep ^name:`" = "name: dummy-package" test "`guix package -L "$module_dir" -s dummy-output | grep ^name:`" = "name: dummy-package"
rm -rf "$module_dir" rm -rf "$module_dir"
# Make sure we can see user profiles.
guix package --list-profiles | grep "$profile"
guix package --list-profiles | grep '\.guix-profile'