patchutils: generalize package

pkgs/tools/text/patchutils/0.3.3.nix

@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "0.3.3";
+  sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
+  patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
+})

pkgs/tools/text/patchutils/generic.nix

@@ -1,15 +1,16 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl
-
+, version, sha256, patches ? []
+, ...
+}:
 stdenv.mkDerivation rec {
-  name = "patchutils-0.3.3";
+  pname = "patchutils";
+  inherit version patches;
 
   src = fetchurl {
-    url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz";
+    url = "http://cyberelk.net/tim/data/patchutils/stable/${pname}-${version}.tar.xz";
-    sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i";
+    inherit sha256;
   };
 
-  patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one
-
   hardeningDisable = [ "format" ];
 
   doCheck = false; # fails

pkgs/top-level/all-packages.nix

@@ -4881,7 +4881,9 @@ in
 
   parcellite = callPackage ../tools/misc/parcellite { };
 
-  patchutils = callPackage ../tools/text/patchutils { };
+  patchutils = patchutils_0_3_3;
+
+  patchutils_0_3_3 = callPackage ../tools/text/patchutils/0.3.3.nix { };
 
   parted = callPackage ../tools/misc/parted { };