1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 11:30:44 +02:00

Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2018-11-14 21:20:46 +01:00
commit 79ee97a144
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
81 changed files with 2462 additions and 1004 deletions

View file

@ -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.