diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-04 13:41:27 +0200 |
| commit | f35d3132654bd1be5c7453f9eb43eb6e9de85a15 (patch) | |
| tree | f62c3a069153d1612a5c270e991eebe43c4f5cae /gnu/packages/pcre.scm | |
| parent | 1dff73acf908125b292de2ab2fc5b25155ad77d8 (diff) | |
| parent | e920037793faeebf8fb2a918b50a1751b125a0af (diff) | |
| download | guix-patches-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar guix-patches-f35d3132654bd1be5c7453f9eb43eb6e9de85a15.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/pcre.scm')
| -rw-r--r-- | gnu/packages/pcre.scm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index 1395a3ea40..7385c78b9f 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -89,6 +89,7 @@ POSIX regular expression API.") (define-public pcre2 (package (name "pcre2") + (replacement pcre2/fixed) (version "10.33") (source (origin (method url-fetch) @@ -125,3 +126,14 @@ 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))))) |