diff options
author | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:17:08 +0100 |
---|---|---|
committer | Christopher Baines <mail@cbaines.net> | 2024-04-19 13:52:11 +0100 |
commit | 5fec94f3a3d4c67b748f11847064ed60d67c5ade (patch) | |
tree | 9f2c7a21ad8f2c061a8d46aac817e4c68d307086 /guix/scripts/system.scm | |
parent | 6931ca9baaaee4c7e85cf3cd5d0f7e4eb5cfd88e (diff) | |
parent | 949f97f7f98ac74306b9de79c93790337d804e32 (diff) |
Merge remote-tracking branch 'savannah/master' into core-updates
Change-Id: I4f15bcb3e575062c4dd3b6c07a48470300413f24
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/dictionaries.scm
gnu/packages/display-managers.scm
gnu/packages/engineering.scm
gnu/packages/geo.scm
gnu/packages/gl.scm
gnu/packages/glib.scm
gnu/packages/gnome-xyz.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/image-processing.scm
gnu/packages/linux.scm
gnu/packages/mail.scm
gnu/packages/patches/eudev-rules-directory.patch
gnu/packages/plotutils.scm
gnu/packages/sdl.scm
gnu/packages/syndication.scm
Diffstat (limited to 'guix/scripts/system.scm')
-rw-r--r-- | guix/scripts/system.scm | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index bf3d2f9044..2260bcf985 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2016 Alex Kost <alezost@gmail.com> ;;; Copyright © 2016, 2017, 2018 Chris Marusich <cmmarusich@gmail.com> ;;; Copyright © 2017, 2019 Mathieu Othacehe <m.othacehe@gmail.com> @@ -35,9 +35,9 @@ #:use-module (guix store) #:autoload (guix base16) (bytevector->base16-string) #:autoload (guix store database) - (sqlite-register store-database-file call-with-database) + (register-valid-path store-database-file call-with-database) #:autoload (guix build store-copy) (copy-store-item) - #:use-module (guix describe) + #:autoload (guix describe) (current-profile) #:use-module (guix gexp) #:use-module (guix derivations) #:use-module (guix diagnostics) @@ -47,7 +47,10 @@ #:use-module (guix records) #:use-module (guix profiles) #:use-module (guix scripts) - #:use-module (guix channels) + #:autoload (guix channels) (channel-name + channel-url + channel-branch + channel-commit) #:use-module (guix scripts build) #:autoload (guix scripts package) (delete-generations delete-matching-generations @@ -57,7 +60,8 @@ graph-backend-name lookup-backend) #:use-module (guix scripts system reconfigure) #:use-module (guix build utils) - #:use-module (guix progress) + #:autoload (guix progress) (progress-reporter/bar + call-with-progress-reporter) #:use-module ((guix docker) #:select (%docker-image-max-layers)) #:use-module (gnu build image) #:use-module (gnu build install) @@ -158,14 +162,15 @@ given INFO, a <path-info> record." (copy-store-item item target #:deduplicate? #t) - (sqlite-register db - #:path item - #:references (path-info-references info) - #:deriver (path-info-deriver info) - #:hash (string-append - "sha256:" - (bytevector->base16-string (path-info-hash info))) - #:nar-size (path-info-nar-size info)))) + (register-valid-path db + #:path item + #:references (path-info-references info) + #:deriver (path-info-deriver info) + #:hash (string-append + "sha256:" + (bytevector->base16-string + (path-info-hash info))) + #:nar-size (path-info-nar-size info)))) (define* (copy-closure item target #:key (log-port (current-error-port))) |