From ad34338d1edba343e04e292b9656363e469fd54b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 28 Jan 2019 20:09:51 +0100 Subject: [PATCH] gnu: scons: Update to 3.0.3. Fixes . * gnu/packages/python-xyz.scm (scons): Update to 3.0.3. [arguments]: Add "bootstrap" phase. --- gnu/packages/python-xyz.scm | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 53c0789437..992a750911 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1337,18 +1337,30 @@ (define-public python2-polib (define-public scons (package (name "scons") - (version "3.0.1") + (version "3.0.3") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/scons/scons/" version - "/scons-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/SCons/scons.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4")))) + "1xizkjgrvydkjhpv7i5rx0mdkp3618sis7jsckjh57nxcynlk5dc")))) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; still relies on distutils - #:tests? #f)) ; no 'python setup.py test' command + #:tests? #f ; no 'python setup.py test' command + #:phases + (modify-phases %standard-phases + (add-before 'build 'bootstrap + (lambda _ + (substitute* "src/engine/SCons/compat/__init__.py" + (("sys.modules\\[new\\] = imp.load_module\\(old, \\*imp.find_module\\(old\\)\\)") + "sys.modules[new] = __import__(old)")) + (invoke "python" "bootstrap.py" "build/scons" "DEVELOPER=guix") + (chdir "build/scons") + #t))))) (home-page "http://scons.org/") (synopsis "Software construction tool written in Python") (description