diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
| commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
| tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/php.scm | |
| parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
| parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
| download | guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm
Diffstat (limited to 'gnu/packages/php.scm')
| -rw-r--r-- | gnu/packages/php.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index e93d1122be..5e5b1c72d2 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -60,7 +60,7 @@ (define-public php (package (name "php") - (version "7.4.16") + (version "7.4.19") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ "php-" version ".tar.xz")) (sha256 (base32 - "12xr7w2mk8ab3igvbpi94ks2xfw2nqga9a6nxs94rvcdz3xcw5hw")) + "1ck72j56a4xw2s8hirgblfh74g5nkf4xwllp9mlwn72198n1f5vc")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -325,7 +325,9 @@ ;; Expects an Array with 3 preg_matches; gets 0. "ext/pcre/tests/bug79846.phpt" ;; Expects an empty Array; gets one with " " in it. - "ext/pcre/tests/bug80118.phpt")) + "ext/pcre/tests/bug80118.phpt" + ;; Renicing a process fails in the build environment. + "ext/standard/tests/general_functions/proc_nice_basic.phpt")) ;; Accomodate two extra openssl errors flanking the expected one: ;; random number generator:RAND_{load,write}_file:Cannot open file |