gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php85: init at 8.5.2 (#481104)

Browse Source 
Skipping the merge queue to allow the ratchet to go back a notch.
This commit is contained in:
Philip Taron
2026-01-27 07:45:33 -08:00
committed by GitHub
parent 5961d0e477 1c614d7500
commit 86fa73ce80
14 changed files with 126 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/tests/all-tests.nix
+4
View File
@@ -1254,6 +1254,10 @@ in
inherit runTest;
php = pkgs.php84;
};
php85 = import ./php/default.nix {
inherit runTest;
php = pkgs.php85;
};
phylactery = runTest ./web-apps/phylactery.nix;
pict-rs = runTest ./pict-rs.nix;
pihole-ftl = import ./pihole-ftl { inherit runTest; };
pkgs/development/interpreters/php/8.5.nix
+57
View File
@@ -0,0 +1,57 @@
{ callPackage, ... }@_args:
let
base = callPackage ./generic.nix (
_args
// {
version = "8.5.2";
hash = "sha256-9+/ezMOoELGJIGkjBlNrmaO6hmENvQeVopbPd9P7OgY=";
}
);
in
base.withExtensions (
{ all, ... }:
with all;
[
bcmath
calendar
curl
ctype
dom
exif
fileinfo
filter
ftp
gd
gettext
gmp
iconv
intl
ldap
mbstring
mysqli
mysqlnd
openssl
pcntl
pdo
pdo_mysql
pdo_odbc
pdo_pgsql
pdo_sqlite
pgsql
posix
readline
session
simplexml
sockets
soap
sodium
sysvsem
sqlite3
tokenizer
xmlreader
xmlwriter
zip
zlib
]
)
pkgs/development/interpreters/php/generic.nix
+4
View File
@@ -346,6 +346,10 @@ let
substituteInPlace $dev/bin/phpize \
--replace-fail "$out/lib" "$dev/lib"
''
+ lib.optionalString (lib.versionAtLeast version "8.5") ''
# PHP 8.5+ has lexbor built into core; dom needs its headers.
cp -r ext/lexbor/lexbor $dev/include/php/ext/lexbor/
'';
src = if phpSrc == null then defaultPhpSrc else phpSrc;
pkgs/development/php-packages/grpc/default.nix
+2
View File
@@ -3,6 +3,7 @@
pkg-config,
lib,
grpc,
php,
}:
buildPecl {
@@ -26,5 +27,6 @@ buildPecl {
homepage = "https://github.com/grpc/grpc/tree/master/src/php/ext/grpc";
license = lib.licenses.asl20;
teams = [ lib.teams.php ];
broken = lib.versionAtLeast php.version "8.5";
};
}
pkgs/development/php-packages/igbinary/default.nix
+6 -2
View File
@@ -1,5 +1,8 @@
{ buildPecl, lib }:
{
buildPecl,
lib,
php,
}:
buildPecl {
pname = "igbinary";
version = "3.2.14";
@@ -17,5 +20,6 @@ buildPecl {
homepage = "https://github.com/igbinary/igbinary/";
license = lib.licenses.bsd3;
teams = [ lib.teams.php ];
broken = lib.versionAtLeast php.version "8.5";
};
}
pkgs/development/php-packages/ioncube-loader/default.nix
+1
View File
@@ -49,6 +49,7 @@ stdenv.mkDerivation {
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
license = lib.licenses.unfree;
maintainers = with lib.maintainers; [ neverbehave ];
broken = lib.versionAtLeast php.version "8.5";
platforms = [
"x86_64-linux"
"aarch64-linux"
pkgs/development/php-packages/memcache/default.nix
+1
View File
@@ -31,5 +31,6 @@ buildPecl rec {
homepage = "https://github.com/websupport-sk/pecl-memcache";
maintainers = [ lib.maintainers.krzaczek ];
teams = [ lib.teams.php ];
broken = lib.versionAtLeast php.version "8.5";
};
}
pkgs/development/php-packages/openswoole/default.nix
+1 -1
View File
@@ -35,6 +35,6 @@ buildPecl {
You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process.
'';
teams = [ lib.teams.php ];
broken = lib.versionOlder php.version "8.2";
broken = lib.versionOlder php.version "8.2" || lib.versionAtLeast php.version "8.5";
};
}
pkgs/development/php-packages/pdo_sqlsrv/default.nix
+1
View File
@@ -22,5 +22,6 @@ buildPecl {
license = lib.licenses.mit;
homepage = "https://github.com/Microsoft/msphpsql";
teams = [ lib.teams.php ];
broken = lib.versionAtLeast php.version "8.5";
};
}
pkgs/development/php-packages/phalcon/default.nix
+1
View File
@@ -38,5 +38,6 @@ buildPecl rec {
homepage = "https://phalcon.io";
maintainers = [ lib.maintainers.krzaczek ];
teams = [ lib.teams.php ];
broken = lib.versionAtLeast php.version "8.5";
};
}
pkgs/development/php-packages/rrd/default.nix
+9
View File
@@ -3,6 +3,7 @@
lib,
pkg-config,
rrdtool,
fetchpatch,
}:
buildPecl {
@@ -19,6 +20,14 @@ buildPecl {
pkg-config
];
patches = [
# PHP 8.5 compatibility patch
(fetchpatch {
url = "https://github.com/php/pecl-processing-rrd/pull/4/commits/dd4856dc89499a0141b1710e791f0e1096c7b244.patch";
hash = "sha256-ES+cMhMBUubFB5TpTZzzKKfEK2cY737z7zCuNy4XF8Y=";
})
];
# Fix GCC 14 build.
# from incompatible pointer type [-Wincompatible-pointer-types
env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
pkgs/development/php-packages/swoole/default.nix
+1
View File
@@ -33,5 +33,6 @@ buildPecl {
homepage = "https://www.swoole.com";
license = lib.licenses.asl20;
teams = [ lib.teams.php ];
broken = lib.versionAtLeast php.version "8.5";
};
}
pkgs/top-level/all-packages.nix
+10
View File
@@ -5381,6 +5381,16 @@ with pkgs;
phpExtensions = recurseIntoAttrs php.extensions;
phpPackages = recurseIntoAttrs php.packages;
# Import PHP85 interpreter, extensions and packages
php85 = callPackage ../development/interpreters/php/8.5.nix {
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
pcre2 = pcre2.override {
withJitSealloc = false; # See https://bugs.php.net/bug.php?id=78927 and https://bugs.php.net/bug.php?id=78630
};
};
php85Extensions = recurseIntoAttrs php85.extensions;
php85Packages = recurseIntoAttrs php85.packages;
# Import PHP84 interpreter, extensions and packages
php84 = callPackage ../development/interpreters/php/8.4.nix {
stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
pkgs/top-level/php-packages.nix
+28 -22
View File
@@ -446,6 +446,10 @@ lib.makeScope pkgs.newScope (
configureFlags = [
"--enable-dom"
];
# PHP 8.5+ has lexbor built into core; dom needs its headers.
env = lib.optionalAttrs (lib.versionAtLeast php.version "8.5") {
NIX_CFLAGS_COMPILE = "-I${php.unwrapped.dev}/include/php/ext/lexbor";
};
}
{
name = "enchant";
@@ -572,28 +576,6 @@ lib.makeScope pkgs.newScope (
'')
];
}
{
name = "opcache";
buildInputs = [
pcre2
]
++ lib.optional (
!stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
) valgrind.dev;
configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit";
zendExtension = true;
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Tests are flaky on darwin
rm ext/opcache/tests/blacklist.phpt
rm ext/opcache/tests/bug66338.phpt
rm ext/opcache/tests/bug78106.phpt
rm ext/opcache/tests/issue0115.phpt
rm ext/opcache/tests/issue0149.phpt
rm ext/opcache/tests/revalidate_path_01.phpt
'';
# Tests launch the builtin webserver.
__darwinAllowLocalNetworking = true;
}
{
name = "openssl";
buildInputs = [ openssl ];
@@ -828,6 +810,30 @@ lib.makeScope pkgs.newScope (
"--with-kerberos"
];
}
]
++ lib.optionals (lib.versionOlder php.version "8.5") [
{
name = "opcache";
buildInputs = [
pcre2
]
++ lib.optional (
!stdenv.hostPlatform.isDarwin && lib.meta.availableOn stdenv.hostPlatform valgrind
) valgrind.dev;
configureFlags = lib.optional php.ztsSupport "--disable-opcache-jit";
zendExtension = true;
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# Tests are flaky on darwin
rm ext/opcache/tests/blacklist.phpt
rm ext/opcache/tests/bug66338.phpt
rm ext/opcache/tests/bug78106.phpt
rm ext/opcache/tests/issue0115.phpt
rm ext/opcache/tests/issue0149.phpt
rm ext/opcache/tests/revalidate_path_01.phpt
'';
# Tests launch the builtin webserver.
__darwinAllowLocalNetworking = true;
}
];
# Convert the list of attrs: