BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

php: Drop special cases for versions below 8.0

Browse source
This commit is contained in:
Elis Hirwing 2022-05-25 19:05:55 +02:00
parent 125ad85c09
commit 9ec41c8875
No known key found for this signature in database
GPG key ID: D57EFA625C9A925F
1 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
pkgs/top-level/php-packages.nix
View file

@ -335,13 +335,6 @@ lib.makeScope pkgs.newScope (self: with self; {
configureFlags = [
"--with-iconv${lib.optionalString stdenv.isDarwin "=${libiconv}"}"
];
patches = lib.optionals (lib.versionOlder php.version "8.0") [
# Header path defaults to FHS location, preventing the configure script from detecting errno support.
(fetchpatch {
url = "https://github.com/fossar/nix-phps/raw/263861a8c9bdafd7abe44db6db4ef0179643680c/pkgs/iconv-header-path.patch";
sha256 = "7GHnEUu+hcsQ4h3itDwk6p46ZKfib9JZ2XpWlXrdn6E=";
})
];
doCheck = false;
}
{
@ -355,7 +348,6 @@ lib.makeScope pkgs.newScope (self: with self; {
name = "intl";
buildInputs = [ icu64 ];
}
{ name = "json"; enable = lib.versionOlder php.version "8.0"; }
{
name = "ldap";
buildInputs = [ openldap cyrus_sasl ];
@ -371,9 +363,7 @@ lib.makeScope pkgs.newScope (self: with self; {
}
{
name = "mbstring";
buildInputs = [ oniguruma ] ++ lib.optionals (lib.versionAtLeast php.version "8.0") [
pcre2
];
buildInputs = [ oniguruma pcre2 ];
doCheck = false;
}
{
@ -406,11 +396,9 @@ lib.makeScope pkgs.newScope (self: with self; {
'')
];
}
# oci8 (7.4, 7.3, 7.2)
# odbc (7.4, 7.3, 7.2)
{
name = "opcache";
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin && lib.versionAtLeast php.version "8.0") [
buildInputs = [ pcre2 ] ++ lib.optionals (!stdenv.isDarwin) [
valgrind.dev
];
zendExtension = true;
@ -433,14 +421,12 @@ lib.makeScope pkgs.newScope (self: with self; {
enable = (!stdenv.isDarwin);
doCheck = false;
}
# pdo_firebird (7.4, 7.3, 7.2)
{
name = "pdo_mysql";
internalDeps = with php.extensions; [ pdo mysqlnd ];
configureFlags = [ "--with-pdo-mysql=mysqlnd" "PHP_MYSQL_SOCK=/run/mysqld/mysqld.sock" ];
doCheck = false;
}
# pdo_oci (7.4, 7.3, 7.2)
{
name = "pdo_odbc";
internalDeps = [ php.extensions.pdo ];
@ -490,7 +476,7 @@ lib.makeScope pkgs.newScope (self: with self; {
'';
doCheck = false;
}
{ name = "session"; doCheck = lib.versionOlder php.version "8.0"; }
{ name = "session"; doCheck = false; }
{ name = "shmop"; }
{
name = "simplexml";
@ -548,15 +534,6 @@ lib.makeScope pkgs.newScope (self: with self; {
"--enable-xmlreader"
];
}
{
name = "xmlrpc";
buildInputs = [ libxml2 libiconv ];
# xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc
enable = lib.versionOlder php.version "8.0";
configureFlags = [
"--with-xmlrpc"
];
}
{
name = "xmlwriter";
buildInputs = [ libxml2 ];
@ -567,7 +544,7 @@ lib.makeScope pkgs.newScope (self: with self; {
{
name = "xsl";
buildInputs = [ libxslt libxml2 ];
doCheck = lib.versionOlder php.version "8.0";
doCheck = false;
configureFlags = [ "--with-xsl=${libxslt.dev}" ];
}
{ name = "zend_test"; }