* Sync with the trunk.

svn path=/nixpkgs/branches/stdenv-updates/; revision=19786

3 files changed, 87 insertions, 53 deletions

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 8a1d46663423..a46762a4a4f0 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -6,47 +6,61 @@
 
 assert pamSupport -> pam != null;
 
-stdenv.mkDerivation (rec {
-  name = "openssh-5.2p1";
+let
+
+  hpnSrc = fetchurl {
+    url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.3p1-hpn13v7.diff.gz;
+    sha256 = "1kqir6v14z77l0wn9j4jzdqsip5s1ky34w749psvbshbp9dzizn8";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "openssh-5.3p1";
 
   src = fetchurl {
     url = "ftp://ftp.nluug.nl/pub/security/OpenSSH/${name}.tar.gz";
-    sha256 = "1bpc6i07hlakb9vrxr8zb1yxnc9avsv7kjwrcagdgcyh6w6728s0";
+    sha256 = "04pgqmb43p5lr5wrfnvyys8r504brghshm24n60495wn5131gjfh";
   };
 
-  buildInputs = [zlib openssl perl
-    (if pamSupport then pam else null)
-  ];
+  patchPhase = stdenv.lib.optionalString hpnSupport
+    ''
+      gunzip -c ${hpnSrc} | patch -p1
+    '';
+  
+  buildInputs =
+    [ zlib openssl perl ]
+    ++ stdenv.lib.optional pamSupport pam;
 
-  configureFlags = "
-    --with-mantype=man
-    ${if pamSupport then "--with-pam" else "--without-pam"}
-    ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
-  ";
+  configureFlags =
+    ''
+      --with-mantype=man
+      ${if pamSupport then "--with-pam" else "--without-pam"}
+      ${if etcDir != null then "--sysconfdir=${etcDir}" else ""}
+    '';
 
-  preConfigure = "
-    configureFlags=\"$configureFlags --with-privsep-path=$out/empty\"
-    ensureDir $out/empty
-  ";
+  preConfigure =
+    ''
+      configureFlags="$configureFlags --with-privsep-path=$out/empty"
+      ensureDir $out/empty
+    '';
 
-  postInstall = "
-    # Install ssh-copy-id, it's very useful.
-    cp contrib/ssh-copy-id $out/bin/
-    chmod +x $out/bin/ssh-copy-id
-    cp contrib/ssh-copy-id.1 $out/share/man/man1/
-  ";
+  postInstall =
+    ''
+      # Install ssh-copy-id, it's very useful.
+      cp contrib/ssh-copy-id $out/bin/
+      chmod +x $out/bin/ssh-copy-id
+      cp contrib/ssh-copy-id.1 $out/share/man/man1/
+
+      ensureDir $out/etc/ssh
+      cp moduli $out/etc/ssh/
+    '';
 
   installTargets = "install-nosysconf";
-} //
-(if hpnSupport then
-rec {
-   hpnSrc = fetchurl {
-     url = http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.2p1-hpn13v6.diff.gz;
-     sha256 = "1g91xl1vfg772072qcbcfzyqj7yfvm38xgk8zyy8wsl2g81rb8wh";
-   };
-
-   patchPhase = ''
-     gunzip -c ${hpnSrc} | patch -p1
-   '';
+
+  meta = {
+    homepage = http://www.openssh.org/;
+    description = "An implementation of the SSH protocol";
+    license = "bsd";
+  };
 }
-else {}))
diff --git a/pkgs/tools/networking/p2p/ktorrent/default.nix b/pkgs/tools/networking/p2p/ktorrent/default.nix
index 6950d9557de5..4966a9f9c6ec 100644
--- a/pkgs/tools/networking/p2p/ktorrent/default.nix
+++ b/pkgs/tools/networking/p2p/ktorrent/default.nix
@@ -1,21 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, kdelibs, xlibs, zlib
-, libpng, libjpeg, perl, gmp
+{ stdenv, fetchurl, pkgconfig, kde, xlibs, zlib
+, libpng, libjpeg, perl, gmp, cmake, gettext, boost
 }:
 
 stdenv.mkDerivation {
-  name = "ktorrent-2.2.8";
+  name = "ktorrent-3.3.3";
   
   src = fetchurl {
-    url = http://ktorrent.org/downloads/2.2.8/ktorrent-2.2.8.tar.bz2;
-    sha256 = "10zpc50sggg8h1g6vgcv12mm4sw4d6jvzvnghdplqs86m5bwpg9k";
+    url = http://ktorrent.org/downloads/3.3.3/ktorrent-3.3.3.tar.bz2;
+    sha256 = "1f2hr8q8j1fxd3wa74vavq7b0spdsjfcl3jbyfi9xhk9mxxlm216";
   };
   
   buildInputs = [
-    pkgconfig kdelibs kdelibs.qt xlibs.xlibs zlib libpng libjpeg perl gmp
+    pkgconfig xlibs.xlibs zlib libpng libjpeg perl gmp cmake gettext boost
+  ];
+
+  propagatedBuildInputs = [
+    kde.qt4 kde.automoc4 kde.kdelibs kde.phonon kde.qca2 kde.kdepimlibs
   ];
-  
-  configureFlags = "--without-arts";
 
+  CMAKE_PREFIX_PATH=kde.kdepimlibs;
+  cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
+  includeAllQtDirs=true;
+  
   meta = {
     homepage = http://ktorrent.org/;
     description = "A BitTorrent client for KDE";
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 1bf6f920c4cf..0017c13a7874 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -1,13 +1,14 @@
 { fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
-, simplejson, zfec, pycryptopp, pysqlite, nettools }:
+, simplejson, zfec, pycryptopp, pysqlite, darcsver, setuptoolsTrial
+, setuptoolsDarcs, numpy, nettools }:
 
 buildPythonPackage (rec {
-  name = "tahoe-lafs-1.5.0";
+  name = "tahoe-lafs-1.6.0";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.5.0.zip";
-    sha256 = "1cgwm7v49mlfsq47k8gw2bz14d6lnls0mr6dc18815pf24z4f00n";
+    url = "http://allmydata.org/source/tahoe/releases/allmydata-tahoe-1.6.0.zip";
+    sha256 = "10j6s4wqqxb0x6plwvfnabxxl0k8jy1g1dfsrhpfgdi42f25dain";
   };
 
   patchPhase = ''
@@ -26,18 +27,25 @@ buildPythonPackage (rec {
 
     sed -i "src/allmydata/util/iputil.py" \
         -es"|_linux_path = '/sbin/ifconfig'|_linux_path = '${nettools}/sbin/ifconfig'|g"
+
+    # Chroots don't have /etc/hosts and /etc/resolv.conf, so work around
+    # that.
+    for i in $(find src/allmydata/test -type f)
+    do
+      sed -i "$i" -e"s/localhost/127.0.0.1/g"
+    done
   '';
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip ]
+    ++ [ numpy ]; # Some tests want this
 
-  # The `backup' command works best with `pysqlite'.
-  propagatedBuildInputs = [
-    twisted foolscap nevow simplejson zfec pycryptopp pysqlite
-  ];
+  # The `backup' command requires `pysqlite'.
+  propagatedBuildInputs =
+    [ twisted foolscap nevow simplejson zfec pycryptopp pysqlite
+      darcsver setuptoolsTrial
+    ];
 
-  # FIXME: Many tests try to write to the Nix store or to $HOME, which
-  # fails.  Disable tests until we have a reasonable hack to allow
-  # them to run.
+  # The test suite is run in `postInstall'.
   doCheck = false;
 
   postInstall = ''
@@ -50,6 +58,12 @@ buildPythonPackage (rec {
     ensureDir "$out/share/doc/${name}"
     cp -rv "docs/"* "$out/share/doc/${name}"
     find "$out/share/doc/${name}" -name Makefile -exec rm -v {} \;
+
+    # Run the tests once everything is installed.
+    # FIXME: Some of the tests want to run $out/bin/tahoe, which isn't usable
+    # yet because it gets wrapped later on, in `postFixup'.
+    export PYTHON_EGG_CACHE="$TMPDIR"
+    python setup.py trial
   '';
 
   meta = {