[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/20: gnu: Remove pcre2/fixed.
From: |
guix-commits |
Subject: |
02/20: gnu: Remove pcre2/fixed. |
Date: |
Sun, 4 Aug 2019 07:53:25 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit a33925d122c99eafb6e1e53ab1c122d7245d8a78
Author: Marius Bakke <address@hidden>
Date: Sun Aug 4 13:49:45 2019 +0200
gnu: Remove pcre2/fixed.
* gnu/packages/pcre.scm (pcre2/fixed): Remove variable.
(pcre2)[replacement]: Remove.
[source](patches): New field.
* gnu/packages/php.scm (php)[inputs]: Change PCRE2/FIXED to PCRE2.
---
gnu/packages/pcre.scm | 14 +-------------
gnu/packages/php.scm | 2 +-
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm
index 7385c78..7ab8174 100644
--- a/gnu/packages/pcre.scm
+++ b/gnu/packages/pcre.scm
@@ -89,13 +89,12 @@ POSIX regular expression API.")
(define-public pcre2
(package
(name "pcre2")
- (replacement pcre2/fixed)
(version "10.33")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/pcre/pcre2/"
version "/pcre2-" version ".tar.bz2"))
-
+ (patches (search-patches "pcre2-fix-jit_match-crash.patch"))
(sha256
(base32
"1anqi7vpbfzag7imccrc6di1zl5rl63ab7rfpmajpw6d1kzlsl9m"))))
@@ -126,14 +125,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/fixed
- ;; PHP >= 7.3.8 requires a fixed version at build time, so make it public
- ;; and hide it in the UI.
- (package
- (inherit pcre2)
- (source
- (origin
- (inherit (package-source pcre2))
- (patches (search-patches "pcre2-fix-jit_match-crash.patch"))))
- (properties '((hidden? . #t)))))
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 2411de5..497989b 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -367,7 +367,7 @@
("oniguruma" ,oniguruma-5)
("openldap" ,openldap)
("openssl" ,openssl)
- ("pcre" ,pcre2/fixed) ; must be /fixed for tests
+ ("pcre" ,pcre2)
("postgresql" ,postgresql)
("readline" ,readline)
("sqlite" ,sqlite)
- branch staging updated (1dff73a -> 3082280), guix-commits, 2019/08/04
- 01/20: Merge branch 'master' into staging, guix-commits, 2019/08/04
- 02/20: gnu: Remove pcre2/fixed.,
guix-commits <=
- 05/20: gnu: python-cython: Speed up test suite., guix-commits, 2019/08/04
- 06/20: gnu: MariaDB: Disable the TokuDB plugin., guix-commits, 2019/08/04
- 08/20: gnu: ImageMagick: Update to 6.9.10-58., guix-commits, 2019/08/04
- 03/20: gnu: double-conversion: Update to 3.1.5., guix-commits, 2019/08/04
- 13/20: gnu: cups-filters: Update to 1.25.1., guix-commits, 2019/08/04
- 17/20: gnu: perl-cgi: Update to 4.44., guix-commits, 2019/08/04
- 10/20: gnu: python-mako: Update to 1.0.14., guix-commits, 2019/08/04
- 14/20: gnu: gtk+: Update to 3.24.10., guix-commits, 2019/08/04
- 04/20: gnu: perl-try-tiny: Update to 0.30., guix-commits, 2019/08/04
- 07/20: gnu: libwebp: Update to 1.0.3., guix-commits, 2019/08/04