commit e5c927cb8de8a78cd2ed4ad1bf41ccbfef1dcfce · pyrox.dev/nixpkgs

+7 -7

nixos/doc/manual/development/sources.xml

···

       27
       27
        
       <literal>channels</literal> refers to a read-only repository that

     

       28
       28
        
       tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/>

     

       29
       29
        
       for more information about channels). Thus, the Git branch

     

       30
       30
       -
       <literal>channels/nixos-14.12</literal> will contain the latest built

     

       31
       31
       -
       and tested version available in the <literal>nixos-14.12</literal>

     

       30
       30
       +
       <literal>channels/nixos-17.03</literal> will contain the latest built

     

       31
       31
       +
       and tested version available in the <literal>nixos-17.03</literal>

     

       32
       32
        
       channel.</para>

     

       33
       33
        
       

     

       34
       34
        
       <para>It’s often inconvenient to develop directly on the master

     
···

       39
       39
        
       

     

       40
       40
        
       <screen>

     

       41
       41
        
       $ nixos-version

     

       42
       42
       -
       14.04.273.ea1952b (Baboon)

     

       42
       42
       +
       17.09pre104379.6e0b727 (Hummingbird)

     

       43
       43
        
       

     

       44
       44
       -
       $ git checkout -b local ea1952b

     

       44
       44
       +
       $ git checkout -b local e3938c8

     

       45
       45
        
       </screen>

     

       46
       46
        
       

     

       47
       47
        
       Or, to base your local branch on the latest version available in a

     
···

       49
       49
        
       

     

       50
       50
        
       <screen>

     

       51
       51
        
       $ git remote update channels

     

       52
       52
       -
       $ git checkout -b local channels/nixos-14.12

     

       52
       52
       +
       $ git checkout -b local channels/nixos-17.03

     

       53
       53
        
       </screen>

     

       54
       54
        
       

     

       55
       55
       -
       (Replace <literal>nixos-14.12</literal> with the name of the channel

     

       55
       55
       +
       (Replace <literal>nixos-17.03</literal> with the name of the channel

     

       56
       56
        
       you want to use.) You can use <command>git merge</command> or

     

       57
       57
        
       <command>git rebase</command> to keep your local branch in sync with

     

       58
       58
        
       the channel, e.g.

     

       59
       59
        
       

     

       60
       60
        
       <screen>

     

       61
       61
        
       $ git remote update channels

     

       62
       62
       -
       $ git merge channels/nixos-14.12

     

       62
       62
       +
       $ git merge channels/nixos-17.03

     

       63
       63
        
       </screen>

     

       64
       64
        
       

     

       65
       65
        
       You can use <command>git cherry-pick</command> to copy commits from

+11 -11

nixos/doc/manual/installation/upgrading.xml

···

       15
       15
        
       <itemizedlist>

     

       16
       16
        
         <listitem>

     

       17
       17
        
           <para><emphasis>Stable channels</emphasis>, such as <literal

     

       18
       18
       -
           xlink:href="https://nixos.org/channels/nixos-14.12">nixos-14.12</literal>.

     

       18
       18
       +
           xlink:href="https://nixos.org/channels/nixos-17.03">nixos-17.03</literal>.

     

       19
       19
        
           These only get conservative bug fixes and package upgrades.  For

     

       20
       20
        
           instance, a channel update may cause the Linux kernel on your

     

       21
       21
       -
           system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but

     

       22
       22
       -
           not from 3.4.<replaceable>x</replaceable> to

     

       23
       23
       -
           3.11.<replaceable>x</replaceable> (a major change that has the

     

       21
       21
       +
           system to be upgraded from 4.9.16 to 4.9.17 (a minor bug fix), but

     

       22
       22
       +
           not from 4.9.<replaceable>x</replaceable> to

     

       23
       23
       +
           4.11.<replaceable>x</replaceable> (a major change that has the

     

       24
       24
        
           potential to break things).  Stable channels are generally

     

       25
       25
        
           maintained until the next stable branch is created.</para>

     

       26
       26
        
           <para></para>

     
···

       34
       34
        
         </listitem>

     

       35
       35
        
         <listitem>

     

       36
       36
        
           <para><emphasis>Small channels</emphasis>, such as <literal

     

       37
       37
       -
           xlink:href="https://nixos.org/channels/nixos-14.12-small">nixos-14.12-small</literal>

     

       37
       37
       +
           xlink:href="https://nixos.org/channels/nixos-17.03-small">nixos-17.03-small</literal>

     

       38
       38
        
           or <literal

     

       39
       39
        
           xlink:href="https://nixos.org/channels/nixos-unstable-small">nixos-unstable-small</literal>. These

     

       40
       40
        
           are identical to the stable and unstable channels described above,

     
···

       55
       55
        
       

     

       56
       56
        
       <para>When you first install NixOS, you’re automatically subscribed to

     

       57
       57
        
       the NixOS channel that corresponds to your installation source.   For

     

       58
       58
       -
       instance, if you installed from a 14.12 ISO, you will be subscribed to

     

       59
       59
       -
       the <literal>nixos-14.12</literal> channel.  To see which NixOS

     

       58
       58
       +
       instance, if you installed from a 17.03 ISO, you will be subscribed to

     

       59
       59
       +
       the <literal>nixos-17.03</literal> channel.  To see which NixOS

     

       60
       60
        
       channel you’re subscribed to, run the following as root:

     

       61
       61
        
       

     

       62
       62
        
       <screen>

     
···

       71
       71
        
       </screen>

     

       72
       72
        
       

     

       73
       73
        
       (Be sure to include the <literal>nixos</literal> parameter at the

     

       74
       74
       -
       end.)  For instance, to use the NixOS 14.12 stable channel:

     

       74
       74
       +
       end.)  For instance, to use the NixOS 17.03 stable channel:

     

       75
       75
        
       

     

       76
       76
        
       <screen>

     

       77
       77
       -
       # nix-channel --add https://nixos.org/channels/nixos-14.12 nixos

     

       77
       77
       +
       # nix-channel --add https://nixos.org/channels/nixos-17.03 nixos

     

       78
       78
        
       </screen>

     

       79
       79
        
       

     

       80
       80
        
       If you have a server, you may want to use the “small” channel instead:

     

       81
       81
        
       

     

       82
       82
        
       <screen>

     

       83
       83
       -
       # nix-channel --add https://nixos.org/channels/nixos-14.12-small nixos

     

       83
       83
       +
       # nix-channel --add https://nixos.org/channels/nixos-17.03-small nixos

     

       84
       84
        
       </screen>

     

       85
       85
        
       

     

       86
       86
        
       And if you want to live on the bleeding edge:

     
···

       130
       130
        
       specify a channel explicitly, e.g.

     

       131
       131
        
       

     

       132
       132
        
       <programlisting>

     

       133
       133
       -
       system.autoUpgrade.channel = https://nixos.org/channels/nixos-15.09;

     

       133
       133
       +
       system.autoUpgrade.channel = https://nixos.org/channels/nixos-17.03;

     

       134
       134
        
       </programlisting>

     

       135
       135
        
       

     

       136
       136
        
       </para>