Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6ad7eeecd64
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6a81a60294a3
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Mar 20, 2019

  1. nix-review: 1.0.5 -> 2.0.0

    Mic92 committed Mar 20, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    dywedir Vlad M.
    Copy the full SHA
    eb5afaf View commit details
  2. doc/reviewing-contributions: nix-review instead of nox-review

    It is faster, handles more edge cases and allows to test/review the built
    packages interactively.
    Mic92 committed Mar 20, 2019
    Copy the full SHA
    22d083e View commit details

Commits on Mar 22, 2019

  1. Merge pull request #57076 from Mic92/nix-review

    doc/reviewing-contributions: nix-review instead of nox-review
    Mic92 authored Mar 22, 2019
    Copy the full SHA
    6a81a60 View commit details
Showing with 19 additions and 20 deletions.
  1. +1 −2 .github/PULL_REQUEST_TEMPLATE.md
  2. +5 −5 doc/reviewing-contributions.xml
  3. +11 −11 doc/submitting-changes.xml
  4. +2 −2 pkgs/tools/package-management/nix-review/default.nix
3 changes: 1 addition & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -11,11 +11,10 @@
- [ ] macOS
- [ ] other Linux distributions
- [ ] 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))
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nix-review --run "nix-review wip"`
- [ ] Tested execution of all binary files (usually in `./result/bin/`)
- [ ] Determined the impact on package closure size (by running `nix path-info -S` before and after)
- [ ] Assured whether relevant documentation is up to date
- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).

---

10 changes: 5 additions & 5 deletions doc/reviewing-contributions.xml
Original file line number Diff line number Diff line change
@@ -189,14 +189,14 @@ $ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD <co
</listitem>
<listitem>
<para>
The <link xlink:href="https://github.com/madjar/nox">nox</link> tool can
be used to review a pull request content in a single command. It doesn't
rebase on a channel branch so it might trigger multiple source builds.
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.
of the pull request title. You can also provide the full github pull
request url.
</para>
<screen>
$ nix-shell -p nox --run "nox-review -k pr PRNUMBER"
$ nix-shell -p nix-review --run "nix-review pr PRNUMBER"
</screen>
</listitem>
</itemizedlist>
22 changes: 11 additions & 11 deletions doc/submitting-changes.xml
Original file line number Diff line number Diff line change
@@ -351,26 +351,26 @@ Additional information.
</section>

<section xml:id="submitting-changes-tested-compilation">
<title>Tested compilation of all pkgs that depend on this change using <command>nox-review</command></title>
<title>Tested compilation of all pkgs that depend on this change using <command>nix-review</command></title>

<para>
If you are updating a package's version, you can use nox to make sure all
packages that depend on the updated package still compile correctly. This
can be done using the nox utility. The <command>nox-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.
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.
</para>

<para>
review uncommitted changes:
<screen>nix-shell -p nox --run "nox-review wip"</screen>
review changes from pull request number 12345:
<screen>nix-shell -p nix-review --run "nix-review pr 12345"</screen>
</para>

<para>
review changes from pull request number 12345:
<screen>nix-shell -p nox --run "nox-review pr 12345"</screen>
review uncommitted changes:
<screen>nix-shell -p nix-review --run "nix-review wip"</screen>
</para>

</section>

<section xml:id="submitting-changes-tested-execution">
4 changes: 2 additions & 2 deletions pkgs/tools/package-management/nix-review/default.nix
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@

python3.pkgs.buildPythonApplication rec {
pname = "nix-review";
version = "1.0.5";
version = "2.0.0";

src = fetchFromGitHub {
owner = "Mic92";
repo = "nix-review";
rev = version;
sha256 = "13dv2zpnhf218hfmixsgsbvy9zgrp7b0d125hvq8sk5x57f6114q";
sha256 = "1hichipf02yz9n2n1fnky5rm9wxwcd04xlr0y05y78ixw8xb5ah0";
};

makeWrapperArgs = [