Replace deprecated pathsInNixDB property

This commit is contained in:
Sander van der Burg 2022-03-05 13:52:30 +01:00
parent 90c4cddb62
commit 84bca56fa2
18 changed files with 18 additions and 18 deletions

View File

@ -20,7 +20,7 @@ in
pkgs.disnix
];
pathsInNixDB = [ processesEnvSystem ];
additionalPaths = [ processesEnvSystem ];
deployProcessManager = "";

View File

@ -36,7 +36,7 @@ in
pkgs.docker
];
pathsInNixDB = [ processesEnvProcessManager processesEnvSystem ];
additionalPaths = [ processesEnvProcessManager processesEnvSystem ];
deployProcessManager = ''
machine.succeed(

View File

@ -25,7 +25,7 @@ in
pkgs.s6-rc
];
pathsInNixDB = [ processesEnvProcessManager processesEnvSystem ];
additionalPaths = [ processesEnvProcessManager processesEnvSystem ];
deployProcessManager = ''
machine.succeed(

View File

@ -25,7 +25,7 @@ in
pkgs.pythonPackages.supervisor
];
pathsInNixDB = [ processesEnvProcessManager processesEnvSystem ];
additionalPaths = [ processesEnvProcessManager processesEnvSystem ];
deployProcessManager = ''
machine.succeed(

View File

@ -23,7 +23,7 @@ in
tools.systemd
];
pathsInNixDB = [ processesEnvSystem ];
additionalPaths = [ processesEnvSystem ];
deployProcessManager = ''
machine.succeed("mkdir -p /etc/systemd-mutable/system")

View File

@ -18,7 +18,7 @@ in
tools.sysvinit
];
pathsInNixDB = [ processesEnvSystem ];
additionalPaths = [ processesEnvSystem ];
deployProcessManager = "";

View File

@ -40,7 +40,7 @@ let
++ processManagerSettings.nixosModules
++ lib.optional (nixosConfig != null) nixosConfig;
virtualisation.pathsInNixDB = processManagerSettings.pathsInNixDB;
virtualisation.additionalPaths = processManagerSettings.additionalPaths;
nix.extraOptions = ''
substitute = false

View File

@ -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;

View File

@ -26,7 +26,7 @@ makeTest {
{pkgs, ...}:
{
virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
webappUnprivilegedAutoModeConfig
webappUnprivilegedAutoModeSysvinit
];

View File

@ -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;

View File

@ -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;

View File

@ -49,7 +49,7 @@ makeTest {
{pkgs, ...}:
{
virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
s6-svscanProcessEnv
processesEnvForeground
processesEnvDaemon

View File

@ -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;

View File

@ -49,7 +49,7 @@ makeTest {
{pkgs, ...}:
{
virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
supervisordProcessEnv
processesEnvForeground
processesEnvDaemon

View File

@ -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;

View File

@ -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;

View File

@ -65,7 +65,7 @@ makeTest {
{pkgs, ...}:
{
virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
webappUnprivilegedForegroundMode
webappUnprivilegedDaemonMode
webappUnprivilegedAutoMode

View File

@ -49,7 +49,7 @@ makeTest {
{pkgs, ...}:
{
virtualisation.pathsInNixDB = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
virtualisation.additionalPaths = [ pkgs.stdenv ] ++ pkgs.coreutils.all ++ [
webappUnprivileged
processesEnv
processesEnvUnprivileged