* Sync with the trunk.

svn path=/nixpkgs/branches/modular-python/; revision=26586

12 files changed, 152 insertions, 23 deletions

diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix
index f51d3c2f290..ceb3798f6de 100644
--- a/pkgs/tools/X11/x11vnc/default.nix
+++ b/pkgs/tools/X11/x11vnc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, libjpeg, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "x11vnc-0.9.10";
+  name = "x11vnc-0.9.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/libvncserver/${name}.tar.gz";
-    sha256 = "04g0da04g4iw0qwvn43a8vh2im4wx9rwl1w41acsbdi8b0amhlck";
+    sha256 = "60a7cceee2c9a5f1c854340b2bae13f975ac55906237042f81f795b28a154a79";
   };
 
   buildInputs =
diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix
new file mode 100644
index 00000000000..dc79bd9e2d1
--- /dev/null
+++ b/pkgs/tools/X11/xbindkeys/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, libX11, guile }:
+
+let version = "1.8.5"; in
+stdenv.mkDerivation {
+  name = "xbindkeys-${version}";
+  src = fetchurl {
+    url = "http://www.nongnu.org/xbindkeys/xbindkeys-${version}.tar.gz";
+    sha256 = "10gwyvj69yyqgk1xxbrl37gx3c3jfpgr92mz62b1x5q6jiq7hbyn";
+  };
+
+  buildInputs = [ libX11 guile ];
+
+  meta = {
+    homepage = http://www.nongnu.org/xbindkeys/xbindkeys.html;
+    description = "Launch shell commands with your keyboard or your mouse under X Window";
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 21ce9215017..c4295e7b47a 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchurl, aclSupport ? false, acl ? null, perl, gmp ? null}:
+{ stdenv, fetchurl, perl, gmp ? null
+, aclSupport ? false, acl ? null
+, selinuxSupport? false, libselinux ? null, libsepol ? null }:
 
 assert aclSupport -> acl != null;
+assert selinuxSupport -> ( (libselinux != null) && (libsepol != null) );
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "coreutils-8.7";
 
   src = fetchurl {
@@ -11,11 +14,16 @@ stdenv.mkDerivation rec {
   };
 
   buildNativeInputs = [ perl ];
-  buildInputs = [ gmp ] ++ stdenv.lib.optional aclSupport acl;
+  buildInputs = [ gmp ]
+    ++ stdenv.lib.optional aclSupport acl
+    ++ stdenv.lib.optional selinuxSupport libselinux
+    ++ stdenv.lib.optional selinuxSupport libsepol;
 
   crossAttrs = {
     buildInputs = [ gmp ]
       ++ stdenv.lib.optional aclSupport acl.hostDrv
+      ++ stdenv.lib.optional selinuxSupport libselinux.hostDrv
+      ++ stdenv.lib.optional selinuxSupport libsepol.hostDrv
       ++ stdenv.lib.optional (stdenv.gccCross.libc ? libiconv)
         stdenv.gccCross.libc.libiconv.hostDrv;
 
@@ -48,4 +56,5 @@ stdenv.mkDerivation rec {
 
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
-}
+} // (if selinuxSupport then { NIX_LDFLAGS = "-lsepol"; } else { } ) )
+
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 150ced67776..f009935a6cd 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20110205";
+  name = "parallel-20110322";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "0z1yl7mqs4z1nz5hkjr8agbnj2bpr2f4pq683lr9axa9m0pszzvj";
+    sha256 = "0zcyyc8wlhi6196v4cs1ixz7hmcg10aqs6dycznjmbnwmpd77ybr";
   };
 
   patchPhase =
diff --git a/pkgs/tools/misc/polkit-gnome/default.nix b/pkgs/tools/misc/polkit-gnome/default.nix
new file mode 100644
index 00000000000..9adab0fb0c2
--- /dev/null
+++ b/pkgs/tools/misc/polkit-gnome/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, gtk, polkit, dbus_glib, intltool }:
+stdenv.mkDerivation rec {
+
+  name = "polkit-gnome-${version}";
+  version = "0.96";
+
+  src = fetchurl {
+    url = http://hal.freedesktop.org/releases/polkit-gnome-0.96.tar.bz2;
+    sha256 = "14la7j3h1k1s88amkcv8rzq9wmhgzypvxpwaxwg2x2k55l1wi5hd";
+  };
+
+  buildInputs = [ pkgconfig gtk polkit dbus_glib intltool ];
+
+  configureFlags = [ "--disable-introspection" ];
+
+  meta = with stdenv.lib; {
+    homepage = http://hal.freedesktop.org/docs/PolicyKit/;
+    description = "A dbus session bus service that is used to bring up authentication dialogs";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/networking/dhcp/flush-if.patch b/pkgs/tools/networking/dhcp/flush-if.patch
index a6d914231ee..ff72248b0ab 100644
--- a/pkgs/tools/networking/dhcp/flush-if.patch
+++ b/pkgs/tools/networking/dhcp/flush-if.patch
@@ -10,9 +10,9 @@ diff --exclude '*~' -rc dhcp-4.1.0p1-orig/client/scripts/linux dhcp-4.1.0p1/clie
 + # Delete the old addresses, routes and ARP information for this
 + # interface.
 + flush_if() {
-+   ${ip} address flush dev $interface
-+   ${ip} route flush dev $interface
-+   ${ip} neighbour flush dev $interface
++   ${ip} -4 address flush dev $interface
++   ${ip} -4 route flush dev $interface
++   ${ip} -4 neighbour flush dev $interface
 + }
 + 
   # Invoke the local dhcp client enter hooks, if they exist.
diff --git a/pkgs/tools/networking/knetworkmanager/live.nix b/pkgs/tools/networking/knetworkmanager/live.nix
index 80c7e9335b6..5c812e19639 100644
--- a/pkgs/tools/networking/knetworkmanager/live.nix
+++ b/pkgs/tools/networking/knetworkmanager/live.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://kde.org;
     description = "KDE systray and plasma applet for network management.";
-    license = licenses.gplv2;
+    license = licenses.gpl2;
     maintainers = with maintainers; [  phreedom ];
   };
 }
diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix
new file mode 100644
index 00000000000..1d66d30aaba
--- /dev/null
+++ b/pkgs/tools/networking/ndisc6/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "ndisc6-1.0.1";
+
+  src = fetchurl {
+    url = "http://www.remlab.net/files/ndisc6/archive/${name}.tar.bz2";
+    sha256 = "1pggc9x3zki1sv08rs8x4fm7pmd3sn1nwkan3szax19xg049xbqx";
+  };
+
+  buildInputs = [ perl ];
+
+  configureFlags = "--localstatedir=/var";
+
+  installFlags = "localstatedir=$(TMPDIR)";
+
+  meta = {
+    homepage = http://www.remlab.net/ndisc6/;
+    description = "A small collection of useful tools for IPv6 networking";
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
new file mode 100644
index 00000000000..515e3067365
--- /dev/null
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade
+, networkmanager, GConf, libnotify, gnome_keyring, dbus_glib
+, polkit}:
+stdenv.mkDerivation rec {
+
+  name = "network-manager-applet-${version}";
+  version = "0.8.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/network-manager-applet/0.8/network-manager-applet-${version}.tar.bz2";
+    sha256 = "0rn3mr0v8i3bkfhpvx6bbyhv1i6j6s120pkayq2318bg5ivbk12a";
+  };
+
+  buildInputs = [ intltool pkgconfig gtk glib libglade networkmanager GConf libnotify
+                  gnome_keyring dbus_glib polkit];
+
+  meta = with stdenv.lib; {
+    homepage = http://projects.gnome.org/NetworkManager/;
+    description = "NetworkManager control appler for GNOME.";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix
new file mode 100644
index 00000000000..bf4c429808b
--- /dev/null
+++ b/pkgs/tools/system/efibootmgr/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchurl, pciutils, perl, zlib}:
+
+let version = "0.5.4"; in
+
+stdenv.mkDerivation {
+  name = "efibootmgr-${version}";
+
+  buildInputs = [ pciutils zlib perl ];
+
+  
+  src = fetchurl {
+    url = "http://linux.dell.com/efibootmgr/permalink/efibootmgr-${version}.tar.gz";
+    sha256 = "0wcfgf8x4p4xfh38m9x3njwsxibm9bhnmvpjj94lj9sk9xxa8qmm";
+  };
+
+  patchPhase = ''
+    substituteInPlace "./tools/install.pl" \
+      --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  preBuild = ''
+    export makeFlags="BINDIR=$out/sbin"
+  '';
+
+  meta = {
+    description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager";
+    homepage = http://linux.dell.com/efibootmgr/;
+    license = "GPLv2";
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index b7cebc5795a..df46be2e710 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,14 +1,14 @@
-{ fetchurl, stdenv, libuuid, popt }:
+{ fetchurl, stdenv, libuuid, popt, icu }:
 
 stdenv.mkDerivation rec {
-  name = "gptfdisk-0.7.0";
+  name = "gptfdisk-0.7.1";
 
   src = fetchurl {
     url = "http://www.rodsbooks.com/gdisk/${name}.tgz";
-    sha256 = "1912l01pj7wcaj2fp06yl6m893c52qh2qy0bkx33k6iq2k747zrf";
+    sha256 = "142mrlcaprh7a6r55wvaxpvjmkffh7w8lcagarmwq4cfibfrnwd8";
   };
 
-  buildInputs = [ libuuid popt ];
+  buildInputs = [ libuuid popt icu ];
 
   installPhase = ''
     ensureDir $out/bin
@@ -29,3 +29,4 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+
diff --git a/pkgs/tools/typesetting/lhs2tex/default.nix b/pkgs/tools/typesetting/lhs2tex/default.nix
index 012c98f6887..68f2347bb65 100644
--- a/pkgs/tools/typesetting/lhs2tex/default.nix
+++ b/pkgs/tools/typesetting/lhs2tex/default.nix
@@ -1,14 +1,11 @@
-{cabal, tetex, polytable, regexCompat}:
-
-#assert tetex == polytable.tetex;
+{cabal, texLive, regexCompat}:
 
 cabal.mkDerivation (self : {
   pname = "lhs2tex";
-  version = "1.16";
+  version = "1.17";
   name = self.fname;
-  sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
-  extraBuildInputs = [tetex regexCompat];
-  propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
+  sha256 = "1x49316m5xm4f6hw5q7kia9rpfpygxhk5gnifd54ai0zjmdlkxrc";
+  extraBuildInputs = [regexCompat texLive];
 
   postInstall = ''
     ensureDir "$out/share/doc/$name"