[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
14/49: gnu: commencement: Decouple python-boot0 from python.
From: |
guix-commits |
Subject: |
14/49: gnu: commencement: Decouple python-boot0 from python. |
Date: |
Fri, 23 Jul 2021 11:33:04 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 053677ba3bad3520990cc4a3308ae269c74aee62
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Jul 16 14:31:13 2021 +0200
gnu: commencement: Decouple python-boot0 from python.
* gnu/packages/commencement.scm (python-boot0)[arguments]: Do not use
SUBSTITUTE-KEYWORD-ARGUMENTS to make it easier to change Python without a
full
bootstrap.
---
gnu/packages/commencement.scm | 76 +++++++++++++++++++------------------------
1 file changed, 33 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index a04bb83..bdcde09 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -6,7 +6,7 @@
;;; Copyright © 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
@@ -3123,48 +3123,38 @@ memoized as a function of '%current-system'."
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
-
- ,@(substitute-keyword-arguments (package-arguments python-minimal)
- ;; Disable features that cannot be built at this stage.
- ((#:configure-flags _ ''())
- `(list "--without-ensurepip"
- "--without-threads"))
- ;; Clear #:make-flags, such that changes to the regular
- ;; Python package won't interfere with this one.
- ((#:make-flags _ ''()) ''())
- ((#:phases phases)
- ;; Remove the 'apply-alignment-patch' phase if present to avoid
- ;; rebuilding this package. TODO: for the next rebuild cycle,
- ;; consider inlining all the arguments instead of inheriting to
- ;; make it easier to patch Python without risking a full rebuild.
- ;; Or better yet, change to 'python-on-guile'.
- `(modify-phases ,@(list (match phases
- (('modify-phases original-phases
- changes ...
- ('add-after unpack
apply-alignment-patch _))
- `(modify-phases ,original-phases
,@changes))
- (_ phases)))
- (delete 'remove-windows-binaries)
- (add-before 'configure 'disable-modules
- (lambda _
- (substitute* "setup.py"
- ;; Disable ctypes, since it requires libffi.
- (("extensions\\.append\\(ctypes\\)") "")
- ;; Prevent the 'ossaudiodev' extension from being
- ;; built, since it requires Linux headers.
- (("'linux', ") ""))))
- (delete 'set-TZDIR)
- ,@(if (hurd-system?)
- `((add-before 'build 'fix-regen
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((libc (assoc-ref inputs "libc")))
- (substitute* "Lib/plat-generic/regen"
- (("/usr/include/")
- (string-append libc "/include/")))))))
- '())
- (replace 'install-sitecustomize.py
- ,(customize-site version))))
- ((#:tests? _ #f) #f))))
+ ;; Running the tests won't work because we lack several required
+ ;; modules (OpenSSL, etc).
+ #:tests? #f
+ ;; Disable features that cannot be built at this stage.
+ #:configure-flags '("--without-ensurepip" "--without-threads")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'patch-lib-shells
+ (lambda _
+ (substitute* '("Lib/subprocess.py"
+ "Lib/distutils/tests/test_spawn.py"
+ "Lib/test/support/__init__.py"
+ "Lib/test/test_subprocess.py")
+ (("/bin/sh") (which "sh")))))
+ (add-before 'configure 'disable-modules
+ (lambda _
+ (substitute* "setup.py"
+ ;; Disable ctypes, since it requires libffi.
+ (("extensions\\.append\\(ctypes\\)") "")
+ ;; Prevent the 'ossaudiodev' extension from being
+ ;; built, since it requires Linux headers.
+ (("'linux', ") ""))))
+ ,@(if (hurd-system?)
+ `((add-before 'build 'fix-regen
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((libc (assoc-ref inputs "libc")))
+ (substitute* "Lib/plat-generic/regen"
+ (("/usr/include/")
+ (string-append libc "/include/")))))))
+ '())
+ (add-after 'install 'install-sitecustomize.py
+ ,(customize-site version)))))
(native-search-paths
(list (guix-pythonpath-search-path version)))))
- 01/49: gnu: pcre: Update to 8.45., (continued)
- 01/49: gnu: pcre: Update to 8.45., guix-commits, 2021/07/23
- 04/49: gnu: gdbm: Update to 1.20., guix-commits, 2021/07/23
- 09/49: gnu: gsettings-desktop-schemas: Remove unused input., guix-commits, 2021/07/23
- 03/49: gnu: readline: Update to 8.1.1., guix-commits, 2021/07/23
- 05/49: gnu: gsl: Update to 2.7., guix-commits, 2021/07/23
- 07/49: gnu: gamin: Remove unused input., guix-commits, 2021/07/23
- 06/49: gnu: glib: Remove unused input., guix-commits, 2021/07/23
- 08/49: gnu: gnome-backgrounds: Remove unused input., guix-commits, 2021/07/23
- 12/49: gnu: Python: Remove trailing #t's., guix-commits, 2021/07/23
- 13/49: gnu: glibc: Remove obsolete patch., guix-commits, 2021/07/23
- 14/49: gnu: commencement: Decouple python-boot0 from python.,
guix-commits <=
- 15/49: gnu: tzdata-for-tests: Update to 2021a., guix-commits, 2021/07/23
- 11/49: gnu: Python: Update to 3.9.6., guix-commits, 2021/07/23
- 17/49: gnu: RHash: Update to 1.4.2., guix-commits, 2021/07/23
- 20/49: gnu: coreutils-minimal: Do not build documentation., guix-commits, 2021/07/23
- 21/49: gnu: Perl: Resolve TODO., guix-commits, 2021/07/23
- 22/49: build-system/cmake: Define '%build-inputs' when cross-compiling., guix-commits, 2021/07/23
- 23/49: gnu: nghttp2: Update to 1.44.0., guix-commits, 2021/07/23
- 10/49: gnu: glib-networking: Remove unused input., guix-commits, 2021/07/23
- 16/49: gnu: RHash: Turn arguments into gexp., guix-commits, 2021/07/23
- 24/49: gnu: libuv: Update to 1.41.1., guix-commits, 2021/07/23