svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=32719

13 files changed, 94 insertions, 142 deletions

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index e3b48f4832546..c7bddfd6de2ca 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libnatspec }:
+{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null }:
+
+assert enableNLS -> libnatspec != null;
 
 stdenv.mkDerivation {
   name = "zip-3.0";
@@ -12,9 +14,9 @@ stdenv.mkDerivation {
 
   installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp";
 
-  patches = [ ./natspec-gentoo.patch.bz2 ];
+  patches = if enableNLS then [ ./natspec-gentoo.patch.bz2 ] else [];
 
-  buildInputs = [ libnatspec ];
+  buildInputs = if enableNLS then [ libnatspec ] else [];
 
   meta = {
     homepage = http://www.info-zip.org;
@@ -22,4 +24,3 @@ stdenv.mkDerivation {
     maintainer = [ stdenv.lib.maintainers.urkud ];
   };
 }
-
diff --git a/pkgs/tools/misc/grub/1.98.nix b/pkgs/tools/misc/grub/1.98.nix
deleted file mode 100644
index df7d3408b6190..0000000000000
--- a/pkgs/tools/misc/grub/1.98.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{ fetchurl, stdenv, bison, gettext, ncurses, libusb, freetype, qemu }:
-
-let unifont_bdf = fetchurl {
-      url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
-      sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
-    };
-in
-
-stdenv.mkDerivation rec {
-  name = "grub-1.98";
-
-  src = fetchurl {
-    url = "ftp://alpha.gnu.org/gnu/grub/${name}.tar.gz";
-    sha256 = "05660x82y2rwrzm0d1c4z07fbh02qwmacsmbbav6fa855s4w3wmy";
-  };
-
-  buildInputs = [ bison ncurses libusb freetype gettext ]
-    ++ stdenv.lib.optional doCheck qemu;
-
-  preConfigure =
-    '' for i in "tests/util/"*.in
-       do
-         sed -i "$i" -e's|/bin/bash|/bin/sh|g'
-       done
-
-       # Apparently, the QEMU executable is no longer called
-       # `qemu-system-i386', even on i386.
-       #
-       # In addition, use `-nodefaults' to avoid errors like:
-       #
-       #  chardev: opening backend "stdio" failed
-       #  qemu: could not open serial device 'stdio': Invalid argument
-       #
-       # See <http://www.mail-archive.com/qemu-devel@nongnu.org/msg22775.html>.
-       sed -i "tests/util/grub-shell.in" \
-           -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g'
-    '';
-
-  patches =
-    [ # The udev rules for LVM create symlinks in /dev/mapper rathe
-      # than device nodes, causing GRUB to fail to recognize LVM
-      # volumes. See
-      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=550704
-      # This ugly workaround makes `find_root_device' use stat() on
-      # files in /dev/mapper instead of lstat().
-      ./device-mapper-symlinks.patch
-    ];
-
-  postPatch =
-    '' gunzip < "${unifont_bdf}" > "unifont.bdf"
-       sed -i "configure" \
-           -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
-    '';
-
-  doCheck = true;
-
-  meta = {
-    description = "GNU GRUB, the Grand Unified Boot Loader (2.x alpha)";
-
-    longDescription =
-      '' GNU GRUB is a Multiboot boot loader. It was derived from GRUB, GRand
-         Unified Bootloader, which was originally designed and implemented by
-         Erich Stefan Boleyn.
-
-         Briefly, the boot loader is the first software program that runs when a
-         computer starts.  It is responsible for loading and transferring
-         control to the operating system kernel software (such as the Hurd or
-         the Linux).  The kernel, in turn, initializes the rest of the
-         operating system (e.g., GNU).
-      '';
-
-    homepage = http://www.gnu.org/software/grub/;
-
-    license = "GPLv3+";
-
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-    platforms = stdenv.lib.platforms.gnu;
-  };
-}
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index cb0ffe321594b..0a8832f4b5198 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, intltool, pkgconfig, gtk, glib, libglade
 , networkmanager, GConf, libnotify, gnome_keyring, dbus_glib
-, polkit, xz }:
+, polkit, isocodes, xz }:
 
 let
   pn = "network-manager-applet";
   major = "0.9";
-  version = "${major}.0";
+  version = "${major}.2.0";
 in
 
 stdenv.mkDerivation rec {
@@ -13,11 +13,11 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "097y7c29bgd9wm0im06ka3cd94zssg4s626y5lw7yrypq3hzg18f";
+    sha256 = "ebe725d0140f658c6a3f384674c72fba7a7c417df3be0e84ee8f45e6dfc219de";
   };
 
   buildInputs = [ gtk libglade networkmanager GConf libnotify gnome_keyring
-    polkit];
+    polkit isocodes ];
 
   buildNativeInputs = [ intltool pkgconfig xz ];
 
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 8ca0be990397b..49aacaa4ef9ad 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib
+{ stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
 , udev, libnl1, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "0.9.0";
+  version = "0.9.2.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.bz2";
-    sha256 = "0kvi767c224zlja65r8gixmhj57292k0gsxa0217lw5i99l2incq";
+    url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz";
+    sha256 = "1pvd49ji7mh8ww2rfbvq6hmmjms5mb7w10fr7ihgzqbg589zjyj3";
   };
 
   # Right now we hardcode quite a few paths at build time. Probably we should
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
     "--with-crypto=gnutls" "--disable-more-warnings" ];
 
-  buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp ];
+  buildInputs = [ wirelesstools udev libnl1 libuuid polkit ppp xz ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];
 
diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index b2831fd4d7b62..3aa818db72816 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       LIBEXECDIR=$out/libexec/resolvconf
       VARDIR=/var/run/resolvconf
       MANDIR=$out/share/man
-      RESTARTCMD="initctl restart \1"
+      RESTARTCMD="false \1"
       EOF
     '';
 
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index 34f41272da8fc..8619cd9540904 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
     sha256 = "1128860lis89g1s21hqxvap2nq426c9j4bvgghncc1zj0ays7kj6";
   };
 
-  patches = [ ./makefile.patch ];
+  patches = [ ./makefile.patch ./vpnc-script.patch ];
 
   # The `etc/vpnc/vpnc-script' script relies on `which' and on
   # `ifconfig' as found in net-tools (not GNU Inetutils).
@@ -28,17 +28,22 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    for i in $out/{bin,sbin}/*
+    for i in "$out/{bin,sbin}/"*
     do
       wrapProgram $i --prefix PATH :  \
         "${nettools}/bin:${nettools}/sbin"
     done
+
+    mkdir -p $out/share/doc/vpnc
+    cp README nortel.txt ChangeLog $out/share/doc/vpnc/
   '';
 
   meta = {
-    description = ''VPNC, a virtual private network (VPN) client
-                    for Cisco's VPN concentrators'';
-    homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/;
+    homepage = "http://www.unix-ag.uni-kl.de/~massar/vpnc/";
+    description = "virtual private network (VPN) client for Cisco's VPN concentrators";
     license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/networking/vpnc/vpnc-script.patch b/pkgs/tools/networking/vpnc/vpnc-script.patch
new file mode 100644
index 0000000000000..67a86d5d58fa8
--- /dev/null
+++ b/pkgs/tools/networking/vpnc/vpnc-script.patch
@@ -0,0 +1,12 @@
+diff -ubr vpnc-0.5.3-orig/vpnc-script.in vpnc-0.5.3/vpnc-script.in
+--- vpnc-0.5.3-orig/vpnc-script.in	2012-02-29 23:03:35.289636602 +0100
++++ vpnc-0.5.3/vpnc-script.in	2012-02-29 23:03:59.597307445 +0100
+@@ -116,7 +116,7 @@
+ 
+ if [ -n "$IPROUTE" ]; then
+ 	fix_ip_get_output () {
+-		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g'
++		sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g'
+ 	}
+ 
+ 	set_vpngateway_route() {
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 175ae0693820d..7ad69e8353a9d 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,7 +4,7 @@
 , stateDir ? "/nix/var"
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "nix-1.0pre31851";
 
   src = fetchurl {
@@ -51,4 +51,6 @@ stdenv.mkDerivation rec {
     homepage = http://nixos.org/;
     license = "LGPLv2+";
   };
-}
+} // stdenv.lib.optionalAttrs stdenv.isDarwin {
+      phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
+})
diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix
index 62a75c16b4e4c..3d2360196a665 100644
--- a/pkgs/tools/security/tor/default.nix
+++ b/pkgs/tools/security/tor/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, libevent, openssl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "tor-0.2.1.30";
+  name = "tor-0.2.2.35";
 
   src = fetchurl {
     url = "http://www.torproject.org/dist/${name}.tar.gz";
-    sha256 = "02g15k8w5r57r9r6lz0sxzzvqx200y397y142cjswsd4zyla2lpk";
+    sha256 = "f141a41fffd31494a0f96ebbb6b999eab33ce62d5c31f81222a0acd034adbf3a";
   };
 
-  patchPhase =
+#  patchPhase =
     # DNS lookups fail in chroots.
-    '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g
-    '';
+#    '' sed -i "src/or/test.c" -es/localhost/127.0.0.1/g
+#    '';
 
   buildInputs = [ libevent openssl zlib ];
 
diff --git a/pkgs/tools/security/vidalia/default.nix b/pkgs/tools/security/vidalia/default.nix
new file mode 100644
index 0000000000000..243604c2c79e0
--- /dev/null
+++ b/pkgs/tools/security/vidalia/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, cmake, qt4 }:
+stdenv.mkDerivation rec {
+
+  name = "vidalia-${version}";
+  version = "0.2.17";
+
+  src = fetchurl {
+    url = "https://www.torproject.org/dist/vidalia/${name}.tar.gz";
+    sha256 = "0x0vb37h2d5njxmqkss03ybv7b7jw25682xb793mix1m8l0hs44r";
+  };
+
+  buildInputs = [ cmake qt4 ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.torproject.org/projects/vidalia.html.en;
+    description = "a cross-platform graphical controller for the Tor software, built using the Qt framework";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.all;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
index b8e27bd93d3b6..f93724e4af103 100644
--- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix
+++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix
@@ -1,9 +1,9 @@
 args: with args;
 rec {
-  name = "moderncv-2012.01.16";
+  name = "moderncv-0.19";
   src = fetchurl {
     url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
-    sha256 = "5cd2117cd2a3572dbc055033ca81ca744ee65918c42d23687e133bb1e6ddd644";
+    sha256 = "0i6nvpkb2fqkgrl26bf431cyckklra0wlcsh0ny2smx3s9y13ljw";
   };
 
   buildInputs = [texLive unzip];
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
index f6f32a7c5b790..36dc77bcd2d73 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "ec2-ami-tools-1.4.0.1";
+  name = "ec2-ami-tools-1.4.0.5";
   
   buildInputs = [ unzip makeWrapper ];
   
   src = fetchurl {
     url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
-    sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz";
+    sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75";
   };
 
   # Amazon EC2 requires that disk images are writable.  If they're
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
index c8d0597b47998..54c2228911ebd 100644
--- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
+++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
@@ -1,33 +1,23 @@
-diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb
-*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb	2009-12-02 22:28:44.000000000 +0100
---- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb	2010-01-22 16:16:13.000000000 +0100
-***************
-*** 80,86 ****
-        # piped via several processes. The tee is used to allow a
-        # digest of the file to be calculated without having to re-read
-        # it from disk.
-!       tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse
-        tar.add(File::basename( image_file ), File::dirname( image_file ))
-        openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
-        pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug)
---- 80,86 ----
-        # piped via several processes. The tee is used to allow a
-        # digest of the file to be calculated without having to re-read
-        # it from disk.
-!       tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable
-        tar.add(File::basename( image_file ), File::dirname( image_file ))
-        openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
-        pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug)
-diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb
-*** ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb	2009-12-02 22:28:44.000000000 +0100
---- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb	2010-01-22 16:16:11.000000000 +0100
-***************
-*** 31,36 ****
---- 31,37 ----
-            def update;         @options << '-u';          self; end
-            def sparse;         @options << '-S';          self; end
-            def dereference;    @options << '-h';          self; end
-+           def writable;       @options << '--mode=0755'; self; end
-            
-            def archive(filename)
-              filename = '-' if filename.nil? 
+diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb
+--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb	2011-12-06 14:57:28.000000000 +0100
++++ ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb	2012-02-25 21:24:57.682427268 +0100
+@@ -80,7 +80,7 @@
+       # piped via several processes. The tee is used to allow a
+       # digest of the file to be calculated without having to re-read
+       # it from disk.
+-      tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse
++      tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable
+       tar.owner(0).group(0)
+       tar.add(File::basename( image_file ), File::dirname( image_file ))
+       openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
+diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb
+--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb	2011-12-06 14:57:28.000000000 +0100
++++ ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb	2012-02-25 21:23:36.342716403 +0100
+@@ -31,6 +31,7 @@
+           def update;         @options << '-u';          self; end
+           def sparse;         @options << '-S';          self; end
+           def dereference;    @options << '-h';          self; end
++          def writable;       @options << '--mode=0755'; self; end
+           
+           def archive(filename)
+             filename = '-' if filename.nil?