svn merge ^/nixpkgs/trunk

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

pkgs/applications/misc/kbasket/default.nix

@@ -1,23 +0,0 @@
-{stdenv, fetchurl, kdelibs, x11, zlib, libpng, libjpeg, perl, qt3, gpgme,
-libgpgerror}:
-
-stdenv.mkDerivation {
-  name = "kbasket-1.0.3.1";
-  
-  src = fetchurl {
-    url = http://basket.kde.org/downloads/basket-1.0.3.1.tar.gz;
-    sha256 = "1dgghxmabc3bz1644p6dfnjdjbm80jj6fh343r22nkp703q6fqbk";
-  };
-  
-  buildInputs = [kdelibs x11 zlib libjpeg libpng perl qt3 gpgme libgpgerror];
-
-  configureFlags = [ "--without-arts" "--with-extra-includes=${libjpeg}/include" "--x-libraries=${x11}/lib" ];
-
-  meta = {
-    description = "Multi-purpose note-taking application";
-    homepage = http://kbasket.kde.org/;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-    license = "GPLv2+";
-  };
-}

pkgs/applications/office/kmymoney/default.nix

@@ -1,17 +1,19 @@
 { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext,
-  shared_mime_info, perl, boost, gpgme }:
+  shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-4.5.3";
+  name = "kmymoney-4.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
-    sha256 = "1yvgyzybfm1ajswwq3w3kdij4y2cyhfkk52xhv7dbp1wrxsp5cx9";
+    sha256 = "0ympq70z0a9zrs623jznj6hnjph2rdhpra0np2mqm1mmy72bkjjz";
   };
 
-  buildInputs = [ kdelibs kdepimlibs perl boost gpgme ];
+  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
   buildNativeInputs = [ cmake automoc4 gettext shared_mime_info ];
 
+  KDEDIRS = libalkimia;
+
   patches = [ ./qgpgme.patch ];
 
   meta = {

pkgs/applications/office/skrooge/default.nix

@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, kdelibs, grantlee, qca2, libofx, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "skrooge-1.1.1";
+
+  src = fetchurl {
+    url = "http://skrooge.org/files/${name}.tar.bz2";
+    sha256 = "0qkd1hay7lglb0b4iw3arlwgm0yr8x789x7zf815skxvfhdaclv5";
+  };
+
+  buildInputs = [ kdelibs grantlee qca2 libofx ];
+
+  buildNativeInputs = [ gettext ];
+
+  meta = {
+    inherit (kdelibs.meta) platforms;
+    description = "A personal finance manager for KDE";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+  };
+}

pkgs/applications/office/zanshin/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, kdelibs, kdepimlibs, boost }:
+
+stdenv.mkDerivation rec {
+  name = "zanshin-0.2.2";
+
+  src = fetchurl {
+    url = "http://files.kde.org/zanshin/zanshin-0.2.0.tar.bz2";
+    sha256 = "0kskk8rj4bwx5zywxw0h2lgl7byw9dxzdcafb6xp5cvdkjkg9j87";
+  };
+
+  buildInputs = [ kdelibs kdepimlibs boost ];
+
+  meta = {
+    description = "GTD for KDE";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}

pkgs/applications/video/dvswitch/default.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp,
+  libXv, libav, pixman, libpthreadstubs, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "dvswitch-${version}";
+  version = "0.8.3.6";
+
+  src = fetchurl {
+    url = "https://alioth.debian.org/frs/download.php/3615/${name}.tar.gz";
+    sha256 = "7bd196389f9913ae08e12a29e168d79324c508bb545eab114df77b0375cd87f0";
+  };
+
+  buildInputs = [
+    alsaLib boost cmake gtkmm libXau libXdmcp libXv libav
+    libpthreadstubs pixman pkgconfig
+  ];
+
+  installPhase = "
+    ensureDir $out
+    cp src/dv* $out/
+  ";
+
+  meta =  with stdenv.lib; {
+    description = "digital video mixer intended for interactive live mixing of several incoming DV video streams";
+    homepage = "http://dvswitch.alioth.debian.org";
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}

pkgs/development/libraries/aqbanking/default.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gwenhywfar, pkgconfig, gmp, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "aqbanking-5.0.21";
+
+  src = fetchurl {
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=03&release=91&file=01&dummy=aqbanking-5.0.21.tar.gz";
+    name = "${name}.tar.gz";
+    sha256 = "1xvzg640fswkrjrkrqzj0j9lnij7kcpnyvzd7nsg1by40wxwgp52";
+  };
+
+  buildInputs = [ gwenhywfar gmp zlib ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  configureFlags = "--with-gwen-dir=${gwenhywfar}";
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    # Tries to install gwenhywfar plugin, thus `make install` fails
+    platforms = [];
+  };
+}

pkgs/development/libraries/gwenhywfar/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, qt4, gtk, pkgconfig, gnutls, libgcrypt }:
+
+stdenv.mkDerivation rec {
+  name = "gwenhywfar-4.3.1";
+
+  src = fetchurl {
+    url = "http://www2.aquamaniac.de/sites/download/download.php?package=01&release=65&file=01&dummy=gwenhywfar-4.3.1.tar.gz";
+    name = "${name}.tar.gz";
+    sha256 = "1r8ayi1nwcdcs4mncd7zigl8pk707j7whb85klsyir4nif52fxrs";
+  };
+
+  propagatedBuildInputs = [ gnutls libgcrypt ];
+
+  buildInputs = [ qt4 gtk ];
+
+  buildNativeInputs = [ pkgconfig ];
+
+  QTDIR = qt4;
+}

pkgs/development/libraries/libalkimia/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, kdelibs, gmpxx }:
+
+stdenv.mkDerivation rec {
+  name = "libalkimia-4.3.1";
+
+  src = fetchurl {
+    url = "http://kde-apps.org/CONTENT/content-files/137323-${name}.tar.bz2";
+    sha256 = "1l5jgf0wc4s1sk4q5g2v78r9s7dg9k5ikm3pip6cbhjhfc0nv939";
+  };
+
+  patchPhase = "sed -e 's/KDE4_DATA_DIR/DATA_INSTALL_DIR/' -i CMakeLists.txt";
+  buildInputs = [ kdelibs gmpxx ];
+
+  meta = {
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (kdelibs.meta) platforms;
+  };
+}

pkgs/games/six/default.nix

@@ -19,6 +19,7 @@ stdenv.mkDerivation {
     description = "Six - A Hex playing program for KDE";
     homepage = http://six.retes.hu/;
     license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
   };
 
   buildInputs = [ arts kdelibs libX11 libXext libXt perl qt3 zlib ];

pkgs/games/xmoto/default.nix

@@ -4,7 +4,7 @@ let
   buildInputs = with a; [
     chipmunk sqlite curl zlib bzip2 libjpeg libpng
     freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf 
-    lua5 ode libxdg_basedir
+    lua5 ode libxdg_basedir libxml2
   ];
 in
 rec {
@@ -17,6 +17,8 @@ rec {
   /* doConfigure should be removed if not needed */
   phaseNames = [ "doPatch" "doConfigure" "doMakeInstall"];
 
+  patches = [ ./r3402.patch ];
+
   meta = {
     description = "X-Moto - obstacled race game";
     maintainers = [

pkgs/games/xmoto/r3402.patch

@@ -0,0 +1,26 @@
+Index: a/src/image/tim_png.cpp
+===================================================================
+--- a/src/image/tim_png.cpp	(revision 3401)
++++ b/src/image/tim_png.cpp	(revision 3402)
+@@ -25,7 +25,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include "tim.h"
+-#include "png.h"
++#include <png.h>
++#include <zlib.h>
+ 
+ /*==============================================================================
+ Types
+Index: ChangeLog
+===================================================================
+--- a/ChangeLog	(revision 3401)
++++ b/ChangeLog	(revision 3402)
+@@ -1,3 +1,7 @@
++X-Moto 0.5.10 2012-
++--------------------------------
++ * libpng patch by Kelly Anderson
++
+ X-Moto 0.5.9 2011-11-13
+ --------------------------------
+  * fix a compilation error with libxml

pkgs/games/xmoto/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="0.5.7";
-   name="xmoto-0.5.7";
-   hash="19pwxjgvajv2img3sz8rd0c37d1gsidscwwjbm4jyxhahgg33mks";
+   version="0.5.9";
+   name="xmoto-0.5.9";
+   hash="1r1kl3w2scncw754lgsfa7i6hh4mg39zc3bcvd1iqcmdfr25gmvl";
    url="http://download.tuxfamily.org/xmoto/xmoto/${version}/xmoto-${version}-src.tar.gz";
-   advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.7/xmoto-0.5.7-src.tar.gz";
+   advertisedUrl="http://download.tuxfamily.org/xmoto/xmoto/0.5.9/xmoto-0.5.9-src.tar.gz";
   
   
 }

pkgs/os-specific/linux/htop/default.nix

@@ -1,14 +1,14 @@
 {fetchurl, stdenv, ncurses}:
 
 let
-  name = "htop-0.9";
+  name = "htop-1.0";
 in
 stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "mirror://sourceforge/htop/${name}.tar.gz";
-    sha256 = "4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd";
+    sha256 = "242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852";
   };
 
   buildInputs = [ncurses];

pkgs/tools/misc/unclutter/default.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchurl, x11}:
+
+stdenv.mkDerivation {
+  name = "unclutter-8";
+  src = fetchurl {
+    url = http://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz;
+    sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6";
+  };
+
+  buildInputs = [x11];
+
+  installPhase = ''
+    mkdir -pv "$out/bin"
+    mkdir -pv "$out/share/man/man1"
+    make DESTDIR="$out" BINDIR="$out/bin" PREFIX="" install
+    make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
+  '';
+
+  meta = {
+    description = "Hides mouse pointer while not in use.";
+    longDescription = ''
+      Unclutter hides your X mouse cursor when you do not need it, to prevent
+      it from getting in the way. You have only to move the mouse to restore
+      the mouse cursor. Unclutter is very usefull in tiling wm's where you do
+      not need the mouse often.
+
+      Just run it from your .bash_profile like that:
+
+          unclutter -idle 1 &
+    '';
+  };
+}

pkgs/top-level/all-packages.nix

@@ -1506,6 +1506,8 @@ let
 
   ttmkfdir = callPackage ../tools/misc/ttmkfdir { };
 
+  unclutter = callPackage ../tools/misc/unclutter { };
+
   unbound = callPackage ../tools/networking/unbound { };
 
   units = callPackage ../tools/misc/units { };
@@ -2659,12 +2661,13 @@ let
   pure = callPackage ../development/interpreters/pure {};
 
   python = python27;
+  python3 = python32;
 
   python26 = callPackage ../development/interpreters/python/2.6 { };
 
   python27 = callPackage ../development/interpreters/python/2.7 { };
 
-  python3 = callPackage ../development/interpreters/python/3.1 {
+  python31 = callPackage ../development/interpreters/python/3.1 {
     arch = if stdenv.isDarwin then pkgs.darwinArchUtility else null;
     sw_vers = if stdenv.isDarwin then pkgs.darwinSwVersUtility else null;
   };
@@ -2821,7 +2824,10 @@ let
   automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix {
     doCheck = !stdenv.isArm && !stdenv.isCygwin
       # Some of the parallel tests seem to hang on `i386-pc-solaris2.11'.
-      && stdenv.system != "i686-solaris";
+      && stdenv.system != "i686-solaris"
+
+      # One test fails to terminate on FreeBSD: <http://bugs.gnu.org/8788>.
+      && !stdenv.isFreeBSD;
   };
 
   automoc4 = callPackage ../development/tools/misc/automoc4 { };
@@ -3144,6 +3150,8 @@ let
 
   attr = callPackage ../development/libraries/attr { };
 
+  aqbanking = callPackage ../development/libraries/aqbanking { };
+
   aubio = callPackage ../development/libraries/aubio { };
 
   axis = callPackage ../development/libraries/axis { };
@@ -3692,6 +3700,8 @@ let
 
   gts = callPackage ../development/libraries/gts { };
 
+  gwenhywfar = callPackage ../development/libraries/gwenhywfar { };
+
   # TODO : Add MIT Kerberos and let admin choose.
   kerberos = heimdal;
 
@@ -6178,7 +6188,7 @@ let
   xmoto = builderDefsPackage (import ../games/xmoto) {
     inherit chipmunk sqlite curl zlib bzip2 libjpeg libpng
       freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf
-      lua5 ode libxdg_basedir;
+      lua5 ode libxdg_basedir libxml2;
   };
 
   xorg_sys_opengl = callPackage ../os-specific/linux/opengl/xorg-sys { };
@@ -6517,6 +6527,11 @@ let
 
   dvdauthor = callPackage ../applications/video/dvdauthor { };
 
+  dvswitch = callPackage ../applications/video/dvswitch {
+    inherit (gtkLibs) gtkmm;
+    inherit (xlibs) libXau libXdmcp libXv libpthreadstubs pixman;
+  };
+
   dwm = callPackage ../applications/window-managers/dwm {
     patches = getConfig [ "dwm" "patches" ] [];
   };
@@ -8008,11 +8023,6 @@ let
       inherit (kde3) kdelibs;
     };
 
-    kbasket = callPackage ../applications/misc/kbasket {
-      stdenv = overrideGCC stdenv gcc43;
-      inherit (kde3) kdelibs;
-    };
-
     kphone = callPackage ../applications/networking/kphone {
       stdenv = overrideGCC stdenv gcc42; # I'm to lazy to clean up header files
     };
@@ -8097,6 +8107,8 @@ let
 
       kuickshow = callPackage ../applications/graphics/kuickshow { };
 
+      libalkimia = callPackage ../development/libraries/libalkimia { };
+
       libktorrent = callPackage ../development/libraries/libktorrent { };
 
       libkvkontakte = callPackage ../development/libraries/libkvkontakte { };
@@ -8129,7 +8141,11 @@ let
 
       semnotes = callPackage ../applications/misc/semnotes { };
 
+      skrooge = callPackage ../applications/office/skrooge { };
+
       yakuake = callPackage ../applications/misc/yakuake { };
+
+      zanshin = callPackage ../applications/office/zanshin { };
     };
 
   redshift = callPackage ../applications/misc/redshift {