guix_mirror_bot pushed a commit to branch mesa-updates
in repository guix.

commit 32898c0056ab20890d54a9062ab66aed6e8471f1
Author: Maxim Cournoyer <[email protected]>
AuthorDate: Tue Sep 30 09:12:53 2025 +0900

    gnu: php: Improve style.
    
    * gnu/packages/php.scm (php) [arguments]: Use gexps.
    [native-inputs, inputs]: Drop labels.
    
    Change-Id: I6244b131bfeb3583bd77ca28dd0f8ab93ff8dade
---
 gnu/packages/php.scm | 568 ++++++++++++++++++++++++++-------------------------
 1 file changed, 290 insertions(+), 278 deletions(-)

diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm
index 115e4f3ea0..739d9c888c 100644
--- a/gnu/packages/php.scm
+++ b/gnu/packages/php.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <[email protected]>
 ;;; Copyright © 2018 Ricardo Wurmus <[email protected]>
 ;;; Copyright © 2019 Oleg Pykhalov <[email protected]>
-;;; Copyright © 2020 Maxim Cournoyer <[email protected]>
+;;; Copyright © 2020, 2025 Maxim Cournoyer <[email protected]>
 ;;; Copyright © 2021, 2023 Efraim Flashner <[email protected]>
 ;;; Copyright © 2023 Timo Wilken <[email protected]>
 ;;;
@@ -55,6 +55,7 @@
   #:use-module (gnu packages xorg)
   #:use-module (guix packages)
   #:use-module (guix download)
+  #:use-module (guix gexp)
   #:use-module (guix build-system gnu)
   #:use-module (guix utils)
   #:use-module ((guix licenses) #:prefix license:))
@@ -64,300 +65,311 @@
     (name "php")
     (version "8.3.13")
     (home-page "https://www.php.net/";)
-    (source (origin
-              (method url-fetch)
-              (uri (string-append home-page "distributions/"
-                                  "php-" version ".tar.xz"))
-              (sha256
-               (base32
-                "061hhx0f6m7q0jajxym72c9a4v4nqixk5mizwm7i42d2riwbkbc9"))
-              (modules '((guix build utils)))
-              (snippet
-               '(with-directory-excursion "ext"
-                  (for-each delete-file-recursively
-                            ;; Some of the bundled libraries have no proper 
upstream.
-                            ;; Ideally we'd extract these out as separate 
packages:
-                            ;;"mbstring/libmbfl"
-                            ;;"date/lib"
-                            ;;"bcmath/libbcmath"
-                            ;;"fileinfo/libmagic" ; a patched version of 
libmagic
-                            '("gd/libgd"
-                              "pcre/pcre2lib"))))))
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append home-page "distributions/" "php-" version 
".tar.xz"))
+       (sha256
+        (base32 "061hhx0f6m7q0jajxym72c9a4v4nqixk5mizwm7i42d2riwbkbc9"))
+       (modules '((guix build utils)))
+       (snippet
+        '(with-directory-excursion "ext"
+           (for-each delete-file-recursively
+                     ;; Some of the bundled libraries have no proper upstream.
+                     ;; Ideally we'd extract these out as separate packages:
+                     ;; "mbstring/libmbfl"
+                     ;; "date/lib"
+                     ;; "bcmath/libbcmath"
+                     ;; "fileinfo/libmagic" ; a patched version of libmagic
+                     '("gd/libgd" "pcre/pcre2lib"))))))
     (build-system gnu-build-system)
     (arguments
-     `(#:configure-flags
-       (let-syntax ((with (syntax-rules ()
-                            ((_ option input)
-                             (string-append option "="
-                                            (assoc-ref %build-inputs 
input))))))
-         (list (with "--with-bz2" "bzip2")
-               (with "--with-curl" "curl")
-               (with "--with-gdbm" "gdbm")
-               (with "--with-gettext" "libc")  ; libintl.h
-               (with "--with-gmp" "gmp")
-               (with "--with-ldap" "openldap")
-               (with "--with-ldap-sasl" "cyrus-sasl")
-               (with "--with-pdo-pgsql" "postgresql")
-               (with "--with-pdo-sqlite" "sqlite")
-               (with "--with-pgsql" "postgresql")
-               ;; PHP’s Pspell extension, while retaining its current name,
-               ;; now uses the Aspell library.
-               (with "--with-pspell" "aspell")
-               (with "--with-readline" "readline")
-               (with "--with-sodium" "libsodium")
-               (with "--with-sqlite3" "sqlite")
-               (with "--with-tidy" "tidy")
-               (with "--with-xsl" "libxslt")
-               (with "--with-zlib-dir" "zlib")
-               ;; We could add "--with-snmp", but it requires netsnmp that
-               ;; we don't have a package for. It is used to build the snmp
-               ;; extension of php.
-               "--with-external-pcre"
-               "--with-external-gd"
-               "--with-iconv"
-               "--with-openssl"
-               "--with-mysqli"          ; Required for, e.g. wordpress
-               "--with-pdo-mysql"
-               "--with-zip"
-               "--with-zlib"
-               "--enable-bcmath"        ; Required for, e.g. Zabbix frontend
-               "--enable-calendar"
-               "--enable-dba=shared"
-               "--enable-exif"
-               "--enable-flatfile"
-               "--enable-fpm"
-               "--enable-ftp"
-               "--enable-gd"
-               "--enable-inifile"
-               "--enable-intl"
-               "--enable-mbstring"
-               "--enable-pcntl"
-               "--enable-sockets"
-               "--enable-sysvsem"     ; Required for, e.g. Nextcloud
-               "--enable-embed"       ; Required for embed SAPI
-               "--enable-zts"
-               "--disable-zend-signals"
-               "--enable-zend-max-execution-timers"))
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'do-not-record-build-flags
-           (lambda _
-             ;; Prevent configure flags from being stored and causing
-             ;; unnecessary runtime dependencies.
-             (substitute* "scripts/php-config.in"
-               (("@CONFIGURE_OPTIONS@") "")
-               (("@PHP_LDFLAGS@") ""))
-             ;; This file has ISO-8859-1 encoding.
-             (with-fluids ((%default-port-encoding "ISO-8859-1"))
-               (substitute* "main/build-defs.h.in"
-                 (("@CONFIGURE_COMMAND@") "(omitted)")))))
-         (add-before 'build 'patch-/bin/sh
-           (lambda _
-             (substitute* '("run-tests.php" "ext/standard/proc_open.c")
-               (("/bin/sh") (which "sh")))))
-         (add-before 'check 'prepare-tests
-           (lambda _
-             ;; Some of these files have ISO-8859-1 encoding, whereas others
-             ;; use ASCII, so we can't use a "catch-all" find-files here.
-             (with-fluids ((%default-port-encoding "ISO-8859-1"))
-               (substitute* '("ext/mbstring/tests/mb_send_mail02.phpt"
-                              "ext/mbstring/tests/mb_send_mail04.phpt"
-                              "ext/mbstring/tests/mb_send_mail05.phpt"
-                              "ext/mbstring/tests/mb_send_mail06.phpt")
-                 (("/bin/cat") (which "cat"))))
-             (substitute* '("ext/mbstring/tests/mb_send_mail01.phpt"
-                            "ext/mbstring/tests/mb_send_mail03.phpt"
-                            "ext/mbstring/tests/bug52681.phpt"
-                            
"ext/standard/tests/general_functions/bug34794.phpt"
-                            
"ext/standard/tests/general_functions/bug44667.phpt"
-                            
"ext/standard/tests/general_functions/proc_open.phpt")
-               (("/bin/cat") (which "cat")))
+     (list
+      #:configure-flags
+      #~(let-syntax ((with (syntax-rules ()
+                             ((_ option input)
+                              (string-append
+                               option "="
+                               (assoc-ref %build-inputs input))))))
+          (list (with "--with-bz2" "bzip2")
+                (with "--with-curl" "curl")
+                (with "--with-gdbm" "gdbm")
+                (with "--with-gettext" "libc") ;libintl.h
+                (with "--with-gmp" "gmp")
+                (with "--with-ldap" "openldap")
+                (with "--with-ldap-sasl" "cyrus-sasl")
+                (with "--with-pdo-pgsql" "postgresql")
+                (with "--with-pdo-sqlite" "sqlite")
+                (with "--with-pgsql" "postgresql")
+                ;; PHP’s Pspell extension, while retaining its current name,
+                ;; now uses the Aspell library.
+                (with "--with-pspell" "aspell")
+                (with "--with-readline" "readline")
+                (with "--with-sodium" "libsodium")
+                (with "--with-sqlite3" "sqlite")
+                (with "--with-tidy" "tidy-html")
+                (with "--with-xsl" "libxslt")
+                (with "--with-zlib-dir" "zlib")
+                ;; We could add "--with-snmp", but it requires netsnmp that
+                ;; we don't have a package for. It is used to build the snmp
+                ;; extension of php.
+                "--with-external-pcre"
+                "--with-external-gd"
+                "--with-iconv"
+                "--with-openssl"
+                "--with-mysqli"         ;Required for, e.g. wordpress
+                "--with-pdo-mysql"
+                "--with-zip"
+                "--with-zlib"
+                "--enable-bcmath"       ;Required for, e.g. Zabbix frontend
+                "--enable-calendar"
+                "--enable-dba=shared"
+                "--enable-exif"
+                "--enable-flatfile"
+                "--enable-fpm"
+                "--enable-ftp"
+                "--enable-gd"
+                "--enable-inifile"
+                "--enable-intl"
+                "--enable-mbstring"
+                "--enable-pcntl"
+                "--enable-sockets"
+                "--enable-sysvsem"      ;Required for, e.g. Nextcloud
+                "--enable-embed"        ;Required for embed SAPI
+                "--enable-zts"
+                "--disable-zend-signals"
+                "--enable-zend-max-execution-timers"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'do-not-record-build-flags
+            (lambda _
+              ;; Prevent configure flags from being stored and causing
+              ;; unnecessary runtime dependencies.
+              (substitute* "scripts/php-config.in"
+                (("@CONFIGURE_OPTIONS@")
+                 "")
+                (("@PHP_LDFLAGS@")
+                 ""))
+              ;; This file has ISO-8859-1 encoding.
+              (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                (substitute* "main/build-defs.h.in"
+                  (("@CONFIGURE_COMMAND@")
+                   "(omitted)")))))
+          (add-before 'build 'patch-/bin/sh
+            (lambda _
+              (substitute* '("run-tests.php"
+                             "ext/standard/proc_open.c")
+                (("/bin/sh")
+                 (which "sh")))))
+          (add-before 'check 'prepare-tests
+            (lambda _
+              ;; Some of these files have ISO-8859-1 encoding, whereas others
+              ;; use ASCII, so we can't use a "catch-all" find-files here.
+              (with-fluids ((%default-port-encoding "ISO-8859-1"))
+                (substitute* '("ext/mbstring/tests/mb_send_mail02.phpt"
+                               "ext/mbstring/tests/mb_send_mail04.phpt"
+                               "ext/mbstring/tests/mb_send_mail05.phpt"
+                               "ext/mbstring/tests/mb_send_mail06.phpt")
+                  (("/bin/cat")
+                   (which "cat"))))
+              (substitute* '("ext/mbstring/tests/mb_send_mail01.phpt"
+                             "ext/mbstring/tests/mb_send_mail03.phpt"
+                             "ext/mbstring/tests/bug52681.phpt"
+                             
"ext/standard/tests/general_functions/bug34794.phpt"
+                             
"ext/standard/tests/general_functions/bug44667.phpt"
+                             
"ext/standard/tests/general_functions/proc_open.phpt")
+                (("/bin/cat")
+                 (which "cat")))
 
-             ;; The encoding of this file is not recognized, so we simply drop 
it.
-             (delete-file "ext/mbstring/tests/mb_send_mail07.phpt")
+              ;; The encoding of this file is not recognized, so we simply 
drop it.
+              (delete-file "ext/mbstring/tests/mb_send_mail07.phpt")
 
-             (substitute* "ext/standard/tests/streams/bug60602.phpt"
-               (("'ls'") (string-append "'" (which "ls") "'")))
+              (substitute* "ext/standard/tests/streams/bug60602.phpt"
+                (("'ls'")
+                 (string-append "'"
+                                (which "ls") "'")))
 
-             ;; Drop tests known to fail on different architectures:
-             (for-each delete-file
-             ,(cond
-                ((target-arm32?)
-                 `(list "ext/calendar/tests/unixtojd_error1.phpt"
-                        "ext/opcache/tests/preload_006.phpt"
-                        "ext/opcache/tests/preload_011.phpt"
-                        ;; arm can be a lot slower, so a time-related test 
fails
-                        "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
-                        "ext/pcntl/tests/pcntl_unshare_01.phpt"
-                        "ext/pcre/tests/bug76514.phpt"
-                        "ext/pcre/tests/preg_match_error3.phpt"
-                        "ext/pcre/tests/cache_limit.phpt"
-                        "ext/sockets/tests/socket_getopt.phpt"
-                        "ext/sockets/tests/socket_sendrecvmsg_error.phpt"
-                        
"ext/standard/tests/general_functions/var_export-locale.phpt"
-                        
"ext/standard/tests/general_functions/var_export_basic1.phpt"
-                        
"ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt"
-                        "ext/intl/tests/timezone_getOffset_error.phpt"
-                        "sapi/cli/tests/cli_process_title_unix.phpt"
-                        "Zend/tests/concat_003.phpt"))
-                ((target-x86-32?)
-                 `(list "ext/dba/tests/dba_gdbm.phpt"))
-                ((target-ppc32?)
-                 `(list "sapi/phpdbg/tests/watch_001.phpt"
-                        "sapi/phpdbg/tests/watch_003.phpt"
-                        "sapi/phpdbg/tests/watch_004.phpt"))
-                ((target-ppc64le?)
-                 `(list
-                    ;; phpdbg watchpoints don't work.
-                    ;; Bug tracked upstream at:
-                    ;; https://bugs.php.net/bug.php?id=81408
-                    "sapi/phpdbg/tests/watch_001.phpt"
-                    "sapi/phpdbg/tests/watch_003.phpt"
-                    "sapi/phpdbg/tests/watch_004.phpt"
-                    "sapi/phpdbg/tests/watch_005.phpt"
-                    "sapi/phpdbg/tests/watch_006.phpt"))
-                (else `'())))
+              ;; Drop tests known to fail on different architectures:
+              (for-each
+               delete-file
+               #$(cond
+                  ((target-arm32?)
+                   '(list
+                     "ext/calendar/tests/unixtojd_error1.phpt"
+                     "ext/opcache/tests/preload_006.phpt"
+                     "ext/opcache/tests/preload_011.phpt"
+                     ;; arm can be a lot slower, so a time-related test fails
+                     "ext/fileinfo/tests/cve-2014-3538-nojit.phpt"
+                     "ext/pcntl/tests/pcntl_unshare_01.phpt"
+                     "ext/pcre/tests/bug76514.phpt"
+                     "ext/pcre/tests/preg_match_error3.phpt"
+                     "ext/pcre/tests/cache_limit.phpt"
+                     "ext/sockets/tests/socket_getopt.phpt"
+                     "ext/sockets/tests/socket_sendrecvmsg_error.phpt"
+                     
"ext/standard/tests/general_functions/var_export-locale.phpt"
+                     
"ext/standard/tests/general_functions/var_export_basic1.phpt"
+                     "ext/intl/tests/timezone_getErrorCodeMessage_basic.phpt"
+                     "ext/intl/tests/timezone_getOffset_error.phpt"
+                     "sapi/cli/tests/cli_process_title_unix.phpt"
+                     "Zend/tests/concat_003.phpt"))
+                  ((target-x86-32?)
+                   '(list "ext/dba/tests/dba_gdbm.phpt"))
+                  ((target-ppc32?)
+                   '(list "sapi/phpdbg/tests/watch_001.phpt"
+                          "sapi/phpdbg/tests/watch_003.phpt"
+                          "sapi/phpdbg/tests/watch_004.phpt"))
+                  ((target-ppc64le?)
+                   '(list
+                     ;; phpdbg watchpoints don't work.
+                     ;; Bug tracked upstream at:
+                     ;; https://bugs.php.net/bug.php?id=81408
+                     "sapi/phpdbg/tests/watch_001.phpt"
+                     "sapi/phpdbg/tests/watch_003.phpt"
+                     "sapi/phpdbg/tests/watch_004.phpt"
+                     "sapi/phpdbg/tests/watch_005.phpt"
+                     "sapi/phpdbg/tests/watch_006.phpt"))
+                  (else ''())))
 
-             ;; Drop tests that are known to fail.
-             (for-each delete-file
-                       '("ext/posix/tests/posix_getgrgid.phpt"    ; Requires 
/etc/group.
-                         "ext/posix/tests/posix_getgrnam_basic.phpt" ; 
Requires /etc/group.
-                         "ext/sockets/tests/bug63000.phpt"        ; Fails to 
detect OS.
-                         ;; These need exotic locales.
-                         "ext/standard/tests/strings/setlocale_basic1.phpt"
-                         "ext/standard/tests/strings/setlocale_basic2.phpt"
-                         "ext/standard/tests/strings/setlocale_basic3.phpt"
-                         "ext/standard/tests/strings/setlocale_variation1.phpt"
-                         ;; This bug should have been fixed in gd 2.2.2.
-                         ;; Is it a regression?
-                         "ext/gd/tests/bug65148.phpt"
-                         ;; This bug should have been fixed in the gd 2.2
-                         ;; series.  Perhaps a regression introduced by gd
-                         ;; 2.3.0?
-                         "ext/gd/tests/bug66590.phpt"
-                         ;; This bug should have been fixed in the php-5.5
-                         ;; series.  Perhaps a regression introduced by gd
-                         ;; 2.3.0?
-                         "ext/gd/tests/bug70102.phpt"
-                         ;; This bug should have been fixed in the php-5.6
-                         ;; series.  Perhaps a regression introduced by gd
-                         ;; 2.3.0?
-                         "ext/gd/tests/bug73869.phpt"
-                         ;; Some WebP related tests fail.
-                         "ext/gd/tests/webp_basic.phpt"
-                         "ext/gd/tests/imagecreatefromstring_webp.phpt"
-                         ;; TODO: Enable these when libgd is built with xpm 
support.
-                         "ext/gd/tests/xpm2gd.phpt"
-                         "ext/gd/tests/xpm2jpg.phpt"
-                         "ext/gd/tests/xpm2png.phpt"
-                         ;; AVIF support disabled
-                         "ext/gd/tests/avif_decode_encode.phpt"
-                         ;; Typo in expected outputs
-                         "ext/gd/tests/bug72339.phpt"
-                         ;; AVIF support disabled
-                         "ext/gd/tests/imagecreatefromstring_avif.phpt"
+              ;; Drop tests that are known to fail.
+              (for-each
+               delete-file
+               '("ext/posix/tests/posix_getgrgid.phpt" ;Requires /etc/group.
+                 "ext/posix/tests/posix_getgrnam_basic.phpt" ;Requires 
/etc/group.
+                 "ext/sockets/tests/bug63000.phpt" ;Fails to detect OS.
+                 ;; These need exotic locales.
+                 "ext/standard/tests/strings/setlocale_basic1.phpt"
+                 "ext/standard/tests/strings/setlocale_basic2.phpt"
+                 "ext/standard/tests/strings/setlocale_basic3.phpt"
+                 "ext/standard/tests/strings/setlocale_variation1.phpt"
+                 ;; This bug should have been fixed in gd 2.2.2.
+                 ;; Is it a regression?
+                 "ext/gd/tests/bug65148.phpt"
+                 ;; This bug should have been fixed in the gd 2.2
+                 ;; series.  Perhaps a regression introduced by gd
+                 ;; 2.3.0?
+                 "ext/gd/tests/bug66590.phpt"
+                 ;; This bug should have been fixed in the php-5.5
+                 ;; series.  Perhaps a regression introduced by gd
+                 ;; 2.3.0?
+                 "ext/gd/tests/bug70102.phpt"
+                 ;; This bug should have been fixed in the php-5.6
+                 ;; series.  Perhaps a regression introduced by gd
+                 ;; 2.3.0?
+                 "ext/gd/tests/bug73869.phpt"
+                 ;; Some WebP related tests fail.
+                 "ext/gd/tests/webp_basic.phpt"
+                 "ext/gd/tests/imagecreatefromstring_webp.phpt"
+                 ;; TODO: Enable these when libgd is built with xpm support.
+                 "ext/gd/tests/xpm2gd.phpt"
+                 "ext/gd/tests/xpm2jpg.phpt"
+                 "ext/gd/tests/xpm2png.phpt"
+                 ;; AVIF support disabled
+                 "ext/gd/tests/avif_decode_encode.phpt"
+                 ;; Typo in expected outputs
+                 "ext/gd/tests/bug72339.phpt"
+                 ;; AVIF support disabled
+                 "ext/gd/tests/imagecreatefromstring_avif.phpt"
 
-                         ;; These tests fail due to issues in upstream gd
-                         ;; 2.3.3 around BICUBIC interpolation.  See
-                         ;; https://github.com/libgd/libgd/issues/847
-                         "ext/gd/tests/bug79676.phpt"
-                         "ext/gd/tests/imageinterpolation_basic.phpt"
-                         "ext/gd/tests/imagescale_preserve_ratio.phpt"
+                 ;; These tests fail due to issues in upstream gd
+                 ;; 2.3.3 around BICUBIC interpolation.  See
+                 ;; https://github.com/libgd/libgd/issues/847
+                 "ext/gd/tests/bug79676.phpt"
+                 "ext/gd/tests/imageinterpolation_basic.phpt"
+                 "ext/gd/tests/imagescale_preserve_ratio.phpt"
 
-                         ;; XXX: These test failures appear legitimate, needs 
investigation.
-                         ;; open_basedir() restriction failure.
-                         "ext/curl/tests/curl_setopt_ssl.phpt"
+                 ;; XXX: These test failures appear legitimate, needs 
investigation.
+                 ;; open_basedir() restriction failure.
+                 "ext/curl/tests/curl_setopt_ssl.phpt"
 
-                         ;; Fail because there is no "root" in the build 
container's
-                         ;; /etc/passwd
-                         "sapi/fpm/tests/bug68591-conf-test-group.phpt"
-                         "sapi/fpm/tests/bug68591-conf-test-listen-group.phpt"
-                         "sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt"
+                 ;; Fail because there is no "root" in the build container's
+                 ;; /etc/passwd
+                 "sapi/fpm/tests/bug68591-conf-test-group.phpt"
+                 "sapi/fpm/tests/bug68591-conf-test-listen-group.phpt"
+                 "sapi/fpm/tests/bug68591-conf-test-listen-owner.phpt"
 
-                         ;; The test expects an Array, but instead get the 
contents(?).
-                         "ext/gd/tests/bug43073.phpt"
-                         ;; imagettftext() returns wrong coordinates.
-                         "ext/gd/tests/bug48732-mb.phpt"
-                         "ext/gd/tests/bug48732.phpt"
-                         ;; Similarly for imageftbbox().
-                         "ext/gd/tests/bug48801-mb.phpt"
-                         "ext/gd/tests/bug48801.phpt"
-                         ;; Different expected output from 
imagecolorallocate().
-                         "ext/gd/tests/bug53504.phpt"
-                         ;; Wrong image size after scaling an image.
-                         "ext/gd/tests/bug73272.phpt"
-                         ;; PCRE with/without JIT gives different result
-                         "ext/pcre/tests/gh11374.phpt"
-                         "ext/pcre/tests/gh11956.phpt"
-                         ;; reported bug only seems to affect windows
-                         "ext/standard/tests/directory/bug74589_utf8.phpt"
-                         ;; this test seems to be unreliable/flaky
-                         "sapi/cli/tests/php_cli_server_pdeathsig.phpt"
-                         ;; This test fails on most architectures.
-                         "sapi/cli/tests/upload_2G.phpt"))
+                 ;; The test expects an Array, but instead get the contents(?).
+                 "ext/gd/tests/bug43073.phpt"
+                 ;; imagettftext() returns wrong coordinates.
+                 "ext/gd/tests/bug48732-mb.phpt"
+                 "ext/gd/tests/bug48732.phpt"
+                 ;; Similarly for imageftbbox().
+                 "ext/gd/tests/bug48801-mb.phpt"
+                 "ext/gd/tests/bug48801.phpt"
+                 ;; Different expected output from imagecolorallocate().
+                 "ext/gd/tests/bug53504.phpt"
+                 ;; Wrong image size after scaling an image.
+                 "ext/gd/tests/bug73272.phpt"
+                 ;; PCRE with/without JIT gives different result
+                 "ext/pcre/tests/gh11374.phpt"
+                 "ext/pcre/tests/gh11956.phpt"
+                 ;; reported bug only seems to affect windows
+                 "ext/standard/tests/directory/bug74589_utf8.phpt"
+                 ;; this test seems to be unreliable/flaky
+                 "sapi/cli/tests/php_cli_server_pdeathsig.phpt"
+                 ;; This test fails on most architectures.
+                 "sapi/cli/tests/upload_2G.phpt"))
 
-             ;; Accomodate two extra openssl errors flanking the expected one:
-             ;; random number generator:RAND_{load,write}_file:Cannot open file
-             ;; This is due to an invalid $HOME, but changing it in the test
-             ;; still prints the first one & changing it globally is overkill.
-             (substitute* "ext/openssl/tests/bug80747.phpt"
-               ((".*error:%s:key size too small.*" match)
-                (string-append "%s\n" match "%s\n")))
+              ;; Accomodate two extra openssl errors flanking the expected one:
+              ;; random number generator:RAND_{load,write}_file:Cannot open 
file
+              ;; This is due to an invalid $HOME, but changing it in the test
+              ;; still prints the first one & changing it globally is overkill.
+              (substitute* "ext/openssl/tests/bug80747.phpt"
+                ((".*error:%s:key size too small.*" match)
+                 (string-append "%s\n" match "%s\n")))
 
-             ;; Skip tests requiring network access.
-             (setenv "SKIP_ONLINE_TESTS" "1")
-             ;; Without this variable, 'make test' passes regardless of 
failures.
-             (setenv "REPORT_EXIT_STATUS" "1")
-             ;; Skip tests requiring I/O facilities that are unavailable in the
-             ;; build environment
-             (setenv "SKIP_IO_CAPTURE_TESTS" "1"))))
-       #:test-target "test"))
+              ;; Skip tests requiring network access.
+              (setenv "SKIP_ONLINE_TESTS" "1")
+              ;; Without this variable, 'make test' passes regardless of 
failures.
+              (setenv "REPORT_EXIT_STATUS" "1")
+              ;; Skip tests requiring I/O facilities that are unavailable in 
the
+              ;; build environment
+              (setenv "SKIP_IO_CAPTURE_TESTS" "1"))))
+      #:test-target "test"))
     (inputs
-     `(("aspell" ,aspell)
-       ("bzip2" ,bzip2)
-       ("curl" ,curl)
-       ("cyrus-sasl" ,cyrus-sasl)
-       ("freetype" ,freetype)
-       ("fontconfig" ,fontconfig)
-       ("libjpeg-turbo" ,libjpeg-turbo)
-       ("libpng" ,libpng)
-       ("gd" ,gd)
-       ("gdbm" ,gdbm)
-       ("gmp" ,gmp)
-       ("gnutls" ,gnutls)
-       ("icu4c" ,icu4c)
-       ("libgcrypt" ,libgcrypt)
-       ("libpng" ,libpng)
-       ("libsodium" ,libsodium)
-       ("libxml2" ,libxml2)
-       ("libxslt" ,libxslt)
-       ("libx11" ,libx11)
-       ("libzip" ,libzip)
-       ("oniguruma" ,oniguruma)
-       ("openldap" ,openldap)
-       ("openssl" ,openssl)
-       ("pcre" ,pcre2)
-       ("postgresql" ,postgresql)
-       ("readline" ,readline)
-       ("sqlite" ,sqlite)
-       ("tidy" ,tidy-html)
-       ("zlib" ,zlib)))
+     (list aspell
+           bzip2
+           curl
+           cyrus-sasl
+           fontconfig
+           freetype
+           gd
+           gdbm
+           gmp
+           gnutls
+           icu4c
+           libgcrypt
+           libjpeg-turbo
+           libpng
+           libpng
+           libsodium
+           libx11
+           libxml2
+           libxslt
+           libzip
+           oniguruma
+           openldap
+           openssl
+           pcre2
+           postgresql
+           readline
+           sqlite
+           tidy-html
+           zlib))
     (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("bison" ,bison)
-       ("gettext" ,gettext-minimal)
-       ("procps" ,procps)))             ; for tests
+     (list bison
+           gettext-minimal
+           pkg-config
+           procps))                     ;for tests
     (synopsis "PHP programming language")
     (description
      "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting
 language designed primarily for web development but is also used as
 a general-purpose programming language.  PHP code may be embedded into
 HTML code, or it can be used in combination with various web template
-systems, web content management systems and web frameworks." )
-    (license (list
-              (license:non-copyleft "file://LICENSE")       ; The PHP license.
-              (license:non-copyleft "file://Zend/LICENSE")  ; The Zend license.
-              license:lgpl2.1                               ; 
ext/mbstring/libmbfl
-              license:lgpl2.1+                              ; 
ext/bcmath/libbcmath
-              license:bsd-2                                 ; 
ext/fileinfo/libmagic
-              license:expat))))                             ; ext/date/lib
+systems, web content management systems and web frameworks.")
+    (license (list (license:non-copyleft "file://LICENSE") ;The PHP license.
+                   (license:non-copyleft "file://Zend/LICENSE") ;The Zend 
license.
+                   license:lgpl2.1      ;ext/mbstring/libmbfl
+                   license:lgpl2.1+     ;ext/bcmath/libbcmath
+                   license:bsd-2        ;ext/fileinfo/libmagic
+                   license:expat))))                             ; ext/date/lib

Reply via email to