commit 4227516001065718b5d2f4c24f0f608b57c2c13e · pyrox.dev/nixpkgs

+3 -3

pkgs/development/interpreters/php/8.4.nix

···

       4
       4
        
         base = callPackage ./generic.nix (

     

       5
       5
        
           _args

     

       6
       6
        
           // {

     

       7
       7
       -
             version = "8.4.0beta3";

     

       7
       7
       +
             version = "8.4.0RC3";

     

       8
       8
        
             phpSrc = fetchurl {

     

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

     

       10
       10
       -
               hash = "sha256-aTgUCmS3tdV304Ag05DZObLKTQ8XgpNIfHARbhpZUAw=";

     

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

     

       10
       10
       +
               hash = "sha256-6eA5w7NRfH5k+AyoIvuSEY9JgjtQqYwyZXTRSuKHBvY=";

     

       11
       11
        
             };

     

       12
       12
        
           }

     

       13
       13
        
         );

+9 -8

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

···

       13
       13
        
        

     

       14
       14
        
          AS_VAR_IF([GETTEXT_DIR],,

     

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

     

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

     

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

     

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

     

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

     

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

     

       21
       21
       -
          fi

     

       16
       16
       +
       diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4

     

       17
       17
       +
       index e335721f19..a5087e1320 100644

     

       18
       18
       +
       --- a/sapi/apache2handler/config.m4

     

       19
       19
       +
       +++ b/sapi/apache2handler/config.m4

     

       20
       20
       +
       @@ -68,7 +68,7 @@ if test "$PHP_APXS2" != "no"; then

     

       21
       21
       +
          AS_VERSION_COMPARE([$APACHE_VERSION], [2.4.0],

     

       22
       22
       +
            [AC_MSG_ERROR([Please note that Apache version >= 2.4 is required])])

     

       22
       23
        
        

     

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

     

       24
       24
       +
       -  APXS_LIBEXECDIR='$(INSTALL_ROOT)'$($APXS -q LIBEXECDIR)

     

       24
       25
        
       +  APXS_LIBEXECDIR="$prefix/modules"

     

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

     

       26
       26
       +
          if test -z $($APXS -q SYSCONFDIR); then

     

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

     

       27
       28
        
                         $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \