diff options
Diffstat (limited to 'guix')
| -rw-r--r-- | guix/packages.scm | 4 | ||||
| -rw-r--r-- | guix/scripts/package.scm | 27 |
2 files changed, 20 insertions, 11 deletions
diff --git a/guix/packages.scm b/guix/packages.scm index efec414675..9433fe9586 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -462,8 +462,8 @@ system identifying string)." #:outputs outputs #:system system (args)))))))) -(define* (package-output store package output - #:optional (system (%current-system))) +(define* (package-output store package + #:optional (output "out") (system (%current-system))) "Return the output path of PACKAGE's OUTPUT for SYSTEM---where OUTPUT is the symbolic output name, such as \"out\". Note that this procedure calls `package-derivation', which is costly." diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 1d00e39540..66505f172f 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -955,12 +955,16 @@ more information.~%")) (match (assoc-ref opts 'query) (('list-generations pattern) (define (list-generation number) - (begin - (format #t (_ "Generation ~a\t~a~%") number - (date->string - (time-utc->date - (generation-time profile number)) - "~b ~d ~Y ~T")) + (unless (zero? number) + (let ((header (format #f (_ "Generation ~a\t~a") number + (date->string + (time-utc->date + (generation-time profile number)) + "~b ~d ~Y ~T"))) + (current (generation-number profile))) + (if (= number current) + (format #t (_ "~a\t(current)~%") header) + (format #t "~a~%" header))) (for-each (match-lambda ((name version output location _) (format #t " ~a\t~a\t~a\t~a~%" @@ -977,11 +981,16 @@ more information.~%")) (leave (_ "profile '~a' does not exist~%") profile)) ((string-null? pattern) - (for-each list-generation - (generation-numbers profile))) + (let ((numbers (generation-numbers profile))) + (if (equal? numbers '(0)) + (exit 1) + (for-each list-generation numbers)))) ((matching-generations pattern profile) => - (cut for-each list-generation <>)) + (lambda (numbers) + (if (null-list? numbers) + (exit 1) + (for-each list-generation numbers)))) (else (leave (_ "invalid syntax: ~a~%") pattern))) |