fetchDebianPatch: Rename `patch` parameter, make `name` overrideable

This allows using the fetcher with `invalidateFetcherByDrvHash` for testing.

3 files changed, 10 insertions, 9 deletions

diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md
index d434806aa9b29..02c2cfe2c191c 100644
--- a/doc/builders/fetchers.chapter.md
+++ b/doc/builders/fetchers.chapter.md
@@ -86,7 +86,7 @@ Most other fetchers return a directory rather than a single file.
 ## `fetchDebianPatch` {#fetchdebianpatch}
 
 A wrapper around `fetchpatch`, which takes:
-- `name` and `hash`: the patch's filename without the `.patch` suffix,
+- `patch` and `hash`: the patch's filename without the `.patch` suffix,
   and its hash after normalization by `fetchpatch` ;
 - `pname`: the Debian source package's name ;
 - `version`: the upstream version number ;
diff --git a/pkgs/build-support/fetchdebianpatch/default.nix b/pkgs/build-support/fetchdebianpatch/default.nix
index c1230484f82b0..ba6aa63a732b6 100644
--- a/pkgs/build-support/fetchdebianpatch/default.nix
+++ b/pkgs/build-support/fetchdebianpatch/default.nix
@@ -1,13 +1,14 @@
 { lib, fetchpatch }:
 
 lib.makeOverridable (
-  { pname, version, debianRevision ? null, name, hash, area ? "main" }:
+  { pname, version, debianRevision ? null, patch, hash,
+    area ? "main", name ? "${patch}.patch" }:
   let versionString =
     if debianRevision == null then version else "${version}-${debianRevision}";
   in fetchpatch {
+    inherit name hash;
     url =
       "https://sources.debian.org/data/${area}/${builtins.substring 0 1 pname}/"
-      + "${pname}/${versionString}/debian/patches/${name}.patch";
-    inherit hash;
+      + "${pname}/${versionString}/debian/patches/${patch}.patch";
   }
 )
diff --git a/pkgs/development/python-modules/pysimplesoap/default.nix b/pkgs/development/python-modules/pysimplesoap/default.nix
index b9b0bf506b8ba..eecf544253800 100644
--- a/pkgs/development/python-modules/pysimplesoap/default.nix
+++ b/pkgs/development/python-modules/pysimplesoap/default.nix
@@ -25,17 +25,17 @@ buildPythonPackage rec {
     debianRevision = "5";
   } // args)) [
     # Merged upstream: f5f96210e1483f81cb5c582a6619e3ec4b473027
-    { name = "Add-quotes-to-SOAPAction-header-in-SoapClient";
+    { patch = "Add-quotes-to-SOAPAction-header-in-SoapClient";
       hash = "sha256-xA8Wnrpr31H8wy3zHSNfezFNjUJt1HbSXn3qUMzeKc0="; }
     # Merged upstream: ad03a21cafab982eed321553c4bfcda1755182eb
-    { name = "fix-httplib2-version-check";
+    { patch = "fix-httplib2-version-check";
       hash = "sha256-zUeF3v0N/eMyRVRH3tQLfuUfMKOD/B/aqEwFh/7HxH4="; }
-    { name = "reorder-type-check-to-avoid-a-TypeError";
+    { patch = "reorder-type-check-to-avoid-a-TypeError";
       hash = "sha256-2p5Cqvh0SPfJ8B38wb/xq7jWGYgpI9pavA6qkMUb6hA="; }
     # Merged upstream: 033e5899e131a2c1bdf7db5852f816f42aac9227
-    { name = "Support-integer-values-in-maxOccurs-attribute";
+    { patch = "Support-integer-values-in-maxOccurs-attribute";
       hash = "sha256-IZ0DP7io+ihcnB5547cR53FAdnpRLR6z4J5KsNrkfaI="; }
-    { name = "PR204";
+    { patch = "PR204";
       hash = "sha256-JlxeTnKDFxvEMFBthZsaYRbNOoBvLJhBnXCRoiL/nVw="; }
   ] ++ [ ./stringIO.patch ];