From e2a6d56a0d4f52c4f819efdec8d5cd68004b2553 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Fri, 18 Jul 2008 23:36:28 +0000
Subject: [PATCH] added patchutils

svn path=/nixpkgs/trunk/; revision=12387
---
 pkgs/tools/text/patchutils/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  4 ++++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/text/patchutils/default.nix

diff --git a/pkgs/tools/text/patchutils/default.nix b/pkgs/tools/text/patchutils/default.nix
new file mode 100644
index 000000000000..b89ffb850a0b
--- /dev/null
+++ b/pkgs/tools/text/patchutils/default.nix
@@ -0,0 +1,21 @@
+args:
+args.stdenv.mkDerivation {
+  name = "patchutils-0.3.0";
+
+  src = args.fetchurl {
+    url = http://cyberelk.net/tim/data/patchutils/stable/patchutils-0.3.0.tar.bz2;
+    sha256 = "08jzvprhpcgwvx0xlkwc8dbdd9ilvwyr3cwnq96xmbfipch69yi7";
+  };
+
+  buildInputs =(with args; []);
+
+  meta = { 
+      description = "collection of programs that operate on patch files, fix"
+        + " diffs after manually editing them, create a diff of diffs etc";
+      homepage = http://cyberelk.net/tim/software/patchutils;
+      license = "GPLv2";
+      executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff"
+        "filterdiff" "fixcvsdiff" "flipdiff" "grepdiff" "interdiff" "lsdiff"
+        "recountdiff" "rediff" "splitdiff" "unwrapdiff" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d9f826687b9..94de022c105e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -910,6 +910,10 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
+  patchutils = import ../tools/text/patchutils {
+    inherit fetchurl stdenv;
+  };
+
   parted = import ../tools/misc/parted {
     inherit fetchurl stdenv e2fsprogs readline;
   };