git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #112360 from helsinki-systems/fix/php-xls-xmlrpc

phpExtensions80: fix xls, disable xmlrpc

commit173edd9547c65c31e1a5c8c26fe4d5799e01ef47 authorElis Hirwing <elis@hirwing.se> dateWed 10 Feb 2021, 10:35 (6 years ago) parentc27692cb8c532e
1 file changed+3−1
pkgs/top-level/php-packages.nix+3−1
pkgs/top-level/php-packages.nix+3−1
@@ -510,6 +510,8 @@ lib.makeScope pkgs.newScope (self: with self; {
510510 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
511511 { name = "xmlrpc";
512512 buildInputs = [ libxml2 libiconv ];
513+ # xmlrpc was unbundled in 8.0 https://php.watch/versions/8.0/xmlrpc
514+ enable = lib.versionOlder php.version "8.0";
513515 configureFlags = [ "--with-xmlrpc" ]
514516 # Required to build on darwin.
515517 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
@@ -520,7 +522,7 @@ lib.makeScope pkgs.newScope (self: with self; {
520522 ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; }
521523 { name = "xsl";
522524 buildInputs = [ libxslt libxml2 ];
523− doCheck = !(lib.versionOlder php.version "7.4");
525+ doCheck = lib.versionOlder php.version "8.0";
524526 configureFlags = [ "--with-xsl=${libxslt.dev}" ]; }
525527 { name = "zend_test"; }
526528 { name = "zip";