From a21609b1ab35db1a01ad5175e71cd39f90b4bd62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Feb 2008 18:58:11 +0000
Subject: [PATCH 01/12] Add GNU Inetutils.

svn path=/nixpkgs/trunk/; revision=10817
---
 pkgs/tools/networking/inetutils/default.nix | 29 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/networking/inetutils/default.nix

diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
new file mode 100644
index 00000000000..e276ec10aa4
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6e547636ec..65fd7af8b26 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -622,6 +622,10 @@ rec {
     version = "0.3rc1";
   } null;*/
 
+  inetutils = import ../tools/networking/inetutils {
+    inherit fetchurl stdenv;
+  };
+
   jdiskreport = import ../tools/misc/jdiskreport {
     inherit fetchurl stdenv unzip jdk;
   };

From 96177fce34cf9996afdabf6b1e4265cb958b7598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Feb 2008 19:33:21 +0000
Subject: [PATCH 02/12] VPNC: Clarify run-time dependencies.

svn path=/nixpkgs/trunk/; revision=10818
---
 pkgs/tools/networking/vpnc/default.nix | 20 +++++++++++++++++---
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index c11a4721cb7..87e979330ae 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 65fd7af8b26..35b078f5776 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -878,7 +878,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 {

From 44fcdff01bca6d1c9473ad0851ca50fc10d5671f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Feb 2008 19:57:40 +0000
Subject: [PATCH 03/12] Add ACPI-Tool, a command-line ACPI client for Linux.

svn path=/nixpkgs/trunk/; revision=10819
---
 pkgs/os-specific/linux/acpitool/default.nix | 17 +++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/os-specific/linux/acpitool/default.nix

diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix
new file mode 100644
index 00000000000..e1f8d710500
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 35b078f5776..370aedaaafc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3654,6 +3654,10 @@ rec {
   };
   */
 
+  acpitool = import ../os-specific/linux/acpitool {
+    inherit fetchurl stdenv;
+  };
+
   alsaLib = import ../os-specific/linux/alsa/library {
     inherit fetchurl stdenv;
   };

From 96d354f1935b213e166a61e9d055b05644cfcfac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Feb 2008 20:13:36 +0000
Subject: [PATCH 04/12] Add ACPI, a tiny ACPI client tool for Linux

svn path=/nixpkgs/trunk/; revision=10820
---
 pkgs/os-specific/linux/acpi/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  4 ++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/os-specific/linux/acpi/default.nix

diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
new file mode 100644
index 00000000000..9c093511907
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 370aedaaafc..941e64012f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3654,6 +3654,10 @@ rec {
   };
   */
 
+  acpi = import ../os-specific/linux/acpi {
+    inherit fetchurl stdenv;
+  };
+
   acpitool = import ../os-specific/linux/acpitool {
     inherit fetchurl stdenv;
   };

From e8dd65789688ff4c3d3d5157a287c5da0ebae583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 21 Feb 2008 22:22:57 +0000
Subject: [PATCH 05/12] Intel Wifi Drivers (iwlwifi) 1.2.25.

svn path=/nixpkgs/trunk/; revision=10822
---
 pkgs/os-specific/linux/iwlwifi/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/iwlwifi/default.nix b/pkgs/os-specific/linux/iwlwifi/default.nix
index 8859f7346b5..ed551e9bd45 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";
   };
 }

From 2dde1dfa4f85b53747b596b85297f022874c5af4 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Fri, 22 Feb 2008 09:47:37 +0000
Subject: [PATCH 06/12] fixed install phase so the linker doesn't abort with
 undefined reference to pow()

svn path=/nixpkgs/trunk/; revision=10826
---
 pkgs/applications/misc/procmail/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix
index 50767a7dde8..8246f7522d6 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;
 }

From b567be78365cfa44a79691d71ccba66f53489c8d Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Fri, 22 Feb 2008 10:09:54 +0000
Subject: [PATCH 07/12] Added SSL support to fetchmail, maybe its better to add
 an argument `withSSL`?

svn path=/nixpkgs/trunk/; revision=10827
---
 pkgs/applications/misc/fetchmail/default.nix | 4 ++++
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 9639ff19fb0..0b22295a068 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -6,6 +6,10 @@ stdenv.mkDerivation {
     sha256 = "5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b";
   };
 
+  buildInputs = [ zlib openssl ];
+
+  configureFlags = "--with-ssl=${openssl}";
+
   patches = [ ./security-fix.patch ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 941e64012f1..727000b29cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4739,7 +4739,7 @@ rec {
   fbpanel = fbpanelFun {version="4.12";} null;
 
   fetchmail = import ../applications/misc/fetchmail {
-    inherit stdenv fetchurl;
+    inherit stdenv fetchurl zlib openssl;
   };
 
   wireshark = import ../applications/networking/sniffers/wireshark {

From 1ca69f74e54e8c0ddf8eba7ae470a1a116ef4ecd Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Fri, 22 Feb 2008 10:12:01 +0000
Subject: [PATCH 08/12] svn path=/nixpkgs/trunk/; revision=10828

---
 pkgs/applications/misc/fetchmail/default.nix | 2 +-
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index 0b22295a068..f80ea6ef453 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
     sha256 = "5612f9af367f641e0efd084f44fcf1889669e711dbd8c60f6b7953e494d1b09b";
   };
 
-  buildInputs = [ zlib openssl ];
+  buildInputs = [ openssl ];
 
   configureFlags = "--with-ssl=${openssl}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 727000b29cb..9a25f929da4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4739,7 +4739,7 @@ rec {
   fbpanel = fbpanelFun {version="4.12";} null;
 
   fetchmail = import ../applications/misc/fetchmail {
-    inherit stdenv fetchurl zlib openssl;
+    inherit stdenv fetchurl openssl;
   };
 
   wireshark = import ../applications/networking/sniffers/wireshark {

From c18141227fb831bcc8f24a57a985b9d71439e088 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 22 Feb 2008 13:53:45 +0000
Subject: [PATCH 09/12] Add PyXML.

svn path=/nixpkgs/trunk/; revision=10832
---
 .../python-modules/pyxml/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyxml/default.nix

diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
new file mode 100644
index 00000000000..7c9aafded73
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a25f929da4..1be9f913fd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3506,6 +3506,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 {

From c800565c73b886cb0d2ff2c6b790e896eab6dd54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 22 Feb 2008 16:24:58 +0000
Subject: [PATCH 10/12] Make Inkscape properly depend on Python, which is
 needed for some features.

svn path=/nixpkgs/trunk/; revision=10836
---
 .../inkscape/configure-python-libs.patch      | 11 +++++++
 .../graphics/inkscape/default.nix             | 32 ++++++++++++++++++-
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/graphics/inkscape/configure-python-libs.patch

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 00000000000..4999a55d00b
--- /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 dfed92f691e..7a9c354c310 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -8,7 +8,9 @@
   glib,
   gtkmm, glibmm, libsigcxx,
   boost,
-  gettext
+  gettext,
+  python, pyxml,
+  makeWrapper
 }:
 
 stdenv.mkDerivation {
@@ -19,6 +21,16 @@ stdenv.mkDerivation {
     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
@@ -32,9 +44,27 @@ stdenv.mkDerivation {
     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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1be9f913fd3..568d738f16b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4919,7 +4919,8 @@ rec {
   inkscape = import ../applications/graphics/inkscape {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib
       popt libxml2 libxslt libpng boehmgc fontconfig gtkmm
-      glibmm libsigcxx lcms boost gettext;
+      glibmm libsigcxx lcms boost gettext
+      python pyxml makeWrapper;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libXft;
   };

From adc77fc0c797067fb2a5e7546b6944100437f4f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Fri, 22 Feb 2008 16:51:51 +0000
Subject: [PATCH 11/12] Git: Make dependency on Emacs optional, per Yuri's
 request.

This works by looking for `git.useEmacs', a boolean, in the user's Nixpkgs
config file.  The default is `true' since it's only a build-time dependency
and most users are expected to install the pre-compiled substitute, which
doesn't pull Emacs.

svn path=/nixpkgs/trunk/; revision=10837
---
 .../version-management/git/default.nix        | 20 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  3 ++-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 9cd69bf9008..db0df695f2b 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 568d738f16b..9b6ed7c3ec5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4844,7 +4844,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 {

From e7f99973e1ef2c97e75325991ac763342e09bf18 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Sat, 23 Feb 2008 12:11:27 +0000
Subject: [PATCH 12/12] Added libtorrent a bittorent library written in C++ for
 *nix and rtorrent a ncurses client for libtorrent.

svn path=/nixpkgs/trunk/; revision=10842
---
 .../networking/p2p/libtorrent/default.nix     | 20 +++++++++++++++++++
 .../tools/networking/p2p/rtorrent/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/networking/p2p/libtorrent/default.nix
 create mode 100644 pkgs/tools/networking/p2p/rtorrent/default.nix

diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
new file mode 100644
index 00000000000..d8cdc26fd38
--- /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 00000000000..04b50f9d5d2
--- /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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b6ed7c3ec5..86f7fc5ba4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -659,6 +659,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;
   };
@@ -814,6 +818,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;
   };