From a3619079f95213c4f983e69210ed12b38fd31022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 14 Oct 2022 22:19:34 +0200 Subject: [PATCH] Remove now unnecessary uses of (guix grafts). These modules would use (guix grafts) just to access '%graft?' and related bindings, which are now in (guix store). * gnu/ci.scm, guix/gexp.scm, guix/lint.scm, guix/scripts.scm, guix/scripts/archive.scm, guix/scripts/build.scm, guix/scripts/challenge.scm, guix/scripts/deploy.scm, guix/scripts/environment.scm, guix/scripts/home.scm, guix/scripts/pack.scm, guix/scripts/package.scm, guix/scripts/pull.scm, guix/scripts/size.scm, guix/scripts/system.scm, guix/scripts/weather.scm, tests/builders.scm, tests/channels.scm, tests/cpan.scm, tests/derivations.scm, tests/gexp.scm, tests/graph.scm, tests/guix-daemon.sh, tests/monads.scm, tests/pack.scm, tests/packages.scm, tests/profiles.scm, tests/system.scm: Remove #:use-module (guix grafts). --- gnu/ci.scm | 3 +-- guix/gexp.scm | 1 - guix/lint.scm | 1 - guix/scripts.scm | 1 - guix/scripts/archive.scm | 1 - guix/scripts/build.scm | 3 --- guix/scripts/challenge.scm | 1 - guix/scripts/deploy.scm | 1 - guix/scripts/environment.scm | 1 - guix/scripts/home.scm | 1 - guix/scripts/pack.scm | 1 - guix/scripts/package.scm | 1 - guix/scripts/pull.scm | 1 - guix/scripts/size.scm | 1 - guix/scripts/system.scm | 1 - guix/scripts/weather.scm | 1 - tests/builders.scm | 1 - tests/channels.scm | 1 - tests/cpan.scm | 2 +- tests/derivations.scm | 1 - tests/gexp.scm | 1 - tests/graph.scm | 1 - tests/guix-daemon.sh | 4 ++-- tests/monads.scm | 1 - tests/pack.scm | 1 - tests/packages.scm | 1 - tests/profiles.scm | 1 - tests/system.scm | 1 - 28 files changed, 4 insertions(+), 32 deletions(-) diff --git a/gnu/ci.scm b/gnu/ci.scm index e1ba0f6100..5159205325 100644 --- a/gnu/ci.scm +++ b/gnu/ci.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2021 Ludovic Courtès +;;; Copyright © 2012-2022 Ludovic Courtès ;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2018, 2019 Clément Lassieur ;;; Copyright © 2020 Julien Lepiller @@ -25,7 +25,6 @@ (define-module (gnu ci) #:use-module (guix config) #:autoload (guix describe) (package-channels) #:use-module (guix store) - #:use-module (guix grafts) #:use-module (guix profiles) #:use-module (guix packages) #:autoload (guix transformations) (tunable-package? tuned-package) diff --git a/guix/gexp.scm b/guix/gexp.scm index 73595a216b..5f92174a2c 100644 --- a/guix/gexp.scm +++ b/guix/gexp.scm @@ -25,7 +25,6 @@ (define-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix derivations) - #:use-module (guix grafts) #:use-module (guix utils) #:use-module (guix diagnostics) #:use-module (guix i18n) diff --git a/guix/lint.scm b/guix/lint.scm index 6e9d11074b..8e3976171f 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -47,7 +47,6 @@ (define-module (guix lint) gexp->approximate-sexp)) #:use-module (guix licenses) #:use-module (guix records) - #:use-module (guix grafts) #:use-module (guix upstream) #:use-module (guix utils) #:use-module (guix memoization) diff --git a/guix/scripts.scm b/guix/scripts.scm index 3aabaf5c9c..4de8bc23b3 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -22,7 +22,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix scripts) - #:use-module (guix grafts) #:use-module (guix utils) #:use-module (guix ui) #:use-module (guix store) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 1e961c84e6..3b2bdee835 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -26,7 +26,6 @@ (define-module (guix scripts archive) #:select (fold-archive restore-file)) #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) - #:use-module (guix grafts) #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix monads) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 0787dfcc9a..b4437172d7 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -28,10 +28,7 @@ (define-module (guix scripts build) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix memoization) - #:use-module (guix grafts) - #:use-module (guix utils) - #:use-module (guix monads) #:use-module (guix gexp) #:use-module (guix profiles) diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index f1e5f67dab..620a1762a1 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -22,7 +22,6 @@ (define-module (guix scripts challenge) #:use-module (guix scripts) #:use-module (guix store) #:use-module (guix utils) - #:use-module (guix grafts) #:use-module (guix monads) #:use-module (guix base32) #:use-module (guix packages) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index 40a9374171..ef6f9acc86 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -27,7 +27,6 @@ (define-module (guix scripts deploy) #:use-module (guix gexp) #:use-module (guix ui) #:use-module (guix utils) - #:use-module (guix grafts) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module (guix diagnostics) #:use-module (guix i18n) diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 56f05d1cc3..de9bc8f98d 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -24,7 +24,6 @@ (define-module (guix scripts environment) #:use-module (guix store) #:use-module (guix utils) #:use-module ((guix status) #:select (with-status-verbosity)) - #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix profiles) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 683dfd58cd..754001a5b8 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -47,7 +47,6 @@ (define-module (guix scripts home) #:use-module (guix derivations) #:use-module (guix ui) #:autoload (guix colors) (supports-hyperlinks? file-hyperlink) - #:use-module (guix grafts) #:use-module (guix packages) #:use-module (guix profiles) #:use-module (guix store) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index 78b6978c92..06849e4761 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -33,7 +33,6 @@ (define-module (guix scripts pack) #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix self) #:select (make-config.scm)) - #:use-module (guix grafts) #:autoload (guix inferior) (inferior-package? inferior-package-name inferior-package-version) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 7ba2661bbb..b9090307ac 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -33,7 +33,6 @@ (define-module (guix scripts package) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module ((guix build syscalls) #:select (terminal-rows)) #:use-module (guix store) - #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix profiles) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 19224cf70b..7b6c58dbc3 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -31,7 +31,6 @@ (define-module (guix scripts pull) #:use-module (guix derivations) #:use-module (guix profiles) #:use-module (guix gexp) - #:use-module (guix grafts) #:use-module (guix memoization) #:use-module (guix monads) #:use-module (guix channels) diff --git a/guix/scripts/size.scm b/guix/scripts/size.scm index 5bb970443c..48b8ecc881 100644 --- a/guix/scripts/size.scm +++ b/guix/scripts/size.scm @@ -24,7 +24,6 @@ (define-module (guix scripts size) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix combinators) - #:use-module (guix grafts) #:use-module (guix packages) #:use-module (guix derivations) #:use-module (gnu packages) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index e568a051b3..6482318168 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -38,7 +38,6 @@ (define-module (guix scripts system) (sqlite-register store-database-file call-with-database) #:autoload (guix build store-copy) (copy-store-item) #:use-module (guix describe) - #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix derivations) #:use-module (guix diagnostics) diff --git a/guix/scripts/weather.scm b/guix/scripts/weather.scm index f46c11b1a5..dc27f81984 100644 --- a/guix/scripts/weather.scm +++ b/guix/scripts/weather.scm @@ -29,7 +29,6 @@ (define-module (guix scripts weather) #:use-module (guix progress) #:use-module (guix monads) #:use-module (guix store) - #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix colors) #:use-module ((guix build syscalls) #:select (terminal-columns)) diff --git a/tests/builders.scm b/tests/builders.scm index 2853227465..0b5577c7a3 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -25,7 +25,6 @@ (define-module (tests builders) #:use-module (guix build gnu-build-system) #:use-module (guix build utils) #:use-module (guix build-system python) - #:use-module (guix grafts) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix utils) diff --git a/tests/channels.scm b/tests/channels.scm index 0fe870dbaf..62312e240c 100644 --- a/tests/channels.scm +++ b/tests/channels.scm @@ -23,7 +23,6 @@ (define-module (test-channels) #:use-module ((guix build syscalls) #:select (mkdtemp!)) #:use-module (guix tests) #:use-module (guix store) - #:use-module ((guix grafts) #:select (%graft?)) #:use-module (guix derivations) #:use-module (guix sets) #:use-module (guix gexp) diff --git a/tests/cpan.scm b/tests/cpan.scm index b4db9e60e4..bbcd108e12 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -23,7 +23,7 @@ (define-module (test-cpan) #:use-module (guix base32) #:use-module (gcrypt hash) #:use-module (guix tests http) - #:use-module (guix grafts) + #:use-module ((guix store) #:select (%graft?)) #:use-module (srfi srfi-64) #:use-module (web client) #:use-module (ice-9 match)) diff --git a/tests/derivations.scm b/tests/derivations.scm index 57d80412dc..3912fd31d8 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -20,7 +20,6 @@ (define-module (test-derivations) #:use-module (guix derivations) - #:use-module (guix grafts) #:use-module (guix store) #:use-module (guix utils) #:use-module ((gcrypt hash) #:prefix gcrypt:) diff --git a/tests/gexp.scm b/tests/gexp.scm index 07e940ffdc..6d57ac5d7a 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -21,7 +21,6 @@ (define-module (test-gexp) #:use-module (guix store) #:use-module (guix monads) #:use-module (guix gexp) - #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (guix build-system trivial) diff --git a/tests/graph.scm b/tests/graph.scm index 6aa2d0e0ff..6674b5cc8f 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -24,7 +24,6 @@ (define-module (test-graph) #:use-module (guix derivations) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module (guix gexp) diff --git a/tests/guix-daemon.sh b/tests/guix-daemon.sh index 330ad68835..4b09c8c162 100644 --- a/tests/guix-daemon.sh +++ b/tests/guix-daemon.sh @@ -27,7 +27,7 @@ guix build --version drv="`guix build emacs -d`" out="`guile -c ' \ - (use-modules (guix) (guix grafts) (gnu packages emacs)) \ + (use-modules (guix) (gnu packages emacs)) \ (define store (open-connection)) \ (%graft? #f) (display (derivation->output-path (package-derivation store emacs)))'`" @@ -122,7 +122,7 @@ guix-daemon --no-substitutes --listen="$socket" --disable-chroot \ daemon_pid=$! guile -c " - (use-modules (guix) (guix grafts) (guix tests) (srfi srfi-34)) + (use-modules (guix) (guix tests) (srfi srfi-34)) (define store (open-connection-for-tests \"$socket\")) ;; Disable grafts to avoid building more than needed. diff --git a/tests/monads.scm b/tests/monads.scm index 19b74f4fb9..7f255f02bf 100644 --- a/tests/monads.scm +++ b/tests/monads.scm @@ -20,7 +20,6 @@ (define-module (test-monads) #:use-module (guix tests) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix derivations) #:use-module (guix packages) #:use-module (gnu packages) diff --git a/tests/pack.scm b/tests/pack.scm index 98bfedf21c..a4c388d93e 100644 --- a/tests/pack.scm +++ b/tests/pack.scm @@ -25,7 +25,6 @@ (define-module (test-pack) #:use-module (guix profiles) #:use-module (guix packages) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix tests) #:use-module (guix gexp) #:use-module (guix modules) diff --git a/tests/packages.scm b/tests/packages.scm index dc03b13417..a71eb1125d 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -23,7 +23,6 @@ (define-module (tests packages) #:use-module (guix tests) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix gexp) #:use-module (guix utils) #:use-module ((guix build utils) #:select (tarball?)) diff --git a/tests/profiles.scm b/tests/profiles.scm index 7bed946bf3..9ad03f2b24 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -23,7 +23,6 @@ (define-module (test-profiles) #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix monads) - #:use-module (guix grafts) #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix build-system trivial) diff --git a/tests/system.scm b/tests/system.scm index 873fed4aee..876e15a25e 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -24,7 +24,6 @@ (define-module (test-system) #:use-module (guix monads) #:use-module ((guix gexp) #:select (lower-object)) #:use-module ((guix utils) #:select (%current-system)) - #:use-module (guix grafts) #:use-module (srfi srfi-1) #:use-module (srfi srfi-64))