* makeWrapper: option --run <CMD> to run a command from the wrapper.

This is so that the Unison wrapper can be generated with
  makeWrapper.
* Use makeWrapper as a buildInput everywhere.
* Updated BitTorrent, cvs2svn.

svn path=/nixpkgs/trunk/; revision=10213

pkgs/applications/version-management/cvs2svn/default.nix

@@ -1,25 +1,27 @@
-{stdenv, fetchurl, python, bsddb3, makeWrapper}:
+{stdenv, fetchurl, python, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "cvs2svn-1.5.1";
+  name = "cvs2svn-2.0.1";
 
   src = fetchurl {
-    url = http://cvs2svn.tigris.org/files/documents/1462/36129/cvs2svn-1.5.1.tar.gz;
-    md5 = "d1e42ea51b373be0023f2b3f6b80ec01";
+    url = http://cvs2svn.tigris.org/files/documents/1462/39919/cvs2svn-2.0.1.tar.gz;
+    sha256 = "1pgbyxzgn22lnw3h5c2nd8z46pkk863jg3fgh9pqa1jihsx1cg1j";
   };
 
-  buildInputs = [python bsddb3];
+  buildInputs = [python makeWrapper];
 
   buildPhase = "true";
-  installPhase = "
+  installPhase = ''
     python ./setup.py install --prefix=$out
-
-    source ${makeWrapper}
-    mv $out/bin/cvs2svn $out/bin/.orig-cvs2svn
-    makeWrapper $out/bin/.orig-cvs2svn $out/bin/cvs2svn \\
-        --set PYTHONPATH \"$(toPythonPath $out):$(toPythonPath ${bsddb3}):$PYTHONPATH\"
-  ";
+    wrapProgram $out/bin/cvs2svn \
+        --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH"
+  '';
 
   /* !!! maybe we should absolutise the program names in
      $out/lib/python2.4/site-packages/cvs2svn_lib/config.py. */
-}
+
+  meta = {
+    description = "A tool to convert CVS repositories to Subversion repositories";
+    homepage = http://cvs2svn.tigris.org/;
+  };
+}

pkgs/applications/version-management/mercurial/default.nix

@@ -7,20 +7,17 @@ stdenv.mkDerivation {
     sha256 = "26996df67d508e129d2f0a264e25072764e5c2d21606e1658d77c8984e6ed64a";
   };
 
-  inherit makeWrapper;
-
-  buildInputs = [ python ];
-  addInputsHook = "source $makeWrapper";
+  buildInputs = [ python makeWrapper ];
   makeFlags = "PREFIX=$(out)";
-  postInstall = [
-    "for i in $(cd $out/bin && ls); do"
-    "   mv $out/bin/$i $out/bin/.orig-$i;"
-    "   makeWrapper $out/bin/.orig-$i $out/bin/$i"
-    "       --set PYTHONPATH \"$(toPythonPath $out):$PYTHONPATH\";"
-    "done"
-  ];
+  postInstall = ''
+    for i in $(cd $out/bin && ls); do
+      wrapProgram $out/bin/$i \
+        --prefix PYTHONPATH : "$(toPythonPath $out)"
+    done
+  '';
 
   meta = {
-    description = "a fast, lightweight SCM system for very large distributed projects";
+    description = "A fast, lightweight SCM system for very large distributed projects";
+    homepage = http://www.selenic.com/mercurial/;
   };
 }