commit 10ce7ae76938da13aba228b4d79f32479a4ea085 · pyrox.dev/nixpkgs

+28 -16
nixos/doc/manual/development/sources.xml
···

       24
       24
        
       $ cd <replaceable>/my/sources</replaceable>

     

       25
       25
        
       $ nix-env -i git

     

       26
       26
        
       $ git clone git://github.com/NixOS/nixpkgs.git

     

       27
       27
       +
       $ cd nixpkgs

     

       28
       28
       +
       $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git

     

       29
       29
       +
       $ git remote update channels

     

       27
       30
        
       </screen>

     

       28
       31
        
       

     

       29
       32
        
       This will check out the latest NixOS sources to

     
···

       31
       34
        
       and the Nixpkgs sources to

     

       32
       35
        
       <filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>.

     

       33
       36
        
       (The NixOS source tree lives in a subdirectory of the Nixpkgs

     

       34
       34
       -
       repository.)</para>

     

       37
       37
       +
       repository.) The remote <literal>channels</literal> refers to a

     

       38
       38
       +
       read-only repository that tracks the Nixpkgs/NixOS channels (see <xref

     

       39
       39
       +
       linkend="sec-upgrading"/> for more information about channels). Thus,

     

       40
       40
       +
       the Git branch <literal>channels/nixos-14.12</literal> will contain

     

       41
       41
       +
       the latest built and tested version available in the

     

       42
       42
       +
       <literal>nixos-14.12</literal> channel.</para>

     

       35
       43
        
       

     

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

     

       37
       45
        
       branch, since if somebody has just committed (say) a change to GCC,

     
···

       40
       48
        
       branch based on your current NixOS version:

     

       41
       49
        
       

     

       42
       50
        
       <screen>

     

       43
       43
       -
       $ <replaceable>/my/sources</replaceable>/nixpkgs/maintainers/scripts/update-channel-branches.sh

     

       44
       44
       -
       Fetching channels from https://nixos.org/channels:

     

       45
       45
       -
        * [new branch]      cbe467e           -> channels/remotes/nixos-unstable

     

       46
       46
       -
       Fetching channels from nixos-version:

     

       47
       47
       -
        * [new branch]      9ff4738           -> channels/current-system

     

       48
       48
       -
       Fetching channels from ~/.nix-defexpr:

     

       49
       49
       -
        * [new branch]      0d4acad           -> channels/root/nixos

     

       50
       50
       -
       $ git checkout -b local channels/current-system

     

       51
       51
       +
       $ nixos-version

     

       52
       52
       +
       14.04.273.ea1952b (Baboon)

     

       53
       53
       +
       

     

       54
       54
       +
       $ git checkout -b local ea1952b

     

       51
       55
        
       </screen>

     

       52
       56
        
       

     

       53
       53
       -
       Or, to base your local branch on the latest version available in the

     

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

     

       54
       58
        
       NixOS channel:

     

       55
       59
        
       

     

       56
       60
        
       <screen>

     

       57
       57
       -
       $ <replaceable>/my/sources</replaceable>/nixpkgs/maintainers/scripts/update-channel-branches.sh

     

       58
       58
       -
       $ git checkout -b local channels/remotes/nixos-unstable

     

       61
       61
       +
       $ git remote update channels

     

       62
       62
       +
       $ git checkout -b local channels/nixos-14.12

     

       59
       63
        
       </screen>

     

       60
       64
        
       

     

       61
       61
       -
       You can then use <command>git rebase</command> to sync your local

     

       62
       62
       -
       branch with the upstream branch, and use <command>git

     

       63
       63
       -
       cherry-pick</command> to copy commits from your local branch to the

     

       64
       64
       -
       upstream branch.</para>

     

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

     

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

     

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

     

       68
       68
       +
       the channel, e.g.

     

       69
       69
       +
       

     

       70
       70
       +
       <screen>

     

       71
       71
       +
       $ git remote update channels

     

       72
       72
       +
       $ git merge channels/nixos-14.12

     

       73
       73
       +
       </screen>

     

       74
       74
       +
       

     

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

     

       76
       76
       +
       your local branch to the upstream branch.</para>

     

       65
       77
        
       

     

       66
       78
        
       <para>If you want to rebuild your system using your (modified)

     

       67
       79
        
       sources, you need to tell <command>nixos-rebuild</command> about them