diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 7cd5ce0002c..0b2528e9a77 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -27,8 +27,8 @@ a subdirectory of the Nixpkgs repository.) The remote channels refers to a read-only repository that tracks the Nixpkgs/NixOS channels (see for more information about channels). Thus, the Git branch -channels/nixos-14.12 will contain the latest built -and tested version available in the nixos-14.12 +channels/nixos-17.03 will contain the latest built +and tested version available in the nixos-17.03 channel. It’s often inconvenient to develop directly on the master @@ -39,9 +39,9 @@ branch based on your current NixOS version: $ nixos-version -14.04.273.ea1952b (Baboon) +17.09pre104379.6e0b727 (Hummingbird) -$ git checkout -b local ea1952b +$ git checkout -b local e3938c8 Or, to base your local branch on the latest version available in a @@ -49,17 +49,17 @@ NixOS channel: $ git remote update channels -$ git checkout -b local channels/nixos-14.12 +$ git checkout -b local channels/nixos-17.03 -(Replace nixos-14.12 with the name of the channel +(Replace nixos-17.03 with the name of the channel you want to use.) You can use git merge or git rebase to keep your local branch in sync with the channel, e.g. $ git remote update channels -$ git merge channels/nixos-14.12 +$ git merge channels/nixos-17.03 You can use git cherry-pick to copy commits from diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index c974523f886..aee6523345c 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -15,12 +15,12 @@ been built. These channels are: Stable channels, such as nixos-14.12. + xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your - system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but - not from 3.4.x to - 3.11.x (a major change that has the + system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but + not from 4.9.x to + 4.11.x (a major change that has the potential to break things). Stable channels are generally maintained until the next stable branch is created. @@ -34,7 +34,7 @@ been built. These channels are: Small channels, such as nixos-14.12-small + xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small or nixos-unstable-small. These are identical to the stable and unstable channels described above, @@ -55,8 +55,8 @@ appliances.) When you first install NixOS, you’re automatically subscribed to the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 14.12 ISO, you will be subscribed to -the nixos-14.12 channel. To see which NixOS +instance, if you installed from a 17.03 ISO, you will be subscribed to +the nixos-17.03 channel. To see which NixOS channel you’re subscribed to, run the following as root: @@ -71,16 +71,16 @@ To switch to a different NixOS channel, do (Be sure to include the nixos parameter at the -end.) For instance, to use the NixOS 14.12 stable channel: +end.) For instance, to use the NixOS 17.03 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-14.12 nixos +# nix-channel --add https://nixos.org/channels/nixos-17.03 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos +# nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos And if you want to live on the bleeding edge: @@ -130,7 +130,7 @@ runs, see systemctl list-timers.) You can also specify a channel explicitly, e.g. -system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09; +system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03;