ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 20:49:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: pypy: Update to 7.3.13.

Browse source 
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>
This commit is contained in:
Greg Hogan 2023-12-05 19:50:55 +00:00 committed by Ludovic Courtès
parent 4017555367
commit 7ce0c79e7a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/pypy.scm
View file

@ -42,18 +42,23 @@ (define-module (gnu packages pypy)
(define-public pypy (define-public pypy
(package (package
(name "pypy") (name "pypy")
(version "7.3.5") (version "7.3.13")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.python.org/pypy/" (uri (string-append "https://downloads.python.org/pypy/"
"pypy3.7-v" version "-src.tar.bz2")) "pypy3.10-v" version "-src.tar.bz2"))
(sha256 (sha256
(base32 (base32
"18lrdmpcczlbk3cfarkgwqdmilrybz56i1dafk8dkjlyk90gw86r")))) "0v9s6pwrnaxqi5h1pvmaphj6kgyczx07ykl07hcx656h34y77haa"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
#:tests? #f ;FIXME: 43 out of 364 tests are failing #: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) #:modules '((ice-9 ftw) (ice-9 match)
(guix build utils) (guix build gnu-build-system)) (guix build utils) (guix build gnu-build-system))
#:disallowed-references (list nss-certs) #:disallowed-references (list nss-certs)
@ -151,7 +156,7 @@ (define-public pypy
(for-each (for-each
(lambda (x) (lambda (x)
(delete-file-recursively (string-append (delete-file-recursively (string-append
"lib-python/3/" x))) "lib/pypy3.10/" x)))
'("tkinter/test" '("tkinter/test"
"test" "test"
"sqlite3/test" "sqlite3/test"
@ -161,12 +166,12 @@ (define-public pypy
"ctypes/test" "ctypes/test"
"unittest/test")) "unittest/test"))
;; Patch shebang referencing python. ;; Patch shebang referencing python.
(substitute* '("lib-python/3/cgi.py" (substitute* '("lib/pypy3.10/cgi.py"
"lib-python/3/encodings/rot_13.py") "lib/pypy3.10/encodings/rot_13.py")
((shebang-match-python) shebang-pypy3)) ((shebang-match-python) shebang-pypy3))
(with-fluids ((%default-port-encoding "ISO-8859-1")) (with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* '("lib_pypy/_md5.py" (substitute* '("lib/pypy3.10/_md5.py"
"lib_pypy/_sha1.py") "lib/pypy3.10/_sha1.py")
((shebang-match-python) shebang-pypy3)))) ((shebang-match-python) shebang-pypy3))))
(copy-recursively dist-dir #$output))))))) (copy-recursively dist-dir #$output)))))))
(native-inputs (native-inputs