diff options
| author | Marius Bakke <[email protected]> | 2018-12-11 22:18:05 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2018-12-11 22:18:05 +0100 |
| commit | b03e4fd5269897448124a7b61a737802b2c638ee (patch) | |
| tree | e4eaab1d3076e335c57eea462ff7fda7919f0831 /gnu/packages/php.scm | |
| parent | da3c6a7f19ef1243af725f63c16c8fd92fde33b4 (diff) | |
| parent | 99aad42138e0895df51e64e1261984f277952516 (diff) | |
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. |