commit 868c3718279d510b058db0ee06105ce41aad07aa · pyrox.dev/nixpkgs

+2 -2

nixos/tests/all-tests.nix

···

       699
       699
        
         nixops = handleTest ./nixops/default.nix {};

     

       700
       700
        
         nixos-generate-config = handleTest ./nixos-generate-config.nix {};

     

       701
       701
        
         nixos-rebuild-install-bootloader = handleTestOn ["x86_64-linux"] ./nixos-rebuild-install-bootloader.nix {};

     

       702
       702
       -
         nixos-rebuild-specialisations = handleTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix {};

     

       703
       703
       -
         nixos-rebuild-target-host = handleTest ./nixos-rebuild-target-host.nix {};

     

       702
       702
       +
         nixos-rebuild-specialisations = runTestOn ["x86_64-linux"] ./nixos-rebuild-specialisations.nix;

     

       703
       703
       +
         nixos-rebuild-target-host = runTest ./nixos-rebuild-target-host.nix;

     

       704
       704
        
         nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };

     

       705
       705
        
         nixseparatedebuginfod = handleTest ./nixseparatedebuginfod.nix {};

     

       706
       706
        
         node-red = handleTest ./node-red.nix {};

+7 -3

nixos/tests/nixos-rebuild-specialisations.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       1
       1
       +
       { hostPkgs, ... }: {

     

       2
       2
        
         name = "nixos-rebuild-specialisations";

     

       3
       3
       +
       

     

       4
       4
       +
         # TODO: remove overlay from  nixos/modules/profiles/installation-device.nix

     

       5
       5
       +
         #        make it a _small package instead, then remove pkgsReadOnly = false;.

     

       6
       6
       +
         node.pkgsReadOnly = false;

     

       3
       7
        
       

     

       4
       8
        
         nodes = {

     

       5
       9
        
           machine = { lib, pkgs, ... }: {

     
···

       32
       36
        
       

     

       33
       37
        
         testScript =

     

       34
       38
        
           let

     

       35
       35
       -
             configFile = pkgs.writeText "configuration.nix" ''

     

       39
       39
       +
             configFile = hostPkgs.writeText "configuration.nix" ''

     

       36
       40
        
               { lib, pkgs, ... }: {

     

       37
       41
        
                 imports = [

     

       38
       42
        
                   ./hardware-configuration.nix

     
···

       119
       123
        
                 machine.fail("nixos-rebuild boot --specialisation foo")

     

       120
       124
        
                 machine.fail("nixos-rebuild boot -c foo")

     

       121
       125
        
           '';

     

       122
       122
       -
       })

     

       126
       126
       +
       }

+13 -7

nixos/tests/nixos-rebuild-target-host.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       1
       1
       +
       { hostPkgs, ... }: {

     

       2
       2
        
         name = "nixos-rebuild-target-host";

     

       3
       3
        
       

     

       4
       4
       +
         # TODO: remove overlay from  nixos/modules/profiles/installation-device.nix

     

       5
       5
       +
         #        make it a _small package instead, then remove pkgsReadOnly = false;.

     

       6
       6
       +
         node.pkgsReadOnly = false;

     

       7
       7
       +
       

     

       4
       8
        
         nodes = {

     

       5
       5
       -
           deployer = { lib, ... }: let

     

       9
       9
       +
           deployer = { lib, pkgs, ... }: let

     

       6
       10
        
             inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;

     

       7
       11
        
           in {

     

       8
       12
        
             imports = [ ../modules/profiles/installation-device.nix ];

     
···

       24
       28
        
       

     

       25
       29
        
             system.build.privateKey = snakeOilPrivateKey;

     

       26
       30
        
             system.build.publicKey = snakeOilPublicKey;

     

       27
       27
       -
             # needed to provide STC implementation for target

     

       31
       31
       +
             # We don't switch on `deployer`, but we need it to have the dependencies

     

       32
       32
       +
             # available, to be picked up by system.includeBuildDependencies above.

     

       28
       33
        
             system.switch.enable = true;

     

       29
       34
        
           };

     

       30
       35
        
       

     
···

       57
       62
        
                 system.build = {

     

       58
       63
        
                   inherit targetConfig;

     

       59
       64
        
                 };

     

       65
       65
       +
                 system.switch.enable = true;

     

       60
       66
        
       

     

       61
       67
        
                 networking.hostName = "target";

     

       62
       68
        
               }

     
···

       71
       77
        
               StrictHostKeyChecking=no

     

       72
       78
        
             '';

     

       73
       79
        
       

     

       74
       74
       -
             targetConfigJSON = pkgs.writeText "target-configuration.json"

     

       80
       80
       +
             targetConfigJSON = hostPkgs.writeText "target-configuration.json"

     

       75
       81
        
               (builtins.toJSON nodes.target.system.build.targetConfig);

     

       76
       82
        
       

     

       77
       77
       -
             targetNetworkJSON = pkgs.writeText "target-network.json"

     

       83
       83
       +
             targetNetworkJSON = hostPkgs.writeText "target-network.json"

     

       78
       84
        
               (builtins.toJSON nodes.target.system.build.networkConfig);

     

       79
       85
        
       

     

       80
       80
       -
             configFile = hostname: pkgs.writeText "configuration.nix" ''

     

       86
       86
       +
             configFile = hostname: hostPkgs.writeText "configuration.nix" ''

     

       81
       87
        
               { lib, modulesPath, ... }: {

     

       82
       88
        
                 imports = [

     

       83
       89
        
                   (modulesPath + "/virtualisation/qemu-vm.nix")

     
···

       140
       146
        
               deployer.succeed(f"mkdir -p {tmp_dir}")

     

       141
       147
        
               deployer.succeed(f"TMPDIR={tmp_dir} nixos-rebuild switch -I nixos-config=/root/configuration-1.nix --target-host root@target &>/dev/console")

     

       142
       148
        
           '';

     

       143
       143
       -
       })

     

       149
       149
       +
       }