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 | |
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')
-rw-r--r-- | nixos/doc/manual/development/sources.xml | 32 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix | 3 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 3 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-checkout.nix | 60 | ||||
-rw-r--r-- | nixos/modules/module-list.nix | 1 |
5 files changed, 13 insertions, 86 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, diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index 6fe490b02bf4..d984cb307170 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -52,8 +52,7 @@ in # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = - [ pkgs.subversion # for nixos-checkout - pkgs.w3m # needed for the manual anyway + [ pkgs.w3m # needed for the manual anyway pkgs.testdisk # useful for repairing boot problems pkgs.mssys # for writing Microsoft boot sectors / MBRs pkgs.parted diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 7badfcb8df22..9e733241993d 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -49,8 +49,7 @@ in # Include some utilities that are useful for installing or repairing # the system. environment.systemPackages = - [ pkgs.subversion # for nixos-checkout - pkgs.w3m # needed for the manual anyway + [ pkgs.w3m # needed for the manual anyway pkgs.ddrescue pkgs.ccrypt pkgs.cryptsetup # needed for dm-crypt volumes diff --git a/nixos/modules/installer/tools/nixos-checkout.nix b/nixos/modules/installer/tools/nixos-checkout.nix deleted file mode 100644 index 07274e139f7d..000000000000 --- a/nixos/modules/installer/tools/nixos-checkout.nix +++ /dev/null @@ -1,60 +0,0 @@ -# This module generates the nixos-checkout script, which performs a -# checkout of the Nixpkgs Git repository. - -{ config, lib, pkgs, ... }: - -with lib; - -let - - nixosCheckout = pkgs.substituteAll { - name = "nixos-checkout"; - dir = "bin"; - isExecutable = true; - src = pkgs.writeScript "nixos-checkout" - '' - #! ${pkgs.stdenv.shell} -e - - if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then - echo "Usage: `basename $0` [PREFIX]. See NixOS Manual for more info." - exit 0 - fi - - prefix="$1" - if [ -z "$prefix" ]; then prefix=/etc/nixos; fi - mkdir -p "$prefix" - cd "$prefix" - - if [ -z "$(type -P git)" ]; then - echo "installing Git..." - nix-env -iA nixos.git - fi - - # Move any old nixpkgs directories out of the way. - backupTimestamp=$(date "+%Y%m%d%H%M%S") - - if [ -e nixpkgs -a ! -e nixpkgs/.git ]; then - mv nixpkgs nixpkgs-$backupTimestamp - fi - - # Check out the Nixpkgs sources. - if ! [ -e nixpkgs/.git ]; then - echo "Creating repository in $prefix/nixpkgs..." - git init --quiet nixpkgs - else - echo "Updating repository in $prefix/nixpkgs..." - fi - cd nixpkgs - git remote add origin git://github.com/NixOS/nixpkgs.git || true - git remote add channels git://github.com/NixOS/nixpkgs-channels.git || true - git remote set-url origin --push git@github.com:NixOS/nixpkgs.git - git remote update - git checkout master - ''; - }; - -in - -{ - environment.systemPackages = [ nixosCheckout ]; -} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index bb8fa48105ac..e59ec07b8aa5 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -47,7 +47,6 @@ ./i18n/input-method/nabi.nix ./i18n/input-method/uim.nix ./installer/tools/auto-upgrade.nix - ./installer/tools/nixos-checkout.nix ./installer/tools/tools.nix ./misc/assertions.nix ./misc/crashdump.nix |