Added xxdiff

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

pkgs/development/python-modules/pyqt/3.17.4.nix

@@ -0,0 +1,20 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/p/python-qt3/python-qt3_3.17.4.orig.tar.gz;
+    sha256 = "0p76g64ww9nhg1sahphanwb7nkjmsvxyaqk8k8iaycnlc8040c8r";
+  };
+
+  buildInputs = [qt python pkgconfig pythonSip libX11 libXext glib];
+  configureFlags = [" -q ${qt} "];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doPythonConfigure" "doMakeInstall"];
+  extraPythonConfigureCommand = ''echo yes | \'';
+
+  name = "python-qt-" + version;
+  meta = {
+    description = "Qt bindings for Python";
+    license = "GPL";
+  };
+}

pkgs/development/python-modules/pyqt/4.3.3.nix

@@ -0,0 +1,20 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = mirror://debian/pool/main/p/python-qt4/python-qt4_4.3.3.orig.tar.gz;
+    sha256 = "0m8yzaz17nb8prm2kmy0mbiq4np515abi2xkadflsgwq1bj86qyk";
+  };
+
+  buildInputs = [qt python pkgconfig pythonSip libX11 libXext glib];
+  configureFlags = [" -p $prefix/share/pyQt4/plugins " '' -e "$prefix/include/python$pythonVersion" ''];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doPythonConfigure" "doMakeInstall"];
+  extraPythonConfigureCommand = ''echo yes | \'';
+
+  name = "python-qt-" + version;
+  meta = {
+    description = "Qt bindings for Python";
+    license = "GPL";
+  };
+}

pkgs/development/python-modules/python-sip/4.7.4.nix

@@ -0,0 +1,18 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/s/sip4-qt3/sip4-qt3_4.7.4.orig.tar.gz;
+    sha256 = "0g518b26346q9b0lm13rsgdbq14r4nckyjbf209ylakwx6zir4l5";
+  };
+
+  buildInputs = [python];
+  configureFlags = [ '' -e "$prefix/include/python$pythonVersion" ''];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["doPythonConfigure" "doMakeInstall"];
+      
+  name = "python-sip-" + version;
+  meta = {
+    description = "Python/C++ bindings generator";
+  };
+}

pkgs/development/tools/misc/xxdiff/3.2.nix

@@ -0,0 +1,37 @@
+args : with args; 
+rec {
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/xxdiff/xxdiff-3.2.tar.bz2;
+    sha256 = "1f5j9l9n5j2ab0h3iwaz0mnz0y8h7ilc0dbcrfmaibk2njx38mcn";
+  };
+
+  buildInputs = [qt flex bison python pkgconfig makeWrapper 
+    libX11 libXext];
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["prepareMainBuild"
+    "deploy"
+    "installPythonPackage" 
+    (makeManyWrappers 
+      ''$out/bin/*'' 
+      ''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'')
+  ];
+
+  prepareMainBuild = FullDepEntry (''
+    cd src 
+    export QTDIR=${qt}/
+    make -f Makefile.bootstrap makefile
+  '') ["minInit" "doUnpack"];
+
+  deploy = FullDepEntry (''
+    ensureDir $out/bin/
+    cp ../bin/xxdiff $out/bin
+    cd ..
+  '') ["minInit" "doMake" "defEnsureDir" "addInputs"];
+      
+  name = "xxdiff" + version;
+  meta = {
+    description = "Interactive merge tool";
+  };
+}

pkgs/top-level/all-packages.nix

@@ -2238,6 +2238,15 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
+  xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") {
+    bison = bison23;
+    flex = flex2535;
+    qt = qt3;
+    python = python25;
+    inherit pkgconfig makeWrapper;
+    inherit (xlibs) libXext libX11;
+  } null;
+
   yacc = bison;
 
 
@@ -3789,6 +3798,18 @@ let pkgs = rec {
     inherit (gtkLibs) glib gtk;
   };
 
+  pythonSip = builderDefsPackage (selectVersion ../development/python-modules/python-sip "4.7.4") {
+    python=python25;
+  } null;
+
+  pyqt = builderDefsPackage (selectVersion ../development/python-modules/pyqt "4.3.3") {
+    inherit pkgconfig pythonSip;
+    python = python25;
+    inherit (xlibs) libX11 libXext;
+    inherit (gtkLibs) glib;
+    qt = qt4;
+  } null;
+
   pyxml = import ../development/python-modules/pyxml {
     inherit fetchurl stdenv python makeWrapper;
   };

pkgs/top-level/builder-defs.nix

@@ -245,6 +245,16 @@ args: with args; with stringsWithDeps; with lib;
 		python setup.py install --prefix=\"\$prefix\" 
 		") ["minInit" "addInputs" "doUnpack"];
 
+	doPythonConfigure = FullDepEntry ('' 
+	  pythonVersion=$(toPythonPath "$prefix")
+	  pythonVersion=''${pythonVersion#*/lib/python}
+	  pythonVersion=''${pythonVersion%%/site-packages}
+	  ${if args ? extraPythonConfigureCommand then 
+	    args.extraPythonConfigureCommand 
+	  else ""}
+	  python configure.py -b "$prefix/bin" -d "$(toPythonPath "$prefix")" -v "$prefix/share/sip" ${toString configureFlags}
+	'') ["minInit" "addInputs" "doUnpack"]; 
+
 	doMakeInstall = FullDepEntry ("
 		make ${toString (getAttr ["makeFlags"] "" args)} "+
 			"${toString (getAttr ["installFlags"] "" args)} install") ["doMake"];
@@ -289,6 +299,12 @@ args: with args; with stringsWithDeps; with lib;
 
 	doWrap = cmd: FullDepEntry (wrapEnv cmd (getAttr ["wrappedEnv"] [] args)) ["minInit"];
 
+	makeManyWrappers = wildcard : wrapperFlags : FullDepEntry (''
+	  for i in ${wildcard}; do
+	    wrapProgram "$i" ${wrapperFlags}
+	  done
+	'') ["minInit" "addInputs" "defEnsureDir"];
+
 	doPropagate = FullDepEntry ("
 		ensureDir \$out/nix-support
 		echo '${toString (getAttr ["propagatedBuildInputs"] [] args)}' >\$out/nix-support/propagated-build-inputs