Finishing the update from trunk, having resolved the eclipse related directory

renaming.
I think directory renaming breaks the usual merges... because it leaves the
'to be removed' directory in the working directory still. A manual 'rm' of the
'to be removed' directory fixed the commit.

svn merge  ^/nixpkgs/trunk


svn path=/nixpkgs/branches/stdenv-updates/; revision=18661

pkgs/tools/misc/gnokii/default.nix

@@ -4,7 +4,7 @@ let
 
   s = import ./src-for-default.nix; 
   buildInputs = with a; [
-    perl intltool gettext
+    perl intltool gettext libusb
   ];
 in
 rec {

pkgs/tools/misc/myhasktags/default.nix

@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   version = "0.0"; # Haskell Platform 2009.0.0
   src = fetchurl {
     url = http://mawercer.de/~nix/hasktags.hs;
-    sha256 = "119c4d8f1c33f5aa04b01022a089e3ea2e2b213641b25920c7732ca27fd47c83";
+    sha256 = "e5ce4c4e1f5916baf9395174978faee67a86ff5350936c82e115939812a4d579";
   };
   phases="buildPhase";
   buildPhase = ''