mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-22 02:07:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: Remove pcre2-10.36.

Browse source 
* gnu/packages/pcre.scm (pcre2-10.36): Remove variable.
* gnu/packages/julia.scm (julia)[arguments]: Adjust 'adjust-test-suite
phase for new pcre2 package.
[inputs]: Replace pcre2-10.36 with pcre2.
This commit is contained in:
Efraim Flashner 2021-08-18 12:05:05 +03:00
parent 199a1235bd
commit d6f4dc1db4
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gnu/packages/julia.scm
View file

@ -457,13 +457,13 @@ (define-public julia
#t))
(add-after 'unpack 'adjust-test-suite
(lambda* (#:key inputs #:allow-other-keys)
(let (;(pcre2 (assoc-ref inputs "pcre2"))
(let ((pcre2 (assoc-ref inputs "pcre2"))
(mbedtls-apache (assoc-ref inputs "mbedtls"))
(mpfr (assoc-ref inputs "mpfr"))
(suitesparse (assoc-ref inputs "suitesparse")))
;; Some tests only check to see if the input is the correct version.
;(substitute* "stdlib/PCRE2_jll/test/runtests.jl"
; (("10.36.0") ,(package-version pcre2)))
(substitute* "stdlib/PCRE2_jll/test/runtests.jl"
(("10.36.0") ,(package-version pcre2)))
(substitute* "stdlib/MbedTLS_jll/test/runtests.jl"
(("2.24.0") ,(package-version mbedtls-apache)))
(substitute* "stdlib/MPFR_jll/test/runtests.jl"
@ -647,9 +647,7 @@ (define-public julia
("openblas" ,openblas)
("openlibm" ,openlibm)
("p7zip" ,p7zip)
;; pcre2-10.35 has a bug with the JIT regex parser:
;; https://github.com/JuliaLang/julia/issues/40231#issuecomment-812753324
("pcre2" ,pcre2-10.36)
("pcre2" ,pcre2)
("suitesparse" ,suitesparse)
("utf8proc" ,utf8proc-2.6.1)
("wget" ,wget)

13
gnu/packages/pcre.scm
View file

@ -121,16 +121,3 @@ (define-public pcre2
POSIX regular expression API.")
(license license:bsd-3)
(home-page "https://www.pcre.org/")))
(define-public pcre2-10.36
(package
(inherit pcre2)
(name "pcre2")
(version "10.36")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pcre/pcre2/"
version "/pcre2-" version ".tar.bz2"))
(sha256
(base32
"0p3699msps07p40g9426lvxa3b41rg7k2fn7qxl2jm0kh4kkkvx9"))))))