Propagate the correct variant of the Nix process management framework as a parameter

example-deployments/disnix/processes-bare.nix

@@ -10,13 +10,14 @@
 , forceDisableUserChange ? false
 , processManager
 , enablePAM ? false
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   ids = if builtins.pathExists ./ids-bare.nix then (import ./ids-bare.nix).ids else {};
 
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 in
 rec {

example-deployments/disnix/processes-with-apache-mysql.nix

@@ -10,17 +10,18 @@
 , forceDisableUserChange ? false
 , processManager
 , enablePAM ? false
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   ids = if builtins.pathExists ./ids-apache-mysql.nix then (import ./ids-apache-mysql.nix).ids else {};
 
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 
   containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 in
 rec {

example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix

@@ -10,17 +10,18 @@
 , forceDisableUserChange ? false
 , processManager
 , enablePAM ? false
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   ids = if builtins.pathExists ./ids-tomcat-mysql-multi-instance.nix then (import ./ids-tomcat-mysql-multi-instance.nix).ids else {};
 
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 
   containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 in
 rec {

example-deployments/disnix/processes-with-tomcat-mysql.nix

@@ -10,17 +10,18 @@
 , forceDisableUserChange ? false
 , processManager
 , enablePAM ? false
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   ids = if builtins.pathExists ./ids-tomcat-mysql.nix then (import ./ids-tomcat-mysql.nix).ids else {};
 
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 
   containerProviderConstructors = import ../../service-containers-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager ids nix-processmgmt;
   };
 in
 rec {

example-deployments/hydra/processes.nix

@@ -10,11 +10,12 @@
 , forceDisableUserChange ? false
 , processManager
 , includeNixDaemon ? false
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt;
   };
 
   instanceSuffix = "";

release.nix

@@ -5,9 +5,6 @@
 , profiles ? [ "privileged" "unprivileged" ]
 }:
 
-let
-  pkgs = import nixpkgs {};
-in
 {
   tests = import ./tests {
     inherit nixpkgs system nix-processmgmt processManagers profiles;

tests/apache-tomcat-ajp-reverse-proxy/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
 
   readiness = {instanceName, instance, stateDir, ...}:
     if instanceName == "tomcat" then ''

tests/apache-tomcat-ajp-reverse-proxy/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/apache-tomcat/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
 
   nixosConfig = {
     virtualisation.diskSize = 8192;

tests/apache-tomcat/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/apache/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
 
   readiness = {instanceName, instance, ...}:
     ''

tests/apache/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 
   webappStatic = pkgs.stdenv.mkDerivation {

tests/default.nix

@@ -14,59 +14,59 @@ let
 in
 {
   apache = import ./apache {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   apache-tomcat = import ./apache-tomcat {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   apache-tomcat-ajp-reverse-proxy = import ./apache-tomcat-ajp-reverse-proxy {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   disnix = import ./disnix/bare {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   disnix-with-apache-mysql = import ./disnix/apache-mysql {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   disnix-with-tomcat-mysql = import ./disnix/tomcat-mysql {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   disnix-with-tomcat-mysql-multi-instance = import ./disnix/tomcat-mysql-multi-instance {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   docker = import ./docker {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   fcron = import ./fcron {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   hydra = import ./hydra {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   influxdb = import ./influxdb {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   mongodb = import ./mongodb {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   mysql = import ./mysql {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   nginx = import ./nginx/simple-webapp {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   nginx-reverse-proxy-hostbased = import ./nginx/reverse-proxy-hostbased {
@@ -74,34 +74,34 @@ in
   };
 
   nginx-reverse-proxy-pathbased = import ./nginx/reverse-proxy-pathbased {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   postgresql = import ./postgresql {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   s6-svscan = import ./s6-svscan {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   sshd = import ./sshd {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   supervisord = import ./supervisord {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   svnserve = import ./svnserve {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   xinetd = import ./xinetd/declarative {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 
   xinetd-extendable = import ./xinetd/extendable {
-    inherit pkgs processManagers profiles testService;
+    inherit pkgs processManagers profiles testService nix-processmgmt;
   };
 }

tests/disnix/apache-mysql/default.nix

@@ -1,10 +1,13 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client";
 in
 testService {
   exprFile = ../../../example-deployments/disnix/processes-with-apache-mysql.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.disnix ];
 
   initialTests = {forceDisableUserChange, ...}:

tests/disnix/bare/default.nix

@@ -1,10 +1,13 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client";
 in
 testService {
   exprFile = ../../../example-deployments/disnix/processes-bare.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.disnix ];
 
   initialTests = {forceDisableUserChange, ...}:

tests/disnix/tomcat-mysql-multi-instance/default.nix

@@ -1,10 +1,13 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   env = "NIX_PATH='nixpkgs=${<nixpkgs>}' SSH_OPTS='-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no' DISNIX_REMOTE_CLIENT=disnix-client";
 in
 testService {
   exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql-multi-instance.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.disnix ];
 
   initialTests = {forceDisableUserChange, ...}:

tests/disnix/tomcat-mysql/default.nix

@@ -1,10 +1,13 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   env = "NIX_PATH='nixpkgs=${<nixpkgs>}' DISNIX_CLIENT_INTERFACE=disnix-soap-client DISNIX_TARGET_PROPERTY=targetEPR DISNIX_SOAP_CLIENT_USERNAME=admin DISNIX_SOAP_CLIENT_PASSWORD=secret";
 in
 testService {
   exprFile = ../../../example-deployments/disnix/processes-with-tomcat-mysql.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.disnix pkgs.DisnixWebService ];
 
   readiness = {instanceName, instance, ...}:

tests/docker/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.docker ];
 
   readiness = {instanceName, instance, runtimeDir, ...}:

tests/docker/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/fcron/default.nix

@@ -1,11 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
-
-  readiness = {instanceName, instance, ...}:
-    ''
-    '';
+  extraParams = {
+    inherit nix-processmgmt;
+  };
 
   tests = {instanceName, instance, ...}:
     ''

tests/fcron/processes.nix

@@ -11,11 +11,12 @@
 , callingUser ? null
 , callingGroup ? null
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange callingUser callingGroup processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange callingUser callingGroup processManager nix-processmgmt;
   };
 in
 rec {

tests/hydra/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   node-hydra-connector = (import ./nodepkgs {
@@ -63,6 +63,9 @@ let
 in
 testService {
   exprFile = ../../example-deployments/hydra/processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   nixosConfig = {
     virtualisation.memorySize = 1024;
     virtualisation.diskSize = 8192;
@@ -161,5 +164,8 @@ testService {
       )
     '';
 
-  inherit processManagers profiles;
+  inherit processManagers;
+
+  # We don't support unprivileged user deployments
+  profiles = builtins.filter (profile: profile == "privileged") profiles;
 }

tests/influxdb/default.nix

@@ -1,8 +1,11 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
   systemPackages = [ pkgs.influxdb ];
+  extraParams = {
+    inherit nix-processmgmt;
+  };
 
   readiness = {instanceName, instance, ...}:
     ''

tests/influxdb/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/mongodb/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
@@ -7,6 +7,10 @@ testService {
     virtualisation.memorySize = 1024;
     virtualisation.diskSize = 8192;
   };
+  extraParams = {
+    inherit nix-processmgmt;
+  };
+
   readiness = {instanceName, instance, ...}:
     ''
       machine.wait_for_open_port(${toString instance.port})

tests/mongodb/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/mysql/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.mysql ];
 
   readiness = {instanceName, instance, ...}:

tests/mysql/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/nginx/reverse-proxy-hostbased/processes.nix

@@ -1,6 +1,5 @@
 { pkgs ? import <nixpkgs> { inherit system; }
 , system ? builtins.currentSystem
-, nix-processmgmt
 , stateDir ? "/var"
 , runtimeDir ? "${stateDir}/run"
 , logDir ? "${stateDir}/log"
@@ -10,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../../nix-processmgmt
 }:
 
 let
   sharedConstructors = import ../../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir cacheDir spoolDir libDir tmpDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir cacheDir spoolDir libDir tmpDir forceDisableUserChange processManager nix-processmgmt;
   };
 
   constructors = import "${nix-processmgmt}/examples/webapps-agnostic/constructors/constructors.nix" {

tests/nginx/reverse-proxy-pathbased/default.nix

@@ -1,7 +1,11 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
+
   nixosConfig = {
     virtualisation.memorySize = 1024;
   };

tests/nginx/reverse-proxy-pathbased/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 
   webappStatic = pkgs.stdenv.mkDerivation {

tests/nginx/simple-webapp/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
 
   readiness = {instanceName, instance, ...}:
     ''

tests/nginx/simple-webapp/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 
   webappStatic = from: pkgs.stdenv.mkDerivation {

tests/postgresql/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.postgresql ];
   nixosConfig = {
     virtualisation.diskSize = 8192;

tests/postgresql/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/s6-svscan/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   generateTestExecutable = instanceName:
@@ -42,6 +42,9 @@ let
 in
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.s6-rc ];
 
   readiness = {instanceName, instance, runtimeDir, ...}:

tests/s6-svscan/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/sshd/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.openssh ];
 
   initialTests = {forceDisableUserChange, ...}:

tests/sshd/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir spoolDir libDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/supervisord/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 let
   generateTestExecutable = instanceName:
@@ -27,6 +27,9 @@ let
 in
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.pythonPackages.supervisor ];
 
   readiness = {instanceName, instance, ...}:

tests/supervisord/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/svnserve/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.subversion ];
 
   readiness = {instanceName, instance, ...}:

tests/svnserve/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/xinetd/declarative/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.inetutils ];
 
   readiness = {instanceName, instance, ...}:

tests/xinetd/declarative/processes.nix

@@ -10,11 +10,12 @@
 , forceDisableUserChange ? false
 , callingUser ? null
 , processManager
+, nix-processmgmt ? ../../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {

tests/xinetd/extendable/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, testService, processManagers, profiles }:
+{ pkgs, testService, processManagers, profiles, nix-processmgmt }:
 
 testService {
   exprFile = ./processes.nix;
+  extraParams = {
+    inherit nix-processmgmt;
+  };
   systemPackages = [ pkgs.inetutils ];
 
   tests = {instanceName, instance, stateDir, runtimeDir, forceDisableUserChange, ...}:

tests/xinetd/extendable/processes.nix

@@ -9,11 +9,12 @@
 , tmpDir ? (if stateDir == "/var" then "/tmp" else "${stateDir}/tmp")
 , forceDisableUserChange ? false
 , processManager
+, nix-processmgmt ? ../../../../nix-processmgmt
 }:
 
 let
   constructors = import ../../../services-agnostic/constructors.nix {
-    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager;
+    inherit pkgs stateDir runtimeDir logDir tmpDir cacheDir libDir spoolDir forceDisableUserChange processManager nix-processmgmt;
   };
 in
 rec {