Merge: php84: 8.4.0RC4 -> 8.4.1 (#357904)

Changed files
+5 -31
pkgs
development
interpreters
php
php-packages
top-level
+3 -6
pkgs/development/interpreters/php/8.4.nix
···
-
{ callPackage, fetchurl, ... }@_args:
+
{ callPackage, ... }@_args:
let
base = callPackage ./generic.nix (
_args
// {
-
version = "8.4.0RC4";
-
phpSrc = fetchurl {
-
url = "https://downloads.php.net/~calvinb/php-8.4.0RC4.tar.xz";
-
hash = "sha256-s/ihnYRfSqVlAV/4YZZAfrUzKE60NlrFlT9edK5h3LA=";
-
};
+
version = "8.4.1";
+
hash = "sha256-74onARjtEot2X8MfGYx/RlDIFxQRsPajoaOroR/KzCM=";
}
);
in
+2 -18
pkgs/development/php-packages/apcu/default.nix
···
}:
let
-
version = "5.1.23";
+
version = "5.1.24";
in
buildPecl {
inherit version;
···
owner = "krakjoe";
repo = "apcu";
rev = "v${version}";
-
sha256 = "sha256-UDKLLCCnYJj/lCD8ZkkDf2WYZMoIbcP75+0/IXo4vdQ=";
+
sha256 = "sha256-g+Oo6y+24VOWHaDZ23iItkGwOa5bTtKMAjZOmAi6EOo=";
};
-
-
patches = [
-
# Fix broken test (apc_entry_002) with PHP 8.4 alpha1
-
# See https://github.com/krakjoe/apcu/issues/510
-
(fetchpatch {
-
url = "https://github.com/krakjoe/apcu/commit/9dad016db50cc46321afec592ea9b49520c1cf13.patch";
-
hash = "sha256-8CPUNhEGCVVSXWYridN1+4N4JzCfXZbmUIsPYs/9jfk=";
-
})
-
-
# Fix ZTS detection in tests with PHP 8.4
-
# https://github.com/krakjoe/apcu/pull/511
-
(fetchpatch {
-
url = "https://github.com/krakjoe/apcu/commit/15766e615264620427c2db37061ca9614d3b7319.patch";
-
hash = "sha256-gbSkx47Uo9E28CfJJj4+3ydcw8cXW9NNN/3FuYYTVPY=";
-
})
-
];
buildInputs = [ pcre2 ];
doCheck = true;
-7
pkgs/top-level/php-packages.nix
···
url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.patch";
hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
})
-
]
-
++ lib.optionals (lib.versionAtLeast php.version "8.3") [
-
# https://github.com/php/php-src/pull/16733 (fix soap test)
-
(fetchpatch {
-
url = "https://github.com/php/php-src/commit/5c308d61db104854e4ff84ab123e3ea56e1b4046.patch";
-
hash = "sha256-xQ4Sg4kL0cgHYauRW2AzGgFXfcqtxeRVhI9zNh7CsoM=";
-
})
];
}
{