···

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

     

       
25
       
 
       
$ nix-env -i git

     

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

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
27
       
 
       
</screen>

     

       
28
       
 
       


     

       
29
       
 
       
This will check out the latest NixOS sources to

     
···

       
31
       
 
       
and the Nixpkgs sources to

     

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

     

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

     

       
34
       
-
       
repository.)</para>

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
35
       
 
       


     

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

     

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

     
···

       
40
       
 
       
branch based on your current NixOS version:

     

       
41
       
 
       


     

       
42
       
 
       
<screen>

     

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

     

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

     

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

     

       
46
       
-
       
Fetching channels from nixos-version:

     

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

     

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

     

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

     

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

     

       
51
       
 
       
</screen>

     

       
52
       
 
       


     

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

     

       
54
       
 
       
NixOS channel:

     

       
55
       
 
       


     

       
56
       
 
       
<screen>

     

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

     

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

     

       
59
       
 
       
</screen>

     

       
60
       
 
       


     

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

     

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

     

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

     

       
64
       
-
       
upstream branch.</para>

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
65
       
 
       


     

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

     

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

     

···

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

     

       
25
       
 
       
$ nix-env -i git

     

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

     

       
27
       
+
       
$ cd nixpkgs

     

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

     

       
29
       
+
       
$ git remote update channels

     

       
30
       
 
       
</screen>

     

       
31
       
 
       


     

       
32
       
 
       
This will check out the latest NixOS sources to

     
···

       
34
       
 
       
and the Nixpkgs sources to

     

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

     

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

     

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

     

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

     

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

     

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

     

       
41
       
+
       
the latest built and tested version available in the

     

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

     

       
43
       
 
       


     

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

     

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

     
···

       
48
       
 
       
branch based on your current NixOS version:

     

       
49
       
 
       


     

       
50
       
 
       
<screen>

     

       
51
       
+
       
$ nixos-version

     

       
52
       
+
       
14.04.273.ea1952b (Baboon)

     

       
53
       
+
       


     

       
54
       
+
       
$ git checkout -b local ea1952b

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
55
       
 
       
</screen>

     

       
56
       
 
       


     

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

     

       
58
       
 
       
NixOS channel:

     

       
59
       
 
       


     

       
60
       
 
       
<screen>

     

       
61
       
+
       
$ git remote update channels

     

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

     

       
63
       
 
       
</screen>

     

       
64
       
 
       


     

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

     

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

     

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

     

       
68
       
+
       
the channel, e.g.

     

       
69
       
+
       


     

       
70
       
+
       
<screen>

     

       
71
       
+
       
$ git remote update channels

     

       
72
       
+
       
$ git merge channels/nixos-14.12

     

       
73
       
+
       
</screen>

     

       
74
       
+
       


     

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

     

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

     

       
77
       
 
       


     

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

     

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