aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve George <steve@futurile.net>2025-04-09 09:39:21 +0100
committerAndreas Enge <andreas@enge.fr>2025-04-16 11:46:34 +0200
commit88a160fe3fa0055b470a667078d8e137f94bd114 (patch)
tree603e5f8b3618575a63a7b167b7ab1d66f5451fe2
parent7424092d84bcba1f046dbe72fec3221b750fb858 (diff)
downloadguix-88a160fe3fa0055b470a667078d8e137f94bd114.tar.gz
guix-88a160fe3fa0055b470a667078d8e137f94bd114.zip
gnu: scons: Update to 4.5.0.
* gnu/packages/build-tools.scm (scons): Update to 4.5.0. [arguments]{check phase}: Remove failing tests. Change-Id: If17c26174f7790eee562c7c99e3be39fe1e57197
-rw-r--r--gnu/packages/build-tools.scm12
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm
index 6bf0b2ec67..415ddee3e0 100644
--- a/gnu/packages/build-tools.scm
+++ b/gnu/packages/build-tools.scm
@@ -70,6 +70,7 @@
#:use-module (gnu packages protobuf)
#:use-module (gnu packages python)
#:use-module (gnu packages python-build)
+ #:use-module (gnu packages python-check)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
@@ -79,6 +80,7 @@
#:use-module (gnu packages tls)
#:use-module (gnu packages unicode)
#:use-module (gnu packages version-control)
+ #:use-module (gnu packages xml)
#:use-module (guix build-system gnu)
#:use-module (guix build-system pyproject)
#:use-module (guix build-system python))
@@ -436,7 +438,7 @@ other lower-level build files.")))
(define-public scons
(package
(name "scons")
- (version "4.4.0")
+ (version "4.5.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -446,7 +448,7 @@ other lower-level build files.")))
(patches (search-patches "scons-test-environment.patch"))
(sha256
(base32
- "1czswx1fj2j48rspkrvarkr43k0vii9rsmz054c9yby1dq362fgr"))))
+ "1skz1kzhwsp54i71jrsg46rkxwicfici7pq6qmfhlqd5zhrg21zb"))))
(build-system python-build-system)
(arguments
(list
@@ -467,7 +469,9 @@ other lower-level build files.")))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
- (invoke "python" "runtest.py" "--all" "--unit-only"))))
+ ;; remove these tests as they require a read/write filesystem
+ (delete-file "SCons/Variables/PathVariableTests.py")
+ (invoke "python" "runtest.py" "--all" "--unit-only" ))))
(add-after 'install 'move-manuals
(lambda _
;; XXX: For some reason manuals get installed to the top-level
@@ -483,7 +487,7 @@ other lower-level build files.")))
stray-manuals))))))))
(native-inputs
;; TODO: Add 'fop' when available in Guix to generate manuals.
- (list python-wheel
+ (list python-setuptools python-lxml python-wheel
;;For tests.
python-psutil))
(home-page "https://scons.org/")