diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-06-03 17:03:56 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-06-03 17:03:56 +0200 |
commit | 30e12b9664d774aca3948b1fa2e0aee6af09ca40 (patch) | |
tree | 483e1bfaad4671b922bb070a35da3ada819f9e50 /gnu/packages/php.scm | |
parent | 136b7d81f0eb713783e9ea7cf7f260a2b6252dfd (diff) | |
parent | 3092f1b835d79655eecb2f8a79dda20ad9ba6bd6 (diff) | |
download | patches-30e12b9664d774aca3948b1fa2e0aee6af09ca40.tar patches-30e12b9664d774aca3948b1fa2e0aee6af09ca40.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/php.scm')
-rw-r--r-- | gnu/packages/php.scm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 68043051b5..62444308db 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -58,7 +58,7 @@ (define-public php (package (name "php") - (version "7.3.5") + (version "7.3.6") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -66,7 +66,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "0wi4vd1c3ylsv7cs5b74pkspybb22qwk6fs5r2as3m3glhw1h0g1")) + "0r51aiff2abbr3d2swhvja0wm56sjxzqbciabcvvq3m3v9kqkz7y")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -255,6 +255,10 @@ ;; but the bug report suggests the issue was in ;; the bundled gd, not upstream. "ext/gd/tests/bug77272.phpt" + ;; Expected invalid XBM but got EOF before image was + ;; complete. It's a warning in both cases and test + ;; result is the same. + "ext/gd/tests/bug77973.phpt" ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. |