treewide: switch to channels.nixos.org (#462725)

maintainers/scripts/update-channel-branches.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-: ${NIXOS_CHANNELS:=https://nixos.org/channels/}
+: ${NIXOS_CHANNELS:=https://channels.nixos.org/}
 : ${CHANNELS_NAMESPACE:=refs/heads/channels/}
 
 # List all channels which are currently in the repository which we would

nixos/doc/manual/development/replace-modules.section.md

@@ -37,7 +37,7 @@ nixos-unstable unless explicitly configured to do so.
 
   imports = [
     # Use postgresql service from nixos-unstable channel.
-    # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
+    # sudo nix-channel --add https://channels.nixos.org/nixos-unstable nixos-unstable
     <nixos-unstable/nixos/modules/services/databases/postgresql.nix>
   ];
 

nixos/doc/manual/installation/installing-from-other-distro.section.md

@@ -35,14 +35,14 @@ The first steps to all these are the same:
 
     ```ShellSession
     $ nix-channel --list
-    nixpkgs https://nixos.org/channels/nixpkgs-unstable
+    nixpkgs https://channels.nixos.org/nixpkgs-unstable
     ```
 
     As that channel gets released without running the NixOS tests, it
     will be safer to use the `nixos-*` channels instead:
 
     ```ShellSession
-    $ nix-channel --add https://nixos.org/channels/nixos-<version> nixpkgs
+    $ nix-channel --add https://channels.nixos.org/nixos-<version> nixpkgs
     ```
 
     Where `<version>` corresponds to the latest version available on [channels.nixos.org](https://channels.nixos.org/).

nixos/doc/manual/release-notes/rl-1809.section.md

@@ -39,7 +39,7 @@ Notable changes and additions for 18.09 include:
   For example
 
   ```ShellSession
-  $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable nixpkgsunstable
+  $ nix-channel --add https://channels.nixos.org/nixpkgs-unstable nixpkgsunstable
   $ nix-channel --update
   $ nix-build '<nixpkgsunstable>' -A gitFull
   $ nix run -f '<nixpkgsunstable>' gitFull

nixos/modules/services/continuous-integration/gitlab-runner.nix

@@ -318,7 +318,7 @@ in
 
               ''${pkgs.nix}/bin/nix-env -i ''${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])}
 
-              ''${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+              ''${pkgs.nix}/bin/nix-channel --add https://channels.nixos.org/nixpkgs-unstable
               ''${pkgs.nix}/bin/nix-channel --update nixpkgs
             ''';
             environmentVariables = {

nixos/modules/tasks/auto-upgrade.nix

@@ -52,7 +52,7 @@ in
       channel = lib.mkOption {
         type = lib.types.nullOr lib.types.str;
         default = null;
-        example = "https://nixos.org/channels/nixos-14.12-small";
+        example = "https://channels.nixos.org/nixos-14.12-small";
         description = ''
           The URI of the NixOS channel to use for automatic
           upgrades. By default, this is the channel set using

nixos/tests/activation/nix-channel.nix

@@ -17,7 +17,7 @@
 
       assert machine.succeed("cat /root/.nix-channels") == "${nodes.machine.system.defaultChannel} nixos\n"
 
-      nixpkgs_unstable_channel = "https://nixos.org/channels/nixpkgs-unstable nixpkgs"
+      nixpkgs_unstable_channel = "https://channels.nixos.org/nixpkgs-unstable nixpkgs"
       machine.succeed(f"echo '{nixpkgs_unstable_channel}' > /root/.nix-channels")
 
       machine.reboot()

nixos/tests/ec2.nix

@@ -123,7 +123,7 @@ in
     inherit image;
     sshPublicKey = snakeOilPublicKey;
 
-    # ### https://nixos.org/channels/nixos-unstable nixos
+    # ### https://channels.nixos.org/nixos-unstable nixos
     userData = ''
       { pkgs, ... }: