1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-15 03:20:43 +02:00

gnu: php: Update to 7.4.21.

* gnu/packages/php.scm (php): Update to 7.4.21.
[arguments]: Remove trailing #t's.
[native-inputs]: Remove INTLTOOL. Add GETTEXT-MINIMAL.
This commit is contained in:
Marius Bakke 2021-07-22 15:49:46 +02:00
parent c4918b54bb
commit 379bb236d4
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -36,7 +36,6 @@
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnupg) #:use-module (gnu packages gnupg)
#:use-module (gnu packages icu4c) #:use-module (gnu packages icu4c)
#:use-module (gnu packages image) #:use-module (gnu packages image)
@ -61,7 +60,7 @@
(define-public php (define-public php
(package (package
(name "php") (name "php")
(version "7.4.20") (version "7.4.21")
(home-page "https://secure.php.net/") (home-page "https://secure.php.net/")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -69,7 +68,7 @@
"php-" version ".tar.xz")) "php-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0db3nqfbfqfd8fkvrw1k8l6698qcbzv1v5j8rgr0ny0dg6k6r90z")) "141awf9fjg8ps1b1dv0j1xqvkax4p8cjc0i2zz11n906g153hhyg"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(with-directory-excursion "ext" '(with-directory-excursion "ext"
@ -146,13 +145,11 @@
;; This file has ISO-8859-1 encoding. ;; This file has ISO-8859-1 encoding.
(with-fluids ((%default-port-encoding "ISO-8859-1")) (with-fluids ((%default-port-encoding "ISO-8859-1"))
(substitute* "main/build-defs.h.in" (substitute* "main/build-defs.h.in"
(("@CONFIGURE_COMMAND@") "(omitted)"))) (("@CONFIGURE_COMMAND@") "(omitted)")))))
#t))
(add-before 'build 'patch-/bin/sh (add-before 'build 'patch-/bin/sh
(lambda _ (lambda _
(substitute* '("run-tests.php" "ext/standard/proc_open.c") (substitute* '("run-tests.php" "ext/standard/proc_open.c")
(("/bin/sh") (which "sh"))) (("/bin/sh") (which "sh")))))
#t))
(add-before 'check 'prepare-tests (add-before 'check 'prepare-tests
(lambda _ (lambda _
;; Some of these files have ISO-8859-1 encoding, whereas others ;; Some of these files have ISO-8859-1 encoding, whereas others
@ -345,8 +342,7 @@
(setenv "REPORT_EXIT_STATUS" "1") (setenv "REPORT_EXIT_STATUS" "1")
;; Skip tests requiring I/O facilities that are unavailable in the ;; Skip tests requiring I/O facilities that are unavailable in the
;; build environment ;; build environment
(setenv "SKIP_IO_CAPTURE_TESTS" "1") (setenv "SKIP_IO_CAPTURE_TESTS" "1"))))
#t)))
#:test-target "test")) #:test-target "test"))
(inputs (inputs
`(("aspell" ,aspell) `(("aspell" ,aspell)
@ -378,7 +374,7 @@
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("bison" ,bison) ("bison" ,bison)
("intltool" ,intltool) ("gettext" ,gettext-minimal)
("procps" ,procps))) ; for tests ("procps" ,procps))) ; for tests
(synopsis "PHP programming language") (synopsis "PHP programming language")
(description (description