Merged with trunk again

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

pkgs/tools/networking/ntp/default.nix

@@ -3,14 +3,14 @@
 assert stdenv.isLinux -> libcap != null;
  
 stdenv.mkDerivation {
-  name = "ntp-4.2.4p3";
+  name = "ntp-4.2.4p4";
   src = fetchurl {
-    url = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.4p3.tar.gz;
-    sha256 = "077y1hw6v0qnp3j3w3pcxgsc76waswqhwsbzfj3jqc79jfh65jv9";
+    url = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2.4p4.tar.gz;
+    sha256 = "0im89i51ap7aqlhxq5isz5xg4h8w8ahwdhir8la3c83h3p47fcmv";
   };
-  configureFlags = "
+  configureFlags = ''
     --without-crypto
     ${if stdenv.isLinux then "--enable-linuxcaps" else ""}
-  ";
+  '';
   buildInputs = if stdenv.isLinux then [libcap] else [];
 }

pkgs/tools/networking/p2p/bittorrent/builder.sh

@@ -1,5 +1,4 @@
 source $stdenv/setup
-source $makeWrapper
 
 # Workaround for:
 #  File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
@@ -20,12 +19,9 @@ installPhase() {
 
     # Create wrappers that set the environment correctly.
     for i in $(cd $out/bin && ls); do
-        # Note: the GUI apps except to be in a directory called `bin',
-        # so don't move them. 
-        mv $out/bin/$i $out/bin/.orig-$i
-        makeWrapper $out/bin/.orig-$i $out/bin/$i \
+        wrapProgram $out/bin/$i \
             --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
     done
 }
 
-genericBuild
+genericBuild

pkgs/tools/networking/p2p/bittorrent/default.nix

@@ -6,18 +6,16 @@
 assert gui -> wxPython != null;
 
 stdenv.mkDerivation {
-  name = "bittorrent-5.0.7";
+  name = "bittorrent-5.2.0";
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://download.bittorrent.com/dl/BitTorrent-5.0.7.tar.gz;
-    sha256 = "09m2qlhzbc6j1hf6fniri0hh6cy6ccgwi2sph65bpjrc417l94gj";
+    url = http://download.bittorrent.com/dl/BitTorrent-5.2.0.tar.gz;
+    sha256 = "0lg54x5y2k1cb7vpj7hanlnvzqa2k3v24qq0g6fsycjk4n8dky02";
   };
   
-  buildInputs = [python pycrypto twisted]
-    ++ (if gui then [wxPython] else []);
-
-  inherit makeWrapper;
+  buildInputs = [python pycrypto twisted makeWrapper]
+    ++ stdenv.lib.optional gui wxPython;
 
   meta = {
     description = "The original client for the BitTorrent peer-to-peer file sharing protocol";