From a3c28d7f7eeaf799c8f043848dbb59198649e1ac Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Sat, 6 Apr 2024 22:37:07 +0200 Subject: scripts: system: Rename `sqlite-register'. * guix/scripts/system.scm (define-module): #:autoload `register-valid-path' instead of `sqlite-register'. (copy-item): Call it with the new name. Change-Id: I24f71f822a5f400a47adee43f61184a4fbcb9741 Signed-off-by: Christopher Baines --- guix/scripts/system.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'guix/scripts/system.scm') diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index bf3d2f9044..67020a2aab 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -35,7 +35,7 @@ (define-module (guix scripts system) #: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) #:use-module (guix gexp) @@ -158,14 +158,15 @@ (define* (copy-item item info target db (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))) -- cgit v1.2.3 From 6dc238f2613c5049e2f2d346c4482b7ecc76c9fa Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 1 Apr 2024 00:02:51 +0200 Subject: guix system: Autoload some more. * guix/scripts/system.scm: Autoload more modules. Change-Id: I665857109bbfd1e3755135daacc01affcb3eb2eb --- guix/scripts/system.scm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'guix/scripts/system.scm') diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index 67020a2aab..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 +;;; Copyright © 2014-2024 Ludovic Courtès ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016, 2017, 2018 Chris Marusich ;;; Copyright © 2017, 2019 Mathieu Othacehe @@ -37,7 +37,7 @@ (define-module (guix scripts system) #:autoload (guix store 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 @@ (define-module (guix scripts system) #: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 @@ (define-module (guix scripts system) 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) -- cgit v1.2.3