From 0bf1789b6a64f8654325412de2a1a40c7834f6ba Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 11 Oct 2012 10:50:53 +0400
Subject: [PATCH] Use newly-added taskwarrior as an update to existing
 taskwarrior attribute

---
 .../applications/misc/taskwarrior/default.nix | 35 ++++++++-----------
 pkgs/tools/misc/task/default.nix              | 22 ------------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 pkgs/tools/misc/task/default.nix

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 95f9de2f42b..dbb3c3f6a4e 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,29 +1,22 @@
-{ stdenv, fetchurl, cmake, lua5 }:
+{stdenv, fetchurl, cmake}:
 
 stdenv.mkDerivation {
-  name = "task-warrior-2.0.0";
-
-  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz;
-    sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq";
-  };
-
-  NIX_LDFLAGS = "-ldl";
-
-  buildNativeInputs = [ cmake ];
-  buildInputs = [ lua5 ];
-
-  crossAttrs = {
-    preConfigure = ''
-      export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
-    '';
-  };
+  name = "taskwarrior-2.1.2";
 
   enableParallelBuilding = true;
 
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
+    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
+  };
+
+  buildInputs = [ cmake ];
+
   meta = {
-    description = "Command-line todo list manager";
-    homepage = http://taskwarrior.org/;
-    license = "GPLv2+";
+    description = "GTD (getting things done) implementation";
+    homepage = http://taskwarrior.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix
deleted file mode 100644
index 529eacd377e..00000000000
--- a/pkgs/tools/misc/task/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, cmake}:
-
-stdenv.mkDerivation {
-  name = "task-2.1.2";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
-    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
-  };
-
-  buildInputs = [ cmake ];
-
-  meta = {
-    description = "GTD (getting things done) implementation";
-    homepage = http://taskwarrior.org;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f855a2ab34..caedbfdb783 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1525,8 +1525,6 @@ let
     autoconf = autoconf213;
   };
 
-  task = callPackage ../tools/misc/task { };
-
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   /*