diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
| commit | 7f69459aca16756f35f08049c64a1bd77d23f33e (patch) | |
| tree | 1d267fb62feab89de5d97582672540cbaa37392c /gnu/packages/php.scm | |
| parent | 4a82722a658220ec1e10f9f2d5d77407d38db90e (diff) | |
| parent | b1989c12501e880afab62d3ff961791906fef350 (diff) | |
| download | guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/php.scm')
| -rw-r--r-- | gnu/packages/php.scm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 7c45269bb1..b9a5eb4bf2 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -52,7 +52,7 @@ (define-public php (package (name "php") - (version "7.1.12") + (version "7.2.1") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -60,7 +60,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1czflr5wb2f7pmgdc1vxy1kcln5rlkkly2z3skrb2wa5fx88h4d0")) + "08l8zmp8wbavq6wlgx19irz59csb44jhbsr172bfsq36v8pzhv3c")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -271,12 +271,25 @@ ;; ("ISO-8859-1"=>"UTF-8") unknown error. "ext/standard/tests/file/bug43008.phpt" ;; Table data not created in sqlite(?). - "ext/pdo_sqlite/tests/bug_42589.phpt")) + "ext/pdo_sqlite/tests/bug_42589.phpt" + + ;; Small variation in output. + "ext/mbstring/tests/mb_ereg_variation3.phpt" + "ext/mbstring/tests/mb_ereg_replace_variation1.phpt" + "ext/mbstring/tests/bug72994.phpt" + "ext/ldap/tests/ldap_set_option_error.phpt" + + ;; XXX: This is CVE-2018-5711. There is no fix yet in libgd. + ;; See https://github.com/libgd/libgd/issues/420 + "ext/gd/tests/bug75571.phpt")) ;; Skip tests requiring network access. (setenv "SKIP_ONLINE_TESTS" "1") ;; Without this variable, 'make test' passes regardless of failures. (setenv "REPORT_EXIT_STATUS" "1") + ;; Skip tests requiring I/O facilities that are unavailable in the + ;; build environment + (setenv "SKIP_IO_CAPTURE_TESTS" "1") #t))) #:test-target "test")) (inputs |