* Merged the last of the trunk, preparing for switch... backups/stdenv-updates-merge@10849

svn path=/nixpkgs/branches/stdenv-updates-merge/; revision=10847

14 files changed, 249 insertions, 24 deletions

diff --git a/pkgs/applications/graphics/inkscape/configure-python-libs.patch b/pkgs/applications/graphics/inkscape/configure-python-libs.patch
new file mode 100644
index 0000000000000..4999a55d00b70
--- /dev/null
+++ b/pkgs/applications/graphics/inkscape/configure-python-libs.patch
@@ -0,0 +1,11 @@
+--- inkscape-0.45.1/configure	2007-03-20 14:56:43.000000000 +0100
++++ inkscape-0.45.1/configure	2008-02-22 16:19:10.000000000 +0100
+@@ -10202,7 +10202,7 @@ if test "x$with_python" = "xyes"; then
+     if test "$?" -gt "0"; then
+         with_python="no"
+     else
+-        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
++        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '-L%s -lpython2.4 %s' % (distutils.sysconfig.get_config_var('LIBDIR'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
+         if test "$?" -gt "0"; then
+             with_python="no"
+         else
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index b8ff248633002..8174290de7a17 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -8,12 +8,40 @@ stdenv.mkDerivation rec {
     sha256 = "1y0b9bm8chn6a2ip99dj4dhg0188yn67v571ha0x38wrlmvn4k0d";
   };
 
+  # Work around Python misdetection and set `PYTHON_LIBS' to
+  # "-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so".
+  patches = [ ./configure-python-libs.patch ];
+
+  propagatedBuildInputs = [
+    # Python is used at run-time to execute scripts, e.g., those from
+    # the "Effects" menu.
+    python pyxml
+  ];
+
   buildInputs = [
     pkgconfig perl perlXMLParser gtk libXft fontconfig libpng zlib popt boehmgc
     libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext
+    makeWrapper
   ];
 
+  configureFlags = "--with-python";
+
+  postInstall = ''
+    # Make sure PyXML modules can be found at run-time.
+    for i in "$out/bin/"*
+    do
+      # FIXME: We're assuming Python 2.4.
+      wrapProgram "$i" --prefix PYTHONPATH :      \
+       "${pyxml}/lib/python2.4/site-packages" ||  \
+        exit 2
+    done
+  '';
+
   meta = {
+    license = "GPL";
     homepage = http://www.inkscape.org;
+    description = ''Inkscape is a feature-rich vector graphics editor
+                    that edits files in the W3C SVG (Scalable Vector
+		    Graphics) file format.'';
   };
 }
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 9639ff19fb063..f80ea6ef453e0 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -6,6 +6,10 @@ stdenv.mkDerivation {
     sha256 = "5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b";
   };
 
+  buildInputs = [ openssl ];
+
+  configureFlags = "--with-ssl=${openssl}";
+
   patches = [ ./security-fix.patch ];
 
   meta = {
diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index 50767a7dde805..8246f7522d639 100644
--- a/pkgs/applications/misc/procmail/default.nix
+++ b/pkgs/applications/misc/procmail/default.nix
@@ -1,18 +1,21 @@
 args: with args;
 stdenv.mkDerivation {
   name="procmail-3.22";
-  buildInputs = [stdenv.gcc.libc];
+
+  buildInputs = [ stdenv.gcc.libc ];
+
   installPhase = "
     ensureDir \$out/bin
-    find . -exec sed -e \"s%^RM[ \\t]*=%RM=`type -f rm | awk '{print $3;}'`%\" -i '{}' ';'
-    sed -e 's%\\(LDFLAGS = \$(LDFLAGS1) -lnsl -ldl -lc\\)%\\1 -m%' -i src/Makefile
+    sed -e \"s%^RM.*$%RM=`type -f rm | awk '{print $3;}'` -f%\" -i Makefile
     sed -e \"s%^BASENAME.*%\BASENAME=$out%\" -i Makefile
+    sed -e \"s%^LIBS=.*%LIBS=-lm%\" -i Makefile
     make DESTDIR=\$out install
    ";
-  phases ="installPhase";
+
+  phases = "unpackPhase installPhase";
+
   src = fetchurl {
     url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz;
     sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08";
   };
-  o=62;
 }
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 9cd69bf900876..db0df695f2ba1 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -8,18 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "089n3da06k19gzhacsqgaamgx5hy5r50r2b4a626s87w44mj78sn";
   };
 
-  buildInputs = [curl openssl zlib expat gettext emacs];
+  buildInputs = [curl openssl zlib expat gettext]
+    ++ (if emacs != null then [emacs] else []);
 
   makeFlags="prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell}";
 
-  postInstall = ''
-    # Install Emacs mode.
-    echo "installing Emacs mode..."
-    make install -C contrib/emacs prefix="$out"
+  postInstall =
+    if emacs != null then
+	 ''# Install Emacs mode.
+	   echo "installing Emacs mode..."
+	   make install -C contrib/emacs prefix="$out"
 
-    # XXX: There are other things under `contrib' that people might want to
-    # install.
-  '';
+	   # XXX: There are other things under `contrib' that people might want to
+	   # install. ''
+       else
+         ''echo "NOT installing Emacs mode.  Set \`git.useEmacs' to \`true' in your"
+	   echo "\`~/.nixpkgs/config.nix' file to change it."'';
 
   meta = {
     license = "GPLv2";
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
new file mode 100644
index 0000000000000..7c9aafded73d6
--- /dev/null
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, python, makeWrapper}:
+
+stdenv.mkDerivation rec {
+  name = "PyXML-0.8.4";
+  src = fetchurl {
+    url = "mirror://sourceforge/pyxml/${name}.tar.gz";
+    sha256 = "04wc8i7cdkibhrldy6j65qp5l75zjxf5lx6qxdxfdf2gb3wndawz";
+  };
+
+  buildInputs = [python makeWrapper];
+  buildPhase = "python ./setup.py build";
+  installPhase = ''
+    python ./setup.py install --prefix="$out" || exit 1
+
+    for i in "$out/bin/"*
+    do
+      # FIXME: We're assuming Python 2.4.
+      wrapProgram "$i" --prefix PYTHONPATH :  \
+       "$out/lib/python2.4/site-packages" ||  \
+        exit 2
+    done
+  '';
+
+  meta = {
+    description = ''The PyXML package is a collection of libraries to process
+                    XML with Python.'';
+    homepage = http://pyxml.sourceforge.net/;
+  };
+}
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
new file mode 100644
index 0000000000000..9c09351190714
--- /dev/null
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -0,0 +1,19 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "acpi-0.09";
+  src = fetchurl {
+    url = "http://grahame.angrygoats.net/source/acpi/${name}.tar.gz";
+    sha256 = "11iwzbm3gcn9ljvxl4cjj9fc1n135hx45rhrsprnnkqppndf3vn1";
+  };
+
+
+  meta = {
+    description = ''Linux ACPI client is a small command-line
+                    program that attempts to replicate the functionality of
+		    the "old" `apm' command on ACPI systems.  It includes
+		    battery and thermal information.'';
+    homepage = http://grahame.angrygoats.net/acpi.shtml;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix
new file mode 100644
index 0000000000000..e1f8d71050030
--- /dev/null
+++ b/pkgs/os-specific/linux/acpitool/default.nix
@@ -0,0 +1,17 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name = "acpitool-0.4.7";
+  src = fetchurl {
+    url = "mirror://sourceforge/acpitool/${name}.tar.bz2";
+    sha256 = "133bdgcq9ql0l940kp9m2v6wzdvkyv8f1dizwjbx7v96n8g2c239";
+  };
+
+
+  meta = {
+    description = ''ACPI Tool is a small, convenient command-line
+                    ACPI client with a lot of features for Linux.'';
+    homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
+    license = "GPLv2+";
+  };
+}
diff --git a/pkgs/os-specific/linux/iwlwifi/default.nix b/pkgs/os-specific/linux/iwlwifi/default.nix
index 8859f7346b515..ed551e9bd456c 100644
--- a/pkgs/os-specific/linux/iwlwifi/default.nix
+++ b/pkgs/os-specific/linux/iwlwifi/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, kernel}:
 
-stdenv.mkDerivation {
-  name = "iwlwifi-1.2.23";
+stdenv.mkDerivation rec {
+  name = "iwlwifi-1.2.25";
 
   src = fetchurl {
-    url = http://www.intellinuxwireless.org/iwlwifi/downloads/iwlwifi-1.2.23.tgz;
-    sha256 = "0a4szjgg5b2jj4ax85lakqa951ph6pw5wpwlrw3mnmvcda5ayiip";
+    url = "http://www.intellinuxwireless.org/iwlwifi/downloads/${name}.tgz";
+    sha256 = "09fjy0swcyd77fdp8x2825wj5cd73hwbzl8mz9sy2ha21p1qwq1d";
   };
 
   preBuild = ''
@@ -33,5 +33,6 @@ stdenv.mkDerivation {
   meta = {
     description = "Intel Wireless WiFi Link drivers for Linux";
     homepage = http://www.intellinuxwireless.org/;
+    license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
new file mode 100644
index 0000000000000..e276ec10aa41c
--- /dev/null
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "inetutils-1.5";
+  src = fetchurl {
+    url = "mirror://gnu/inetutils/${name}.tar.gz";
+    sha256 = "048my5fgxnjwr1jcka8yq36c7i019p60r0mg4f6zz96pmys76p1l";
+  };
+
+  # Make sure `configure' honors `$TMPDIR' for chroot builds.
+  patchPhase = ''
+    cat configure | sed -'es|/tmp/,iu|$TMPDIR/,iu|g' > ,,tmp && \
+    mv ,,tmp configure && chmod +x configure
+  '';
+
+  postInstall = ''
+    # XXX: These programs are normally installed setuid but since it
+    # fails, they end up being non-executable, hence this hack.
+    chmod +x $out/bin/{ping,ping6,rcp,rlogin,rsh}
+  '';
+
+  meta = {
+    description = ''GNU Inetutils is a collection of common network
+                    programs, including telnet, FTP, RSH, rlogin and
+		    TFTP clients and servers, among others.'';
+    homepage = http://www.gnu.org/software/inetutils/;
+    license = "GPLv3+";
+  };
+}
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
new file mode 100644
index 0000000000000..d8cdc26fd38c0
--- /dev/null
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -0,0 +1,20 @@
+args: with args;
+stdenv.mkDerivation ( rec {
+  pname = "libtorrent";
+  version = "0.11.9";
+
+  name = "${pname}-${version}";
+  
+  src = fetchurl {
+    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
+    sha256 = "71f09218a7784b21ab53cdfcd8fa122da60352e5ca117fda7cd8d2763f908a08";
+  };
+
+  buildInputs = [ pkgconfig openssl libsigcxx ];
+  
+  meta = {
+    description = "
+      LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code.
+    ";
+  };
+})
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
new file mode 100644
index 0000000000000..04b50f9d5d250
--- /dev/null
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -0,0 +1,20 @@
+args: with args;
+stdenv.mkDerivation ( rec {
+  pname = "rtorrent";
+  version = "0.7.9";
+
+  name = "${pname}-${version}";
+  
+  src = fetchurl {
+    url = "http://libtorrent.rakshasa.no/downloads/${name}.tar.gz";
+    sha256 = "f06f72b1fec94177147b1db0aab15be4f62d1b0354811a67ae74e0cd1e50a119";
+  };
+
+  buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
+  
+  meta = {
+    description = "
+      rtorrent is a ncurses client for libtorrent and is ideal for use with screen or dtach.
+    ";
+  };
+})
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index c11a4721cb744..87e979330aebe 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libgcrypt, perl}:
+args: with args;
 
 stdenv.mkDerivation {
   name = "vpnc-0.5.1";
@@ -9,11 +9,25 @@ stdenv.mkDerivation {
 
   patches = [ ./makefile.patch ];
 
-  buildInputs = [libgcrypt perl];
+  # The `etc/vpnc/vpnc-script' script relies on `which' and on
+  # `ifconfig' as found in net-tools (not GNU Inetutils).
+  propagatedBuildInputs = [which nettools];
+
+  buildInputs = [libgcrypt perl makeWrapper];
+
   builder = ./builder.sh;
 
+  postInstall = ''
+    for i in $out/{bin,sbin}/*
+    do
+      wrapProgram $i --prefix PATH :  \
+        "${which}/bin:${nettools}/bin:${nettools}/sbin"
+    done
+  '';
+
   meta = {
-    description = "VPNC, a virtual private network (VPN) client for Cisco's VPN concentrators";
+    description = ''VPNC, a virtual private network (VPN) client
+                    for Cisco's VPN concentrators.'';
     homepage = http://www.unix-ag.uni-kl.de/~massar/vpnc/;
     license = "GPL";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32c3c9a8aeaf1..27d6fc5447bca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -623,6 +623,10 @@ rec {
     flex = flex2533;
   };*/
 
+  inetutils = import ../tools/networking/inetutils {
+    inherit fetchurl stdenv;
+  };
+
   jdiskreport = import ../tools/misc/jdiskreport {
     inherit fetchurl stdenv unzip jdk;
   };
@@ -656,6 +660,10 @@ rec {
     inherit fetchurl stdenv ghc tetex polytable;
   };
 
+  libtorrent = import ../tools/networking/p2p/libtorrent {
+    inherit fetchurl stdenv pkgconfig openssl libsigcxx;
+  };
+
   lout = import ../tools/typesetting/lout {
     inherit fetchurl stdenv ghostscript;
   };
@@ -807,6 +815,10 @@ rec {
     inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
   };
 
+  rtorrent = import ../tools/networking/p2p/rtorrent {
+    inherit fetchurl stdenv libtorrent ncurses pkgconfig libsigcxx curl zlib openssl;
+  };
+
   sablotron = import ../tools/text/xml/sablotron {
     inherit fetchurl stdenv expat;
   };
@@ -872,7 +884,7 @@ rec {
   };
 
   vpnc = import ../tools/networking/vpnc {
-    inherit fetchurl stdenv libgcrypt perl;
+    inherit fetchurl stdenv libgcrypt perl which nettools makeWrapper;
   };
 
   testdisk = import ../tools/misc/testdisk {
@@ -3482,6 +3494,10 @@ rec {
     inherit (gtkLibs) glib gtk;
   };
 
+  pyxml = import ../development/python-modules/pyxml {
+    inherit fetchurl stdenv python makeWrapper;
+  };
+
   wxPython = wxPython26;
 
   wxPython26 = import ../development/python-modules/wxPython/2.6.nix {
@@ -3638,6 +3654,14 @@ rec {
   };
   */
 
+  acpi = import ../os-specific/linux/acpi {
+    inherit fetchurl stdenv;
+  };
+
+  acpitool = import ../os-specific/linux/acpitool {
+    inherit fetchurl stdenv;
+  };
+
   alsaFun = lib.sumArgs (selectVersion ../os-specific/linux/alsa "1.0.16") {
     inherit fetchurl stdenv ncurses gettext;
   };
@@ -4705,7 +4729,7 @@ rec {
   fbpanel = fbpanelFun null;
 
   fetchmail = import ../applications/misc/fetchmail {
-    inherit stdenv fetchurl openssl python procmail;
+    inherit stdenv fetchurl openssl;
   };
 
   wireshark = import ../applications/networking/sniffers/wireshark {
@@ -4808,7 +4832,8 @@ rec {
   };
 
   git = import ../applications/version-management/git {
-    inherit fetchurl stdenv curl openssl zlib expat perl gettext emacs;
+    inherit fetchurl stdenv curl openssl zlib expat perl gettext;
+    emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null;
   };
 
   gkrellm = import ../applications/misc/gkrellm {
@@ -4878,7 +4903,8 @@ rec {
   inkscape = import ../applications/graphics/inkscape {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
       popt libxml2 libxslt libpng boehmgc fontconfig
-      libsigcxx lcms boost gettext cairomm;
+      libsigcxx lcms boost gettext cairomm
+      python pyxml makeWrapper;
     inherit (gtkLibs) gtk glib glibmm gtkmm;
     inherit (xlibs) libXft;
   };