diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /guix/build-system | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'guix/build-system')
34 files changed, 2 insertions, 58 deletions
diff --git a/guix/build-system/android-ndk.scm b/guix/build-system/android-ndk.scm index 211fd11311..047f884b19 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 08a4c996f9..cfb033f6a5 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 74a3e47da1..2b17cee37b 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 07666d1321..9f518e66e6 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 2a0713d297..fb897356bc 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 effb54f044..323e4aed16 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 6cd3ec0216..d58931b33c 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 8aa93d5b0f..b4011cdb83 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 dc280242fb..3ce930c6d7 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 3df68789ff..ebf97a5344 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 925933516c..c57c304f52 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 f4f431273b..726d19efad 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 bb7552084c..3308302472 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 ffc892260a..1bd292e267 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)) @@ -129,6 +128,7 @@ (phases '%standard-phases) (source-directory ".") + (scheme-file-regexp %scheme-file-regexp) not-compiled-file-regexp (compile-flags %compile-flags) (imported-modules %guile-build-system-modules) @@ -154,6 +154,7 @@ #:target #$target #:outputs %outputs #:source-directory #$source-directory + #:scheme-file-regexp #$scheme-file-regexp #:not-compiled-file-regexp #$not-compiled-file-regexp #:compile-flags #$compile-flags #:inputs %build-target-inputs diff --git a/guix/build-system/haskell.scm b/guix/build-system/haskell.scm index a37b3a938c..b8858421c2 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 66e7711bcd..b5521e38e4 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 9a17dea977..4bbeaed6a4 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 bf43303027..7c617bffb0 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 7d4745ab32..787235deeb 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 24bd677bfc..3f73390809 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 6e1fc62a62..582d00b4cd 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 43ec2fdcb6..7c6deb34bf 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 8f3b562ca3..44d6650ba9 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 c8f04b2298..cca009fb28 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 25fd18f8a8..978aed0fc1 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 9b360ae581..708b9e18fe 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 05a4d9c2ad..3b30fdfd0e 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 6ca5abe4d6..de1294ec3f 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 f1070951ee..3039e3c63b 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 0aa273b4f4..a3793a9381 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 9af24d40f8..046ddef740 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 336e192d83..d970c1beb9 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 378ae481b9..e08884baf1 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 1d520050f6..91b3d0d100 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)) |