git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/tests/php: Declare php package used instead of just using default
commitc6f0a1db39eae371e81c4c46541e59dce828580a authorElis Hirwing <elis@hirwing.se> dateSat 27 Feb 2021, 19:39 (6 years ago) parentac8a8fe
4 files changed+18−14
compare with master
unifiedsplit
nixos/tests/php/default.nix+7−6 nixos/tests/php/fpm.nix+4−3 nixos/tests/php/httpd.nix+4−3 nixos/tests/php/pcre.nix+3−2
nixos/tests/php/default.nix+7−6
@@ -1,8 +1,9 @@
1−{ system ? builtins.currentSystem,
2− config ? {},
3− pkgs ? import ../../.. { inherit system config; }
1+{ system ? builtins.currentSystem
2+, config ? {}
3+, pkgs ? import ../../.. { inherit system config; }
4+, php ? pkgs.php
45}: {
5− fpm = import ./fpm.nix { inherit system pkgs; };
6− httpd = import ./httpd.nix { inherit system pkgs; };
7− pcre = import ./pcre.nix { inherit system pkgs; };
6+ fpm = import ./fpm.nix { inherit system pkgs php; };
7+ httpd = import ./httpd.nix { inherit system pkgs php; };
8+ pcre = import ./pcre.nix { inherit system pkgs php; };
89}
nixos/tests/php/fpm.nix+4−3
@@ -1,5 +1,5 @@
1−import ../make-test-python.nix ({pkgs, lib, ...}: {
2− name = "php-fpm-nginx-test";
1+import ../make-test-python.nix ({pkgs, lib, php, ...}: {
2+ name = "php-${php.version}-fpm-nginx-test";
33 meta.maintainers = lib.teams.php.members;
44
55 machine = { config, lib, pkgs, ... }: {
@@ -25,6 +25,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
2525
2626 services.phpfpm.pools."foobar" = {
2727 user = "nginx";
28+ phpPackage = php;
2829 settings = {
2930 "listen.group" = "nginx";
3031 "listen.mode" = "0600";
@@ -44,7 +45,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
4445
4546 # Check so we get an evaluated PHP back
4647 response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
47− assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected"
48+ assert "PHP Version ${php.version}" in response, "PHP version not detected"
4849
4950 # Check so we have database and some other extensions loaded
5051 for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
nixos/tests/php/httpd.nix+4−3
@@ -1,5 +1,5 @@
1−import ../make-test-python.nix ({pkgs, lib, ...}: {
2− name = "php-httpd-test";
1+import ../make-test-python.nix ({pkgs, lib, php, ...}: {
2+ name = "php-${php.version}-httpd-test";
33 meta.maintainers = lib.teams.php.members;
44
55 machine = { config, lib, pkgs, ... }: {
@@ -14,6 +14,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
1414 index = "index.php index.html";
1515 };
1616 };
17+ phpPackage = php;
1718 enablePHP = true;
1819 };
1920 };
@@ -22,7 +23,7 @@ import ../make-test-python.nix ({pkgs, lib, ...}: {
2223
2324 # Check so we get an evaluated PHP back
2425 response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/")
25− assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected"
26+ assert "PHP Version ${php.version}" in response, "PHP version not detected"
2627
2728 # Check so we have database and some other extensions loaded
2829 for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]:
nixos/tests/php/pcre.nix+3−2
@@ -1,7 +1,7 @@
11let
22 testString = "can-use-subgroups";
3−in import ../make-test-python.nix ({lib, ...}: {
4− name = "php-httpd-pcre-jit-test";
3+in import ../make-test-python.nix ({lib, php, ...}: {
4+ name = "php-${php.version}-httpd-pcre-jit-test";
55 meta.maintainers = lib.teams.php.members;
66
77 machine = { lib, pkgs, ... }: {
@@ -9,6 +9,7 @@ in import ../make-test-python.nix ({lib, ...}: {
99 services.httpd = {
1010 enable = true;
1111 adminAddr = "please@dont.contact";
12+ phpPackage = php;
1213 enablePHP = true;
1314 phpOptions = "pcre.jit = true";
1415 extraConfig = let