Use newly-added taskwarrior as an update to existing taskwarrior attribute

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;
   };
 }

pkgs/tools/misc/task/default.nix

@@ -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;
-  };
-}

pkgs/top-level/all-packages.nix

@@ -1525,8 +1525,6 @@ let
     autoconf = autoconf213;
   };
 
-  task = callPackage ../tools/misc/task { };
-
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   /*