Unverified Commit a4945cae authored by nikstur's avatar nikstur Committed by GitHub
Browse files

Merge pull request #264831 from nikstur/nix-channel-fix-default-2 

nixos/nix-channnel: fix setting up the default channel again
parents 9e93d62a 7d0b5b3a

nixos/modules/config/nix-channel.nix

+1 −2
Original line number Diff line number Diff line
@@ -98,8 +98,7 @@ in 
    nix.settings.nix-path = mkIf (! cfg.channel.enable) (mkDefault "");



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

      "f /root/.nix-channels -"

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

      ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n''

    ];

  };

}

nixos/tests/activation/nix-channel.nix

+9 −0
Original line number Diff line number Diff line
@@ -11,7 +11,16 @@ 
  };



  testScript = { nodes, ... }: ''

    machine.start(allow_reboot=True)



    assert machine.succeed("cat /root/.nix-channels") == "${nodes.machine.system.defaultChannel} nixos\n"



    nixpkgs_unstable_channel = "https://nixos.org/channels/nixpkgs-unstable nixpkgs"

    machine.succeed(f"echo '{nixpkgs_unstable_channel}' > /root/.nix-channels")



    machine.reboot()



    assert machine.succeed("cat /root/.nix-channels") == f"{nixpkgs_unstable_channel}\n"

  '';



}