diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-20 20:53:24 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-04-20 20:57:02 +0200 |
| commit | 25387a1bedefb391db9f8585cfa1d160fc3bacfe (patch) | |
| tree | 5adb9da9533817c2090b25677f5fa2f0e36bd1c9 /nixos/doc/manual | |
| parent | 0087d161204afc42355d1f867df5a9d51533bfae (diff) | |
| download | nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.tar nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.tar.gz nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.tar.bz2 nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.tar.lz nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.tar.xz nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.tar.zst nixlib-25387a1bedefb391db9f8585cfa1d160fc3bacfe.zip | |
nixos-checkout: Remove
This command was useful when NixOS was spread across multiple repositories, but now it's pretty pointless (and obfuscates what happens, i.e. "git clone git://github.com/NixOS/nixpkgs.git").
Diffstat (limited to 'nixos/doc/manual')
| -rw-r--r-- | nixos/doc/manual/development/sources.xml | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 879a31e32c59..fd0b0109b322 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -11,35 +11,25 @@ uses the NixOS and Nixpkgs sources provided by the <literal>nixos-unstable</literal> channel (kept in <filename>/nix/var/nix/profiles/per-user/root/channels/nixos</filename>). To modify NixOS, however, you should check out the latest sources from -Git. This is done using the following command: +Git. This is as follows: <screen> -$ nixos-checkout <replaceable>/my/sources</replaceable> -</screen> - -or - -<screen> -$ mkdir -p <replaceable>/my/sources</replaceable> -$ cd <replaceable>/my/sources</replaceable> -$ nix-env -i git $ git clone git://github.com/NixOS/nixpkgs.git $ cd nixpkgs $ git remote add channels git://github.com/NixOS/nixpkgs-channels.git $ git remote update channels </screen> -This will check out the latest NixOS sources to -<filename><replaceable>/my/sources</replaceable>/nixpkgs/nixos</filename> -and the Nixpkgs sources to -<filename><replaceable>/my/sources</replaceable>/nixpkgs</filename>. -(The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) The remote <literal>channels</literal> refers to a -read-only repository that tracks the Nixpkgs/NixOS channels (see <xref -linkend="sec-upgrading"/> for more information about channels). Thus, -the Git branch <literal>channels/nixos-14.12</literal> will contain -the latest built and tested version available in the -<literal>nixos-14.12</literal> channel.</para> +This will check out the latest Nixpkgs sources to +<filename>./nixpkgs</filename> the NixOS sources to +<filename>./nixpkgs/nixos</filename>. (The NixOS source tree lives in +a subdirectory of the Nixpkgs repository.) The remote +<literal>channels</literal> refers to a read-only repository that +tracks the Nixpkgs/NixOS channels (see <xref linkend="sec-upgrading"/> +for more information about channels). Thus, the Git branch +<literal>channels/nixos-14.12</literal> will contain the latest built +and tested version available in the <literal>nixos-14.12</literal> +channel.</para> <para>It’s often inconvenient to develop directly on the master branch, since if somebody has just committed (say) a change to GCC, |