svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=31430

15 files changed, 77 insertions, 85 deletions

diff --git a/pkgs/development/libraries/arts/default.nix b/pkgs/development/libraries/arts/default.nix
index d895724f6919..50c270f534e7 100644
--- a/pkgs/development/libraries/arts/default.nix
+++ b/pkgs/development/libraries/arts/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg, libpng, perl, qt}:
+{stdenv, fetchurl, pkgconfig, glib, kdelibs, libX11, libXext, zlib, libjpeg
+, libpng, perl, qt3}:
 
 stdenv.mkDerivation {
   name = "arts-1.5.10";
@@ -19,7 +20,10 @@ stdenv.mkDerivation {
     --enable-final
   '';
 
-  buildInputs = [pkgconfig glib kdelibs libX11 libXext zlib libjpeg libpng perl qt];
+  buildNativeInputs = [ pkgconfig perl ];
+
+  buildInputs =
+    [glib kdelibs libX11 libXext zlib libjpeg libpng qt3];
 
   meta = {
     homepage = http://www.arts-project.org/;
diff --git a/pkgs/development/libraries/atkmm/2.22.x.nix b/pkgs/development/libraries/atkmm/2.22.x.nix
index 66237c4c7b99..2d415821fc58 100644
--- a/pkgs/development/libraries/atkmm/2.22.x.nix
+++ b/pkgs/development/libraries/atkmm/2.22.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, atk, glibmm, pkgconfig }:
+{ stdenv, fetchurl, atk, glibmm, pkgconfig, xz }:
 
 stdenv.mkDerivation rec {
   name = "atkmm-2.22.6";
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dmf72i7jv2a2gavjiah2722bf5qk3hb97hn5dasxqxr0r8jjx0a";
   };
 
+  buildInputs = [ xz ];
   propagatedBuildInputs = [ atk glibmm ];
 
   buildNativeInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
index 596e645c686c..eb7eaf91bb07 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, xlibs, xz
+{ stdenv, fetchurl, pkgconfig, glib, libtiff, libjpeg, libpng, libX11, xz
 , jasper }:
 
 stdenv.mkDerivation {
@@ -10,13 +10,13 @@ stdenv.mkDerivation {
   };
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ xlibs.xlibs ];
+  buildInputs = [ libX11 ];
 
   buildNativeInputs = [ pkgconfig xz ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
-  configureFlags = "--with-libjasper";
+  configureFlags = "--with-libjasper --with-x11";
 
   postInstall = "rm -rf $out/share/gtk-doc";
 
diff --git a/pkgs/development/libraries/haskell/conduit/default.nix b/pkgs/development/libraries/haskell/conduit/default.nix
index f7dd889c6735..fa210279ec02 100644
--- a/pkgs/development/libraries/haskell/conduit/default.nix
+++ b/pkgs/development/libraries/haskell/conduit/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit";
-  version = "0.0.1";
-  sha256 = "1klbwiqic6qgvzsxgb9x4hrfn0d3y679ml4f2qjdgx6p33gsyzns";
+  version = "0.0.1.1";
+  sha256 = "1144l40x8xvr3dkkhbg33fnajn9ggavxqa094zan0bdqljh48ips";
   buildDepends = [
     liftedBase monadControl text transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 9035c606ed89..5f506021c14f 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.3.2";
-  sha256 = "0410gg8sdnw0iyhqrw1wfv9abbrv7r6awgvlhqds17vnrdxxk2w8";
+  version = "3.2.4.0";
+  sha256 = "1hyvvcq4hvbwz8zaswi8949sqzjkby6754b0y5zp2cpax2ykkbgx";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
     regexBase regexPcre snapCore snapServer tagsoup time
diff --git a/pkgs/development/libraries/libdbusmenu-qt/default.nix b/pkgs/development/libraries/libdbusmenu-qt/default.nix
index 4c12880f5578..aeb9331c8ada 100644
--- a/pkgs/development/libraries/libdbusmenu-qt/default.nix
+++ b/pkgs/development/libraries/libdbusmenu-qt/default.nix
@@ -3,13 +3,15 @@
 let
   baseName = "libdbusmenu-qt";
   v = "0.9.0";
+  homepage = "http://launchpad.net/${baseName}";
+  name = "${baseName}-${v}";
 in
 
-stdenv.mkDerivation rec {
-  name = "${baseName}-${v}";
+stdenv.mkDerivation {
+  inherit name;
 
   src = fetchurl {
-    url = "http://launchpad.net/${baseName}/trunk/${v}/+download/${name}.tar.bz2";
+    url = "${homepage}/trunk/${v}/+download/${name}.tar.bz2";
     sha256 = "0xdicb3fmwgbyhc6cpcmdkwysdg18m5rcqc3izpwv6brq4aq4787";
   };
 
@@ -20,7 +22,7 @@ stdenv.mkDerivation rec {
   
   meta = with stdenv.lib; {
     description = "Provides a Qt implementation of the DBusMenu spec";
-    homepage = http://people.canonical.com/~agateau/dbusmenu/;
+    inherit homepage;
     maintainers = [ maintainers.urkud ];
     inherit (qt4.meta) platforms;
   };
diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 7ea9eb4db874..16001e689ddb 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -1,17 +1,18 @@
 {stdenv, fetchurl, pkgconfig, libusb, libtool, libexif, libjpeg, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "libgphoto2-2.4.10.1";
+  name = "libgphoto2-2.4.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "12m99hcak59ppq1ijnfsrcm09mdj102f1xjmz4myggwjdymwc3lq";
+    sha256 = "08y40mqy714cg0160lny13z9kyxm63m3ksg8hljy5pspxanbn5ji";
   };
   
-  buildInputs = [pkgconfig libtool libjpeg gettext];
+  buildNativeInputs = [ pkgconfig gettext ];
+  buildInputs = [ libtool libjpeg ];
 
   # These are mentioned in the Requires line of libgphoto's pkg-config file.
-  propagatedBuildInputs = [libusb libexif];
+  propagatedBuildInputs = [ libusb libexif ];
 
   meta = {
     homepage = http://www.gphoto.org/proj/libgphoto2/;
diff --git a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch b/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
deleted file mode 100644
index 8d39d663719d..000000000000
--- a/pkgs/development/libraries/libgphoto2/libgphoto2-2.2.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ruN libgphoto2-2.2.1/packaging/generic/print-camera-list.c libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c
---- libgphoto2-2.2.1/packaging/generic/print-camera-list.c	2006-04-19 03:54:05.000000000 +0200
-+++ libgphoto2-2.2.1.new/packaging/generic/print-camera-list.c	2006-07-06 22:54:42.000000000 +0200
-@@ -48,8 +48,8 @@
- #include <time.h>
- #include <string.h>
- 
--#include <gphoto2/gphoto2-camera.h>
--#include <gphoto2/gphoto2-port-log.h>
-+#include <gphoto2-camera.h>
-+#include <gphoto2-port-log.h>
- 
- #ifndef TRUE
- #define TRUE  (0==0)
diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix
new file mode 100644
index 000000000000..504bddb777a7
--- /dev/null
+++ b/pkgs/development/libraries/libwpd/0.8.nix
@@ -0,0 +1,14 @@
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
+stdenv.mkDerivation rec {
+  name = "libwpd-0.8.14";
+  
+  src = fetchurl {
+    url = "mirror://sourceforge/libwpd/${name}.tar.gz";
+    sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
+  };
+  
+  buildInputs = [ glib libgsf libxml2 ];
+
+  buildNativeInputs = [ pkgconfig bzip2 ];
+}
diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix
index 13f0a69950c2..384c31a7cd44 100644
--- a/pkgs/development/libraries/mlt/default.nix
+++ b/pkgs/development/libraries/mlt/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, SDL, qt, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
+{stdenv, fetchurl, SDL, qt4, pkgconfig, ffmpeg, libdv, libxml2, libsamplerate,
 libvorbis, sox}:
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1xcrrd3xbz9hmahgl7xf610cm97chwpxwgcajkd10mpcxbqs08i0";
   };
 
-  buildInputs = [ qt SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
+  buildInputs = [ qt4 SDL ffmpeg libdv libxml2 libsamplerate libvorbis sox ];
 
   # Mostly taken from:
   # http://www.kdenlive.org/user-manual/downloading-and-installing-kdenlive/installing-source/installing-mlt-rendering-engine
diff --git a/pkgs/development/libraries/pangomm/2.28.x.nix b/pkgs/development/libraries/pangomm/2.28.x.nix
index 5cd4744fed38..c004b7160f20 100644
--- a/pkgs/development/libraries/pangomm/2.28.x.nix
+++ b/pkgs/development/libraries/pangomm/2.28.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng }:
+{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm, libpng, xz }:
 
 stdenv.mkDerivation rec {
   name = "pangomm-2.28.4";
@@ -8,6 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "10kcdpg080m393f1vz0km41kd3483fkyabprm59gvjwklxkcp3bp";
   };
 
+  buildInputs = [ xz];
   buildNativeInputs = [ pkgconfig ];
   propagatedBuildInputs = [ pango glibmm cairomm libpng ];
 
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 64b984c3f3af..e023235b936c 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -5,7 +5,7 @@
 , xineramaSupport ? true, libXinerama ? null
 , cursorSupport ? true, libXcursor ? null
 , threadSupport ? true
-, mysqlSupport ? true, mysql ? null
+, mysqlSupport ? false, mysql ? null
 , openglSupport ? false, mesa ? null, libXmu ? null
 , x11, xextproto, zlib, libjpeg, libpng, which
 }:
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index df51c51bde17..86f2e8cf2b2e 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, flex, bison, qt }:
+{ stdenv, fetchurl, perl, flex, bison, qt4 }:
 
 let
   name = "doxygen-1.7.4";
@@ -15,18 +15,18 @@ stdenv.mkDerivation {
 
   buildInputs =
     [ perl flex bison ]
-    ++ stdenv.lib.optional (qt != null) qt;
+    ++ stdenv.lib.optional (qt4 != null) qt4;
 
   prefixKey = "--prefix ";
 
   configureFlags =
     [ "--dot dot" ]
-    ++ stdenv.lib.optional (qt != null) "--with-doxywizard";
+    ++ stdenv.lib.optional (qt4 != null) "--with-doxywizard";
 
-  preConfigure = stdenv.lib.optionalString (qt != null)
+  preConfigure = stdenv.lib.optionalString (qt4 != null)
     ''
-      echo "using QTDIR=${qt}..."
-      export QTDIR=${qt}
+      echo "using QTDIR=${qt4}..."
+      export QTDIR=${qt4}
     '';
 
   makeFlags = "MAN1DIR=share/man/man1";
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
     '';
 
     maintainers = [stdenv.lib.maintainers.simons];
-    platforms = if (qt != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
+    platforms = if (qt4 != null) then stdenv.lib.platforms.linux else stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/tools/misc/xxdiff/3.2.nix b/pkgs/development/tools/misc/xxdiff/3.2.nix
deleted file mode 100644
index ddaa8e6849b4..000000000000
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-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" "fixInc"
-    "deploy"
-    "installPythonPackage" 
-    (makeManyWrappers 
-      ''$out/bin/*'' 
-      ''--prefix PYTHONPATH : $(toPythonPath $out):$PYTHONPATH'')
-  ];
-
-  prepareMainBuild = fullDepEntry (''
-    cd src 
-    export QTDIR=${qt}/
-    make -f Makefile.bootstrap makefile
-  '') ["minInit" "doUnpack"];
-
-  fixInc = fullDepEntry(''
-    sed -e '1i\#include <stdlib.h>' -i resources.inline.h
-  '') ["minInit" "doUnpack"];
-
-  deploy = fullDepEntry (''
-    ensureDir $out/bin/
-    cp ../bin/xxdiff $out/bin
-    cd ..
-  '') ["minInit" "doMake" "defEnsureDir" "addInputs"];
-      
-  name = "xxdiff-3.2";
-  meta = {
-    description = "Interactive merge tool";
-    homepage = http://furius.ca/xxdiff/;
-  };
-}
diff --git a/pkgs/development/tools/misc/xxdiff/default.nix b/pkgs/development/tools/misc/xxdiff/default.nix
new file mode 100644
index 000000000000..f4847e1b42d3
--- /dev/null
+++ b/pkgs/development/tools/misc/xxdiff/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchhg, qt4, flex, bison }:
+
+stdenv.mkDerivation {
+  name = "xxdiff-4.0-beta1-20110723";
+
+  src = fetchhg {
+    name = "xxdiff";
+    url = https://hg.furius.ca/public/xxdiff;
+    sha256 = "0ahx80vdf67vq9w0g66dx39y27gvz6v1aybqj9554n6vxvg1zk5n";
+  };
+
+  buildNativeInputs = [ flex bison qt4 ];
+
+  buildInputs = [ qt4 ];
+
+  QMAKE = "qmake";
+
+  configurePhase =
+    ''
+      cd src
+      make -f Makefile.bootstrap
+    '';
+
+  installPhase = "mkdir -pv $out/bin; cp -v ../bin/xxdiff $out/bin";
+}