[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: Remove pcre2-10.36.
From: |
guix-commits |
Subject: |
01/02: gnu: Remove pcre2-10.36. |
Date: |
Wed, 18 Aug 2021 06:14:23 -0400 (EDT) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit d6f4dc1db488b5fbfdbdfe056308d881f30b27f2
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Aug 18 12:05:05 2021 +0300
gnu: Remove pcre2-10.36.
* 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.
---
gnu/packages/julia.scm | 10 ++++------
gnu/packages/pcre.scm | 13 -------------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index f5bbb5d..1ede2b0 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -457,13 +457,13 @@ libraries. It is also a bit like @code{ldd} and
@code{otool -L}.")
#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 @@ libraries. It is also a bit like @code{ldd} and
@code{otool -L}.")
("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)
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index 3187279..7e760c9 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -121,16 +121,3 @@ own native API, as well as a set of wrapper functions that
correspond to the
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"))))))