aboutsummaryrefslogtreecommitdiff
path: root/tests/nixos/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'tests/nixos/default.nix')
-rw-r--r--tests/nixos/default.nix38
1 files changed, 1 insertions, 37 deletions
diff --git a/tests/nixos/default.nix b/tests/nixos/default.nix
index 5e8bc69ce..301eede46 100644
--- a/tests/nixos/default.nix
+++ b/tests/nixos/default.nix
@@ -33,7 +33,7 @@ let
checkOverrideNixVersion = { pkgs, lib, ... }: {
# pkgs.nix: The new Nix in this repo
# We disallow it, to make sure we don't accidentally use it.
- system.forbiddenDependenciesRegex = lib.strings.escapeRegex "nix-${pkgs.nix.version}";
+ system.forbiddenDependenciesRegexes = [ (lib.strings.escapeRegex "nix-${pkgs.nix.version}") ];
};
in
@@ -53,15 +53,6 @@ in
};
};
- remoteBuilds_remote_2_13 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
- name = "remoteBuilds_remote_2_13";
- imports = [ ./remote-builds.nix ];
- builders.config = { lib, pkgs, ... }: {
- imports = [ checkOverrideNixVersion ];
- nix.package = lib.mkForce pkgs.nixVersions.nix_2_13;
- };
- });
-
remoteBuilds_remote_2_18 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
name = "remoteBuilds_remote_2_18";
imports = [ ./remote-builds.nix ];
@@ -82,15 +73,6 @@ in
};
});
- remoteBuilds_local_2_13 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
- name = "remoteBuilds_local_2_13";
- imports = [ ./remote-builds.nix ];
- nodes.client = { lib, pkgs, ... }: {
- imports = [ checkOverrideNixVersion ];
- nix.package = lib.mkForce pkgs.nixVersions.nix_2_13;
- };
- });
-
remoteBuilds_local_2_18 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
name = "remoteBuilds_local_2_18";
imports = [ ./remote-builds.nix ];
@@ -115,15 +97,6 @@ in
};
};
- remoteBuildsSshNg_remote_2_13 = runNixOSTestFor "x86_64-linux" {
- name = "remoteBuildsSshNg_remote_2_13";
- imports = [ ./remote-builds-ssh-ng.nix ];
- builders.config = { lib, pkgs, ... }: {
- imports = [ checkOverrideNixVersion ];
- nix.package = lib.mkForce pkgs.nixVersions.nix_2_13;
- };
- };
-
remoteBuildsSshNg_remote_2_18 = runNixOSTestFor "x86_64-linux" {
name = "remoteBuildsSshNg_remote_2_18";
imports = [ ./remote-builds-ssh-ng.nix ];
@@ -146,15 +119,6 @@ in
};
});
- remoteBuildsSshNg_local_2_13 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
- name = "remoteBuildsSshNg_local_2_13";
- imports = [ ./remote-builds-ssh-ng.nix ];
- nodes.client = { lib, pkgs, ... }: {
- imports = [ checkOverrideNixVersion ];
- nix.package = lib.mkForce pkgs.nixVersions.nix_2_13;
- };
- });
-
# TODO: (nixpkgs update) remoteBuildsSshNg_local_2_18 = ...
*/