From 697d2e037bc999760b85b7904079679e0ccc1e62 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 29 Oct 2020 22:06:02 +0100 Subject: gnu: php: Update to 7.4.12 [security fixes]. * gnu/packages/php.scm (php): Update to 7.4.12. [arguments]: Disable two more failing tests. --- gnu/packages/php.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/php.scm') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 9e34811969..835ce5c884 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -60,7 +60,7 @@ (define-module (gnu packages php) (define-public php (package (name "php") - (version "7.4.11") + (version "7.4.12") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -68,7 +68,7 @@ (define-public php "php-" version ".tar.xz")) (sha256 (base32 - "1knnw9b5hkxmisxclw384ic6bcihihhii51q0fyva8cwkdd6fcax")) + "0xkbx7ykjlkv8p1an342am4j0d633dbf5x1ggmmmy985mp72nbg8")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -312,6 +312,10 @@ (define-public php "ext/standard/tests/file/bug43008.phpt" ;; Table data not created in sqlite(?). "ext/pdo_sqlite/tests/bug_42589.phpt" + ;; 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" ;; This tests whether microseconds ‘differ enough’ and ;; fails inconsistently on ‘fast’ machines. -- cgit v1.2.3 From 08d8e76678c7cedb65f2faded6310f140f31164e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 30 Oct 2020 13:53:07 +0100 Subject: gnu: php: Move a test disablement. * gnu/packages/php.scm (php)[arguments]: Disable bug73837.phpt under a more appropriate comment section. --- gnu/packages/php.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'gnu/packages/php.scm') diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 835ce5c884..7abe561e0e 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -218,6 +218,9 @@ (define-public php ;; count of a sub-directory to increase compared to ;; its parent. "ext/standard/tests/file/lstat_stat_variation8.phpt" + ;; This tests whether microseconds ‘differ enough’ and + ;; fails inconsistently on ‘fast’ machines. + "ext/date/tests/bug73837.phpt" ;; XXX: These gd tests fails. Likely because our version ;; is different from the (patched) bundled one. @@ -315,11 +318,7 @@ (define-public php ;; 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" - - ;; This tests whether microseconds ‘differ enough’ and - ;; fails inconsistently on ‘fast’ machines. - "ext/date/tests/bug73837.phpt")) + "ext/pcre/tests/bug80118.phpt")) ;; Skip tests requiring network access. (setenv "SKIP_ONLINE_TESTS" "1") -- cgit v1.2.3