* Merged from the trunk. Let's see how well this works with

Subversion 1.5...

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

pkgs/tools/misc/coreutils-5/default.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "coreutils-5.97";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/coreutils-5.97.tar.gz;
+    url = http://nixos.org/tarballs/coreutils-5.97.tar.gz;
     md5 = "bdec4b75c76ac9bf51b6dd1747d3b06e";
   };
   patches = [./dietlibc.patch];

pkgs/tools/misc/dosfstools/3.00deb.nix

@@ -1,15 +1,15 @@
 args : with args; with builderDefs;
     let patch = 
         fetchurl {
-          url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11-2.3.diff.gz;
-          sha256 = "0bzjhpgg4ih6c76ax8byis9vxgkr2c7bbbshqrkfq8j7ar48n5ld";
-        };	
-      localDefs = builderDefs.meta.function (rec {
-        src = /* put a fetchurl here */
-          fetchurl {
-            url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_2.11.orig.tar.gz;
-            sha256 = "1154k0y04npblgac81p4pcmglilk1ldrqll4hvbrwgcb7096vb0f";
-          };
+          url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.0-1.diff.gz;
+          sha256 = "5ecab7e9cf213b0cc7406649ca59edb9ec6daad2fa454bce423ccb1744fc1336";
+         };
+       localDefs = builderDefs.passthru.function (rec {
+         src = /* put a fetchurl here */
+           fetchurl {
+            url = http://ftp.de.debian.org/debian/pool/main/d/dosfstools/dosfstools_3.0.0.orig.tar.gz;
+            sha256 = "46125aafff40e8215e6aa30087c6c72a82654c8f5fca4878adc1fa26342eab58";
+           };
 	preBuild = FullDepEntry (''
 	  gunzip < ${patch} | patch -Np1
 	'')["minInit" "doUnpack"];

pkgs/tools/misc/fdupes/default.nix

@@ -0,0 +1,24 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "fdupes-1.40";
+  src = fetchurl {
+    url = http://premium.caribe.net/~adrian2/programs/fdupes-1.40.tar.gz;
+    sha256 = "1ryxpckgrmqa4y7nx9a9xpg4z1r00k11kc1cm7lqv87l9g293vg1";
+  };
+
+  installPhase =  ''
+    mkdir -p $out/{bin,man/man1}
+    make INSTALLDIR=$out/bin MANPAGEDIR=$out/man install
+  '';
+
+  meta = {
+    description = "identifies duplicate files residing within specified directories.";
+    longDescription = ''
+      FDUPES uses md5sums and then a byte by byte comparison to finde duplicate
+      files within a set of directories.
+    '';
+    homepage = http://premium.caribe.net/~adrian2/fdupes.html;
+    license = "MIT";
+  };
+}

pkgs/tools/misc/findutils/4.2.27.nix

@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "findutils-4.2.27";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/findutils-4.2.27.tar.gz;
+    url = http://nixos.org/tarballs/findutils-4.2.27.tar.gz;
     md5 = "f1e0ddf09f28f8102ff3b90f3b5bc920";
   };
   buildInputs = [coreutils];

pkgs/tools/misc/getopt/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "getopt-1.1.4";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/getopt-1.1.4.tar.gz;
+    url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz;
     md5 = "02188ca68da27c4175d6e9f3da732101";
   };
 }

pkgs/tools/misc/hg2git/default.nix

@@ -0,0 +1,26 @@
+args: with args;
+stdenv.mkDerivation {
+  name = "hg2git";
+
+  src = sourceByName "hg2git";
+
+  buildInputs =([mercurial.python mercurial makeWrapper]);
+
+  installPhase = ''
+    ensureDir $out/bin;
+    cp hg2git.sh hg2git.py $out/bin
+    cat >> $out/bin/hg2git-doc << EOF
+    #!${coreutils}/bin/cat
+    $(cat hg2git.txt)
+    EOF
+    chmod +x $out/bin/hg2git-doc
+    wrapProgram $out/bin/hg2git.sh \
+      --set PYTHONPATH "$(echo ${mercurial}/lib/python*/site-packages)"
+  '';
+
+  meta = {
+      description = "mercurial to git one way conversion";
+      homepage = "http://git.grml.org/?p=hg-to-git.git;a=summary";
+      license = "?"; # the .py file is GPLv2
+  };
+}

pkgs/tools/misc/pinentry/default.nix

@@ -1,17 +1,26 @@
-args:
-args.stdenv.mkDerivation {
-  name = "pinentry-0.7.2";
+{ fetchurl, stdenv, glib, pkgconfig, gtk, ncurses }:
 
-  src = args.fetchurl {
-    url = http://gentoo.chem.wisc.edu/gentoo/distfiles/pinentry-0.7.2.tar.gz;
-    sha256 = "0s6n5n4bxg95rmwa3mw3r49dabf8yh6fkpfi8mbl7i85dgpibnzv";
+stdenv.mkDerivation rec {
+  name = "pinentry-0.7.5";
+
+  src = fetchurl {
+    url = "mirror://gnupg/pinentry/${name}.tar.gz";
+    sha256 = "cb269ac058793b2df343a12a65e3402abc4b68503e105b12e4ca903d8d8e3172";
   };
 
-  buildInputs =(with args; [glib pkgconfig x11 gtk]);
+  patches = [ ./duplicate-glib-defs.patch ];
+
+  buildInputs = [ glib pkgconfig gtk ncurses ];
 
   meta = { 
-      description = "input interface for passwords needed by  gnupg";
-      homepage = "don't know, gentoo lists http://www.gnupg.org/aegypten/";
-      license = "GPL2";
+    description = "GnuPG's interface to passphrase input";
+
+    longDescription = ''
+      Pinentry provides a console and a GTK+ GUI that allows users to
+      enter a passphrase when `gpg' or `gpg2' is run and needs it.
+    '';
+
+    homepage = http://gnupg.org/aegypten2/;
+    license = "GPLv2+";
   };
 }

pkgs/tools/misc/pinentry/duplicate-glib-defs.patch

@@ -0,0 +1,20 @@
+Comment out definitions of functions that are part of Glib.
+
+--- pinentry-0.7.5/gtk+-2/gtksecentry.c	2007-11-19 12:20:50.000000000 +0100
++++ pinentry-0.7.5/gtk+-2/gtksecentry.c	2008-12-08 22:08:22.000000000 +0100
+@@ -269,6 +269,7 @@ gboolean g_use_secure_mem = FALSE;
+ 				} while(0)
+ 
+ 
++#if 0
+ gpointer
+ g_malloc(gulong size)
+ {
+@@ -347,6 +348,7 @@ g_free(gpointer mem)
+ 	    free(mem);
+     }
+ }
++#endif
+ 
+ GType
+ gtk_secure_entry_get_type(void)

pkgs/tools/misc/relfs/cvs.2008.03.05.nix

@@ -1,6 +1,6 @@
 
 args : with args;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 	src = /* put a fetchurl here */
 	if args ? src then args.src else fetchcvs {
 		cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs";

pkgs/tools/misc/rlwrap/0.28.nix

@@ -1,5 +1,5 @@
 args : with args; with builderDefs;
-	let localDefs = builderDefs.meta.function {
+	let localDefs = builderDefs.passthru.function {
 		src = /* put a fetchurl here */
 		fetchurl {
 			url = ftp://ftp.chg.ru/mirrors/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/rlwrap-0.28.tar.gz;