* Sync with the trunk.

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

pkgs/applications/version-management/git-and-tools/default.nix

@@ -32,7 +32,7 @@ rec {
   qgit = import ./qgit {
     inherit fetchurl stdenv;
     inherit (xlibs) libXext libX11;
-    qt = qt3;
+    qt = qt4;
   };
 
   qgitGit = import ./qgit/qgit-git.nix {

pkgs/applications/version-management/git-and-tools/qgit/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, qt, libXext, libX11}:
 
 stdenv.mkDerivation rec {
-  name = "qgit-1.5.8";
+  name = "qgit-2.2";
   meta =
   {
     license = "GPLv2";
@@ -11,8 +11,11 @@ stdenv.mkDerivation rec {
   src = fetchurl
   {
     url = "mirror://sourceforge/qgit/${name}.tar.bz2";
-    sha256 = "0qmgd1cjny5aciljpvn2bczgdvlpgd2f7wzafda24zj4mzqnppsq";
+    sha256 = "82adcc59b2a9d3a3e54eef9e6a76ac6583e459b6f5c97050d26b0593d11c3d32";
   };
   buildInputs = [qt libXext libX11];
-  configureFlags = "CXXFLAGS=-O3";
+  configurePhase = "qmake PREFIX=$out";
+  installPhase = ''
+    install -s -D -m 755 bin/qgit "$out/bin/qgit"
+  '';
 }

pkgs/applications/version-management/tailor/0.9.31.nix

@@ -1,19 +0,0 @@
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://darcs.arstecnica.it/tailor-0.9.31.tar.gz;
-    sha256 = "1apzd6mfmhgmxffzgzwsr17gnyqj6bycn783l9105cihsfcv9v3j";
-  };
-
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-      
-  name = "tailor-" + version;
-  meta = {
-    description = "Version control tools integration tool";
-  };
-}
- 

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

@@ -1,7 +1,8 @@
 args : with args; 
+let version = if args ? version then args.version else "0.9.35"; in
 rec {
   src = fetchurl {
-    url = http://darcs.arstecnica.it/tailor-0.9.35.tar.gz;
+    url = "http://darcs.arstecnica.it/tailor-${version}.tar.gz";
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };