public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/tests/php-pcre: replace usage of deprecated services.httpd.extraSubservices

Browse Source
This commit is contained in:
Aaron Andersen 2019-08-11 10:03:28 -04:00
parent ac4327c025
commit d1129a5688
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/tests/php-pcre.nix
View File

@ -8,11 +8,8 @@ import ./make-test.nix ({ ...}: {
services.httpd = { services.httpd = {
enable = true; enable = true;
adminAddr = "please@dont.contact"; adminAddr = "please@dont.contact";
extraSubservices = lib.singleton {
function = f: {
enablePHP = true; enablePHP = true;
phpOptions = "pcre.jit = true"; phpOptions = "pcre.jit = true";
extraConfig = extraConfig =
let let
testRoot = pkgs.writeText "index.php" testRoot = pkgs.writeText "index.php"
@ -32,8 +29,6 @@ import ./make-test.nix ({ ...}: {
''; '';
}; };
}; };
};
};
testScript = { ... }: testScript = { ... }:
'' ''
$machine->waitForUnit('httpd.service'); $machine->waitForUnit('httpd.service');