diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-10-24 08:33:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-24 08:33:16 +0200 |
| commit | fa21e8c1bb8b785c042ff0c111d0f684a8d1305b (patch) | |
| tree | b479adb6a5aa9c7ca389854d1e4982dad27667b8 /doc | |
| parent | 3265f554ca6078b571f979ea733ae83786ed0ec9 (diff) | |
| parent | 32389de159a0983f4daf7de446da6439a92a29a2 (diff) | |
| download | nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.tar nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.tar.gz nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.tar.bz2 nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.tar.lz nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.tar.xz nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.tar.zst nixpkgs-fa21e8c1bb8b785c042ff0c111d0f684a8d1305b.zip | |
Merge pull request #71780 from NixOS/staging-next
Staging next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/introduction.chapter.md | 4 | ||||
| -rw-r--r-- | doc/reviewing-contributions.xml | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/doc/introduction.chapter.md b/doc/introduction.chapter.md index 6abdc2714e2..713c7181a3a 100644 --- a/doc/introduction.chapter.md +++ b/doc/introduction.chapter.md @@ -47,5 +47,5 @@ which also builds binary packages from the Nix expressions in Nixpkgs for The binaries are made available via a [binary cache](https://cache.nixos.org). The current Nix expressions of the channels are available in the -[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository, -which has branches corresponding to the available channels. +[`nixpkgs`](https://github.com/NixOS/nixpkgs) repository in branches +that correspond to the channel names (e.g. `nixos-19.09-small`). diff --git a/doc/reviewing-contributions.xml b/doc/reviewing-contributions.xml index c6fb6256781..ed8f379c460 100644 --- a/doc/reviewing-contributions.xml +++ b/doc/reviewing-contributions.xml @@ -115,19 +115,12 @@ <para> It is possible to rebase the changes on nixos-unstable or nixpkgs-unstable for easier review by running the following commands from a nixpkgs clone. <screen> -<prompt>$ </prompt>git remote add channels https://github.com/NixOS/nixpkgs-channels.git <co - xml:id='reviewing-rebase-1' /> -<prompt>$ </prompt>git fetch channels nixos-unstable <co xml:id='reviewing-rebase-2' /> +<prompt>$ </prompt>git fetch origin nixos-unstable <co xml:id='reviewing-rebase-2' /> <prompt>$ </prompt>git fetch origin pull/PRNUMBER/head <co xml:id='reviewing-rebase-3' /> <prompt>$ </prompt>git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co xml:id='reviewing-rebase-4' /> </screen> <calloutlist> - <callout arearefs='reviewing-rebase-1'> - <para> - This should be done only once to be able to fetch channel branches from the nixpkgs-channels repository. - </para> - </callout> <callout arearefs='reviewing-rebase-2'> <para> Fetching the nixos-unstable branch. |