git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #76167 from Mic92/nix-review

nixpkgs-review: 2.1.0 -> 2.1.1

commitba5d7efe43541fc082130a78af711674b8f5bbec authorMaximilian Bosch <maximilian@mbosch.me> dateSun 22 Dec 2019, 14:01 (7 years ago) parent65061ab8a57552
6 files changed+21−20
.github/PULL_REQUEST_TEMPLATE.md+1−1 doc/contributing/reviewing-contributions.xml+2−2 doc/contributing/submitting-changes.xml+11−11 pkgs/tools/package-management/nix-review/default.nix → pkgs/tools/package-management/nixpkgs-review/default.nix+5−5 pkgs/top-level/aliases.nix+1 pkgs/top-level/all-packages.nix+1−1
.github/PULL_REQUEST_TEMPLATE.md+1−1
@@ -12,7 +12,7 @@
1212 - [ ] macOS
1313 - [ ] other Linux distributions
1414- [ ] Tested via one or more NixOS test(s) if existing and applicable for the change (look inside [nixos/tests](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests))
15−- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
15+- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review wip"`
1616- [ ] Tested execution of all binary files (usually in `./result/bin/`)
1717- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
1818- [ ] Ensured that relevant documentation is up to date
doc/contributing/reviewing-contributions.xml+2−2
@@ -141,10 +141,10 @@
141141 </listitem>
142142 <listitem>
143143 <para>
144− The <link xlink:href="https://github.com/Mic92/nix-review">nix-review</link> tool can be used to review a pull request content in a single command. <varname>PRNUMBER</varname> should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
144+ The <link xlink:href="https://github.com/Mic92/nixpkgs-review">nixpkgs-review</link> tool can be used to review a pull request content in a single command. <varname>PRNUMBER</varname> should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url.
145145 </para>
146146<screen>
147−<prompt>$ </prompt>nix-shell -p nix-review --run "nix-review pr PRNUMBER"
147+<prompt>$ </prompt>nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER"
148148</screen>
149149 </listitem>
150150 </itemizedlist>
doc/contributing/submitting-changes.xml+11−11
@@ -317,25 +317,25 @@ Additional information.
317317 </section>
318318
319319 <section xml:id="submitting-changes-tested-compilation">
320− <title>Tested compilation of all pkgs that depend on this change using <command>nix-review</command></title>
320+ <title>Tested compilation of all pkgs that depend on this change using <command>nixpkgs-review</command></title>
321321
322322 <para>
323− If you are updating a package's version, you can use nix-review to make sure all packages that depend on the updated package still compile correctly. The <command>nix-review</command> utility can look for and build all dependencies either based on uncommited changes with the <literal>wip</literal> option or specifying a github pull request number.
323+ If you are updating a package's version, you can use nixpkgs-review to make sure all packages that depend on the updated package still compile correctly. The <command>nixpkgs-review</command> utility can look for and build all dependencies either based on uncommited changes with the <literal>wip</literal> option or specifying a github pull request number.
324324 </para>
325325
326326 <para>
327327 review changes from pull request number 12345:
328− <screen>nix run nixpkgs.nix-review -c nix-review pr 12345</screen>
328+ <screen>nix run nixpkgs.nixpkgs-review -c nixpkgs-review pr 12345</screen>
329329 </para>
330330
331331 <para>
332332 review uncommitted changes:
333− <screen>nix run nixpkgs.nix-review -c nix-review wip</screen>
333+ <screen>nix run nixpkgs.nixpkgs-review -c nixpkgs-review wip</screen>
334334 </para>
335335
336336 <para>
337337 review changes from last commit:
338− <screen>nix run nixpkgs.nix-review -c nix-review rev HEAD</screen>
338+ <screen>nix run nixpkgs.nixpkgs-review -c nixpkgs-review rev HEAD</screen>
339339 </para>
340340 </section>
341341
@@ -408,7 +408,7 @@ Additional information.
408408 <section xml:id="submitting-changes-master-branch">
409409 <title>Master branch</title>
410410 <para>
411− The <literal>master</literal> branch is the main development branch.
411+ The <literal>master</literal> branch is the main development branch.
412412 It should only see non-breaking commits that do not cause mass rebuilds.
413413 </para>
414414 </section>
@@ -416,8 +416,8 @@ Additional information.
416416 <section xml:id="submitting-changes-staging-branch">
417417 <title>Staging branch</title>
418418 <para>
419− The <literal>staging</literal> branch is a development branch where mass-rebuilds go.
420− It should only see non-breaking mass-rebuild commits.
419+ The <literal>staging</literal> branch is a development branch where mass-rebuilds go.
420+ It should only see non-breaking mass-rebuild commits.
421421 That means it is not to be used for testing, and changes must have been well tested already.
422422 If the branch is already in a broken state, please refrain from adding extra new breakages.
423423 </para>
@@ -426,10 +426,10 @@ Additional information.
426426 <section xml:id="submitting-changes-staging-next-branch">
427427 <title>Staging-next branch</title>
428428 <para>
429− The <literal>staging-next</literal> branch is for stabilizing mass-rebuilds submitted to the <literal>staging</literal> branch prior to merging them into <literal>master</literal>.
430− Mass-rebuilds should go via the <literal>staging</literal> branch.
429+ The <literal>staging-next</literal> branch is for stabilizing mass-rebuilds submitted to the <literal>staging</literal> branch prior to merging them into <literal>master</literal>.
430+ Mass-rebuilds should go via the <literal>staging</literal> branch.
431431 It should only see non-breaking commits that are fixing issues blocking it from being merged into the <literal>master </literal> branch.
432− </para>
432+ </para>
433433 <para>
434434 If the branch is already in a broken state, please refrain from adding extra new breakages. Stabilize it for a few days and then merge into master.
435435 </para>
pkgs/tools/package-management/nix-review/default.nix → pkgs/tools/package-management/nixpkgs-review/default.nixrenamed+5−5
@@ -7,14 +7,14 @@
77}:
88
99python3.pkgs.buildPythonApplication rec {
10− pname = "nix-review";
11− version = "2.1.0";
10+ pname = "nixpkgs-review";
11+ version = "2.1.1";
1212
1313 src = fetchFromGitHub {
1414 owner = "Mic92";
15− repo = "nix-review";
15+ repo = "nixpkgs-review";
1616 rev = version;
17− sha256 = "0bdar2d88qjkf76hi3ar1lyfxnbwzhx1fi8fv65bw95m2sp1p0b5";
17+ sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd";
1818 };
1919
2020 makeWrapperArgs = [
@@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec {
2323
2424 meta = with stdenv.lib; {
2525 description = "Review pull-requests on https://github.com/NixOS/nixpkgs";
26− homepage = https://github.com/Mic92/nix-review;
26+ homepage = https://github.com/Mic92/nixpkgs-review;
2727 license = licenses.mit;
2828 maintainers = [ maintainers.mic92 ];
2929 };
pkgs/top-level/aliases.nix+1
@@ -270,6 +270,7 @@ mapAliases ({
270270 networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25
271271 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25
272272 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25
273+ nix-review = nixpkgs-review; # added 2019-12-22
273274 nfsUtils = nfs-utils; # added 2014-12-06
274275 nginxUnstable = nginxMainline; # added 2018-04-25
275276 nilfs_utils = nilfs-utils; # added 2018-04-25
pkgs/top-level/all-packages.nix+1−1
@@ -24900,7 +24900,7 @@ in
2490024900 "Also see https://github.com/NixOS/nixpkgs/pull/44903"
2490124901 );
2490224902
24903− nix-review = callPackage ../tools/package-management/nix-review { };
24903+ nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { };
2490424904
2490524905 nix-serve = callPackage ../tools/package-management/nix-serve { };
2490624906