From 4920af40fce2c56ae2c4fd08ad1ff8b6f1dc80b1 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 27 Jun 2023 15:56:54 +0200 Subject: [PATCH 1/2] doc/reviewing-contributions: Add points about patches A weaker version of https://github.com/NixOS/nixpkgs/pull/186484#issuecomment-1608960696 --- doc/contributing/reviewing-contributions.chapter.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index b4caf11f6d4b..7ee37863c204 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -62,6 +62,8 @@ Sample template for a package update review is provided below. - [ ] package build on ARCHITECTURE - [ ] executables tested on ARCHITECTURE - [ ] all depending packages build +- [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed +- [ ] patches that are remotely available are fetched with `fetchpatch` ##### Possible improvements @@ -105,6 +107,7 @@ Sample template for a new package review is provided below. - [ ] source is fetched using the appropriate function - [ ] the list of `phases` is not overridden - [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`. +- [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed - [ ] patches that are remotely available are fetched with `fetchpatch` ##### Possible improvements From a0a4354a13f7c25bad03173ffa528d220dec5a63 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 27 Jun 2023 18:35:15 +0200 Subject: [PATCH 2/2] doc/reviewing-contributions: Remove wrong fetchpatch detail It may have to be fetchpatch, fetchpatch2, or fetchurl. We should link somewhere, but we don't have a link target yet, so until then, remove the inaccurate info. Co-authored-by: Alyssa Ross --- doc/contributing/reviewing-contributions.chapter.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/contributing/reviewing-contributions.chapter.md b/doc/contributing/reviewing-contributions.chapter.md index 7ee37863c204..10c72fe3d13e 100644 --- a/doc/contributing/reviewing-contributions.chapter.md +++ b/doc/contributing/reviewing-contributions.chapter.md @@ -63,7 +63,7 @@ Sample template for a package update review is provided below. - [ ] executables tested on ARCHITECTURE - [ ] all depending packages build - [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed -- [ ] patches that are remotely available are fetched with `fetchpatch` +- [ ] patches that are remotely available are fetched rather than vendored ##### Possible improvements @@ -108,7 +108,7 @@ Sample template for a new package review is provided below. - [ ] the list of `phases` is not overridden - [ ] when a phase (like `installPhase`) is overridden it starts with `runHook preInstall` and ends with `runHook postInstall`. - [ ] patches have a comment describing either the upstream URL or a reason why the patch wasn't upstreamed -- [ ] patches that are remotely available are fetched with `fetchpatch` +- [ ] patches that are remotely available are fetched rather than vendored ##### Possible improvements