summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-09-04 20:23:02 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-09-05 00:21:41 +0200
commit5ec7c4a153f2d620d1d58923afefe80ca48d8ede (patch)
treedf388a4745e765cf037bebe4751fa625cf34956f /gnu/packages
parent5ceac3f42b41067c8de994b0bd16560129279a18 (diff)
downloadguix-5ec7c4a153f2d620d1d58923afefe80ca48d8ede.tar.gz
gnu: php: Build against Oniguruma 6.
* gnu/packages/php.scm (php)[inputs]: Change ONIGURUMA-5 to ONIGURUMA.
* gnu/packages/textutils.scm (oniguruma-5): Remove variable.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/php.scm2
-rw-r--r--gnu/packages/textutils.scm14
2 files changed, 1 insertions, 15 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 497989b781..ca7f0ee892 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -364,7 +364,7 @@
        ("libxpm" ,libxpm)
        ("libxslt" ,libxslt)
        ("libx11" ,libx11)
-       ("oniguruma" ,oniguruma-5)
+       ("oniguruma" ,oniguruma)
        ("openldap" ,openldap)
        ("openssl" ,openssl)
        ("pcre" ,pcre2)
diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm
index 60215523b6..388f164428 100644
--- a/gnu/packages/textutils.scm
+++ b/gnu/packages/textutils.scm
@@ -492,20 +492,6 @@ characteristic of this library is that different character encoding for every
 regular expression object can be specified.")
     (license license:bsd-2)))
 
-;; PHP < 7.3.0 requires this old version.  Remove once no longer needed.
-(define-public oniguruma-5
-  (package
-    (inherit oniguruma)
-    (version "5.9.6")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/kkos/"
-                                  "oniguruma/releases/download/v" version
-                                  "/onig-" version ".tar.gz"))
-              (sha256
-               (base32
-                "19s79vsclqn170mw0ajwv7j37qsbn4f1yjz3yavnhvva6c820r6m"))))))
-
 (define-public antiword
   (package
     (name "antiword")