From d5019f9ca750aa2bd49048c5462d9eac220b0644 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 12 Jul 2018 16:59:56 +0200 Subject: [PATCH] gnu: php: Build with an older oniguruma. * gnu/packages/textutils.scm (oniguruma-5): New public variable. * gnu/packages/php.scm (php)[inputs]: Change ONIGURUMA to ONIGURUMA-5. --- gnu/packages/php.scm | 2 +- gnu/packages/textutils.scm | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 90e6ab1c1c..1acab0de71 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -318,7 +318,7 @@ (define-public php ("libxpm" ,libxpm) ("libxslt" ,libxslt) ("libx11" ,libx11) - ("oniguruma" ,oniguruma) + ("oniguruma" ,oniguruma-5) ("openldap" ,openldap) ("openssl" ,openssl) ("pcre" ,pcre) diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 9cf324ba15..355683df8a 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -355,6 +355,20 @@ (define-public oniguruma 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")