From db439da3cdc5d3162dd275a54dcbb6d94f7230cd Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 28 Feb 2021 21:16:08 +0100 Subject: [PATCH] nixos/tests/php: Select the right versions of the tests depending on version --- nixos/tests/all-tests.nix | 3 +++ pkgs/development/interpreters/php/generic.nix | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 773f91d8604..7d676e15fa9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -307,6 +307,9 @@ in pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; php = handleTest ./php {}; + php73 = handleTest ./php { php = pkgs.php73; }; + php74 = handleTest ./php { php = pkgs.php74; }; + php80 = handleTest ./php { php = pkgs.php80; }; pinnwand = handleTest ./pinnwand.nix {}; plasma5 = handleTest ./plasma5.nix {}; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix {}; diff --git a/pkgs/development/interpreters/php/generic.nix b/pkgs/development/interpreters/php/generic.nix index ec5f955370f..659157e24c4 100644 --- a/pkgs/development/interpreters/php/generic.nix +++ b/pkgs/development/interpreters/php/generic.nix @@ -112,7 +112,8 @@ let withExtensions = mkWithExtensions allArgs allExtensionFunctions; phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; - tests = nixosTests.php; + # Select the right php tests for the php version + tests = nixosTests."php${lib.strings.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor php.version)}"; inherit (php-packages) extensions buildPecl; packages = php-packages.tools; meta = php.meta // {