From 84bca56fa2851ccf5e909cd97a10646f957f320b Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Sat, 5 Mar 2022 13:52:30 +0100
Subject: [PATCH] Replace deprecated pathsInNixDB property

---
 nixproc/backends/disnix/test-module/default.nix      | 2 +-
 nixproc/backends/docker/test-module/default.nix      | 2 +-
 nixproc/backends/s6-rc/test-module/default.nix       | 2 +-
 nixproc/backends/supervisord/test-module/default.nix | 2 +-
 nixproc/backends/systemd/test-module/default.nix     | 2 +-
 nixproc/backends/sysvinit/test-module/default.nix    | 2 +-
 nixproc/test-driver/agnostic.nix                     | 2 +-
 tests/multi-process-images.nix                       | 2 +-
 tests/webapps-agnostic-config.nix                    | 2 +-
 tests/webapps-agnostic-disnix.nix                    | 2 +-
 tests/webapps-agnostic-docker.nix                    | 2 +-
 tests/webapps-agnostic-s6-rc.nix                     | 2 +-
 tests/webapps-agnostic-supervisord-stateless.nix     | 2 +-
 tests/webapps-agnostic-supervisord.nix               | 2 +-
 tests/webapps-agnostic-systemd-user.nix              | 2 +-
 tests/webapps-agnostic-systemd.nix                   | 2 +-
 tests/webapps-agnostic-sysvinit.nix                  | 2 +-
 tests/webapps-sysvinit.nix                           | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/nixproc/backends/disnix/test-module/default.nix b/nixproc/backends/disnix/test-module/default.nix
index 5bb287d..bdde429 100644
--- a/nixproc/backends/disnix/test-module/default.nix
+++ b/nixproc/backends/disnix/test-module/default.nix
@@ -20,7 +20,7 @@ in
     pkgs.disnix
   ];
 
-  pathsInNixDB = [ processesEnvSystem ];
+  additionalPaths = [ processesEnvSystem ];
 
   deployProcessManager = "";
 
diff --git a/nixproc/backends/docker/test-module/default.nix b/nixproc/backends/docker/test-module/default.nix
index 3c3a5f5..13ba140 100644
--- a/nixproc/backends/docker/test-module/default.nix
+++ b/nixproc/backends/docker/test-module/default.nix
@@ -36,7 +36,7 @@ in
     pkgs.docker
   ];
 
-  pathsInNixDB = [ processesEnvProcessManager processesEnvSystem ];
+  additionalPaths = [ processesEnvProcessManager processesEnvSystem ];
 
   deployProcessManager = ''
     machine.succeed(
diff --git a/nixproc/backends/s6-rc/test-module/default.nix b/nixproc/backends/s6-rc/test-module/default.nix
index ed268cc..9765374 100644
--- a/nixproc/backends/s6-rc/test-module/default.nix
+++ b/nixproc/backends/s6-rc/test-module/default.nix
@@ -25,7 +25,7 @@ in
     pkgs.s6-rc
   ];
 
-  pathsInNixDB = [ processesEnvProcessManager processesEnvSystem ];
+  additionalPaths = [ processesEnvProcessManager processesEnvSystem ];
 
   deployProcessManager = ''
     machine.succeed(
diff --git a/nixproc/backends/supervisord/test-module/default.nix b/nixproc/backends/supervisord/test-module/default.nix
index f32c05a..474d859 100644
--- a/nixproc/backends/supervisord/test-module/default.nix
+++ b/nixproc/backends/supervisord/test-module/default.nix
@@ -25,7 +25,7 @@ in
     pkgs.pythonPackages.supervisor
   ];
 
-  pathsInNixDB = [ processesEnvProcessManager processesEnvSystem ];
+  additionalPaths = [ processesEnvProcessManager processesEnvSystem ];
 
   deployProcessManager = ''
     machine.succeed(
diff --git a/nixproc/backends/systemd/test-module/default.nix b/nixproc/backends/systemd/test-module/default.nix
index 0e76e8d..c0c586a 100644
--- a/nixproc/backends/systemd/test-module/default.nix
+++ b/nixproc/backends/systemd/test-module/default.nix
@@ -23,7 +23,7 @@ in
     tools.systemd
   ];
 
-  pathsInNixDB = [ processesEnvSystem ];
+  additionalPaths = [ processesEnvSystem ];
 
   deployProcessManager = ''
     machine.succeed("mkdir -p /etc/systemd-mutable/system")
diff --git a/nixproc/backends/sysvinit/test-module/default.nix b/nixproc/backends/sysvinit/test-module/default.nix
index b937a95..df9c287 100644
--- a/nixproc/backends/sysvinit/test-module/default.nix
+++ b/nixproc/backends/sysvinit/test-module/default.nix
@@ -18,7 +18,7 @@ in
     tools.sysvinit
   ];
 
-  pathsInNixDB = [ processesEnvSystem ];
+  additionalPaths = [ processesEnvSystem ];
 
   deployProcessManager = "";
 
diff --git a/nixproc/test-driver/agnostic.nix b/nixproc/test-driver/agnostic.nix
index 5304d35..7fc57be 100644
--- a/nixproc/test-driver/agnostic.nix
+++ b/nixproc/test-driver/agnostic.nix
@@ -40,7 +40,7 @@ let
             ++ processManagerSettings.nixosModules
             ++ lib.optional (nixosConfig != null) nixosConfig;
 
-          virtualisation.pathsInNixDB = processManagerSettings.pathsInNixDB;
+          virtualisation.additionalPaths = processManagerSettings.additionalPaths;
 
           nix.extraOptions = ''
             substitute = false
diff --git a/tests/multi-process-images.nix b/tests/multi-process-images.nix
index 31c190f..73f4802 100644
--- a/tests/multi-process-images.nix
+++ b/tests/multi-process-images.nix
@@ -32,7 +32,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ dockerProcessEnv ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ dockerProcessEnv ];
       virtualisation.writableStore = true;
       virtualisation.diskSize = 4096;
       virtualisation.memorySize = 8192;
diff --git a/tests/webapps-agnostic-config.nix b/tests/webapps-agnostic-config.nix
index ba01253..8dbaafc 100644
--- a/tests/webapps-agnostic-config.nix
+++ b/tests/webapps-agnostic-config.nix
@@ -26,7 +26,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
         webappUnprivilegedAutoModeConfig
         webappUnprivilegedAutoModeSysvinit
       ];
diff --git a/tests/webapps-agnostic-disnix.nix b/tests/webapps-agnostic-disnix.nix
index 4f9ecf3..f31397d 100644
--- a/tests/webapps-agnostic-disnix.nix
+++ b/tests/webapps-agnostic-disnix.nix
@@ -53,7 +53,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvForeground processesEnvDaemon processesEnvAuto processesEnvAdvanced processesEnvNoUserChange processesEnvEmpty ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvForeground processesEnvDaemon processesEnvAuto processesEnvAdvanced processesEnvNoUserChange processesEnvEmpty ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 1024;
 
diff --git a/tests/webapps-agnostic-docker.nix b/tests/webapps-agnostic-docker.nix
index dd95622..ba5e2cb 100644
--- a/tests/webapps-agnostic-docker.nix
+++ b/tests/webapps-agnostic-docker.nix
@@ -60,7 +60,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ dockerProcessEnv processesEnvForeground processesEnvDaemon processesEnvAuto processesEnvAdvanced processesEnvUnprivileged processesEnvEmpty ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ dockerProcessEnv processesEnvForeground processesEnvDaemon processesEnvAuto processesEnvAdvanced processesEnvUnprivileged processesEnvEmpty ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 8192;
       virtualisation.diskSize = 4096;
diff --git a/tests/webapps-agnostic-s6-rc.nix b/tests/webapps-agnostic-s6-rc.nix
index 1abd1da..91adeaa 100644
--- a/tests/webapps-agnostic-s6-rc.nix
+++ b/tests/webapps-agnostic-s6-rc.nix
@@ -49,7 +49,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
         s6-svscanProcessEnv
         processesEnvForeground
         processesEnvDaemon
diff --git a/tests/webapps-agnostic-supervisord-stateless.nix b/tests/webapps-agnostic-supervisord-stateless.nix
index 4df846d..56848bb 100644
--- a/tests/webapps-agnostic-supervisord-stateless.nix
+++ b/tests/webapps-agnostic-supervisord-stateless.nix
@@ -18,7 +18,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvAuto ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvAuto ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 1024;
 
diff --git a/tests/webapps-agnostic-supervisord.nix b/tests/webapps-agnostic-supervisord.nix
index 9514c2a..ab53ca3 100644
--- a/tests/webapps-agnostic-supervisord.nix
+++ b/tests/webapps-agnostic-supervisord.nix
@@ -49,7 +49,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
         supervisordProcessEnv
         processesEnvForeground
         processesEnvDaemon
diff --git a/tests/webapps-agnostic-systemd-user.nix b/tests/webapps-agnostic-systemd-user.nix
index b744fc8..9311cae 100644
--- a/tests/webapps-agnostic-systemd-user.nix
+++ b/tests/webapps-agnostic-systemd-user.nix
@@ -26,7 +26,7 @@ makeTest {
     {pkgs, lib, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvAuto processesEnvEmpty ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvAuto processesEnvEmpty ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 1024;
 
diff --git a/tests/webapps-agnostic-systemd.nix b/tests/webapps-agnostic-systemd.nix
index b63957a..c2594bb 100644
--- a/tests/webapps-agnostic-systemd.nix
+++ b/tests/webapps-agnostic-systemd.nix
@@ -40,7 +40,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvForeground processesEnvDaemon processesEnvAuto processesEnvAdvanced processesEnvEmpty ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [ processesEnvForeground processesEnvDaemon processesEnvAuto processesEnvAdvanced processesEnvEmpty ];
       virtualisation.writableStore = true;
       virtualisation.memorySize = 1024;
 
diff --git a/tests/webapps-agnostic-sysvinit.nix b/tests/webapps-agnostic-sysvinit.nix
index 8b5cd6a..9507dae 100644
--- a/tests/webapps-agnostic-sysvinit.nix
+++ b/tests/webapps-agnostic-sysvinit.nix
@@ -65,7 +65,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
         webappUnprivilegedForegroundMode
         webappUnprivilegedDaemonMode
         webappUnprivilegedAutoMode
diff --git a/tests/webapps-sysvinit.nix b/tests/webapps-sysvinit.nix
index 0a6bfab..b9549d4 100644
--- a/tests/webapps-sysvinit.nix
+++ b/tests/webapps-sysvinit.nix
@@ -49,7 +49,7 @@ makeTest {
     {pkgs, ...}:
 
     {
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
+      virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
         webappUnprivileged
         processesEnv
         processesEnvUnprivileged