Unverified Commit 4c110cd3 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #334628 from piotrkwiecinski/8.4beta1 

php84: 8.4.0alpha4 -> 8.4.0beta3
parents 94574c75 3e432331

pkgs/development/interpreters/php/8.4.nix

+3 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ let 
  base = callPackage ./generic.nix (

    _args

    // {

      version = "8.4.0alpha4";

      version = "8.4.0beta3";

      phpSrc = fetchurl {

        url = "https://downloads.php.net/~saki/php-8.4.0alpha4.tar.xz";

        hash = "sha256-v411aNKrbteDZnkfpai8SqUgWFQbqZJbzPF5mdCr2Og=";

        url = "https://downloads.php.net/~calvinb/php-8.4.0beta3.tar.xz";

        hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw=";

      };

    }

  );

pkgs/development/interpreters/php/fix-paths-php84.patch

0 → 100644
+27 −0
Original line number Diff line number Diff line 
diff --git a/ext/gettext/config.m4 b/ext/gettext/config.m4

index e46acf0928..ee8e5a88f8 100644

--- a/ext/gettext/config.m4

+++ b/ext/gettext/config.m4

@@ -4,9 +4,7 @@ PHP_ARG_WITH([gettext],

     [Include GNU gettext support])])

 

 if test "$PHP_GETTEXT" != "no"; then

-  for i in $PHP_GETTEXT /usr/local /usr; do

-    AS_IF([test -r $i/include/libintl.h], [GETTEXT_DIR=$i; break;])

-  done

+  GETTEXT_DIR=$PHP_GETTEXT

 

   AS_VAR_IF([GETTEXT_DIR],,

     [AC_MSG_ERROR([Cannot locate header file libintl.h])])

diff -ru a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4

--- a/sapi/apache2handler/config.m4	2018-11-07 15:35:23.000000000 +0000

+++ b/sapi/apache2handler/config.m4	2018-11-27 00:32:28.000000000 +0000

@@ -66,7 +66,7 @@

     AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required])

   fi

 

-  APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR`

+  APXS_LIBEXECDIR="$prefix/modules"

   if test -z `$APXS -q SYSCONFDIR`; then

     INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \

                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \

pkgs/development/interpreters/php/generic.nix

+5 −1
Original line number Diff line number Diff line
@@ -313,7 +313,11 @@ let 


          src = if phpSrc == null then defaultPhpSrc else phpSrc;



          patches = [ ./fix-paths-php7.patch ] ++ extraPatches;

          patches = lib.optionals (lib.versionOlder version "8.4")  [

            ./fix-paths-php7.patch

          ] ++ lib.optionals (lib.versionAtLeast version "8.4") [

            ./fix-paths-php84.patch

          ] ++ extraPatches;



          separateDebugInfo = true;

pkgs/top-level/php-packages.nix

+0 −8
Original line number Diff line number Diff line
@@ -417,14 +417,6 @@ in { 
              hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";

              excludes = [ "NEWS" ];

            })

          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.4") [

            # Fix compatibility with libxml2 ≥ 2.13.2

            # https://github.com/php/php-src/issues/15331

            (fetchpatch {

              url = "https://github.com/php/php-src/commit/8d7365b6f009ba43e305d6459013ac4fbed7c606.diff?full_index=1";

              hash = "sha256-ct0Ml9kjjcRLryjxMsUQQsDXiDExjpnCnWKf+mYgTsQ=";

              excludes = [ "NEWS" ];

            })

          ];

        }

        {