commit cb08d3dd72f51fd20d26c823204faa11d742cfe1 · pyrox.dev/nixpkgs

+4 -7

nixos/modules/config/nix-channel.nix

···

       97
       97
        
       

     

       98
       98
        
           nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault "");

     

       99
       99
        
       

     

       100
       100
       -
           system.activationScripts.nix-channel = mkIf cfg.channel.enable

     

       101
       101
       -
             (stringAfter [ "etc" "users" ] ''

     

       102
       102
       -
               # Subscribe the root user to the NixOS channel by default.

     

       103
       103
       -
               if [ ! -e "/root/.nix-channels" ]; then

     

       104
       104
       -
                   echo "${config.system.defaultChannel} nixos" > "/root/.nix-channels"

     

       105
       105
       -
               fi

     

       106
       106
       -
             '');

     

       100
       100
       +
           systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [

     

       101
       101
       +
             "f /root/.nix-channels -"

     

       102
       102
       +
             ''w "/root/.nix-channels" - - - - "${config.system.defaultChannel} nixos\n"''

     

       103
       103
       +
           ];

     

       107
       104
        
         };

     

       108
       105
        
       }

+16

nixos/tests/activation/nix-channel.nix

···

       1
       1
       +
       { lib, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
       

     

       5
       5
       +
         name = "activation-nix-channel";

     

       6
       6
       +
       

     

       7
       7
       +
         meta.maintainers = with lib.maintainers; [ nikstur ];

     

       8
       8
       +
       

     

       9
       9
       +
         nodes.machine = {

     

       10
       10
       +
           nix.channel.enable = true;

     

       11
       11
       +
         };

     

       12
       12
       +
       

     

       13
       13
       +
         testScript = ''

     

       14
       14
       +
           print(machine.succeed("cat /root/.nix-channels"))

     

       15
       15
       +
         '';

     

       16
       16
       +
       }

+1

nixos/tests/all-tests.nix

···

       265
       265
        
         etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };

     

       266
       266
        
         activation = pkgs.callPackage ../modules/system/activation/test.nix { };

     

       267
       267
        
         activation-var = runTest ./activation/var.nix;

     

       268
       268
       +
         activation-nix-channel = runTest ./activation/nix-channel.nix;

     

       268
       269
        
         etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};

     

       269
       270
        
         etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};

     

       270
       271
        
         etebase-server = handleTest ./etebase-server.nix {};