diff options
author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2014-12-18 22:25:21 +0100 |
---|---|---|
committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2014-12-18 22:25:21 +0100 |
commit | 9334085e80600e4baf9561b3a9836937a6f73d5f (patch) | |
tree | af3f9869d5a83391dd1d529e9ad492747d6c13f5 /nixos | |
parent | d7edec4888fae4bd4611d94e89b1af234fdacbc4 (diff) | |
download | nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.tar nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.tar.gz nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.tar.bz2 nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.tar.lz nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.tar.xz nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.tar.zst nixlib-9334085e80600e4baf9561b3a9836937a6f73d5f.zip |
update-channel-branches.sh: Add verbosity to improve the user experience, and update NixOS documentation.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/development/sources.xml | 18 |
1 files changed, 10 insertions, 8 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 |