diff options
author | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2019-03-10 18:38:25 +0100 |
commit | 8c5533b582bc3fe1293469771d1a326926e84586 (patch) | |
tree | 7f71c4dd85489139a11897ee2668e26acdaf40b0 /gnu/packages/php.scm | |
parent | 2b0c755d195c79bfc95cdbe802e1e2dea1adb7a2 (diff) | |
parent | 41ce92501b53caa1dcf89fa81aed71dbf1f85d34 (diff) | |
download | guix-8c5533b582bc3fe1293469771d1a326926e84586.tar guix-8c5533b582bc3fe1293469771d1a326926e84586.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/php.scm')
-rw-r--r-- | gnu/packages/php.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index eba11943b0..8d96e54c90 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -58,7 +58,7 @@ (define-public php (package (name "php") - (version "7.3.1") + (version "7.3.3") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -66,7 +66,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "0qikydmjg8k68l56azq4vg3gkynqwlpzayd5qi9wsl03pr03xsfg")) + "1cxrpaz5cvx1qq9klwgvcyvcly865sxpn4bdk82wpl43l5wkxc3b")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -234,6 +234,13 @@ "ext/gd/tests/xpm2gd.phpt" "ext/gd/tests/xpm2jpg.phpt" "ext/gd/tests/xpm2png.phpt" + ;; Whitespace difference, probably caused by a very + ;; long store path + "ext/gd/tests/bug77479.phpt" + ;; Slightly different result (NULL instead of false), + ;; but the bug report suggests the issue was in + ;; the bundled gd, not upstream. + "ext/gd/tests/bug77272.phpt" ;; XXX: These iconv tests have the expected outcome, ;; but with different error messages. |