[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/150: gnu: Use %python-build-system-module inside #:imported-modules.
|
From: |
guix-commits |
|
Subject: |
04/150: gnu: Use %python-build-system-module inside #:imported-modules. |
|
Date: |
Sun, 24 Apr 2022 05:12:14 -0400 (EDT) |
lbraun pushed a commit to branch wip-python-pep517
in repository guix.
commit 7e9bea152a81cfe69c4641a26469219a147f1d87
Author: Lars-Dominik Braun <lars@6xq.net>
AuthorDate: Sat Jan 8 14:56:04 2022 +0100
gnu: Use %python-build-system-module inside #:imported-modules.
It includes (guix build json), which is now required for (guix build
python-build-system).
* gnu/packages/boost.scm (boost): Use %python-build-system-module.
* gnu/packages/cups.scm (hplip): Likewise.
* gnu/packages/djvu.scm (didjvu): Likewise.
* gnu/packages/finance.scm (ledger): Likewise.
* gnu/packages/games.scm (fifengine): Likewise.
* gnu/packages/geo.scm (grass): Likewise.
(qgis): Likewise.
* gnu/packages/gnome.scm (system-config-printer): Likewise.
(gnome-tweaks): Likewise.
(lollypop): Likewise.
(soundconverter): Likewise.
(piper): Likewise.
* gnu/packages/graph.scm (python-graph-tool): Likewise.
* gnu/packages/graphics.scm (lib2geom): Likewise.
* gnu/packages/gstreamer.scm (python-gst): Likewise.
* gnu/packages/julia-xyz.scm (julia-pycall): Likewise.
* gnu/packages/lisp-xyz.scm (sbcl-burgled-batteries3): Likewise.
* gnu/packages/machine-learning.scm (ghmm): Likewise.
(tensorflow): Likewise.
* gnu/packages/maths.scm (nomad-optimizer): Likewise.
(gmsh): Likewise.
(z3): Likewise.
(ocaml-z3): Likewise.
(fp16): Likewise.
(optizelle): Likewise.
* gnu/packages/mpd.scm (sonata): Likewise.
* gnu/packages/music.scm (jack-select): Likewise.
* gnu/packages/networking.scm (opendht): Likewise.
* gnu/packages/openldap.scm (389-ds-base): Likewise.
* gnu/packages/qt.scm (python-sip-4): Likewise.
(python-pyqt): Likewise.
(python-pyqtwebengine): Likewise.
* gnu/packages/radio.scm (gnuradio): Likewise.
(gr-osmosdr): Likewise.
(gr-satellites): Likewise.
* gnu/packages/rpm.scm (libmodulemd): Likewise.
(createrepo-c): Likewise.
* gnu/packages/textutils.scm (opencc): Likewise.
* gnu/packages/version-control.scm (hg-commitsigs): Likewise.
* gnu/packages/virtualization.scm (ganeti): Likewise.
* gnu/packages/vpn.scm (bitmask): Likewise.
* gnu/packages/xdisorg.scm (redshift): Likewise.
---
gnu/packages/boost.scm | 3 ++-
gnu/packages/cups.scm | 2 +-
gnu/packages/djvu.scm | 2 +-
gnu/packages/finance.scm | 2 +-
gnu/packages/geo.scm | 4 ++--
gnu/packages/gnome.scm | 10 +++++-----
gnu/packages/graph.scm | 2 +-
gnu/packages/graphics.scm | 2 +-
gnu/packages/gstreamer.scm | 3 ++-
gnu/packages/julia-xyz.scm | 3 ++-
gnu/packages/lisp-xyz.scm | 3 ++-
gnu/packages/machine-learning.scm | 4 ++--
gnu/packages/maths.scm | 12 ++++++------
gnu/packages/mpd.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/networking.scm | 2 +-
gnu/packages/openldap.scm | 2 +-
gnu/packages/qt.scm | 6 +++---
gnu/packages/radio.scm | 6 +++---
gnu/packages/rpm.scm | 5 +++--
gnu/packages/textutils.scm | 2 +-
gnu/packages/version-control.scm | 2 +-
gnu/packages/virtualization.scm | 2 +-
gnu/packages/vpn.scm | 2 +-
gnu/packages/xdisorg.scm | 2 +-
25 files changed, 46 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm
index b53b1f4257..ff9b6a3167 100644
--- a/gnu/packages/boost.scm
+++ b/gnu/packages/boost.scm
@@ -42,6 +42,7 @@
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
@@ -86,7 +87,7 @@
`(("python" ,python-minimal-wrapper)))
("tcsh" ,tcsh)))
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules (((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules)
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index da113ac168..3a006c3993 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -562,7 +562,7 @@ should only be used as part of the Guix cups-pk-helper
service.")
(assoc-ref %outputs "out") "/etc/xdg")
"--enable-qt5" "--disable-qt4")
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules ((guix build gnu-build-system)
(guix build utils)
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm
index 07c77f318e..b5ee1ebe19 100644
--- a/gnu/packages/djvu.scm
+++ b/gnu/packages/djvu.scm
@@ -356,7 +356,7 @@ It is able to:
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:test-target "test"
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm
index 84547639e4..1160fc341b 100644
--- a/gnu/packages/finance.scm
+++ b/gnu/packages/finance.scm
@@ -319,7 +319,7 @@ and dynamically with report tools based on filtering and
graphical charts.")
`(#:modules (,@%cmake-build-system-modules
((guix build python-build-system) #:select (python-version)))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:configure-flags
`("-DBUILD_DOCS:BOOL=ON"
"-DBUILD_WEB_DOCS:BOOL=ON"
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index c2569c27d4..ec6740ba9a 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -2182,7 +2182,7 @@ orienteering sport.")
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -2309,7 +2309,7 @@ growing set of geoscientific methods.")
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system)
+ ,@%python-build-system-modules
(guix build qt-utils))
#:configure-flags
'("-DWITH_QTWEBKIT=NO")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 19adb67423..a55c54e8cb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2941,7 +2941,7 @@ database is translated at Transifex.")
(build-system glib-or-gtk-build-system)
(arguments
(list
- #:imported-modules `((guix build python-build-system)
+ #:imported-modules `(,@%python-build-system-modules
,@%glib-or-gtk-build-system-modules)
#:phases
#~(modify-phases %standard-phases
@@ -9935,7 +9935,7 @@ existing databases over the internet.")
`(#:glib-or-gtk? #t
#:configure-flags '("-Dlocalstatedir=/tmp"
"-Dsysconfdir=/tmp")
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%meson-build-system-modules)
#:phases
(modify-phases %standard-phases
@@ -10629,7 +10629,7 @@ views can be printed as PDF or PostScript files, or
exported to HTML.")
(arguments
`(#:imported-modules
(,@%meson-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules
((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
@@ -10889,7 +10889,7 @@ mp3, Ogg Vorbis and FLAC")
(base32 "1jv8m82hi23ilrgdznlc1jhp2jm8bw1yrw0chh3qw2l0sixvkl11"))))
(build-system glib-or-gtk-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
(guix build glib-or-gtk-build-system)
,@%gnu-build-system-modules)
@@ -12133,7 +12133,7 @@ your operating-system definition:
python-pycairo
python-pygobject))
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%meson-build-system-modules)
#:modules (((guix build python-build-system) #:prefix python:)
(guix build meson-build-system)
diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm
index 981c4d4793..1e5e64de62 100644
--- a/gnu/packages/graph.scm
+++ b/gnu/packages/graph.scm
@@ -621,7 +621,7 @@ transformed into common image formats for display or
printing.")
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules (,@%gnu-build-system-modules
((guix build python-build-system) #:select (site-packages)))
#:configure-flags
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index 2cc75d57cf..b48b105d68 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -752,7 +752,7 @@ exception-handling library.")
"03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:configure-flags '("-D2GEOM_BUILD_SHARED=ON"
"-D2GEOM_BOOST_PYTHON=ON"
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 8b01c9b04b..1df699b6fe 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -34,6 +34,7 @@
#:use-module (guix build-system cmake)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (guix utils)
#:use-module (gnu packages)
@@ -1072,7 +1073,7 @@ given, also pass them to the build system instead of the
ones used by PKG."
(guix build utils)
((guix build python-build-system) #:prefix python:))
#:imported-modules (,@%meson-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:configure-flags
(list (string-append
"-Dpygi-overrides-dir="
diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm
index 5d45c07115..ab0b8a37b4 100644
--- a/gnu/packages/julia-xyz.scm
+++ b/gnu/packages/julia-xyz.scm
@@ -28,6 +28,7 @@
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix build-system julia)
+ #:use-module (guix build-system python)
#:use-module (gnu packages gcc)
#:use-module (gnu packages julia-jll)
#:use-module (gnu packages python)
@@ -4160,7 +4161,7 @@ human-readable format.")
(build-system julia-build-system)
(arguments
(list
- #:imported-modules `((guix build python-build-system)
+ #:imported-modules `(,@%python-build-system-modules
,@%julia-build-system-modules)
#:modules '((guix build julia-build-system)
(guix build utils)
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 9317108f4c..263dd29234 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -64,6 +64,7 @@
#:use-module (guix utils)
#:use-module (guix build-system asdf)
#:use-module (guix build-system gnu)
+ #:use-module (guix build-system python)
#:use-module (guix build-system trivial)
#:use-module (gnu packages base)
#:use-module (gnu packages c)
@@ -5344,7 +5345,7 @@ high-level way. This library provides such operators.")
`(#:tests? #f
#:modules (((guix build python-build-system) #:select
(python-version))
,@%asdf-build-system-modules)
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%asdf-build-system-modules)
#:phases
(modify-phases (@ (guix build asdf-build-system) %standard-phases)
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 7f082ee677..48e6c1489d 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -234,7 +234,7 @@ classification.")
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build python-build-system)
,@%gnu-build-system-modules)
#:phases
@@ -1884,7 +1884,7 @@ Python.")
((guix build python-build-system)
#:select (python-version)))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-source-file-times-to-1980
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f9767d2430..d02d1c2303 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -1953,7 +1953,7 @@ interfaces.")
`(("python" ,python-wrapper)
("python-cython" ,python-cython)))
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:modules (((guix build python-build-system)
#:select (python-version site-packages))
@@ -2853,7 +2853,7 @@ This is the certified version of the Open Cascade
Technology (OCCT) library.")
"-DENABLE_BUILD_SHARED:BOOL=ON"
"-DENABLE_BUILD_DYNAMIC:BOOL=ON")
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build cmake-build-system)
(guix build utils))
@@ -5710,7 +5710,7 @@ as equations, scalars, vectors, and matrices.")
"1hnbzq10d23drd7ksm3c1n2611c3kd0q0yxgz8y78zaafwczvwxx"))))
(build-system gnu-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build gnu-build-system)
@@ -5765,7 +5765,7 @@ theories} (SMT) solver. It provides a C/C++ API, as well
as Python bindings.")
(inherit z3)
(name "ocaml-z3")
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules (((guix build python-build-system) #:select (site-packages))
(guix build gnu-build-system)
@@ -7333,7 +7333,7 @@ when an application performs repeated divisions by the
same divisor.")
(patches (search-patches "fp16-system-libraries.patch"))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:modules (((guix build python-build-system)
#:select (site-packages))
@@ -7405,7 +7405,7 @@ half-precision floating point formats.")
#t))))
(build-system cmake-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%cmake-build-system-modules)
#:modules (((guix build python-build-system) #:select
(python-version))
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 1ee6806735..e5795a724c 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -328,7 +328,7 @@ interface for the Music Player Daemon.")
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system)
+ ,@%python-build-system-modules
(guix build glib-or-gtk-build-system))
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 89d64957c8..2e4a08c283 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3226,7 +3226,7 @@ can connect to any JACK port and record the output into a
stereo WAV file.")
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:make-flags
(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
#:tests? #f ; there are none
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b45f2f79f2..35cee1877a 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3412,7 +3412,7 @@ and targeted primarily for asynchronous processing of
HTTP-requests.")
(build-system gnu-build-system)
(arguments
(list
- #:imported-modules `((guix build python-build-system) ;for site-packages
+ #:imported-modules `(,@%python-build-system-modules ;for site-packages
,@%gnu-build-system-modules)
#:modules '(((guix build python-build-system) #:prefix python:)
(guix build gnu-build-system)
diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index c8a47e45d5..ee3c2de367 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -259,7 +259,7 @@ servers from Python programs.")
((guix build python-build-system)
#:select (add-installed-pythonpath python-version))
(guix build utils))
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:configure-flags
(list (string-append "--with-db="
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 0163d02bc0..f98920373d 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -2017,7 +2017,7 @@ module provides support functions to the automatically
generated code.")
(propagated-inputs `())
(arguments
`(#:tests? #f ; no check target
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
@@ -2082,7 +2082,7 @@ module provides support functions to the automatically
generated code.")
`(#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules)
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
@@ -2183,7 +2183,7 @@ contain over 620 classes.")
`(#:modules ((srfi srfi-1)
((guix build python-build-system) #:select (python-version))
,@%gnu-build-system-modules)
- #:imported-modules ((guix build python-build-system)
+ #:imported-modules (,@%python-build-system-modules
,@%gnu-build-system-modules)
#:phases
(modify-phases %standard-phases
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index dfc274a1de..d49ae0f591 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -545,7 +545,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex}
signals (MPX).")
(ice-9 match))
#:imported-modules (,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system)
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:configure-flags
(list (string-append "-DMATHJAX2_ROOT="
(assoc-ref %build-inputs "js-mathjax")
@@ -675,7 +675,7 @@ environment.")
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'install 'wrap-python
@@ -807,7 +807,7 @@ to the fix block above.
((guix build python-build-system) #:prefix python:)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-before 'check 'set-test-environment
diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm
index 96c6776d1a..4583f1afc1 100644
--- a/gnu/packages/rpm.scm
+++ b/gnu/packages/rpm.scm
@@ -23,6 +23,7 @@
#:use-module (guix packages)
#:use-module (guix build-system cmake)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system python)
#:use-module (gnu packages bash)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -90,7 +91,7 @@ applying deltarpms, compatible with the original deltarpm
packages.")
(list (string-append "-Dgobject_overrides_dir_py3="
(python:site-packages %build-inputs %outputs)))
#:imported-modules (,@%meson-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build meson-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
@@ -160,7 +161,7 @@ information on multiple streams, default data and
translations).")
(build-system cmake-build-system)
(arguments
`(#:imported-modules (,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build cmake-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index cbc657172d..faba62673f 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -1198,7 +1198,7 @@ formats (e.g. Bibtex, RIS, ...) using a common XML
intermediate.")
#:parallel-build? #f ;occasionally failed.
#:imported-modules
(,@%cmake-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules ((guix build cmake-build-system)
((guix build python-build-system) #:prefix python:)
(guix build utils))
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index d77c2e51f6..5fb7de5f15 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -1835,7 +1835,7 @@ history. It implements the changeset evolution concept
for Mercurial.")
"059gm66q06m6ayl4brsc517zkw3ahmz249b6xm1m32ac5y24wb9x"))))
(build-system copy-build-system)
(arguments
- `(#:imported-modules ((guix build python-build-system)
+ `(#:imported-modules (,@%python-build-system-modules
,@%copy-build-system-modules)
#:modules ((srfi srfi-1)
(guix build python-build-system)
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index f3396e7c94..127306eb28 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -565,7 +565,7 @@ firmware blobs. You can
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
(guix build haskell-build-system)
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:modules (,@%gnu-build-system-modules
((guix build haskell-build-system) #:prefix haskell:)
((guix build python-build-system) #:select (site-packages))
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm
index 5bf5a62481..9e83f06551 100644
--- a/gnu/packages/vpn.scm
+++ b/gnu/packages/vpn.scm
@@ -114,7 +114,7 @@
`(#:imported-modules
((guix build cmake-build-system)
(guix build copy-build-system)
- (guix build python-build-system)
+ ,@%python-build-system-modules
(guix build qt-build-system)
(guix build qt-utils)
,@%go-build-system-modules)
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d2caee85ec..ae610b0bea 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -1356,7 +1356,7 @@ the X.Org X Server version 1.7 and later (X11R7.5 or
later).")
(build-system gnu-build-system)
(arguments
`(#:imported-modules (,@%gnu-build-system-modules
- (guix build python-build-system))
+ ,@%python-build-system-modules)
#:phases
(modify-phases %standard-phases
(add-after 'install 'split-outputs
- 55/150: gnu: Add python-pytest-expect., (continued)
- 55/150: gnu: Add python-pytest-expect., guix-commits, 2022/04/24
- 81/150: gnu: python-setuptools-scm-git-archive: Disable tests., guix-commits, 2022/04/24
- 79/150: gnu: python-dnspython: Force poetry backend., guix-commits, 2022/04/24
- 108/150: gnu: python-argcomplete: Add missing test input., guix-commits, 2022/04/24
- 105/150: gnu: python-gevent: Override build backend., guix-commits, 2022/04/24
- 106/150: gnu: python-tables: Move flags to #:configure-flags., guix-commits, 2022/04/24
- 114/150: gnu: python-immutabledict: Add missing build input., guix-commits, 2022/04/24
- 99/150: gnu: Remove remaining uses of #:use-setuptools?., guix-commits, 2022/04/24
- 123/150: gnu: python-anndata: Remove custom build phases, disable failing test., guix-commits, 2022/04/24
- 135/150: gnu: python-helpdev: Add missing test input., guix-commits, 2022/04/24
- 04/150: gnu: Use %python-build-system-module inside #:imported-modules.,
guix-commits <=
- 08/150: gnu: python-pypa-build: Replace toml with tomli., guix-commits, 2022/04/24
- 06/150: gnu: Properly bootstrap python-flit-core and python-tomli., guix-commits, 2022/04/24
- 10/150: gnu: python-tomli-w: Remove custom phases., guix-commits, 2022/04/24
- 29/150: gnu: python-pastel: Add missing build system input., guix-commits, 2022/04/24
- 44/150: gnu: calibre: Remove old build flag., guix-commits, 2022/04/24
- 43/150: gnu: python-pyfakefs: Disable tests., guix-commits, 2022/04/24
- 60/150: gnu: python-pastedeploy: Remove obsolete argument., guix-commits, 2022/04/24
- 59/150: gnu: python-rauth: Remove obsolete argument., guix-commits, 2022/04/24
- 46/150: gnu: openmolar: Remove old build flag., guix-commits, 2022/04/24
- 71/150: gnu: python-flake8-pie: Fix build., guix-commits, 2022/04/24