diff options
| -rw-r--r-- | nixos/tests/php/default.nix | 14 | ||||
| -rw-r--r-- | nixos/tests/php/fpm.nix | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/nixos/tests/php/default.nix b/nixos/tests/php/default.nix index 6ecaed2460464..cf78c9db53b7f 100644 --- a/nixos/tests/php/default.nix +++ b/nixos/tests/php/default.nix @@ -2,8 +2,14 @@ , config ? {} , pkgs ? import ../../.. { inherit system config; } , php ? pkgs.php -}: { - fpm = import ./fpm.nix { inherit system pkgs php; }; - httpd = import ./httpd.nix { inherit system pkgs php; }; - pcre = import ./pcre.nix { inherit system pkgs php; }; +}: + +let + php' = php.buildEnv { + extensions = { enabled, all }: with all; enabled ++ [ apcu ]; + }; +in { + fpm = import ./fpm.nix { inherit system pkgs; php = php'; }; + httpd = import ./httpd.nix { inherit system pkgs; php = php'; }; + pcre = import ./pcre.nix { inherit system pkgs; php = php'; }; } diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 3550116a20107..b11f85d39cb6f 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -50,7 +50,7 @@ import ../make-test-python.nix ({pkgs, lib, php, ...}: { assert "PHP Version ${php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded - for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: + for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]: assert ext in response, f"Missing {ext} extension" machine.succeed(f'test -n "$(php -m | grep -i {ext})"') ''; |