From c9dc62eda10d4084b5c6b9e2f706299ca3ad45cf Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Mon, 17 Nov 2025 23:38:20 +0100 Subject: [PATCH] treewide: switch to channels.nixos.org This is a follow-up for #460057 to completely remove all mentions of nixos.org/channels/. The following command was used to generate this change: ``` find . -type f -exec sed -i 's|nixos.org/channels/|channels.nixos.org/|g' {} + ``` --- maintainers/scripts/update-channel-branches.sh | 2 +- nixos/doc/manual/development/replace-modules.section.md | 2 +- .../installation/installing-from-other-distro.section.md | 4 ++-- nixos/doc/manual/release-notes/rl-1809.section.md | 2 +- .../modules/services/continuous-integration/gitlab-runner.nix | 2 +- nixos/modules/tasks/auto-upgrade.nix | 2 +- nixos/tests/activation/nix-channel.nix | 2 +- nixos/tests/ec2.nix | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh index eaa731adccce..9d9e8b62fb14 100755 --- a/maintainers/scripts/update-channel-branches.sh +++ b/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 diff --git a/nixos/doc/manual/development/replace-modules.section.md b/nixos/doc/manual/development/replace-modules.section.md index eb89ba7d7246..3065930b9a06 100644 --- a/nixos/doc/manual/development/replace-modules.section.md +++ b/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 ]; diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index 134192fa425b..56b1cca00e05 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/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- nixpkgs + $ nix-channel --add https://channels.nixos.org/nixos- nixpkgs ``` Where `` corresponds to the latest version available on [channels.nixos.org](https://channels.nixos.org/). diff --git a/nixos/doc/manual/release-notes/rl-1809.section.md b/nixos/doc/manual/release-notes/rl-1809.section.md index efaf86720a0e..acea4d5dae86 100644 --- a/nixos/doc/manual/release-notes/rl-1809.section.md +++ b/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 '' -A gitFull $ nix run -f '' gitFull diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index eb305d1e9a19..8361ce7f71d4 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/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 = { diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index 29eb03743b9c..7028c0be444d 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/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 diff --git a/nixos/tests/activation/nix-channel.nix b/nixos/tests/activation/nix-channel.nix index fac028b32659..4452a89bdb74 100644 --- a/nixos/tests/activation/nix-channel.nix +++ b/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() diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 4285a703eee1..508b943910da 100644 --- a/nixos/tests/ec2.nix +++ b/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, ... }: