diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 89c751f4db7..b923902cf92 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -12,7 +12,7 @@ - [ ] 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 nix-review --run "nix-review wip"` +- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-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) - [ ] Ensured that relevant documentation is up to date diff --git a/doc/contributing/reviewing-contributions.xml b/doc/contributing/reviewing-contributions.xml index ed8f379c460..fe79d8d992b 100644 --- a/doc/contributing/reviewing-contributions.xml +++ b/doc/contributing/reviewing-contributions.xml @@ -141,10 +141,10 @@ - The nix-review tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url. + The nixpkgs-review tool can be used to review a pull request content in a single command. PRNUMBER should be replaced by the number at the end of the pull request title. You can also provide the full github pull request url. -$ nix-shell -p nix-review --run "nix-review pr PRNUMBER" +$ nix-shell -p nixpkgs-review --run "nixpkgs-review pr PRNUMBER" diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index 950e1ea974a..f283ae1e685 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -317,25 +317,25 @@ Additional information.
- Tested compilation of all pkgs that depend on this change using <command>nix-review</command> + Tested compilation of all pkgs that depend on this change using <command>nixpkgs-review</command> - 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 nix-review utility can look for and build all dependencies either based on uncommited changes with the wip option or specifying a github pull request number. + 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 nixpkgs-review utility can look for and build all dependencies either based on uncommited changes with the wip option or specifying a github pull request number. review changes from pull request number 12345: - nix run nixpkgs.nix-review -c nix-review pr 12345 + nix run nixpkgs.nixpkgs-review -c nixpkgs-review pr 12345 review uncommitted changes: - nix run nixpkgs.nix-review -c nix-review wip + nix run nixpkgs.nixpkgs-review -c nixpkgs-review wip review changes from last commit: - nix run nixpkgs.nix-review -c nix-review rev HEAD + nix run nixpkgs.nixpkgs-review -c nixpkgs-review rev HEAD
@@ -408,7 +408,7 @@ Additional information.
Master branch - The master branch is the main development branch. + The master branch is the main development branch. It should only see non-breaking commits that do not cause mass rebuilds.
@@ -416,8 +416,8 @@ Additional information.
Staging branch - The staging branch is a development branch where mass-rebuilds go. - It should only see non-breaking mass-rebuild commits. + The staging branch is a development branch where mass-rebuilds go. + It should only see non-breaking mass-rebuild commits. That means it is not to be used for testing, and changes must have been well tested already. If the branch is already in a broken state, please refrain from adding extra new breakages. @@ -426,10 +426,10 @@ Additional information.
Staging-next branch - The staging-next branch is for stabilizing mass-rebuilds submitted to the staging branch prior to merging them into master. - Mass-rebuilds should go via the staging branch. + The staging-next branch is for stabilizing mass-rebuilds submitted to the staging branch prior to merging them into master. + Mass-rebuilds should go via the staging branch. It should only see non-breaking commits that are fixing issues blocking it from being merged into the master branch. - + 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. diff --git a/pkgs/tools/package-management/nix-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix similarity index 68% rename from pkgs/tools/package-management/nix-review/default.nix rename to pkgs/tools/package-management/nixpkgs-review/default.nix index 44a7eaff2bf..928c946de2b 100644 --- a/pkgs/tools/package-management/nix-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -7,14 +7,14 @@ }: python3.pkgs.buildPythonApplication rec { - pname = "nix-review"; - version = "2.1.0"; + pname = "nixpkgs-review"; + version = "2.1.1"; src = fetchFromGitHub { owner = "Mic92"; - repo = "nix-review"; + repo = "nixpkgs-review"; rev = version; - sha256 = "0bdar2d88qjkf76hi3ar1lyfxnbwzhx1fi8fv65bw95m2sp1p0b5"; + sha256 = "0rx0ld2ihsvlr1yiap5cq7h227jr79zf3xhkninh2m00x384s6bd"; }; makeWrapperArgs = [ @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; - homepage = https://github.com/Mic92/nix-review; + homepage = https://github.com/Mic92/nixpkgs-review; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 24a67bcbd00..8e13ab7be79 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -270,6 +270,7 @@ mapAliases ({ networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 + nix-review = nixpkgs-review; # added 2019-12-22 nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d68186b170..ab75e4dca42 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24900,7 +24900,7 @@ in "Also see https://github.com/NixOS/nixpkgs/pull/44903" ); - nix-review = callPackage ../tools/package-management/nix-review { }; + nixpkgs-review = callPackage ../tools/package-management/nixpkgs-review { }; nix-serve = callPackage ../tools/package-management/nix-serve { };