diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-05-12 15:17:10 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-05-12 15:17:10 +0200 |
commit | 0fb181b8ceae97e3ca1695db13b15e4457ad5353 (patch) | |
tree | 232ae4e4a6c78a5dc89e49c42191dfdffea26949 /pkgs/tools | |
parent | 359a7340d78175b0eba53009051e3fcc22ef1e8d (diff) | |
parent | e07c5ec107c720b9f1ace4bfa87fe8f359e358c0 (diff) |
Merge #59422: patchutils: 0.3.3 -> 0.3.4, keep 0.3.3 for fetchpatch
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/text/patchutils/0.3.3.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/text/patchutils/default.nix | 30 | ||||
-rw-r--r-- | pkgs/tools/text/patchutils/generic.nix | 27 |
3 files changed, 39 insertions, 25 deletions
diff --git a/pkgs/tools/text/patchutils/0.3.3.nix b/pkgs/tools/text/patchutils/0.3.3.nix new file mode 100644 index 000000000000..b324137be6aa --- /dev/null +++ b/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 +}) diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix index 238676020e8b..eab0e98f95c7 100644 --- a/pkgs/tools/text/patchutils/default.nix +++ b/pkgs/tools/text/patchutils/default.nix @@ -1,26 +1,6 @@ -{ stdenv, fetchurl }: +{ callPackage, ... } @ args: -stdenv.mkDerivation rec { - name = "patchutils-0.3.3"; - - src = fetchurl { - url = "http://cyberelk.net/tim/data/patchutils/stable/${name}.tar.xz"; - sha256 = "0g5df00cj4nczrmr4k791l7la0sq2wnf8rn981fsrz1f3d2yix4i"; - }; - - patches = [ ./drop-comments.patch ]; # we would get into a cycle when using fetchpatch on this one - - hardeningDisable = [ "format" ]; - - doCheck = false; # fails - - meta = with stdenv.lib; { - description = "Tools to manipulate patch files"; - homepage = http://cyberelk.net/tim/software/patchutils; - license = licenses.gpl2Plus; - platforms = platforms.all; - executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" - "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff" - "recountdiff" "rediff" "splitdiff" "unwrapdiff" ]; - }; -} +callPackage ./generic.nix (args // rec { + version = "0.3.4"; + sha256 = "0xp8mcfyi5nmb5a2zi5ibmyshxkb1zv1dgmnyn413m7ahgdx8mfg"; +}) diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix new file mode 100644 index 000000000000..87d925e333f6 --- /dev/null +++ b/pkgs/tools/text/patchutils/generic.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl +, version, sha256, patches ? [] +, ... +}: +stdenv.mkDerivation rec { + pname = "patchutils"; + inherit version patches; + + src = fetchurl { + url = "http://cyberelk.net/tim/data/patchutils/stable/${pname}-${version}.tar.xz"; + inherit sha256; + }; + + hardeningDisable = [ "format" ]; + + doCheck = false; # fails + + meta = with stdenv.lib; { + description = "Tools to manipulate patch files"; + homepage = http://cyberelk.net/tim/software/patchutils; + license = licenses.gpl2Plus; + platforms = platforms.all; + executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" + "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff" + "recountdiff" "rediff" "splitdiff" "unwrapdiff" ]; + }; +} |