nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2019-09-04 20:23:02 +02:00
parent 5ceac3f42b
commit 5ec7c4a153
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/php.scm
View File

@ -364,7 +364,7 @@
("libxpm" ,libxpm) ("libxpm" ,libxpm)
("libxslt" ,libxslt) ("libxslt" ,libxslt)
("libx11" ,libx11) ("libx11" ,libx11)
("oniguruma" ,oniguruma-5) ("oniguruma" ,oniguruma)
("openldap" ,openldap) ("openldap" ,openldap)
("openssl" ,openssl) ("openssl" ,openssl)
("pcre" ,pcre2) ("pcre" ,pcre2)

14
gnu/packages/textutils.scm
View File

@ -492,20 +492,6 @@ characteristic of this library is that different character encoding for every
regular expression object can be specified.") regular expression object can be specified.")
(license license:bsd-2))) (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 (define-public antiword
(package (package
(name "antiword") (name "antiword")