dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

php84: 8.4.0beta3 -> 8.4.0RC3

Browse Source 
Changes:
https://github.com/php/php-src/blob/php-8.4.0RC3/NEWS
This commit is contained in:
Thomas Gerbet 2024-11-02 00:13:48 +01:00
parent 17915e169a
commit 4227516001
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/php/8.4.nix
View File

@ -4,10 +4,10 @@ let
base = callPackage ./generic.nix ( base = callPackage ./generic.nix (
_args _args
// { // {
version = "8.4.0beta3"; version = "8.4.0RC3";
phpSrc = fetchurl { phpSrc = fetchurl {
url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz"; url = "https://downloads.php.net/~saki/php-8.4.0RC3.tar.xz";
hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw="; hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY=";
}; };
} }
); );

17
pkgs/development/interpreters/php/fix-paths-php84.patch
View File

@ -13,15 +13,16 @@ index e46acf0928..ee8e5a88f8 100644
AS_VAR_IF([GETTEXT_DIR],, AS_VAR_IF([GETTEXT_DIR],,
[AC_MSG_ERROR([Cannot locate header file libintl.h])]) [AC_MSG_ERROR([Cannot locate header file libintl.h])])
diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4
--- a/sapi/apache2handler/config.m4 2018-11-07 15:35:23.000000000 +0000 index e335721f19..a5087e1320 100644
+++ b/sapi/apache2handler/config.m4 2018-11-27 00:32:28.000000000 +0000 --- a/sapi/apache2handler/config.m4
@@ -66,7 +66,7 @@ +++ b/sapi/apache2handler/config.m4
AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) @@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then
fi AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],
[AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])
- APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)
+ APXS_LIBEXECDIR="$prefix/modules" + APXS_LIBEXECDIR="$prefix/modules"
if test -z `$APXS -q SYSCONFDIR`; then if test -z $($APXS -q SYSCONFDIR); then
INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \