summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authortalyz <kim.lindberger@gmail.com>2021-10-06 19:19:29 +0200
committerYuka <yuka@yuka.dev>2021-10-28 12:55:01 +0200
commitaf9f6d9a2aeb279408bcbb90db16ef3f727e2601 (patch)
tree65507f4953525990ee1221d45216ee4745eed84f /nixos/tests
parent84839b395f5740789af7a843aaeea80ac2f6f60b (diff)
downloadnixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.tar
nixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.tar.gz
nixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.tar.bz2
nixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.tar.lz
nixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.tar.xz
nixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.tar.zst
nixpkgs-af9f6d9a2aeb279408bcbb90db16ef3f727e2601.zip
nixos/qemu-vm: Rename pathsInNixDB to additionalPaths
pathsInNixDB isn't a very accurate name when a Nix store image is
built (virtualisation.useNixStoreImage); rename it to additionalPaths,
which should be general enough to cover both cases.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/containers-bridge.nix2
-rw-r--r--nixos/tests/containers-extra_veth.nix2
-rw-r--r--nixos/tests/containers-imperative.nix2
-rw-r--r--nixos/tests/containers-ip.nix2
-rw-r--r--nixos/tests/containers-portforward.nix2
-rw-r--r--nixos/tests/containers-tmpfs.nix2
6 files changed, 6 insertions, 6 deletions
diff --git a/nixos/tests/containers-bridge.nix b/nixos/tests/containers-bridge.nix
index 12fa67c8b01..a1b0c9469d8 100644
--- a/nixos/tests/containers-bridge.nix
+++ b/nixos/tests/containers-bridge.nix
@@ -56,7 +56,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
         };
 
 
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ];
     };
 
   testScript = ''
diff --git a/nixos/tests/containers-extra_veth.nix b/nixos/tests/containers-extra_veth.nix
index cbbb2525832..172409f56e8 100644
--- a/nixos/tests/containers-extra_veth.nix
+++ b/nixos/tests/containers-extra_veth.nix
@@ -45,7 +45,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
             };
         };
 
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ];
     };
 
   testScript =
diff --git a/nixos/tests/containers-imperative.nix b/nixos/tests/containers-imperative.nix
index 1dcccfc306a..361160b1fdc 100644
--- a/nixos/tests/containers-imperative.nix
+++ b/nixos/tests/containers-imperative.nix
@@ -17,7 +17,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
       virtualisation.memorySize = 1024;
       # Make sure we always have all the required dependencies for creating a
       # container available within the VM, because we don't have network access.
-      virtualisation.pathsInNixDB = let
+      virtualisation.additionalPaths = let
         emptyContainer = import ../lib/eval-config.nix {
           inherit (config.nixpkgs.localSystem) system;
           modules = lib.singleton {
diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix
index 5abea2dbad9..8fc42dab624 100644
--- a/nixos/tests/containers-ip.nix
+++ b/nixos/tests/containers-ip.nix
@@ -27,7 +27,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
 
       containers.webserver4 = webserverFor "10.231.136.1" "10.231.136.2";
       containers.webserver6 = webserverFor "fc00::2" "fc00::1";
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ];
     };
 
   testScript = { nodes, ... }: ''
diff --git a/nixos/tests/containers-portforward.nix b/nixos/tests/containers-portforward.nix
index 221a6f50efd..e21f6cee76a 100644
--- a/nixos/tests/containers-portforward.nix
+++ b/nixos/tests/containers-portforward.nix
@@ -29,7 +29,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
             };
         };
 
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ];
     };
 
   testScript =
diff --git a/nixos/tests/containers-tmpfs.nix b/nixos/tests/containers-tmpfs.nix
index fd9f9a252ca..0185c2d91f2 100644
--- a/nixos/tests/containers-tmpfs.nix
+++ b/nixos/tests/containers-tmpfs.nix
@@ -26,7 +26,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
           config = { };
         };
 
-      virtualisation.pathsInNixDB = [ pkgs.stdenv ];
+      virtualisation.additionalPaths = [ pkgs.stdenv ];
     };
 
   testScript = ''