lix-project/lix
18
37
Fork 14
Code Issues 286 Code Review (Gerrit) Projects 1 Releases Wiki Activity

Merge "nixos/tests: enable remoteBuilds tests against Nix 2.18" into main

Browse source
This commit is contained in:
Pierre Bourdon 2024-05-24 00:55:25 +00:00 committed by Gerrit Code Review
parent 00bf2b105d 6260563bed
commit 6ade981476
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tests/nixos/default.nix
View file

@ -62,7 +62,14 @@ in
};
});
# TODO: (nixpkgs update) remoteBuilds_remote_2_18 = ...
remoteBuilds_remote_2_18 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
name = "remoteBuilds_remote_2_18";
imports = [ ./remote-builds.nix ];
builders.config = { lib, pkgs, ... }: {
imports = [ checkOverrideNixVersion ];
nix.package = lib.mkForce pkgs.nixVersions.nix_2_18;
};
});
# Test our Nix as a builder for clients that are older
@ -84,7 +91,14 @@ in
};
});
# TODO: (nixpkgs update) remoteBuilds_local_2_18 = ...
remoteBuilds_local_2_18 = runNixOSTestFor "x86_64-linux" ({ lib, pkgs, ... }: {
name = "remoteBuilds_local_2_18";
imports = [ ./remote-builds.nix ];
nodes.client = { lib, pkgs, ... }: {
imports = [ checkOverrideNixVersion ];
nix.package = lib.mkForce pkgs.nixVersions.nix_2_18;
};
});
# End remoteBuilds tests
@ -110,7 +124,14 @@ in
};
};
# TODO: (nixpkgs update) remoteBuildsSshNg_remote_2_18 = ...
remoteBuildsSshNg_remote_2_18 = runNixOSTestFor "x86_64-linux" {
name = "remoteBuildsSshNg_remote_2_18";
imports = [ ./remote-builds-ssh-ng.nix ];
builders.config = { lib, pkgs, ... }: {
imports = [ checkOverrideNixVersion ];
nix.package = lib.mkForce pkgs.nixVersions.nix_2_18;
};
};
# Test our Nix as a builder for clients that are older