dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixosTest.nix-upgrade: actually use nix-daemon for build

Browse Source 
root by-passes nix-daemon
This commit is contained in:
Jörg Thalheim 2024-08-23 10:57:22 +02:00
parent 19f85e2650
commit d01abc5602
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
nixos/tests/nix/upgrade.nix
View File

@ -8,12 +8,13 @@ let
}'';
inputDrv = import ../.. {
configuration =
{
imports = [ nixos-module ];
nix.package = nixVersions.latest;
boot.isContainer = true;
};
configuration = {
imports = [ nixos-module ];
nix.package = nixVersions.latest;
boot.isContainer = true;
users.users.alice.isNormalUser = true;
};
system = pkgs.system;
};
@ -76,7 +77,7 @@ pkgs.testers.nixosTest {
if not match: raise Exception("Couldn't find new version in output: " + result)
with subtest("nix-build-with-mismatch-daemon"):
machine.succeed("nix build --expr 'derivation {name =\"test\"; system = \"${pkgs.system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")
machine.succeed("runuser -u alice -- nix build --expr 'derivation {name =\"test\"; system = \"${pkgs.system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")
with subtest("remove-new-nix"):
@ -99,6 +100,6 @@ pkgs.testers.nixosTest {
if not match: raise Exception("Couldn't find new version in output: " + result)
with subtest("nix-build-with-new-daemon"):
machine.succeed("nix build --expr 'derivation {name =\"test-new\"; system = \"${pkgs.system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")
machine.succeed("runuser -u alice -- nix build --expr 'derivation {name =\"test-new\"; system = \"${pkgs.system}\";builder = \"/bin/sh\"; args = [\"-c\" \"echo test > $out\"];}' --print-out-paths")
'';
}