mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge remote-tracking branch 'origin/master' into core-updates-frozen
This commit is contained in:
commit
9bc0f45df5
202 changed files with 205024 additions and 194678 deletions
|
@ -5,6 +5,7 @@
|
|||
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2019 Oleg Pykhalov <go.wigust@gmail.com>
|
||||
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -60,7 +61,7 @@
|
|||
(define-public php
|
||||
(package
|
||||
(name "php")
|
||||
(version "7.4.25")
|
||||
(version "7.4.26")
|
||||
(home-page "https://secure.php.net/")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -68,7 +69,7 @@
|
|||
"php-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"02iw75niazf3zh3ry15k5yjy6ivg49rwzlr8g8w49rgyszqmi9qj"))
|
||||
"1y0f1xgfi8cks6npdhrycg8r9g3q0pikqgf5h4xafpy8znmb61g3"))
|
||||
(patches (search-patches "php-bug-74093-test.patch"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
|
@ -93,7 +94,7 @@
|
|||
(list (with "--with-bz2" "bzip2")
|
||||
(with "--with-curl" "curl")
|
||||
(with "--with-gdbm" "gdbm")
|
||||
(with "--with-gettext" "glibc") ; libintl.h
|
||||
(with "--with-gettext" "libc") ; libintl.h
|
||||
(with "--with-gmp" "gmp")
|
||||
(with "--with-ldap" "openldap")
|
||||
(with "--with-ldap-sasl" "cyrus-sasl")
|
||||
|
@ -367,7 +368,6 @@
|
|||
("cyrus-sasl" ,cyrus-sasl)
|
||||
("gd" ,gd)
|
||||
("gdbm" ,gdbm)
|
||||
("glibc" ,glibc)
|
||||
("gmp" ,gmp)
|
||||
("gnutls" ,gnutls)
|
||||
("icu4c" ,icu4c)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue