mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-23 21:17:11 -05:00
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).
This commit is contained in:
parent
5f0febcd45
commit
a3619079f9
28 changed files with 4 additions and 32 deletions
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2012-2021 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2018, 2019 Clément Lassieur <clement@lassieur.org>
|
||||
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
|
||||
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -22,7 +22,6 @@
|
|||
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
(define-module (guix scripts)
|
||||
#:use-module (guix grafts)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (guix ui)
|
||||
#:use-module (guix store)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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:)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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?))
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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))
|
||||
|
||||
|
|
Loading…
Reference in a new issue