diff options
| author | Marius Bakke <marius@gnu.org> | 2022-09-01 16:24:18 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-09-01 16:24:18 +0200 |
| commit | c4ce54055a75c951f69d1241afc023ddebaf8b4f (patch) | |
| tree | fd1f713120b7cfb567eb6edd34601df3f85112a1 /guix/scripts | |
| parent | cd782ad7e4aee8e2f5bd7fec03f14bdf3175fb80 (diff) | |
| parent | 4f7f4e82e1f63f49216ee11dcfa67123ef940fcd (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/package.scm | 2 | ||||
| -rw-r--r-- | guix/scripts/pull.scm | 3 | ||||
| -rw-r--r-- | guix/scripts/system.scm | 6 | ||||
| -rw-r--r-- | guix/scripts/system/reconfigure.scm | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 7d92598efa..7ba2661bbb 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -145,6 +145,7 @@ denote ranges as interpreted by 'matching-generations'." dry-run? (hooks %default-profile-hooks) allow-collisions? + (format-version %manifest-format-version) bootstrap?) "Build a new generation of PROFILE, a file name, using the packages specified in MANIFEST, a manifest object. When ALLOW-COLLISIONS? is true, @@ -154,6 +155,7 @@ hooks\" run when building the profile." (profile-derivation manifest #:allow-collisions? allow-collisions? #:hooks (if bootstrap? '() hooks) + #:format-version format-version #:locales? (not bootstrap?)))) (prof (derivation->output-path prof-drv))) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index b0cc459d63..19224cf70b 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -452,6 +452,9 @@ true, display what would be built without actually building it." (mlet %store-monad ((manifest (channel-instances->manifest instances))) (mbegin %store-monad (update-profile profile manifest + ;; Create a version 3 profile so that it is readable by + ;; old instances of Guix. + #:format-version 3 #:hooks %channel-profile-hooks) (return diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 443e9d3282..4bcf789703 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -41,6 +41,7 @@ #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix derivations) + #:use-module (guix diagnostics) #:use-module (guix packages) #:use-module (guix utils) #:use-module (guix monads) @@ -1257,7 +1258,10 @@ resulting from command-line parsing." (size image-size) (volatile-root? volatile?) (shared-network? shared-network?)))) - (os (image-operating-system image)) + (os (or (image-operating-system image) + (raise + (formatted-message + (G_ "image lacks an operating-system"))))) (target-file (match args ((first second) second) (_ #f))) diff --git a/guix/scripts/system/reconfigure.scm b/guix/scripts/system/reconfigure.scm index 9ca66687ee..afd410d4bc 100644 --- a/guix/scripts/system/reconfigure.scm +++ b/guix/scripts/system/reconfigure.scm @@ -34,7 +34,6 @@ #:use-module (guix monads) #:use-module (guix store) #:use-module ((guix self) #:select (make-config.scm)) - #:autoload (guix describe) (current-profile) #:use-module (guix channels) #:autoload (guix git) (update-cached-checkout) #:use-module (guix i18n) @@ -372,8 +371,7 @@ currently-deployed commit (from CURRENT-CHANNELS, which is as returned by 'guix system describe' by default) and the target commit (as returned by 'guix describe')." (define new - (or (and=> (current-profile) profile-channels) - '())) + ((@ (guix describe) current-channels))) (when (null? current-channels) (warning (G_ "cannot determine provenance for current system~%"))) |