diff options
| author | Christopher Baines <mail@cbaines.net> | 2021-03-05 22:56:40 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2021-03-06 00:18:30 +0000 |
| commit | a8448da0f4a090818104e64dd79f90b0e50d5e77 (patch) | |
| tree | 494c58b4724f12cd9de0db9b0a7096de2b922c0f /guix/scripts/pack.scm | |
| parent | 4f4b749e75b38b8c08b4f67ef51c2c8740999e28 (diff) | |
| parent | a714af38d5d1046081524d859cde4cd8fd12a923 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/pack.scm')
| -rw-r--r-- | guix/scripts/pack.scm | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 169cbc2500..d12fbaff6a 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net> ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> @@ -1179,24 +1179,19 @@ Create a bundle of PACKAGE.\n")) manifest)) identity)) - (define (with-transformations manifest) - (map-manifest-entries manifest-entry-with-transformations - manifest)) - (with-provenance - (with-transformations - (cond - ((and (not (null? manifests)) (not (null? packages))) - (leave (G_ "both a manifest and a package list were given~%"))) - ((not (null? manifests)) - (concatenate-manifests - (map (lambda (file) - (let ((user-module (make-user-module - '((guix profiles) (gnu))))) - (load* file user-module))) - manifests))) - (else - (packages->manifest packages))))))) + (cond + ((and (not (null? manifests)) (not (null? packages))) + (leave (G_ "both a manifest and a package list were given~%"))) + ((not (null? manifests)) + (concatenate-manifests + (map (lambda (file) + (let ((user-module (make-user-module + '((guix profiles) (gnu))))) + (load* file user-module))) + manifests))) + (else + (packages->manifest packages)))))) (with-error-handling (with-store store |