From ae587c2ef041413bc709a555261db752068ea360 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 8 Mar 2023 22:51:17 +0100 Subject: [PATCH] guix: Strip #:use-module lists. This was obtained by setting up this environment: guix shell -D guix --with-input=guile@3.0.9=guile-next \ --with-commit=guile-next=e2ed33ef0445c867fe56c247054aa67e834861f2 -- make -j5 then adding 'unused-module' to (@@ (guix build compiler) %warnings), building, and checking all the "unused module" warnings and removing those that were definitely unused. --- guix/android-repo-download.scm | 3 --- guix/base32.scm | 1 - guix/build-system/android-ndk.scm | 2 -- guix/build-system/ant.scm | 2 -- guix/build-system/asdf.scm | 2 -- guix/build-system/chicken.scm | 1 - guix/build-system/clojure.scm | 2 -- guix/build-system/cmake.scm | 2 -- guix/build-system/copy.scm | 1 - guix/build-system/dub.scm | 2 -- guix/build-system/dune.scm | 2 -- guix/build-system/emacs.scm | 2 -- guix/build-system/font.scm | 1 - guix/build-system/glib-or-gtk.scm | 2 -- guix/build-system/gnu.scm | 1 - guix/build-system/guile.scm | 1 - guix/build-system/haskell.scm | 1 - guix/build-system/julia.scm | 2 -- guix/build-system/maven.scm | 1 - guix/build-system/meson.scm | 1 - guix/build-system/minify.scm | 2 -- guix/build-system/node.scm | 1 - guix/build-system/ocaml.scm | 1 - guix/build-system/perl.scm | 2 -- guix/build-system/pyproject.scm | 4 ---- guix/build-system/python.scm | 3 --- guix/build-system/qt.scm | 1 - guix/build-system/r.scm | 1 - guix/build-system/rakudo.scm | 1 - guix/build-system/rebar.scm | 2 -- guix/build-system/renpy.scm | 3 --- guix/build-system/ruby.scm | 2 -- guix/build-system/scons.scm | 1 - guix/build-system/texlive.scm | 1 - guix/build-system/trivial.scm | 2 -- guix/build-system/waf.scm | 3 --- guix/build/android-ndk-build-system.scm | 5 ----- guix/build/asdf-build-system.scm | 4 ---- guix/build/chicken-build-system.scm | 1 - guix/build/clojure-utils.scm | 1 - guix/build/download-nar.scm | 1 - guix/build/elm-build-system.scm | 1 - guix/build/guile-build-system.scm | 1 + guix/build/linux-module-build-system.scm | 4 ---- guix/build/lisp-utils.scm | 2 -- guix/build/make-bootstrap.scm | 3 --- guix/build/svn.scm | 1 - guix/build/waf-build-system.scm | 4 ---- guix/channels.scm | 4 ---- guix/derivations.scm | 2 -- guix/discovery.scm | 1 - guix/ftp-client.scm | 2 -- guix/git-authenticate.scm | 1 - guix/git.scm | 2 -- guix/gnu-maintenance.scm | 3 --- guix/graph.scm | 1 - guix/hg-download.scm | 1 - guix/import/cabal.scm | 1 - guix/import/cpan.scm | 2 +- guix/import/cran.scm | 4 ---- guix/import/crate.scm | 3 --- guix/import/egg.scm | 4 ---- guix/import/elm.scm | 11 ----------- guix/import/elpa.scm | 5 +---- guix/import/gem.scm | 1 - guix/import/git.scm | 5 +---- guix/import/github.scm | 2 -- guix/import/gnome.scm | 2 -- guix/import/gnu.scm | 3 --- guix/import/go.scm | 8 -------- guix/import/hexpm.scm | 9 --------- guix/import/kde.scm | 1 - guix/import/minetest.scm | 7 ------- guix/import/opam.scm | 7 +------ guix/import/print.scm | 3 +-- guix/import/pypi.scm | 3 --- guix/import/test.scm | 2 -- guix/import/texlive.scm | 3 --- guix/import/utils.scm | 1 - guix/ipfs.scm | 5 ----- guix/lint.scm | 1 - guix/pki.scm | 1 - guix/records.scm | 1 - guix/remote.scm | 2 -- 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/discover.scm | 1 - guix/scripts/download.scm | 3 --- guix/scripts/edit.scm | 3 ++- guix/scripts/graph.scm | 1 - guix/scripts/hash.scm | 4 ---- guix/scripts/home.scm | 2 -- guix/scripts/import.scm | 3 --- guix/scripts/offload.scm | 1 - guix/scripts/pack.scm | 2 -- guix/scripts/package.scm | 5 ----- guix/scripts/publish.scm | 4 ---- guix/scripts/pull.scm | 2 -- guix/scripts/refresh.scm | 3 --- guix/scripts/repl.scm | 2 -- guix/scripts/search.scm | 1 - guix/scripts/show.scm | 1 - guix/scripts/style.scm | 2 -- guix/scripts/substitute.scm | 4 ---- guix/scripts/system.scm | 7 ------- guix/scripts/time-machine.scm | 1 - guix/self.scm | 1 - guix/serialization.scm | 1 - guix/status.scm | 1 - guix/store.scm | 2 -- guix/store/database.scm | 2 -- guix/store/deduplication.scm | 2 -- guix/substitutes.scm | 9 --------- guix/tests/gnupg.scm | 1 - guix/tests/http.scm | 1 - guix/upstream.scm | 1 - guix/utils.scm | 3 --- 120 files changed, 8 insertions(+), 279 deletions(-) diff --git a/guix/android-repo-download.scm b/guix/android-repo-download.scm index 1c3502e6739367831a3958c0054914ddc3152632..e224cdd2950ea3e3d3fe3782d11eb9af5d424d6e 100644 --- a/guix/android-repo-download.scm +++ b/guix/android-repo-download.scm @@ -29,10 +29,7 @@ #:use-module (guix modules) #:autoload (guix build-system gnu) (standard-packages) #:use-module (ice-9 match) - #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:export (android-repo-reference android-repo-reference? android-repo-reference-manifest-url diff --git a/guix/base32.scm b/guix/base32.scm index 8f097d4e77707e876113724f634f98c58a3bd430..dd18a796f2397fc3391a32774635e4dd3118057d 100644 --- a/guix/base32.scm +++ b/guix/base32.scm @@ -17,7 +17,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix base32) - #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-60) diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 211fd113113b8ef267d41762c56db933fe70d24f..047f884b1946699c0210d01d20674a4b5ff42ed1 100644 --- a/guix/build-system/android-ndk.scm +++ b/guix/build-system/android-ndk.scm @@ -26,8 +26,6 @@ #:use-module (guix packages) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (android-ndk-build-system)) (define %android-ndk-build-system-modules diff --git a/guix/build-system/ant.scm b/guix/build-system/ant.scm index 08a4c996f9ae9d4135c3ad6c8d63880ef95676c2..cfb033f6a5acb3f0727787d9d40b9c3e06d5fc00 100644 --- a/guix/build-system/ant.scm +++ b/guix/build-system/ant.scm @@ -26,8 +26,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (%ant-build-system-modules ant-build ant-build-system)) diff --git a/guix/build-system/asdf.scm b/guix/build-system/asdf.scm index 74a3e47da189e0affff6eb499836f1a8a0e69322..2b17cee37b74ee0ab841c2dadf4c945357440c92 100644 --- a/guix/build-system/asdf.scm +++ b/guix/build-system/asdf.scm @@ -33,9 +33,7 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:use-module (gnu packages) #:export (%asdf-build-system-modules %asdf-build-modules diff --git a/guix/build-system/chicken.scm b/guix/build-system/chicken.scm index 07666d13218fa73a06db8985be030944cdd45cd4..9f518e66e63e9fa1fa3928c7cba2b06e7047fe07 100644 --- a/guix/build-system/chicken.scm +++ b/guix/build-system/chicken.scm @@ -27,7 +27,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%chicken-build-system-modules chicken-build chicken-build-system diff --git a/guix/build-system/clojure.scm b/guix/build-system/clojure.scm index 2a0713d297198af08026e823aa3593e01d6e4a0f..fb897356bc11297b5cd5a0938056cfb70f26a6cc 100644 --- a/guix/build-system/clojure.scm +++ b/guix/build-system/clojure.scm @@ -33,8 +33,6 @@ #:select ((search-path-specification->sexp . search-path-spec->sexp))) #:use-module (guix utils) - - #:use-module (ice-9 match) #:export (%clojure-build-system-modules clojure-build clojure-build-system)) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 0aabc95b901e81051f89754f14c7f41897de55e5..09e3ac85db41ab660dca8de302e770c5cff42764 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -24,12 +24,10 @@ #:use-module (guix gexp) #:use-module (guix utils) #:use-module (guix monads) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%cmake-build-system-modules cmake-build cmake-build-system)) diff --git a/guix/build-system/copy.scm b/guix/build-system/copy.scm index 6efc2b276657735b1b70b16eabba3a24fae330a1..4091eb7847179ccf8090b227523fb0b74abadcb7 100644 --- a/guix/build-system/copy.scm +++ b/guix/build-system/copy.scm @@ -28,7 +28,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%copy-build-system-modules default-glibc diff --git a/guix/build-system/dub.scm b/guix/build-system/dub.scm index 8aa93d5b0f3315f16e95124fab6b000bb7cd08c3..b4011cdb830dc7519b705e30e7428dc393b4e2ec 100644 --- a/guix/build-system/dub.scm +++ b/guix/build-system/dub.scm @@ -29,8 +29,6 @@ #:use-module (guix packages) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (dub-build-system)) (define (default-ldc) diff --git a/guix/build-system/dune.scm b/guix/build-system/dune.scm index 3f81d21441d99ab40f184ebe1e703ab59c4736e9..afe5b24f22edbcf0295c4f716732e0e888d8b279 100644 --- a/guix/build-system/dune.scm +++ b/guix/build-system/dune.scm @@ -25,10 +25,8 @@ #:use-module (guix gexp) #:use-module (guix search-paths) #:use-module (guix build-system) - #:use-module ((guix build-system gnu) #:prefix gnu:) #:use-module ((guix build-system ocaml) #:prefix ocaml:) #:use-module (guix packages) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%dune-build-system-modules dune-build diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 3df68789ff335573f11f390507e92e1ba26ab154..ebf97a5344ba42d5fe6a9e30de28397eb1f584fd 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -28,8 +28,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (%emacs-build-system-modules emacs-build emacs-build-system) diff --git a/guix/build-system/font.scm b/guix/build-system/font.scm index a99f76c66b9d430db6ea05229428ccafa86fb44d..aac130da4ed38376d3a4f845969a07daed417a75 100644 --- a/guix/build-system/font.scm +++ b/guix/build-system/font.scm @@ -22,7 +22,6 @@ #:use-module (guix monads) #:use-module (guix utils) #:use-module (guix packages) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm index aa9703829baa49ec30442b8e1ebe0ff22049aa24..e956354687ed05865df57db41c5ccd44c41e4cf5 100644 --- a/guix/build-system/glib-or-gtk.scm +++ b/guix/build-system/glib-or-gtk.scm @@ -24,14 +24,12 @@ #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix monads) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module ((guix build glib-or-gtk-build-system) #:select (%gdk-pixbuf-loaders-cache-file)) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%glib-or-gtk-build-system-modules glib-or-gtk-build glib-or-gtk-cross-build diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index e62ee1836776c54f7900715d787e4bc3ba61a7dd..c363c3910f28c82fbccfdc9f701da0333106b51b 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -22,7 +22,6 @@ #:use-module (guix memoization) #:use-module (guix gexp) #:use-module (guix monads) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix packages) diff --git a/guix/build-system/guile.scm b/guix/build-system/guile.scm index 7e2e33c13ed2c994f51e4dcef50122e69eeefc49..1bd292e267fc15537010fd5a4fa87591e794bf77 100644 --- a/guix/build-system/guile.scm +++ b/guix/build-system/guile.scm @@ -25,7 +25,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) #:use-module (srfi srfi-26) #:export (%guile-build-system-modules guile-build-system)) diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index a37b3a938ccb630a79eeefb2197062c33e9fd1bc..b8858421c242262a32248a979c06478d204fb94f 100644 --- a/guix/build-system/haskell.scm +++ b/guix/build-system/haskell.scm @@ -32,7 +32,6 @@ #:use-module (guix build-system gnu) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (hackage-uri %haskell-build-system-modules diff --git a/guix/build-system/julia.scm b/guix/build-system/julia.scm index 66e7711bcd50b6ea1839eca3fec4963b3d2b101e..b5521e38e47c8c9cd4b5e374004bb422f1554c46 100644 --- a/guix/build-system/julia.scm +++ b/guix/build-system/julia.scm @@ -29,8 +29,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (%julia-build-system-modules julia-build julia-build-system)) diff --git a/guix/build-system/maven.scm b/guix/build-system/maven.scm index 0af59226924cbeff5dca4311a305e26f328b5cd5..3daff07323c1148f2b38d96a7486dedff157725d 100644 --- a/guix/build-system/maven.scm +++ b/guix/build-system/maven.scm @@ -26,7 +26,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%maven-build-system-modules default-maven diff --git a/guix/build-system/meson.scm b/guix/build-system/meson.scm index 7d413a991d45fe9f23d2a2100db84362f0219147..d7d807f5b6b9f8e7d44ca26db5c3765c9adc1172 100644 --- a/guix/build-system/meson.scm +++ b/guix/build-system/meson.scm @@ -30,7 +30,6 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%meson-build-system-modules meson-build-system make-cross-file)) diff --git a/guix/build-system/minify.scm b/guix/build-system/minify.scm index 7d4745ab3285e94bc726811f686d8f5f6dfac090..787235deebc0ca02561163ce1197d0cd289340ad 100644 --- a/guix/build-system/minify.scm +++ b/guix/build-system/minify.scm @@ -26,8 +26,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (%minify-build-system-modules minify-build minify-build-system)) diff --git a/guix/build-system/node.scm b/guix/build-system/node.scm index 24bd677bfc19313579b99cbccebd17f0e8fd60a6..3f73390809b2a474a9783672f0049a7c927ffb58 100644 --- a/guix/build-system/node.scm +++ b/guix/build-system/node.scm @@ -29,7 +29,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) #:export (%node-build-system-modules node-build node-build-system)) diff --git a/guix/build-system/ocaml.scm b/guix/build-system/ocaml.scm index 921c1f862929c5ad16e0e7bba516621df0e9c8ef..27d5183640565cc38261fdd299360ee6cbb18626 100644 --- a/guix/build-system/ocaml.scm +++ b/guix/build-system/ocaml.scm @@ -25,7 +25,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:export (%ocaml-build-system-modules package-with-ocaml4.07 diff --git a/guix/build-system/perl.scm b/guix/build-system/perl.scm index 43ec2fdcb67c3ff3b9a7fe2ba4b3e4af53eb8540..7c6deb34bfedcd2669f64434523513387512de6a 100644 --- a/guix/build-system/perl.scm +++ b/guix/build-system/perl.scm @@ -22,12 +22,10 @@ #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix monads) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%perl-build-system-modules perl-build perl-cross-build diff --git a/guix/build-system/pyproject.scm b/guix/build-system/pyproject.scm index 8f3b562ca3e9e6698d40d3564b61c183387970f5..44d6650ba9f99ef2510bdbd00b3568baba67dacc 100644 --- a/guix/build-system/pyproject.scm +++ b/guix/build-system/pyproject.scm @@ -22,18 +22,14 @@ #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix utils) - #:use-module (guix memoization) #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix packages) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix build-system python) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%pyproject-build-system-modules default-python pyproject-build diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index c8f04b229832289b99d275039cd80b8d2e9c8798..cca009fb28ad517b14b454ce1b0e44ce3b705db5 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -24,7 +24,6 @@ #:use-module (guix gexp) #:use-module (guix store) #:use-module (guix utils) - #:use-module (guix memoization) #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix packages) @@ -32,9 +31,7 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%python-build-system-modules package-with-python2 strip-python2-variant diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 7e3a54f1f8d1070079df948698b69ca9ed0c3776..cb33212abde9126a6f2840aa06e858b880c3d66d 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -33,7 +33,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%qt-build-system-modules qt-build qt-build-system)) diff --git a/guix/build-system/r.scm b/guix/build-system/r.scm index 9b360ae5817f22c399134407b30a9e6462d96e29..708b9e18fefc808364da8d9d56cbad679a9cbb85 100644 --- a/guix/build-system/r.scm +++ b/guix/build-system/r.scm @@ -27,7 +27,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (%r-build-system-modules r-build r-build-system diff --git a/guix/build-system/rakudo.scm b/guix/build-system/rakudo.scm index 05a4d9c2adac64bace0525d4e5aaef77d31a0559..3b30fdfd0ef901026d9a56e3e96477cc8be38597 100644 --- a/guix/build-system/rakudo.scm +++ b/guix/build-system/rakudo.scm @@ -26,7 +26,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix packages) - #:use-module (ice-9 match) #:export (%rakudo-build-system-modules rakudo-build rakudo-build-system)) diff --git a/guix/build-system/rebar.scm b/guix/build-system/rebar.scm index 6ca5abe4d6951e774c1e9f6711ef4a26aa4995ac..de1294ec3fe787c08d5540227008da04fa6e456f 100644 --- a/guix/build-system/rebar.scm +++ b/guix/build-system/rebar.scm @@ -26,8 +26,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (hexpm-uri hexpm-package-url %rebar-build-system-modules diff --git a/guix/build-system/renpy.scm b/guix/build-system/renpy.scm index f1070951ee61b081fbe46b6c5080152cefdb0fe6..3039e3c63b2c528065023de85c170979e433e160 100644 --- a/guix/build-system/renpy.scm +++ b/guix/build-system/renpy.scm @@ -21,16 +21,13 @@ (define-module (guix build-system renpy) #:use-module (guix store) #:use-module (guix utils) - #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%renpy-build-system-modules default-renpy renpy-build diff --git a/guix/build-system/ruby.scm b/guix/build-system/ruby.scm index 0aa273b4f41c663660f4823ffd881777b9ac280d..a3793a93816b0e1400edc101bdb0383f985e5b20 100644 --- a/guix/build-system/ruby.scm +++ b/guix/build-system/ruby.scm @@ -23,11 +23,9 @@ #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix packages) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) #:export (rubygems-uri %ruby-build-system-modules ruby-build diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index 9af24d40f8a7f2031e70660b4d9fff369e25e4c3..046ddef740972eb2f522a4e75dbfa21a54fc8839 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -25,7 +25,6 @@ #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) - #:use-module (ice-9 match) #:export (%scons-build-system-modules scons-build scons-build-system)) diff --git a/guix/build-system/texlive.scm b/guix/build-system/texlive.scm index 336e192d83fc4499424fedc28de254962e3a8169..d970c1beb929a61cbddec642ca4ae23bea7d170e 100644 --- a/guix/build-system/texlive.scm +++ b/guix/build-system/texlive.scm @@ -28,7 +28,6 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix svn-download) - #:use-module (ice-9 match) #:export (%texlive-build-system-modules texlive-build texlive-build-system diff --git a/guix/build-system/trivial.scm b/guix/build-system/trivial.scm index 378ae481b9c15d8227706694fd94c7c0dcf19407..e08884baf1f8ace2aab83cada94775aba6738781 100644 --- a/guix/build-system/trivial.scm +++ b/guix/build-system/trivial.scm @@ -18,12 +18,10 @@ (define-module (guix build-system trivial) #:use-module (guix store) - #:use-module (guix utils) #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix packages) #:use-module (guix build-system) - #:use-module (ice-9 match) #:export (trivial-build-system)) (define* (lower name diff --git a/guix/build-system/waf.scm b/guix/build-system/waf.scm index 1d520050f6ced3b22abfdd54e5b47a8f5eb94a1d..91b3d0d1009a411e404f46341376478181053b02 100644 --- a/guix/build-system/waf.scm +++ b/guix/build-system/waf.scm @@ -22,14 +22,11 @@ #:use-module (guix gexp) #:use-module (guix monads) #:use-module (guix packages) - #:use-module (guix derivations) #:use-module (guix search-paths) #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module ((guix build-system python) #:select (default-python default-python2)) - #:use-module (ice-9 match) - #:use-module (srfi srfi-26) #:export (%waf-build-system-modules waf-build waf-build-system)) diff --git a/guix/build/android-ndk-build-system.scm b/guix/build/android-ndk-build-system.scm index 3c8f726d1dc74eaab1490df05a5a6977f1ce9787..0298292ac986d39c43dbaacafe5f5618cbf1e1fc 100644 --- a/guix/build/android-ndk-build-system.scm +++ b/guix/build/android-ndk-build-system.scm @@ -18,14 +18,9 @@ (define-module (guix build android-ndk-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) - #:use-module (guix build syscalls) #:use-module (guix build utils) - #:use-module (ice-9 popen) - #:use-module (ice-9 rdelim) - #:use-module (ice-9 ftw) #:use-module (ice-9 format) #:use-module (ice-9 match) - #:use-module (rnrs io ports) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:export (%standard-phases diff --git a/guix/build/asdf-build-system.scm b/guix/build/asdf-build-system.scm index 92154e7d3482f320cc73f04919126748a1c068ab..a47e825439468d68e7cecd8ab035987d10e38892 100644 --- a/guix/build/asdf-build-system.scm +++ b/guix/build/asdf-build-system.scm @@ -24,11 +24,7 @@ #:use-module (guix build union) #:use-module (guix build lisp-utils) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (ice-9 rdelim) - #:use-module (ice-9 receive) - #:use-module (ice-9 regex) #:use-module (ice-9 match) #:use-module (ice-9 format) #:use-module (ice-9 ftw) diff --git a/guix/build/chicken-build-system.scm b/guix/build/chicken-build-system.scm index a669822dad72288b546e5aeb02ef11b8d77cbb49..8f9f59cc2591c2554897ebbe080e4bf90ccbc646 100644 --- a/guix/build/chicken-build-system.scm +++ b/guix/build/chicken-build-system.scm @@ -18,7 +18,6 @@ (define-module (guix build chicken-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) - #:use-module (guix build union) #:use-module (guix build utils) #:use-module (ice-9 match) #:use-module (ice-9 ftw) diff --git a/guix/build/clojure-utils.scm b/guix/build/clojure-utils.scm index c5322141d3dc974b4c0e3ecac8a3355f4b2799dc..57081d30f7d9db99c7f94b8cc5494c0dc2ac964e 100644 --- a/guix/build/clojure-utils.scm +++ b/guix/build/clojure-utils.scm @@ -20,7 +20,6 @@ #:use-module (guix build utils) #:use-module (ice-9 ftw) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-8) #:use-module (srfi srfi-26) diff --git a/guix/build/download-nar.scm b/guix/build/download-nar.scm index 867f3c10bba30f208fcc77923dbc802fd7a4d330..d760f3ce009fa0b40ec68a83a008c362c81c1e06 100644 --- a/guix/build/download-nar.scm +++ b/guix/build/download-nar.scm @@ -18,7 +18,6 @@ (define-module (guix build download-nar) #:use-module (guix build download) - #:use-module (guix build utils) #:use-module ((guix serialization) #:hide (dump-port*)) #:autoload (zlib) (call-with-gzip-input-port) #:use-module (guix progress) diff --git a/guix/build/elm-build-system.scm b/guix/build/elm-build-system.scm index 02d7c029dd9b84e7f81d6d14e4dde9c7a6b1b2a4..87a426e2a98c89b0dcd08fd9aed371293f70c778 100644 --- a/guix/build/elm-build-system.scm +++ b/guix/build/elm-build-system.scm @@ -23,7 +23,6 @@ #:use-module (guix build union) #:use-module (ice-9 ftw) #:use-module (ice-9 rdelim) - #:use-module (ice-9 regex) #:use-module (ice-9 match) #:use-module (ice-9 popen) #:use-module (ice-9 vlist) diff --git a/guix/build/guile-build-system.scm b/guix/build/guile-build-system.scm index 32a431d3476e3e9229a4331fff749e68aaaae591..a293b3f624ffbaa39dc713aee450d00eb533ec1a 100644 --- a/guix/build/guile-build-system.scm +++ b/guix/build/guile-build-system.scm @@ -26,6 +26,7 @@ #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (ice-9 format) + #:autoload (ice-9 threads) (current-processor-count) #:use-module (guix build utils) #:export (target-guile-effective-version %standard-phases diff --git a/guix/build/linux-module-build-system.scm b/guix/build/linux-module-build-system.scm index 18ccf7cd8b84a4da3f1f881def19eba944179139..b93c5eaf93a1da4923269d40176977a3a8a9ac54 100644 --- a/guix/build/linux-module-build-system.scm +++ b/guix/build/linux-module-build-system.scm @@ -21,10 +21,6 @@ (define-module (guix build linux-module-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build utils) - #:use-module (ice-9 ftw) - #:use-module (ice-9 match) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%standard-phases linux-module-build)) diff --git a/guix/build/lisp-utils.scm b/guix/build/lisp-utils.scm index 646d4a33650801d5a5cc08c38f1cb1c9d801578f..2ebd4bec9b3e331e4330ecd60877bb39950afbd0 100644 --- a/guix/build/lisp-utils.scm +++ b/guix/build/lisp-utils.scm @@ -20,11 +20,9 @@ (define-module (guix build lisp-utils) #:use-module (ice-9 format) - #:use-module (ice-9 hash-table) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:use-module (guix build utils) #:export (%lisp %lisp-type diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm index 0d29338ce35fa6d338ce5f4f685e5167e84c4979..ffa8de175c518c491998f858a34475f9c27ba20f 100644 --- a/guix/build/make-bootstrap.scm +++ b/guix/build/make-bootstrap.scm @@ -20,9 +20,6 @@ (define-module (guix build make-bootstrap) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-19) - #:use-module (srfi srfi-26) #:use-module (guix build utils) #:export (copy-linux-headers make-stripped-libc)) diff --git a/guix/build/svn.scm b/guix/build/svn.scm index 44d77a968f75408367e3d7cc75faebda6e76641f..2d960cb36424ae2453ea47284498fede630e05ce 100644 --- a/guix/build/svn.scm +++ b/guix/build/svn.scm @@ -22,7 +22,6 @@ (define-module (guix build svn) #:use-module (guix build utils) #:use-module (srfi srfi-34) - #:use-module (ice-9 format) #:export (svn-fetch)) ;;; Commentary: diff --git a/guix/build/waf-build-system.scm b/guix/build/waf-build-system.scm index 56048e768522f7044efeaf40d45e0a854a830eb2..63791ee6ed11fb2003051def35cca0039b768804 100644 --- a/guix/build/waf-build-system.scm +++ b/guix/build/waf-build-system.scm @@ -19,10 +19,6 @@ (define-module (guix build waf-build-system) #:use-module ((guix build gnu-build-system) #:prefix gnu:) #:use-module (guix build utils) - #:use-module (ice-9 match) - #:use-module (ice-9 ftw) - #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:export (%standard-phases waf-build)) diff --git a/guix/channels.scm b/guix/channels.scm index d44e7a0a3a3dc2477bbd07d320a33604cb87222e..1ff72b7e720537fac5621cf4b51629b226b671ce 100644 --- a/guix/channels.scm +++ b/guix/channels.scm @@ -29,8 +29,6 @@ #:use-module (guix base16) #:use-module (guix records) #:use-module (guix gexp) - #:use-module (guix modules) - #:use-module (guix discovery) #:use-module (guix monads) #:use-module (guix profiles) #:use-module (guix packages) @@ -55,8 +53,6 @@ #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 vlist) - #:use-module ((ice-9 rdelim) #:select (read-string)) - #:use-module ((rnrs bytevectors) #:select (bytevector=?)) #:export (channel channel? channel-name diff --git a/guix/derivations.scm b/guix/derivations.scm index 0bb6a281474532e2963901dec742362813fb4dc6..9fec7f4f0b4d5e951b21429a928e633e1113a99f 100644 --- a/guix/derivations.scm +++ b/guix/derivations.scm @@ -41,8 +41,6 @@ #:use-module (guix i18n) #:use-module (guix monads) #:use-module (gcrypt hash) - #:use-module (guix base32) - #:use-module (guix records) #:use-module (guix sets) #:export ( derivation? diff --git a/guix/discovery.scm b/guix/discovery.scm index 81d4ca600f17292a89c9d98cc8743aca893e36b1..0edc7fd1ae348fab5724f5ac0e6c9dc0eb5c529e 100644 --- a/guix/discovery.scm +++ b/guix/discovery.scm @@ -24,7 +24,6 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:use-module (ice-9 vlist) - #:use-module (ice-9 ftw) #:export (scheme-files scheme-modules scheme-modules* diff --git a/guix/ftp-client.scm b/guix/ftp-client.scm index 9cc34cc7ecbbf994fe22eae641a370adb43790de..c1d99bd75fcc333d5e1cc581cd013a7b9f2278fc 100644 --- a/guix/ftp-client.scm +++ b/guix/ftp-client.scm @@ -20,10 +20,8 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-31) #:use-module (ice-9 binary-ports) - #:use-module (rnrs bytevectors) #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) diff --git a/guix/git-authenticate.scm b/guix/git-authenticate.scm index 419cb85afcc55fcc84dd57020decb2e82353c32b..37c69d0880c64ce5c38a9fbaa54df2e42bfed344 100644 --- a/guix/git-authenticate.scm +++ b/guix/git-authenticate.scm @@ -35,7 +35,6 @@ #:use-module (guix progress) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (rnrs bytevectors) diff --git a/guix/git.scm b/guix/git.scm index 401932332728286f47bfe403ea1d73d7d56f4fbc..be20cde019a466c791f7cac5faef91c49307484a 100644 --- a/guix/git.scm +++ b/guix/git.scm @@ -23,8 +23,6 @@ (define-module (guix git) #:use-module (git) - #:use-module (git object) - #:use-module (git submodule) #:use-module (guix i18n) #:use-module (guix base32) #:use-module (guix cache) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 0aa70243b5f00829f7d68f92adfee0d24a1c3952..32712f721830ff6488ab5541a08228b52e78e71e 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -23,15 +23,12 @@ #:use-module (web uri) #:use-module (web client) #:use-module (web response) - #:use-module (sxml simple) #:use-module (ice-9 regex) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) #:use-module (rnrs io ports) - #:use-module (system foreign) #:use-module ((guix http-client) #:hide (open-socket-for-uri)) ;; not required in many cases, so autoloaded to reduce start-up costs. #:autoload (guix download) (%mirrors) diff --git a/guix/graph.scm b/guix/graph.scm index 41219ab67dbf38e086953cabcf7e55b12a0fe139..aee0021d6c5dae802d94709ba5e692715c17aafe 100644 --- a/guix/graph.scm +++ b/guix/graph.scm @@ -24,7 +24,6 @@ #:use-module (guix sets) #:autoload (guix diagnostics) (formatted-message) #:autoload (guix i18n) (G_) - #:use-module (rnrs io ports) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) diff --git a/guix/hg-download.scm b/guix/hg-download.scm index 382c34922a5a3d3328f81f5e801f134c1b33dc6e..a7022dd43165520b3445c49dfd7f514c10b5ce4c 100644 --- a/guix/hg-download.scm +++ b/guix/hg-download.scm @@ -25,7 +25,6 @@ #:use-module (guix records) #:use-module (guix modules) #:use-module (guix packages) - #:autoload (guix build-system gnu) (standard-packages) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (ice-9 match) diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm index 4410c1250085da23f49f96fd21af3171f2f1c222..fe03c302545a1fe87eedec40e741a816f1d5e328 100644 --- a/guix/import/cabal.scm +++ b/guix/import/cabal.scm @@ -22,7 +22,6 @@ #:use-module (ice-9 match) #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) - #:use-module (ice-9 receive) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 8972b8708049a30da6fc340c5ed7d83daf3ad749..eeb142a9b8a7d13a0fb764625ff5ce86a949e232 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -31,10 +31,10 @@ #:use-module (json) #:use-module (gcrypt hash) #:use-module (guix diagnostics) + #:use-module (guix i18n) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix base32) - #:use-module (guix ui) #:use-module ((guix download) #:select (download-to-store url-fetch)) #:use-module ((guix import utils) #:select (factorize-uri)) #:use-module (guix import json) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 17c19a2dcf9a4eee4c1dacc72ea3c47a6c6c9c74..210cb40ec7c5a0f25fdbd6bcf963e486fc7ca626 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -29,12 +29,10 @@ #:use-module ((ice-9 rdelim) #:select (read-string read-line)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (srfi srfi-71) - #:use-module (ice-9 receive) #:use-module (web uri) #:use-module (guix memoization) #:use-module (guix http-client) @@ -52,11 +50,9 @@ #:use-module (guix utils) #:use-module (guix git) #:use-module ((guix build-system r) #:select (cran-uri bioconductor-uri)) - #:use-module (guix ui) #:use-module (guix upstream) #:use-module (guix packages) #:use-module (guix sets) - #:use-module (gnu packages) #:export (%input-style cran->guix-package diff --git a/guix/import/crate.scm b/guix/import/crate.scm index c17d96ef41b8f8b3d4ed36fb49e77f21191a6128..514eca22298ec48d2122177163888861457848b2 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -23,14 +23,11 @@ (define-module (guix import crate) #:use-module (guix base32) #:use-module (guix build-system cargo) - #:use-module ((guix download) #:prefix download:) #:use-module (gcrypt hash) #:use-module (guix http-client) #:use-module (guix import json) #:use-module (guix import utils) - #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) - #:use-module (guix monads) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix utils) diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 90d97909b5c06ae0bec40e381f111575a58aaf6f..e3bc158475bd1ff9047fff9866b8a2b9e4e5c1ff 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -26,18 +26,14 @@ #:use-module (srfi srfi-71) #:use-module (gcrypt hash) #:use-module (guix git) - #:use-module (guix i18n) #:use-module (guix base32) - #:use-module (guix diagnostics) #:use-module (guix memoization) #:use-module (guix packages) #:use-module (guix upstream) - #:use-module (guix build-system) #:use-module (guix build-system chicken) #:use-module (guix store) #:use-module ((guix download) #:select (download-to-store url-fetch)) #:use-module (guix import utils) - #:use-module ((guix licenses) #:prefix license:) #:export (egg->guix-package egg-recursive-import %egg-updater diff --git a/guix/import/elm.scm b/guix/import/elm.scm index c8fb15343fd008fb1d6b0e7ab9b1fa8c0098bc4e..508bac5462b791cacc0517044e097781664630d0 100644 --- a/guix/import/elm.scm +++ b/guix/import/elm.scm @@ -18,10 +18,8 @@ (define-module (guix import elm) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -32,20 +30,11 @@ #:use-module (guix memoization) #:use-module (guix diagnostics) #:use-module (guix i18n) - #:use-module ((guix ui) #:select (display-hint)) - #:use-module ((guix build utils) - #:select ((package-name->name+version - . hyphen-package-name->name+version) - find-files - invoke)) #:use-module (guix import utils) #:use-module (guix git) #:use-module (guix import json) #:autoload (gcrypt hash) (hash-algorithm sha256) #:use-module (json) - #:use-module (guix packages) - #:use-module (guix upstream) - #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system elm) #:export (elm-recursive-import %elm-package-registry diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index f9e9f2de5385611e363684eef27b37848c7bf264..f71e758db49949cf47f6c3110eda2489c323b47d 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -34,22 +34,19 @@ #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (guix i18n) #:use-module (guix diagnostics) #:use-module ((guix download) #:select (download-to-store)) #:use-module (guix import utils) #:use-module (guix http-client) #:use-module (guix git) #:use-module (guix hash) - #:use-module ((guix serialization) #:select (write-file)) #:use-module (guix store) - #:use-module (guix ui) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (guix packages) #:use-module (guix memoization) - #:use-module ((guix utils) #:select (call-with-temporary-output-file)) #:export (elpa->guix-package guix-package->elpa-name %elpa-updater diff --git a/guix/import/gem.scm b/guix/import/gem.scm index c8d6cd4d2d63bd932280aba833a17e960efe9ff4..4e2be0f5f8e1848ad4f62154487f5c8bde99ee33 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -27,7 +27,6 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (json) - #:use-module ((guix download) #:prefix download:) #:use-module (guix import utils) #:use-module (guix import json) #:use-module (guix packages) diff --git a/guix/import/git.scm b/guix/import/git.scm index c15943bd7c601ff055e5e17b1e1093fa876ff21a..ab51719255daec924783153e56a3d843da56135a 100644 --- a/guix/import/git.scm +++ b/guix/import/git.scm @@ -20,17 +20,14 @@ ;;; along with GNU Guix. If not, see . (define-module (guix import git) - #:use-module (guix build utils) + #:use-module (guix i18n) #:use-module (guix diagnostics) #:use-module (guix git) #:use-module (guix git-download) - #:use-module (guix i18n) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix utils) - #:use-module (ice-9 format) #:use-module (ice-9 match) - #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) diff --git a/guix/import/github.scm b/guix/import/github.scm index a1bda5ec4344e0afd5d94232b6de263d1ae657e1..7409c9a202e014f0a30c595f44c54b2b23de1a21 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -35,13 +35,11 @@ #:use-module ((guix download) #:prefix download:) #:use-module ((guix git-download) #:prefix download:) #:autoload (guix build download) (open-connection-for-uri) - #:use-module (guix import utils) #:use-module (json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix http-client) #:use-module (web uri) - #:use-module (web response) #:export (%github-api %github-updater)) ;; For tests. diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm index 3c5a96fdde874c526f9f82b848d4b4e0b40d5501..054ae44f7ae6156af168256d6b7fc0086724ebf3 100644 --- a/guix/import/gnome.scm +++ b/guix/import/gnome.scm @@ -25,8 +25,6 @@ #:use-module (guix http-client) #:use-module (json) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (web uri) #:use-module (ice-9 match) diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm index cff088f423ed101547481ec978ba89ff2a6dd1a8..fb61332fb86192d3ee6f3b2926a5dca3bd7e0b11 100644 --- a/guix/import/gnu.scm +++ b/guix/import/gnu.scm @@ -23,19 +23,16 @@ #:use-module (guix gnu-maintenance) #:use-module (guix import utils) #:use-module (guix i18n) - #:use-module (guix utils) #:use-module (guix store) #:use-module (gcrypt hash) #:use-module (guix base32) #:use-module (guix upstream) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) #:use-module (web uri) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:export (gnu->guix-package)) ;;; Commentary: diff --git a/guix/import/go.scm b/guix/import/go.scm index 90d4c8931d83c438ba7c81d4ab6cd2b7c98450c4..0357e6a1ebe7cbe1c0fe18b35a9f5c49b92a2f39 100644 --- a/guix/import/go.scm +++ b/guix/import/go.scm @@ -32,25 +32,20 @@ #:use-module (guix import utils) #:use-module (guix import json) #:use-module (guix packages) - #:use-module ((guix utils) #:select (string-replace-substring)) #:use-module (guix http-client) - #:use-module ((guix licenses) #:prefix license:) #:use-module (guix memoization) #:autoload (htmlprag) (html->sxml) ;from Guile-Lib - #:autoload (guix serialization) (write-file) #:autoload (guix base32) (bytevector->nix-base32-string) #:autoload (guix build utils) (mkdir-p) #:autoload (gcrypt hash) (hash-algorithm sha256) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 peg) - #:use-module (ice-9 rdelim) #:use-module (ice-9 receive) #:use-module (ice-9 regex) #:use-module (ice-9 textual-ports) #:use-module ((rnrs io ports) #:select (call-with-port)) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-2) #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) @@ -61,10 +56,7 @@ (if (eq? 'filter s) 'xfilter s))) - #:use-module (web client) - #:use-module (web response) #:use-module (web uri) - #:export (go-module->guix-package go-module->guix-package* go-module-recursive-import)) diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm index dac5d1756f4a45ad4a0dd44005c1dc006780dba7..628a44ff241a3b8f563ac362cc78b4989223106d 100644 --- a/guix/import/hexpm.scm +++ b/guix/import/hexpm.scm @@ -22,10 +22,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix import hexpm) - #:use-module (guix base32) - #:use-module ((guix download) #:prefix download:) - #:use-module (gcrypt hash) - #:use-module (guix http-client) #:use-module (json) #:use-module (guix import utils) #:use-module ((guix import json) #:select (json-fetch)) @@ -33,16 +29,11 @@ #:select ((package-name->name+version . hyphen-package-name->name+version) dump-port)) - #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix monads) #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module (ice-9 regex) - #:use-module (ice-9 popen) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-2) #:use-module (srfi srfi-26) #:use-module (guix build-system rebar) #:export (hexpm->guix-package diff --git a/guix/import/kde.scm b/guix/import/kde.scm index 3566312eca7c7265d98451b357a6a20c4f8de7e5..0ae457ef3d2f5c787a5420edb7e7da18cbd86e47 100644 --- a/guix/import/kde.scm +++ b/guix/import/kde.scm @@ -20,7 +20,6 @@ (define-module (guix import kde) #:use-module (guix http-client) - #:use-module (guix memoization) #:use-module (guix gnu-maintenance) #:use-module (guix packages) #:use-module (guix upstream) diff --git a/guix/import/minetest.scm b/guix/import/minetest.scm index e5775e2fa99d11352d1c260762720ca19308d3a2..7e7b6dd6ac3cf108f512940a32c5b2e2cd285ff2 100644 --- a/guix/import/minetest.scm +++ b/guix/import/minetest.scm @@ -19,24 +19,17 @@ (define-module (guix import minetest) #:use-module (ice-9 match) - #:use-module (ice-9 receive) #:use-module (ice-9 threads) #:use-module (ice-9 hash-table) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-2) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (guix diagnostics) #:use-module ((guix packages) #:prefix package:) #:use-module (guix upstream) - #:use-module (guix utils) - #:use-module (guix ui) #:use-module (guix i18n) #:use-module (guix memoization) #:use-module (guix serialization) #:use-module (guix import utils) #:use-module (guix import json) - #:use-module ((gcrypt hash) #:select (open-sha256-port port-sha256)) #:use-module (json) #:use-module (guix base32) #:use-module (guix git) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 938a88f69d7bd323184f2f244b400107cbb556cc..e336936306eafa77e5c858574df9858e8ca38f31 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -22,23 +22,19 @@ ;;; along with GNU Guix. If not, see . (define-module (guix import opam) - #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (ice-9 peg) #:use-module ((ice-9 popen) #:select (open-pipe*)) - #:use-module (ice-9 receive) #:use-module (ice-9 textual-ports) - #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module ((srfi srfi-26) #:select (cut)) #:use-module ((web uri) #:select (string->uri uri->string)) #:use-module ((guix build utils) #:select (dump-port find-files mkdir-p)) #:use-module (guix build-system) - #:use-module (guix build-system ocaml) + #:use-module (guix i18n) #:use-module (guix diagnostics) #:use-module (guix http-client) - #:use-module (guix ui) #:use-module (guix packages) #:use-module (guix upstream) #:use-module ((guix utils) #:select (cache-directory @@ -49,7 +45,6 @@ recursive-import spdx-string->license url-fetch)) - #:use-module ((guix licenses) #:prefix license:) #:export (opam->guix-package opam-recursive-import %opam-updater diff --git a/guix/import/print.scm b/guix/import/print.scm index 2f54adbd8c88d0f86519c2d6b57c4063e12d3a3e..08a484f5f3eb4d85d1e2901359808227d7775908 100644 --- a/guix/import/print.scm +++ b/guix/import/print.scm @@ -19,12 +19,11 @@ (define-module (guix import print) #:use-module (guix base32) - #:use-module (guix utils) #:use-module (guix licenses) #:use-module (guix packages) + #:use-module ((guix diagnostics) #:select (location-file)) #:use-module (guix search-paths) #:use-module (guix build-system) - #:use-module (gnu packages) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (guix import utils) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index c9aaacbc3f163c2e31ddd76bfa8706b32646ec9c..261fdb46d91a3723540eee56efbaf0f4cf87926c 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -36,7 +36,6 @@ #:use-module (ice-9 receive) #:use-module ((ice-9 rdelim) #:select (read-line)) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) @@ -51,13 +50,11 @@ find-files invoke)) #:use-module (guix import utils) - #:use-module ((guix download) #:prefix download:) #:use-module (guix import json) #:use-module (json) #:use-module (guix packages) #:use-module (guix upstream) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix build-system python) #:export (parse-requires.txt parse-wheel-metadata specification->requirement-name diff --git a/guix/import/test.scm b/guix/import/test.scm index 767dcd5b613dfa7d2a8fd9bafe66502e806589f0..b1ed0b455d0624e93931ebbcd6c991825c27f2e1 100644 --- a/guix/import/test.scm +++ b/guix/import/test.scm @@ -18,8 +18,6 @@ (define-module (guix import test) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:use-module (web uri) #:use-module (guix packages) #:use-module (guix upstream) #:use-module ((guix utils) #:select (version-prefix?)) diff --git a/guix/import/texlive.scm b/guix/import/texlive.scm index 6bf7f92e60e3988329f081207a07e0d91a1becbd..82014ee5687b5cd4330a6c4e7a8df59e7dfcff57 100644 --- a/guix/import/texlive.scm +++ b/guix/import/texlive.scm @@ -35,9 +35,6 @@ #:use-module (guix serialization) #:use-module (guix svn-download) #:use-module (guix import utils) - #:use-module (guix utils) - #:use-module (guix upstream) - #:use-module (guix packages) #:use-module (guix build-system texlive) #:export (files-differ? texlive->guix-package diff --git a/guix/import/utils.scm b/guix/import/utils.scm index 2da5d93a6709f09ca44fb88c4dd26d3d2251608d..e1f651928731ecb1a98ba3961c91e23b3f63d9d6 100644 --- a/guix/import/utils.scm +++ b/guix/import/utils.scm @@ -39,7 +39,6 @@ #:use-module (guix packages) #:use-module (guix discovery) #:use-module (guix build-system) - #:use-module (guix gexp) #:use-module ((guix i18n) #:select (G_)) #:use-module (guix store) #:use-module (guix download) diff --git a/guix/ipfs.scm b/guix/ipfs.scm index 31a89888a72884b95dcdbf0c724370b621ebd8b3..3c25f2a4991b55edd003377429c4a206829d0c29 100644 --- a/guix/ipfs.scm +++ b/guix/ipfs.scm @@ -18,15 +18,10 @@ (define-module (guix ipfs) #:use-module (json) - #:use-module (guix base64) - #:use-module ((guix build utils) #:select (dump-port)) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) #:use-module (rnrs io ports) - #:use-module (rnrs bytevectors) #:use-module (ice-9 match) - #:use-module (ice-9 ftw) #:use-module (web uri) #:use-module (web client) #:use-module (web response) diff --git a/guix/lint.scm b/guix/lint.scm index 17dcc23647e46eb2ab1c0af55cb6ebf8715b3281..a1a27873d994294a9e171939342a4e481a5de63c 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -33,7 +33,6 @@ (define-module (guix lint) #:use-module (guix store) #:autoload (guix base16) (bytevector->base16-string) - #:use-module (guix base32) #:autoload (guix base64) (base64-encode) #:use-module (guix build-system) #:use-module (guix diagnostics) diff --git a/guix/pki.scm b/guix/pki.scm index c5b2fb9634e1f18aa229a0a6c1b4453e7fd911f9..93932128cdee91a4046628f299fc549780d053ab 100644 --- a/guix/pki.scm +++ b/guix/pki.scm @@ -24,7 +24,6 @@ #:autoload (srfi srfi-1) (delete-duplicates) #:use-module (ice-9 match) #:use-module (ice-9 rdelim) - #:use-module (ice-9 binary-ports) #:export (%public-key-file %private-key-file %acl-file diff --git a/guix/records.scm b/guix/records.scm index 1f097c7108a9576724c1631916d593dc9c70036a..7d43b064d810e35bc676609a7016c2e29234b2ab 100644 --- a/guix/records.scm +++ b/guix/records.scm @@ -22,7 +22,6 @@ #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) #:autoload (system base target) (target-most-positive-fixnum) #:export (define-record-type* diff --git a/guix/remote.scm b/guix/remote.scm index f6adb22846e512ddc327235870e04ccacd9178d5..a58ec2103c3436fb32967847e0b86022cea37ae2 100644 --- a/guix/remote.scm +++ b/guix/remote.scm @@ -32,8 +32,6 @@ #:use-module (srfi srfi-1) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) - #:use-module (ice-9 format) - #:use-module (ice-9 match) #:export (remote-eval)) ;;; Commentary: diff --git a/guix/scripts.scm b/guix/scripts.scm index 395df864a3fbadba9d3241c255cd21b58011ad97..5d11ce7fe9a619eb060146a62357bc03db92f578 100644 --- a/guix/scripts.scm +++ b/guix/scripts.scm @@ -28,7 +28,6 @@ #:use-module (guix monads) #:use-module (guix packages) #:use-module (guix derivations) - #:use-module ((guix profiles) #:select (%profile-directory)) #:autoload (guix describe) (current-profile-date) #:use-module (guix build syscalls) #:use-module (srfi srfi-1) diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm index 3b2bdee835b515ee393a901e540ffc283db0beb7..a7ff1593a64f4e901521db18872e0b8e26082a61 100644 --- a/guix/scripts/archive.scm +++ b/guix/scripts/archive.scm @@ -18,7 +18,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix scripts archive) - #:use-module (guix config) #:use-module (guix utils) #:use-module (guix combinators) #:use-module ((guix build utils) #:select (mkdir-p)) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 6a4a32fc0a3e48b50edbf78943749032f535766d..72a24f91ac8a9e89378d2d5861af25865852f03f 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -27,7 +27,6 @@ #:use-module (guix store) #:use-module (guix derivations) #:use-module (guix packages) - #:use-module (guix memoization) #:use-module (guix utils) #:use-module (guix monads) #:use-module (guix gexp) @@ -36,10 +35,8 @@ #:autoload (guix http-client) (http-fetch http-get-error?) #:use-module (ice-9 format) #:use-module (ice-9 match) - #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm index 620a1762a1804a2e7fc3ad2a78e7469958250e38..4821e11bf6ba58ecc539e2ccc4db02ad8591b968 100644 --- a/guix/scripts/challenge.scm +++ b/guix/scripts/challenge.scm @@ -24,7 +24,6 @@ #:use-module (guix utils) #:use-module (guix monads) #:use-module (guix base32) - #:use-module (guix packages) #:use-module ((guix progress) #:hide (dump-port*)) #:use-module (guix serialization) #:use-module (guix substitutes) diff --git a/guix/scripts/deploy.scm b/guix/scripts/deploy.scm index ef6f9acc86302690acbdfc28422cdce055e230ae..14ce736174d87df72290436dee04ce8c0b60cdb9 100644 --- a/guix/scripts/deploy.scm +++ b/guix/scripts/deploy.scm @@ -26,7 +26,6 @@ #:use-module (guix store) #:use-module (guix gexp) #:use-module (guix ui) - #:use-module (guix utils) #:use-module ((guix status) #:select (with-status-verbosity)) #:use-module (guix diagnostics) #:use-module (guix i18n) diff --git a/guix/scripts/discover.scm b/guix/scripts/discover.scm index dadade81bbbf3b344e564d8c8be54411443251ec..8970f835c957ad6096d9183921724d2f26e09803 100644 --- a/guix/scripts/discover.scm +++ b/guix/scripts/discover.scm @@ -23,7 +23,6 @@ #:use-module (guix scripts) #:use-module (guix ui) #:use-module (guix utils) - #:use-module (guix build syscalls) #:use-module (guix build utils) #:use-module (guix scripts publish) #:use-module (avahi) diff --git a/guix/scripts/download.scm b/guix/scripts/download.scm index 5a91390358726fa5998b20e17d88cab7e276d7bf..0ab5c8c39ce1130482fe81ad54c4252d6923f9fe 100644 --- a/guix/scripts/download.scm +++ b/guix/scripts/download.scm @@ -35,11 +35,8 @@ #:use-module (web uri) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-14) #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) - #:use-module (rnrs bytevectors) - #:use-module (ice-9 binary-ports) #:export (guix-download)) diff --git a/guix/scripts/edit.scm b/guix/scripts/edit.scm index 8e777d1405c3e6fe3f3dedfe7ca6714d7ae36a5c..5ce2870c5adfdd12710bb42cb56696a02ee3781f 100644 --- a/guix/scripts/edit.scm +++ b/guix/scripts/edit.scm @@ -22,7 +22,8 @@ #:use-module (guix ui) #:use-module (guix scripts) #:use-module ((guix scripts build) #:select (%standard-build-options)) - #:use-module (guix utils) + #:use-module ((guix diagnostics) + #:select (location-file location-line)) #:use-module (gnu packages) #:use-module (srfi srfi-1) #:use-module (srfi srfi-37) diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 6847dd1962f0cc9cc7b275497cbd7d8481fb5c2d..c075e0ec29d807364f3191a5f6625836a58f27d5 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -20,7 +20,6 @@ (define-module (guix scripts graph) #:use-module (guix ui) #:use-module (guix graph) - #:use-module (guix grafts) #:use-module (guix scripts) #:use-module (guix packages) #:use-module (guix monads) diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index 4e792c6a03a4b539890a2063f380d1d496be7135..6dc67a24160766c8ad85b930e814c93c446c52c1 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -23,18 +23,14 @@ (define-module (guix scripts hash) #:use-module (gcrypt hash) - #:use-module (guix serialization) #:use-module (guix ui) #:use-module (guix hash) #:use-module (guix scripts) #:use-module (guix base16) #:use-module (guix base32) #:autoload (guix base64) (base64-encode) - #:use-module (ice-9 binary-ports) - #:use-module (rnrs files) #:use-module (ice-9 match) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:autoload (disarchive git-hash) (git-hash-file git-hash-directory) diff --git a/guix/scripts/home.scm b/guix/scripts/home.scm index 8ff8182a796cc95d4caa73e01551564374170256..954bb0045fc7a959e68a33ffa4b2e810313346f0 100644 --- a/guix/scripts/home.scm +++ b/guix/scripts/home.scm @@ -22,9 +22,7 @@ ;;; along with GNU Guix. If not, see . (define-module (guix scripts home) - #:use-module (gnu packages admin) #:use-module ((gnu services) #:hide (delete)) - #:use-module (gnu packages) #:autoload (gnu packages base) (coreutils) #:autoload (gnu packages bash) (bash) #:autoload (gnu packages gnupg) (guile-gcrypt) diff --git a/guix/scripts/import.scm b/guix/scripts/import.scm index fe1d7a8ddadbb2fe54950c0d8bf7dddd2aea5aae..f84a964a53a6f27f1def63e4b88c8be741eda048 100644 --- a/guix/scripts/import.scm +++ b/guix/scripts/import.scm @@ -28,9 +28,6 @@ #:use-module (guix read-print) #:use-module (guix utils) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) - #:use-module (srfi srfi-26) - #:use-module (srfi srfi-37) #:use-module (ice-9 format) #:use-module (ice-9 match) #:export (%standard-import-options diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index 8c6132e7c3b0f414c163fba02ebeba0eb225b6ee..7b76126d353924af29b175f8e2ee7b9f9c23790b 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -39,7 +39,6 @@ #:autoload (guix derivations) (read-derivation-from-file derivation-file-name build-derivations) - #:autoload (guix serialization) (nar-error? nar-error-file) #:autoload (guix nar) (restore-file-set) #:use-module ((guix utils) #:select (%current-system)) #:use-module ((guix build syscalls) diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm index eb41eb55631d9dadcf4ae20d81742d6b2ea5c542..25ac9d29d01b0e79f9b8a214623556986fb073a5 100644 --- a/guix/scripts/pack.scm +++ b/guix/scripts/pack.scm @@ -28,7 +28,6 @@ #:use-module (guix scripts) #:use-module (guix ui) #:use-module (guix gexp) - #:use-module ((guix build utils) #:select (%xz-parallel-args)) #:use-module (guix utils) #:use-module (guix store) #:use-module ((guix status) #:select (with-status-verbosity)) @@ -54,7 +53,6 @@ #:use-module ((gnu packages compression) #:hide (zip)) #:use-module (gnu packages guile) #:use-module (gnu packages base) - #:autoload (gnu packages package-management) (guix) #:autoload (gnu packages gnupg) (guile-gcrypt) #:autoload (gnu packages guile) (guile2.0-json guile-json) #:use-module (srfi srfi-1) diff --git a/guix/scripts/package.scm b/guix/scripts/package.scm index 945e2f2ccadd3bbaac3a73b1ab153da2a957b1ef..f1eef9dfafae727157bacaa5002b6ef8ec6b66a9 100644 --- a/guix/scripts/package.scm +++ b/guix/scripts/package.scm @@ -38,9 +38,7 @@ #:use-module (guix profiles) #:use-module (guix search-paths) #:autoload (guix import json) (json->scheme-file) - #:use-module (guix monads) #:use-module (guix utils) - #:use-module (guix config) #:use-module (guix scripts) #:use-module (guix scripts build) #:use-module (guix transformations) @@ -48,12 +46,9 @@ manifest-entry-with-provenance) #:autoload (guix channels) (channel-name channel-commit channel->code) #:autoload (guix store roots) (gc-roots user-owned?) - #:use-module ((guix build utils) - #:select (directory-exists? mkdir-p)) #:use-module (ice-9 format) #:use-module (ice-9 match) #:autoload (ice-9 pretty-print) (pretty-print) - #:use-module (ice-9 regex) #:use-module (ice-9 vlist) #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 6307ae54bb83b2d29854ed471403313408a744f5..ada81838acc32bc74a77ae26a2aa52f416361318 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -23,16 +23,13 @@ (define-module (guix scripts publish) #:use-module ((system repl server) #:prefix repl:) - #:use-module (ice-9 binary-ports) #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (ice-9 poll) - #:use-module (ice-9 regex) #:use-module (ice-9 rdelim) #:use-module (ice-9 threads) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-2) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) #:use-module (srfi srfi-19) @@ -50,7 +47,6 @@ #:use-module (guix base32) #:use-module (guix base64) #:use-module (guix config) - #:use-module (guix derivations) #:use-module (gcrypt hash) #:use-module (guix pki) #:use-module (gcrypt pk-crypto) diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm index 2be8de3b9c27c6c747e9ee6c9575497624e6a133..cd2e470289c0b7160d6b377f511858dc9dc9d97c 100644 --- a/guix/scripts/pull.scm +++ b/guix/scripts/pull.scm @@ -30,7 +30,6 @@ #:use-module (guix packages) #:use-module (guix derivations) #:use-module (guix profiles) - #:use-module (guix gexp) #:use-module (guix memoization) #:use-module (guix monads) #:use-module (guix channels) @@ -45,7 +44,6 @@ #:autoload (gnu packages) (fold-available-packages) #:autoload (guix scripts package) (build-and-use-profile delete-matching-generations) - #:autoload (gnu packages base) (canonical-package) #:autoload (gnu packages bootstrap) (%bootstrap-guile) #:autoload (gnu packages certs) (le-certs) #:use-module (srfi srfi-1) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index 6498d73c2b1ef58e3c49c50912a5add8b362f154..ee94ed29a192dde3329ec96a058b2f1a96d8b0b0 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -43,15 +43,12 @@ #:use-module (gnu packages) #:use-module ((gnu packages commencement) #:select (%final-inputs)) #:use-module (ice-9 match) - #:use-module (ice-9 regex) - #:use-module (ice-9 vlist) #:use-module (ice-9 format) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:use-module (srfi srfi-71) - #:use-module (ice-9 binary-ports) #:export (guix-refresh)) diff --git a/guix/scripts/repl.scm b/guix/scripts/repl.scm index 0b978ae35fca8ab4133adbbb972c3637788ced71..fd23a2b982e504855e8930f66b76190f199d8f48 100644 --- a/guix/scripts/repl.scm +++ b/guix/scripts/repl.scm @@ -23,10 +23,8 @@ #:use-module (guix scripts) #:use-module (guix repl) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:use-module (ice-9 match) - #:use-module (rnrs bytevectors) #:autoload (guix describe) (current-profile) #:autoload (system repl repl) (start-repl) #:autoload (system repl server) diff --git a/guix/scripts/search.scm b/guix/scripts/search.scm index 27b9da527877e8df9a3d38d0a086460b9775f204..307ea410b94f2b5bf79fcbd4d4ccf972e151d613 100644 --- a/guix/scripts/search.scm +++ b/guix/scripts/search.scm @@ -24,7 +24,6 @@ #:select (%standard-build-options)) #:use-module (guix scripts) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:export (guix-search)) diff --git a/guix/scripts/show.scm b/guix/scripts/show.scm index c747eedd21b2de3ff6ec9a163dd0012929add004..f6d825695133f43f49b69830b578f650f59a4cad 100644 --- a/guix/scripts/show.scm +++ b/guix/scripts/show.scm @@ -23,7 +23,6 @@ #:select (%standard-build-options)) #:use-module (guix scripts) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:export (guix-show)) diff --git a/guix/scripts/style.scm b/guix/scripts/style.scm index fa7175fb16d345fbf558260a16e1fd5546e05c11..8e89a589489db02f8c78cff4924a288a28bb7bbe 100644 --- a/guix/scripts/style.scm +++ b/guix/scripts/style.scm @@ -31,7 +31,6 @@ #:autoload (gnu packages) (specification->package fold-packages) #:use-module (guix scripts) #:use-module ((guix scripts build) #:select (%standard-build-options)) - #:use-module (guix combinators) #:use-module (guix ui) #:use-module (guix packages) #:use-module (guix utils) @@ -42,7 +41,6 @@ #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) - #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-37) #:export (guix-style)) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index fedb33019de7cc1009f507143f6f337da908e9a9..109b0c7900bf10cfb09dba9589871aae512a9b63 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -26,7 +26,6 @@ #:use-module (guix store) #:use-module (guix substitutes) #:use-module (guix utils) - #:use-module (guix combinators) #:use-module (guix config) #:use-module (guix records) #:use-module (guix diagnostics) @@ -36,7 +35,6 @@ #:autoload (guix scripts discover) (read-substitute-urls) #:use-module (gcrypt hash) #:use-module (guix base32) - #:use-module (guix base64) #:use-module (guix cache) #:use-module (gcrypt pk-crypto) #:use-module (guix pki) @@ -55,10 +53,8 @@ #:use-module (ice-9 ftw) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (srfi srfi-71) #:use-module (web uri) #:use-module (guix http-client) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index c0bc295c0026639d34e35b5fa12b70dbfb673076..d7163dd3eb32260da9c201dd80e9e593a0f42265 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -55,20 +55,14 @@ #:autoload (guix scripts pull) (channel-commit-hyperlink) #:autoload (guix graph) (export-graph node-type graph-backend-name lookup-backend) - #:use-module (guix scripts graph) #:use-module (guix scripts system reconfigure) #:use-module (guix build utils) #:use-module (guix progress) - #:use-module ((guix build syscalls) #:select (terminal-columns)) #:use-module (gnu build image) #:use-module (gnu build install) #:autoload (gnu build file-systems) (find-partition-by-label find-partition-by-uuid) - #:autoload (gnu build linux-modules) - (device-module-aliases matching-modules) - #:use-module (gnu system linux-initrd) #:use-module (gnu image) - #:use-module (guix platform) #:use-module (gnu system) #:use-module (gnu bootloader) #:use-module (gnu system file-systems) @@ -81,7 +75,6 @@ #:use-module (gnu services shepherd) #:use-module (gnu services herd) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index 5179ea035fa5fca89f81c22994a5c18125edd3dd..d7c71ef70527216e911cf4f4cece859316e9cee5 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -22,7 +22,6 @@ #:use-module (guix ui) #:use-module (guix scripts) #:use-module (guix inferior) - #:use-module (guix channels) #:use-module (guix store) #:use-module (guix status) #:use-module ((guix git) diff --git a/guix/self.scm b/guix/self.scm index 93019e1c648f76796494fcc8bd360be403b90056..d1dcde34ac2135981315c65467cc711d7cb568de 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -19,7 +19,6 @@ (define-module (guix self) #:use-module (guix config) - #:use-module (guix i18n) #:use-module (guix modules) #:use-module (guix gexp) #:use-module (guix store) diff --git a/guix/serialization.scm b/guix/serialization.scm index 9b888a7d2534a478c36839a145173444ad0ec708..9656e5ac2a2d6e78e3f434b47684b3352f579438 100644 --- a/guix/serialization.scm +++ b/guix/serialization.scm @@ -17,7 +17,6 @@ ;;; along with GNU Guix. If not, see . (define-module (guix serialization) - #:use-module (guix combinators) #:use-module (rnrs bytevectors) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) diff --git a/guix/status.scm b/guix/status.scm index a192cd789ad6bc03858f0f3190c17887ea350adf..d4d3fca02697fa03ace4e04c1660fe0573bc7cd9 100644 --- a/guix/status.scm +++ b/guix/status.scm @@ -27,7 +27,6 @@ #:autoload (guix build download) (nar-uri-abbreviation) #:use-module (guix store) #:use-module (guix derivations) - #:use-module (guix memoization) #:use-module (srfi srfi-1) #:use-module (srfi srfi-9) #:use-module (srfi srfi-9 gnu) diff --git a/guix/store.scm b/guix/store.scm index a36dce416ed2777031c7ba09f854ac7acca33c31..f8e77b2cd9d3df38a0e009349b05d9bac97f02c6 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -24,7 +24,6 @@ #:use-module (guix utils) #:use-module (guix config) #:use-module (guix deprecation) - #:use-module (guix memoization) #:use-module (guix serialization) #:use-module (guix monads) #:use-module (guix records) @@ -45,7 +44,6 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) - #:use-module (srfi srfi-39) #:use-module (ice-9 match) #:use-module (ice-9 vlist) #:use-module (ice-9 popen) diff --git a/guix/store/database.scm b/guix/store/database.scm index e6640156730c80b15f7668c0bca557b92bd19819..2968f13492b0058a216fddfce0d653a744ad208e 100644 --- a/guix/store/database.scm +++ b/guix/store/database.scm @@ -22,7 +22,6 @@ (define-module (guix store database) #:use-module (sqlite3) #:use-module (guix config) - #:use-module (guix serialization) #:use-module (guix store deduplication) #:use-module (guix base16) #:use-module (guix progress) @@ -36,7 +35,6 @@ #:use-module (srfi srfi-26) #:use-module (rnrs io ports) #:use-module (ice-9 match) - #:use-module (system foreign) #:export (sql-schema %default-database-file store-database-file diff --git a/guix/store/deduplication.scm b/guix/store/deduplication.scm index acb6ffcc4a5e5497733b1926c2cc30418c8c40fa..129574c073228f89cd9c5e5878d075cc6d014706 100644 --- a/guix/store/deduplication.scm +++ b/guix/store/deduplication.scm @@ -28,9 +28,7 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) - #:use-module (rnrs bytevectors) #:use-module (rnrs io ports) - #:use-module (ice-9 ftw) #:use-module (ice-9 match) #:use-module (guix serialization) #:export (nar-sha256 diff --git a/guix/substitutes.scm b/guix/substitutes.scm index edff84aac3fd6f3c70f3b46e4917390e823912d1..84c7be83caceee49f12caf46e024c6d333edd7bf 100644 --- a/guix/substitutes.scm +++ b/guix/substitutes.scm @@ -25,26 +25,19 @@ #:use-module (guix utils) #:use-module (guix combinators) #:use-module (guix config) - #:use-module (guix records) #:use-module (guix diagnostics) #:use-module (guix i18n) #:use-module (gcrypt hash) #:use-module (guix base32) - #:use-module (guix base64) #:use-module (guix cache) - #:use-module (gcrypt pk-crypto) - #:use-module (guix pki) #:use-module ((guix build utils) #:select (mkdir-p dump-port)) #:use-module ((guix build download) #:select ((open-connection-for-uri . guix:open-connection-for-uri) resolve-uri-reference)) #:use-module (guix progress) - #:use-module (ice-9 rdelim) - #:use-module (ice-9 regex) #:use-module (ice-9 match) #:use-module (ice-9 format) - #:use-module (ice-9 ftw) #:use-module (ice-9 binary-ports) #:use-module (ice-9 vlist) #:use-module (rnrs bytevectors) @@ -52,8 +45,6 @@ #:use-module (srfi srfi-11) #:use-module (srfi srfi-19) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (web uri) #:use-module (web request) #:use-module (web response) diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm index 09f02a2b67ff40adf8e0ea93441e1b2a559dda00..0e4573ae4daf1e3b8a67bf7976f78ebb4357d8ae 100644 --- a/guix/tests/gnupg.scm +++ b/guix/tests/gnupg.scm @@ -21,7 +21,6 @@ #:use-module (guix utils) #:use-module (guix build utils) #:use-module (rnrs io ports) - #:use-module (ice-9 match) #:export (gpg-command gpgconf-command with-fresh-gnupg-setup diff --git a/guix/tests/http.scm b/guix/tests/http.scm index 8f50eaefcaa4fe028b2a58d4963a6f6a23ddfb46..37e5744353e3bfe733df2acfd4112fb7a016cdd3 100644 --- a/guix/tests/http.scm +++ b/guix/tests/http.scm @@ -23,7 +23,6 @@ #:use-module (web server http) #:use-module (web response) #:use-module (srfi srfi-11) - #:use-module (srfi srfi-39) #:use-module (ice-9 match) #:export (with-http-server call-with-http-server diff --git a/guix/upstream.scm b/guix/upstream.scm index 4c72388bf325fcb6489b1f5e5706eaa24c573f66..52fae1183203b067887c77238f71dc41950277fa 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -48,7 +48,6 @@ #:use-module (srfi srfi-35) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) - #:use-module (ice-9 regex) #:export (upstream-source upstream-source? upstream-source-package diff --git a/guix/utils.scm b/guix/utils.scm index 774b80cd252cd28c554ddfe51d9ebedf45fc6225..943d540bfca4cb16ec308fdff2871eaac1ed60e8 100644 --- a/guix/utils.scm +++ b/guix/utils.scm @@ -36,10 +36,8 @@ (define-module (guix utils) #:use-module (guix config) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-9) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-39) #:use-module (srfi srfi-71) #:use-module (rnrs io ports) ;need 'port-position' etc. #:use-module ((rnrs bytevectors) #:select (bytevector-u8-set!)) @@ -51,7 +49,6 @@ #:use-module ((guix combinators) #:select (fold2)) #:use-module (guix diagnostics) ;, &error-location, etc. #:use-module (ice-9 format) - #:use-module (ice-9 ftw) #:use-module ((ice-9 iconv) #:prefix iconv:) #:use-module (ice-9 match) #:use-module (ice-9 regex)