Merge ^/nixpkgs/trunk.

This merge leads to a big rebuild, but this wouldn't hurt as I'm going to
reintegrate this branch soon.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33455

15 files changed, 78 insertions, 122 deletions

diff --git a/pkgs/tools/X11/xauth/default.nix b/pkgs/tools/X11/xauth/default.nix
deleted file mode 100644
index 42e01c0aeda..00000000000
--- a/pkgs/tools/X11/xauth/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libX11, libXau, libXext, libXmu}:
-
-stdenv.mkDerivation {
-  name = "xauth-7.0";
-  src = fetchurl {
-    url = http://nixos.org/tarballs/xauth-7.0.tar.bz2;
-    md5 = "d597005016baa8af81a5b0e38951d563";
-  };
-  buildInputs = [pkgconfig libX11 libXau libXext libXmu];
-}
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 678744ad5bb..c070a73d1f1 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -29,6 +29,10 @@ stdenv.mkDerivation rec {
     sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile
   '';
 
+  postInstall = ''
+    sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty
+  '';
+
   meta = {
     description = "A program for visualising graphs";
     homepage = http://www.graphviz.org/;
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index da0bbf0fb87..7a4de418a8c 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,18 +1,22 @@
-{stdenv, fetchurl, unzip, jdk}:
+{ stdenv, fetchurl, unzip, jdk }:
 
-#assert jdk.swingSupport;
-
-stdenv.mkDerivation {
-  name = "jdiskreport-1.3.0";
+stdenv.mkDerivation rec {
+  name = "jdiskreport-1.4.0";
   
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip;
-    sha256 = "1vgiq797gqc6i89w4kscg57snn74wi8x566bhi9xn8r0fbphihxb";
+    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip;
+    sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd";
   };
   
-  buildInputs = [unzip];
+  buildInputs = [ unzip ];
   
   inherit jdk;
+
+  meta = {
+    homepage = http://www.jgoodies.com/freeware/jdiskreport/;
+    description = "A graphical utility to visualize disk usage";
+    license = "unfree-redistributable";
+  };  
 }
diff --git a/pkgs/tools/misc/qdu/default.nix b/pkgs/tools/misc/qdu/default.nix
deleted file mode 100644
index cd9c296a758..00000000000
--- a/pkgs/tools/misc/qdu/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{stdenv, fetchurl, qt3, libXext, libX11}:
-
-stdenv.mkDerivation {
-  name = "qdu-2.2";
-  src = fetchurl {
-    url = http://artis.imag.fr/~Gilles.Debunne/Code/QDU/qdu-2.2.tar.gz;
-    sha256 = "0nn13lcw7bpasdn5xd0ydkyzirz9zamgl8lizi3ncqdzv8bjm7xl";
-  };
-
-  buildInputs = [ qt3 libXext libX11 ];
-
-  patchPhase = ''
-    sed -i "s@/usr/bin@$out/bin@" qdu.pro
-    sed -i "s@hint>directoryview@hint>directoryView@g" qduInterface.ui
-  '';
-  buildPhase = ''
-    qmake
-    make
-    make install
-  '';
-
-  meta = {
-    homepage = "http://artis.imag.fr/~Gilles.Debunne/Code/QDU";
-    description = "A graphical disk usage tool based on Qt";
-    license="GPL";
-  };
-}
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index f23d0f41e11..9a862a461b6 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -19,5 +19,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
     homepage = http://roy.marples.name/projects/dhcpcd;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 929db017152..987b5d261cd 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation {
   # The test suite doesn't succeed on Hydra.
   doCheck = false;
 
+  # Glib calls `clock_gettime', which is in librt. Linking that library
+  # here ensures that a proper rpath is added to the executable so that
+  # it can be loaded at run-time.
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread";
+
   meta = {
     homepage = "http://nbd.sourceforge.net";
     description = "map arbitrary files as block devices over the network";
diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix
index 754aabe3a87..7028c3bf605 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.1.2";
+  name = "socat-1.7.2.0";
   
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "0rz12l36id4sfzbr2mpral1ddcqgm71al0snh14smg8l94amnfgp";
+    sha256 = "00hq0ia1fs4sy0qpavzlpf4qmnhh2ybq5is2kqzvqky14zlvvcsr";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix
index 16853cab7fc..e97c9be9702 100644
--- a/pkgs/tools/package-management/cabal-install/0.10.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.10.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix
index 140c3628405..f98aa8c306d 100644
--- a/pkgs/tools/package-management/cabal-install/0.6.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.6.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix
index ed84d069d10..c0ea0752d13 100644
--- a/pkgs/tools/package-management/cabal-install/0.8.0.nix
+++ b/pkgs/tools/package-management/cabal-install/0.8.0.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix
index a53460b6319..4b00985297f 100644
--- a/pkgs/tools/package-management/cabal-install/0.8.2.nix
+++ b/pkgs/tools/package-management/cabal-install/0.8.2.nix
@@ -12,9 +12,6 @@ cabal.mkDerivation (self: {
     description = "The command-line interface for Cabal and Hackage";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
   };
 })
diff --git a/pkgs/tools/security/ksshaskpass/default.nix b/pkgs/tools/security/ksshaskpass/default.nix
new file mode 100644
index 00000000000..1c777294c9b
--- /dev/null
+++ b/pkgs/tools/security/ksshaskpass/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, kdelibs}:
+
+stdenv.mkDerivation {
+  name = "ksshaskpass-0.5.3";
+
+  src = fetchurl {
+    url = http://kde-apps.org/CONTENT/content-files/50971-ksshaskpass-0.5.3.tar.gz;
+    sha256 = "0911i8jr0nzqah8xidb8wba55a2skaidj3klv3cw6bm5fjx7x953";
+  };
+
+  buildInputs = [ kdelibs ];
+
+  patchPhase = ''
+    sed -i 's@/usr/bin/@@' src/ksshaskpass.desktop
+  '';
+
+  meta = {
+    homepage = http://kde-apps.org/content/show.php?content=50971;
+    description = "A KDE 4 version of ssh-askpass with KWallet support";
+    license = stdenv.lib.licenses.gpl2Plus;
+    inherit (kdelibs.meta) platforms;
+  };
+}
diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix
deleted file mode 100644
index 22c58cdfecf..00000000000
--- a/pkgs/tools/security/p0f/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{stdenv, fetchurl, libpcap}:
-  
-stdenv.mkDerivation {
-  name = "p0f-2.0.8";
-  
-  src = fetchurl {
-    url = http://lcamtuf.coredump.cx/p0f/p0f-2.0.8.tgz;
-    md5 = "1ccbcd8d4c95ef6dae841120d23c56a5";
-  };
-  
-  buildInputs = [libpcap];
-  patches = [./p0f.patch];
-}
diff --git a/pkgs/tools/security/p0f/p0f.patch b/pkgs/tools/security/p0f/p0f.patch
deleted file mode 100644
index e1b73fa37a0..00000000000
--- a/pkgs/tools/security/p0f/p0f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -ruN p0f/Build p0f.new/Build
---- p0f/Build	2006-03-16 08:44:34.000000000 +0100
-+++ p0f.new/Build	2007-01-13 03:26:40.000000000 +0100
-@@ -36,9 +36,9 @@
- 
- USE_BPF="pcap-bpf.h"
- 
--if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
--  USE_BPF="net/bpf.h"
--fi
-+#if [ ! -f "/usr/include/$USE_BPF" -a ! -f "/usr/local/include/$USE_BPF" ]; then
-+#  USE_BPF="net/bpf.h"
-+#fi
- 
- export USE_BPF
- 
-diff -ruN p0f/mk/Linux p0f.new/mk/Linux
---- p0f/mk/Linux	2006-08-21 14:37:00.000000000 +0200
-+++ p0f.new/mk/Linux	2007-01-13 03:34:18.000000000 +0100
-@@ -11,8 +11,7 @@
- LIBS	= -lpcap
- STRIP   = strip
- CFLAGS  = -O3 -Wall -fomit-frame-pointer -funroll-loops \
--          -DUSE_BPF=\"${USE_BPF}\" \
--	  -I/usr/include/pcap -I/usr/local/include/pcap -I/usr/local/include
-+          -DUSE_BPF=\"${USE_BPF}\"
- FILE	= p0f
- TOOLS   = test/sendack test/sendack2 test/sendsyn
- 
-@@ -47,9 +46,11 @@
- 	rm -f /tmp/p0f.tgz
- 	
- install: $(FILE)
--	cp -f $(FILE) /usr/sbin/
--	cp -f p0frep /usr/sbin/
--	mkdir /etc/p0f || true
--	cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp /etc/p0f/
--	cp -f p0f.1 /usr/man/man1/ || cp -f p0f.1 /usr/local/man/man1/
-+	mkdir -p ${out}/sbin
-+	cp -f $(FILE) ${out}/sbin/
-+	cp -f p0frep ${out}/sbin/
-+	mkdir -p ${out}/etc/p0f || true
-+	cp -f p0f.fp p0fa.fp p0fr.fp p0fo.fp ${out}/etc/p0f/
-+	mkdir -p ${out}/man/man1
-+	cp -f p0f.1 ${out}/man/man1/
- 	@echo "You might want to manually install test/ tools now."
diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix
new file mode 100644
index 00000000000..c9993ec4282
--- /dev/null
+++ b/pkgs/tools/text/wgetpaste/default.nix
@@ -0,0 +1,26 @@
+{stdenv, fetchurl, wget, bash, coreutils}:
+  stdenv.mkDerivation rec {
+    version = "2.18";
+    name = "wgetpaste-${version}";
+      src = fetchurl {
+        url = "http://wgetpaste.zlin.dk/${name}.tar.bz2";
+        sha256 = "95ee46eac37ca74ce960c1726afc19f4a1dde4d1875ac860fdc5e45d3cb05d3e";
+    };
+    # currently zsh-autocompletion support is not installed
+
+    prePatch = ''
+      substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash"
+    '';
+
+    installPhase = ''
+      mkdir -p $out/bin;
+      cp wgetpaste $out/bin;
+    '';
+
+    meta = {
+      description = "wgetpaste";
+      homepage = http://wgetpaste.zlin.dk/;
+      license = "publicDomain";
+      maintainers = with stdenv.lib.maintainers; [qknight];
+    };
+  }