amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: php: Improve style.

Browse source 
* gnu/packages/php.scm (php) [arguments]: Use gexps.
[native-inputs, inputs]: Drop labels.

Change-Id: I6244b131bfeb3583bd77ca28dd0f8ab93ff8dade
This commit is contained in:
Maxim Cournoyer 2025-09-30 09:12:53 +09:00
parent 732606d654
commit e6b0acff41
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 290 additions and 278 deletions
Download patch file Download diff file Expand all files Collapse all files

140
gnu/packages/php.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
;;; Copyright © 2020 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2020, 2025 Maxim Cournoyer <maxim@guixotic.coop>
;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2023 Timo Wilken <guix@twilken.net> ;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;; ;;;
@ -55,6 +55,7 @@
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module ((guix licenses) #:prefix license:)) #:use-module ((guix licenses) #:prefix license:))
@ -64,13 +65,12 @@
(name "php") (name "php")
(version "8.3.13") (version "8.3.13")
(home-page "https://www.php.net/") (home-page "https://www.php.net/")
(source (origin (source
(origin
(method url-fetch) (method url-fetch)
(uri (string-append home-page "distributions/" (uri (string-append home-page "distributions/" "php-" version ".tar.xz"))
"php-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32 "061hhx0f6m7q0jajxym72c9a4v4nqixk5mizwm7i42d2riwbkbc9"))
"061hhx0f6m7q0jajxym72c9a4v4nqixk5mizwm7i42d2riwbkbc9"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(with-directory-excursion "ext" '(with-directory-excursion "ext"
@ -81,14 +81,15 @@
;; "date/lib" ;; "date/lib"
;; "bcmath/libbcmath" ;; "bcmath/libbcmath"
;; "fileinfo/libmagic" ; a patched version of libmagic ;; "fileinfo/libmagic" ; a patched version of libmagic
'("gd/libgd" '("gd/libgd" "pcre/pcre2lib"))))))
"pcre/pcre2lib"))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags (list
(let-syntax ((with (syntax-rules () #:configure-flags
#~(let-syntax ((with (syntax-rules ()
((_ option input) ((_ option input)
(string-append option "=" (string-append
option "="
(assoc-ref %build-inputs input)))))) (assoc-ref %build-inputs input))))))
(list (with "--with-bz2" "bzip2") (list (with "--with-bz2" "bzip2")
(with "--with-curl" "curl") (with "--with-curl" "curl")
@ -106,7 +107,7 @@
(with "--with-readline" "readline") (with "--with-readline" "readline")
(with "--with-sodium" "libsodium") (with "--with-sodium" "libsodium")
(with "--with-sqlite3" "sqlite") (with "--with-sqlite3" "sqlite")
(with "--with-tidy" "tidy") (with "--with-tidy" "tidy-html")
(with "--with-xsl" "libxslt") (with "--with-xsl" "libxslt")
(with "--with-zlib-dir" "zlib") (with "--with-zlib-dir" "zlib")
;; We could add "--with-snmp", but it requires netsnmp that ;; We could add "--with-snmp", but it requires netsnmp that
@ -139,22 +140,27 @@
"--disable-zend-signals" "--disable-zend-signals"
"--enable-zend-max-execution-timers")) "--enable-zend-max-execution-timers"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'do-not-record-build-flags (add-after 'unpack 'do-not-record-build-flags
(lambda _ (lambda _
;; Prevent configure flags from being stored and causing ;; Prevent configure flags from being stored and causing
;; unnecessary runtime dependencies. ;; unnecessary runtime dependencies.
(substitute* "scripts/php-config.in" (substitute* "scripts/php-config.in"
(("@CONFIGURE_OPTIONS@") "") (("@CONFIGURE_OPTIONS@")
(("@PHP_LDFLAGS@") "")) "")
(("@PHP_LDFLAGS@")
""))
;; 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)")))))
(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"
(("/bin/sh") (which "sh"))))) "ext/standard/proc_open.c")
(("/bin/sh")
(which "sh")))))
(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
@ -164,26 +170,32 @@
"ext/mbstring/tests/mb_send_mail04.phpt" "ext/mbstring/tests/mb_send_mail04.phpt"
"ext/mbstring/tests/mb_send_mail05.phpt" "ext/mbstring/tests/mb_send_mail05.phpt"
"ext/mbstring/tests/mb_send_mail06.phpt") "ext/mbstring/tests/mb_send_mail06.phpt")
(("/bin/cat") (which "cat")))) (("/bin/cat")
(which "cat"))))
(substitute* '("ext/mbstring/tests/mb_send_mail01.phpt" (substitute* '("ext/mbstring/tests/mb_send_mail01.phpt"
"ext/mbstring/tests/mb_send_mail03.phpt" "ext/mbstring/tests/mb_send_mail03.phpt"
"ext/mbstring/tests/bug52681.phpt" "ext/mbstring/tests/bug52681.phpt"
"ext/standard/tests/general_functions/bug34794.phpt" "ext/standard/tests/general_functions/bug34794.phpt"
"ext/standard/tests/general_functions/bug44667.phpt" "ext/standard/tests/general_functions/bug44667.phpt"
"ext/standard/tests/general_functions/proc_open.phpt") "ext/standard/tests/general_functions/proc_open.phpt")
(("/bin/cat") (which "cat"))) (("/bin/cat")
(which "cat")))
;; The encoding of this file is not recognized, so we simply drop it. ;; The encoding of this file is not recognized, so we simply drop it.
(delete-file "ext/mbstring/tests/mb_send_mail07.phpt") (delete-file "ext/mbstring/tests/mb_send_mail07.phpt")
(substitute* "ext/standard/tests/streams/bug60602.phpt" (substitute* "ext/standard/tests/streams/bug60602.phpt"
(("'ls'") (string-append "'" (which "ls") "'"))) (("'ls'")
(string-append "'"
(which "ls") "'")))
;; Drop tests known to fail on different architectures: ;; Drop tests known to fail on different architectures:
(for-each delete-file (for-each
,(cond delete-file
#$(cond
((target-arm32?) ((target-arm32?)
`(list "ext/calendar/tests/unixtojd_error1.phpt" '(list
"ext/calendar/tests/unixtojd_error1.phpt"
"ext/opcache/tests/preload_006.phpt" "ext/opcache/tests/preload_006.phpt"
"ext/opcache/tests/preload_011.phpt" "ext/opcache/tests/preload_011.phpt"
;; arm can be a lot slower, so a time-related test fails ;; arm can be a lot slower, so a time-related test fails
@ -201,13 +213,13 @@
"sapi/cli/tests/cli_process_title_unix.phpt" "sapi/cli/tests/cli_process_title_unix.phpt"
"Zend/tests/concat_003.phpt")) "Zend/tests/concat_003.phpt"))
((target-x86-32?) ((target-x86-32?)
`(list "ext/dba/tests/dba_gdbm.phpt")) '(list "ext/dba/tests/dba_gdbm.phpt"))
((target-ppc32?) ((target-ppc32?)
`(list "sapi/phpdbg/tests/watch_001.phpt" '(list "sapi/phpdbg/tests/watch_001.phpt"
"sapi/phpdbg/tests/watch_003.phpt" "sapi/phpdbg/tests/watch_003.phpt"
"sapi/phpdbg/tests/watch_004.phpt")) "sapi/phpdbg/tests/watch_004.phpt"))
((target-ppc64le?) ((target-ppc64le?)
`(list '(list
;; phpdbg watchpoints don't work. ;; phpdbg watchpoints don't work.
;; Bug tracked upstream at: ;; Bug tracked upstream at:
;; https://bugs.php.net/bug.php?id=81408 ;; https://bugs.php.net/bug.php?id=81408
@ -216,10 +228,11 @@
"sapi/phpdbg/tests/watch_004.phpt" "sapi/phpdbg/tests/watch_004.phpt"
"sapi/phpdbg/tests/watch_005.phpt" "sapi/phpdbg/tests/watch_005.phpt"
"sapi/phpdbg/tests/watch_006.phpt")) "sapi/phpdbg/tests/watch_006.phpt"))
(else `'()))) (else ''())))
;; Drop tests that are known to fail. ;; Drop tests that are known to fail.
(for-each delete-file (for-each
delete-file
'("ext/posix/tests/posix_getgrgid.phpt" ;Requires /etc/group. '("ext/posix/tests/posix_getgrgid.phpt" ;Requires /etc/group.
"ext/posix/tests/posix_getgrnam_basic.phpt" ;Requires /etc/group. "ext/posix/tests/posix_getgrnam_basic.phpt" ;Requires /etc/group.
"ext/sockets/tests/bug63000.phpt" ;Fails to detect OS. "ext/sockets/tests/bug63000.phpt" ;Fails to detect OS.
@ -313,40 +326,40 @@
(setenv "SKIP_IO_CAPTURE_TESTS" "1")))) (setenv "SKIP_IO_CAPTURE_TESTS" "1"))))
#:test-target "test")) #:test-target "test"))
(inputs (inputs
`(("aspell" ,aspell) (list aspell
("bzip2" ,bzip2) bzip2
("curl" ,curl) curl
("cyrus-sasl" ,cyrus-sasl) cyrus-sasl
("freetype" ,freetype) fontconfig
("fontconfig" ,fontconfig) freetype
("libjpeg-turbo" ,libjpeg-turbo) gd
("libpng" ,libpng) gdbm
("gd" ,gd) gmp
("gdbm" ,gdbm) gnutls
("gmp" ,gmp) icu4c
("gnutls" ,gnutls) libgcrypt
("icu4c" ,icu4c) libjpeg-turbo
("libgcrypt" ,libgcrypt) libpng
("libpng" ,libpng) libpng
("libsodium" ,libsodium) libsodium
("libxml2" ,libxml2) libx11
("libxslt" ,libxslt) libxml2
("libx11" ,libx11) libxslt
("libzip" ,libzip) libzip
("oniguruma" ,oniguruma) oniguruma
("openldap" ,openldap) openldap
("openssl" ,openssl) openssl
("pcre" ,pcre2) pcre2
("postgresql" ,postgresql) postgresql
("readline" ,readline) readline
("sqlite" ,sqlite) sqlite
("tidy" ,tidy-html) tidy-html
("zlib" ,zlib))) zlib))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) (list bison
("bison" ,bison) gettext-minimal
("gettext" ,gettext-minimal) pkg-config
("procps" ,procps))) ; for tests procps)) ;for tests
(synopsis "PHP programming language") (synopsis "PHP programming language")
(description (description
"PHP (PHP Hypertext Processor) is a server-side (CGI) scripting "PHP (PHP Hypertext Processor) is a server-side (CGI) scripting
@ -354,8 +367,7 @@ language designed primarily for web development but is also used as
a general-purpose programming language. PHP code may be embedded into a general-purpose programming language. PHP code may be embedded into
HTML code, or it can be used in combination with various web template HTML code, or it can be used in combination with various web template
systems, web content management systems and web frameworks.") systems, web content management systems and web frameworks.")
(license (list (license (list (license:non-copyleft "file://LICENSE") ;The PHP license.
(license:non-copyleft "file://LICENSE") ; The PHP license.
(license:non-copyleft "file://Zend/LICENSE") ;The Zend license. (license:non-copyleft "file://Zend/LICENSE") ;The Zend license.
license:lgpl2.1 ;ext/mbstring/libmbfl license:lgpl2.1 ;ext/mbstring/libmbfl
license:lgpl2.1+ ;ext/bcmath/libbcmath license:lgpl2.1+ ;ext/bcmath/libbcmath