diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2021-12-05 19:17:41 +0100 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2021-12-05 19:17:41 +0100 |
commit | 9bc0f45df5d6aed217020b1183dca54989844fb0 (patch) | |
tree | d927e89949ff7f65b5059bc94273c53fd43d0763 /gnu/packages/php.scm | |
parent | 6db3c536e89deb8a204e756f427614925a7d2582 (diff) | |
parent | 10554e0a57feeea470127a1d0441957d1776b0bd (diff) | |
download | guix-9bc0f45df5d6aed217020b1183dca54989844fb0.tar.gz guix-9bc0f45df5d6aed217020b1183dca54989844fb0.zip |
Merge remote-tracking branch 'origin/master' into core-updates-frozen
Diffstat (limited to 'gnu/packages/php.scm')
-rw-r--r-- | gnu/packages/php.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/php.scm b/gnu/packages/php.scm index 44eab76918..b81fae1f74 100644 --- a/gnu/packages/php.scm +++ b/gnu/packages/php.scm @@ -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) |