diff options
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/development/sources.xml | 18 | ||||
-rw-r--r-- | nixos/modules/installer/tools/nixos-option.sh | 5 |
2 files changed, 12 insertions, 11 deletions
diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index f9fadd6bf5ed..3ac07da19f12 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -40,20 +40,22 @@ rebuild everything from source. So you may want to create a local branch based on your current NixOS version: <screen> -$ nixos-version -14.04.273.ea1952b (Baboon) - -$ git checkout -b local ea1952b +$ <replaceable>/my/sources</replaceable>/nixpkgs/maintainers/scripts/update-channel-branches.sh +Fetching channels from https://nixos.org/channels: + * [new branch] cbe467e -> channels/remotes/nixos-unstable +Fetching channels from nixos-version: + * [new branch] 9ff4738 -> channels/current-system +Fetching channels from ~/.nix-defexpr: + * [new branch] 0d4acad -> channels/root/nixos +$ git checkout -b local channels/current-system </screen> Or, to base your local branch on the latest version available in the NixOS channel: <screen> -$ curl -sI https://nixos.org/channels/nixos-unstable/ | grep Location -Location: https://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ - -$ git checkout -b local acaf4a6 +$ <replaceable>/my/sources</replaceable>/nixpkgs/maintainers/scripts/update-channel-branches.sh +$ git checkout -b local channels/remotes/nixos-unstable </screen> You can then use <command>git rebase</command> to sync your local diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 86210ecacae0..17c17d05e288 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -91,9 +91,8 @@ EOF fi } -header=" -let - nixos = import <nixos> {}; +header="let + nixos = import <nixpkgs/nixos> {}; nixpkgs = import <nixpkgs> {}; in with nixpkgs.lib; " |