diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-14 21:20:46 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-14 21:20:46 +0100 |
| commit | 79ee97a144aaaa890be0724aaf796e2a771179d7 (patch) | |
| tree | fddd2f20003d60e42eed7a614acea91a13d854d7 /gnu/packages/php.scm | |
| parent | 7d9d521fbcf1423f66d6f33208c03d5dacb7ba50 (diff) | |
| parent | e921993c25626541385f191f0463cad8e5e5c5c7 (diff) | |
| download | patches-79ee97a144aaaa890be0724aaf796e2a771179d7.tar patches-79ee97a144aaaa890be0724aaf796e2a771179d7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/php.scm')
| -rw-r--r-- | gnu/packages/php.scm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 466b26c238..a28cb31e5c 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -53,7 +53,7 @@ (define-public php (package (name "php") - (version "7.2.10") + (version "7.2.12") (home-page "https://secure.php.net/") (source (origin (method url-fetch) @@ -61,7 +61,7 @@ name "-" version ".tar.xz")) (sha256 (base32 - "1w0432i5wjga9z8x3rhc72h2ij1jd2aimg5xmhc0hg4f7951bhh1")) + "1qbz2j9kzqxxp0mmx02zavvz20ji7izqdnri25g1mrwyhz60974q")) (modules '((guix build utils))) (snippet '(with-directory-excursion "ext" @@ -176,6 +176,11 @@ (substitute* "ext/standard/tests/streams/bug60602.phpt" (("'ls'") (string-append "'" (which "ls") "'"))) + ;; The expected output is slightly different from what is given, + ;; in a section that's not related to the actual test + (substitute* "sapi/cli/tests/upload_2G.phpt" + (("Test\\\\n") "Test\n\n")) + ;; Drop tests that are known to fail. (for-each delete-file '("ext/posix/tests/posix_getgrgid.phpt" ; Requires /etc/group. |