diff options
| author | Greg Hogan <code@greghogan.com> | 2023-12-05 19:50:55 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-12-14 23:12:24 +0100 |
| commit | 7ce0c79e7abd1822060760d4f1cb0bd6c00b5d19 (patch) | |
| tree | 5450b854979918e23806eccf2b21f6e5f120d7cf | |
| parent | 401755536787c4ae50dec5733a162b6e4ae1a569 (diff) | |
| download | guix-7ce0c79e7abd1822060760d4f1cb0bd6c00b5d19.tar guix-7ce0c79e7abd1822060760d4f1cb0bd6c00b5d19.tar.gz | |
gnu: pypy: Update to 7.3.13.
The validate-runpath error was previously reported in #57653.
Version update fixes the existing build errors.
* gnu/packages/python.scm (pypy3): Update to 7.3.13.
[source]: Update origin URI.
[arguments]<#:validate-runpath>: Disable check.
[arguments]<#:phases>: Update directory paths.
Change-Id: Ic6ab7dd77e30fa85d6fa5f000f9aa2528951b81e
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
| -rw-r--r-- | gnu/packages/pypy.scm | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/gnu/packages/pypy.scm b/gnu/packages/pypy.scm index c7c74c5c34..a39621b5ad 100644 --- a/gnu/packages/pypy.scm +++ b/gnu/packages/pypy.scm @@ -42,18 +42,23 @@ (define-public pypy (package (name "pypy") - (version "7.3.5") + (version "7.3.13") (source (origin (method url-fetch) (uri (string-append "https://downloads.python.org/pypy/" - "pypy3.7-v" version "-src.tar.bz2")) + "pypy3.10-v" version "-src.tar.bz2")) (sha256 (base32 - "18lrdmpcczlbk3cfarkgwqdmilrybz56i1dafk8dkjlyk90gw86r")))) + "0v9s6pwrnaxqi5h1pvmaphj6kgyczx07ykl07hcx656h34y77haa")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;FIXME: 43 out of 364 tests are failing + + ;; XXX: ELF file 'pypy.debug' makes 'validate-needed-in-runpath' throw: + ;; <https://issues.guix.gnu.org/57653>. + #:validate-runpath? #f + #:modules '((ice-9 ftw) (ice-9 match) (guix build utils) (guix build gnu-build-system)) #:disallowed-references (list nss-certs) @@ -151,7 +156,7 @@ (for-each (lambda (x) (delete-file-recursively (string-append - "lib-python/3/" x))) + "lib/pypy3.10/" x))) '("tkinter/test" "test" "sqlite3/test" @@ -161,12 +166,12 @@ "ctypes/test" "unittest/test")) ;; Patch shebang referencing python. - (substitute* '("lib-python/3/cgi.py" - "lib-python/3/encodings/rot_13.py") + (substitute* '("lib/pypy3.10/cgi.py" + "lib/pypy3.10/encodings/rot_13.py") ((shebang-match-python) shebang-pypy3)) (with-fluids ((%default-port-encoding "ISO-8859-1")) - (substitute* '("lib_pypy/_md5.py" - "lib_pypy/_sha1.py") + (substitute* '("lib/pypy3.10/_md5.py" + "lib/pypy3.10/_sha1.py") ((shebang-match-python) shebang-pypy3)))) (copy-recursively dist-dir #$output))))))) (native-inputs |