Merge branch 'master' from viric's fork.

It has a few updates to some packages: taskwarrior, dar.
Also made links2 cross-build.

pkgs/applications/misc/taskwarrior/default.nix

@@ -1,13 +1,26 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, cmake, lua5 }:
 
 stdenv.mkDerivation {
-  name = "task-warrior-1.9.4";
+  name = "task-warrior-2.0.0";
 
   src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-1.9.4.tar.gz;
-    sha256 = "0jnk30k1b2j3nx39il70jmj6p49wxp6cl4awd8hw71gqkcf6480h";
+    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"
+    '';
+  };
+
+  enableParallelBuilding = true;
+
   meta = {
     description = "Command-line todo list manager";
     homepage = http://taskwarrior.org/;

pkgs/applications/misc/taskwarrior/unstable.nix

@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, cmake, lua5 }:
-
-stdenv.mkDerivation {
-  name = "task-warrior-2.0.0.beta4";
-
-  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.0.0.beta4.tar.gz;
-    sha256 = "1c9n6b5ly3m5kminnsvqgmjxdkb68w4av9kdnh47dw4sj3gwrn1w";
-  };
-
-  NIX_LDFLAGS = "-ldl";
-
-  buildNativeInputs = [ cmake ];
-  buildInputs = [ lua5 ];
-
-  crossAttrs = {
-    preConfigure = ''
-      export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
-    '';
-  };
-
-  meta = {
-    description = "Command-line todo list manager";
-    homepage = http://taskwarrior.org/;
-    license = "MIT";
-  };
-}

pkgs/applications/networking/browsers/links2/default.nix

@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals enableX11 [ libX11 libXau libXt ]
     ++ stdenv.lib.optional enableDirectFB [ directfb ];
 
-  buildNativeInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig bzip2 ];
 
   configureFlags = [ "--with-ssl" ]
     ++ stdenv.lib.optional (enableX11 || enableFB || enableDirectFB) "--enable-graphics"

pkgs/tools/archivers/dar/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }:
 
 stdenv.mkDerivation rec {
-  name = "dar-2.4.2";
+  name = "dar-2.4.6";
   
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "0cvcy9xccg4wmvbpxyacwppapbq03m3pwjk8b3xmdn2h8lr1pziq";
+    sha256 = "1r83ad32wbdrwxifkw1gdki7z534ggm9hfbmc6jf5lgr5mgkrqbq";
   };
 
   buildInputs = [ zlib bzip2 openssl attr lzo libgcrypt e2fsprogs ];

pkgs/top-level/all-packages.nix

@@ -7423,8 +7423,6 @@ let
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
-  taskwarrior_unstable = callPackage ../applications/misc/taskwarrior/unstable.nix { };
-
   telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
     inherit (pkgs.gnome) libsoup;
   };