svn merge ^/nixpkgs/trunk

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

18 files changed, 182 insertions, 55 deletions

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index b0452bba115d..c47ed07a48d3 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -8,12 +8,12 @@
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "0.9.1";
+  version = "0.9.3";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/darktable/darktable-${version}.tar.gz";
-    sha256 = "b687a5f1b2a6c8aa230c1dc3ef83bf74a103e3ebe1c61cdea95a612a7375f21e";
+    sha256 = "0al9fxifqv9vg8rj6vybjsn6f25pq5ij9367imlhpmsv6m9m5mqw";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/darktable/libpng-15.patch b/pkgs/applications/graphics/darktable/libpng-15.patch
new file mode 100644
index 000000000000..f817a3264488
--- /dev/null
+++ b/pkgs/applications/graphics/darktable/libpng-15.patch
@@ -0,0 +1,22 @@
+commit 5803d31ae7704e0349821dcc20a94a1cddda69f1
+Author: Tim Harder <radhermit@gmail.com>
+Date:   Wed Sep 21 14:13:55 2011 -0700
+
+    Fix build with libpng-1.5
+    
+    Explicitly include the zlib.h header for the Z_BEST_COMPRESSION and
+    Z_DEFAULT_STRATEGY macros since >=libpng-1.5 doesn't pull it in anymore
+    via the png.h header.
+
+diff --git a/src/imageio/format/png.c b/src/imageio/format/png.c
+index 40c7d48..c7be566 100644
+--- a/src/imageio/format/png.c
++++ b/src/imageio/format/png.c
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <png.h>
+ #include <inttypes.h>
++#include <zlib.h>
+ 
+ DT_MODULE(1)
+ 
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 4b3f57d0dc87..fc800dc22225 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -13,14 +13,14 @@ assert monotoneSupport -> (monotone != null);
 
 let
   name = "ikiwiki";
-  version = "3.20111229";
+  version = "3.20120109";
 in
 stdenv.mkDerivation {
   name = "${name}-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "6470d40c77ae055cfe8c5bbe2f64c765fc84f1ed2dcdd7dcc7577ae190414b89";
+    sha256 = "0a47135c039f3dfd62162dd3b250397fcdab2dbb4bf4cf0433099f6e48d6f3e8";
   };
 
   buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
diff --git a/pkgs/applications/misc/kbasket/default.nix b/pkgs/applications/misc/kbasket/default.nix
deleted file mode 100644
index 2cc51629e042..000000000000
--- a/pkgs/applications/misc/kbasket/default.nix
+++ /dev/null
@@ -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+";
-  };
-}
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 1ea41d644656..eae84d9c3a6d 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://dl.google.com/linux/direct/google-talkplugin_current_x86_64.rpm";
-        sha256 = "14cf9bef6f70ff850b773dbb92833bbe45645db2636b7e17720fdc6b60e76d63";
+        sha256 = "1jdcnz4iwnjmrr5xyqgam1yd0dc2vyd9iij5imnir4r88l5fc9wh";
       }
     else
       throw "Google Talk does not support your platform.";
diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix
new file mode 100644
index 000000000000..6a608e8d9502
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, openssl, curl, ncurses, libjpeg
+, withGpg ? true, gpgme ? null}:
+
+stdenv.mkDerivation rec {
+  name = "centerim-4.22.10";
+
+  src = fetchurl {
+    url = "http://centerim.org/download/releases/${name}.tar.gz";
+    sha256 = "0viz86jflp684vfginhl6aaw4gh2qvalc25anlwljjl3kkmibklk";
+  };
+
+  buildInputs = [ openssl curl ncurses libjpeg ]
+    ++ stdenv.lib.optional withGpg gpgme;
+
+  configureFlags = [ "--with-openssl=${openssl}" ];
+
+  meta = {
+    homepage = http://www.centerim.org/;
+    description = "Fork of CenterICQ, a curses instant messaging program";
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
index f7e4395e5309..88ba5b9193e5 100644
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ b/pkgs/applications/networking/irc/xchat/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, pkgconfig, tcl, gtk}:
 
 stdenv.mkDerivation {
-  name = "xchat-2.8.4";
+  name = "xchat-2.8.8";
   src = fetchurl {
-    url = http://www.xchat.org/files/source/2.8/xchat-2.8.4.tar.bz2;
-    sha256 = "0qyx6rdvnjwy52amcmkjj134sysfkzbyv7b66vjsla3i8yg9lnpr";
+    url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2;
+    sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0";
   };
   buildInputs = [pkgconfig tcl gtk];
   configureFlags = "--disable-nls";
diff --git a/pkgs/applications/networking/skype/default.nix b/pkgs/applications/networking/skype/default.nix
index 98cbfdb7c57d..8d3645e38195 100644
--- a/pkgs/applications/networking/skype/default.nix
+++ b/pkgs/applications/networking/skype/default.nix
@@ -53,6 +53,16 @@ stdenv.mkDerivation rec {
     EOF
 
     chmod +x $out/bin/skype
+
+    # Desktop icon for Skype
+    patch skype.desktop << EOF
+    5c5
+    < Icon=skype.png
+    ---
+    > Icon=$out/opt/skype/icons/SkypeBlue_48x48.png
+    EOF
+    ensureDir $out/share/applications
+    mv skype.desktop $out/share/applications
   '';
 
   meta = {
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 8665b8731500..8d1b5afe4d0b 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/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 = {
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
new file mode 100644
index 000000000000..b83f79f46e47
--- /dev/null
+++ b/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 ];
+  };
+}
diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix
new file mode 100644
index 000000000000..5cfe2d01f58d
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix
index 702f4c28912f..b444783ba21d 100644
--- a/pkgs/applications/science/chemistry/avogadro/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel }:
+{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "avogadro-1.0.3";
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0s44r78vm7hf4cs13d2qki3gf178gjj1ihph6rs04g6s4figvdpg";
   };
 
-  buildInputs = [ qt4 eigen zlib openbabel ];
+  buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
 
-  buildNativeInputs = [ cmake ];
+  buildNativeInputs = [ cmake pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
 
   meta = {
     maintainers = [ stdenv.lib.maintainers.urkud ];
diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix
new file mode 100644
index 000000000000..f22ef09a9839
--- /dev/null
+++ b/pkgs/applications/science/electronics/archimedes/default.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "archimedes-2.0.0";
+
+  src = fetchurl {
+    url = "mirror://gnu/archimedes/${name}.tar.gz";
+    sha256 = "1ajg4xvk5slv05fsbikrina9g4bmhx8gykk249yz21pir67sdk4x";
+  };
+
+  meta = {
+    description = "GNU package for semiconductor device simulations";
+    homepage = http://www.gnu.org/software/archimedes;
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 793d5c9452aa..4961bbeabfd1 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "hol_light-20111224";
+  name = "hol_light-20120109";
   src = fetchsvn {
     url = http://hol-light.googlecode.com/svn/trunk;
-    rev = "116";
-    sha256 = "c840cc2dfeb2088484692cb0073e6a7bb85e3e44e95aee1e0f5a8e223f7ccae6";
+    rev = "118";
+    sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495";
   };
 
   buildInputs = [ ocaml findlib camlp5 ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
index 905db2dc68ba..32b30bc32420 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "3.20111231";
+  version = "3.20120106";
 in
 stdenv.mkDerivation {
   name = "git-annex-${version}";
 
   src = fetchurl {
     url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
-    sha256 = "4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5";
+    sha256 = "60735d8b036aa8ac44e1838724d9b4da1fceb2f1547ce7f39b2069a8c3605438";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index a1a6a3fcd7fb..9e31e9906c62 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -6,8 +6,10 @@
 , pythonBindings ? false
 , perlBindings ? false
 , javahlBindings ? false
+, saslSupport ? false
 , stdenv, fetchurl, apr, aprutil, neon, zlib, sqlite
 , httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null
+, sasl ? null
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -31,7 +33,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib apr aprutil sqlite ]
     ++ stdenv.lib.optional httpSupport neon
     ++ stdenv.lib.optional pythonBindings python
-    ++ stdenv.lib.optional perlBindings perl;
+    ++ stdenv.lib.optional perlBindings perl
+    ++ stdenv.lib.optional saslSupport sasl;
 
   configureFlags = ''
     ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"}
@@ -39,6 +42,7 @@ stdenv.mkDerivation rec {
     ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"}
     ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""}
     ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"}
+    ${if saslSupport then "--enable-sasl --with-sasl=${sasl}" else "--disable-sasl"}
     --with-zlib=${zlib}
     --with-sqlite=${sqlite}
   '';
diff --git a/pkgs/applications/video/dvswitch/default.nix b/pkgs/applications/video/dvswitch/default.nix
new file mode 100644
index 000000000000..9ef9b6785608
--- /dev/null
+++ b/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 ];
+  };
+}
diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix
index 4607c85b6a16..092f5270b783 100644
--- a/pkgs/applications/video/xine-ui/default.nix
+++ b/pkgs/applications/video/xine-ui/default.nix
@@ -1,26 +1,29 @@
-{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl}:
+{stdenv, fetchurl, pkgconfig, xlibs, xineLib, libpng, readline, ncurses, curl
+, lirc, xz, shared_mime_info }:
 
-stdenv.mkDerivation {
-  name = "xine-ui-0.99.5";
+stdenv.mkDerivation rec {
+  name = "xine-ui-0.99.6";
   
   src = fetchurl {
-    url = mirror://sourceforge/xine/xine-ui-0.99.5.tar.gz;
-    sha256 = "07jywadk6fhk3wn1j9m0cfa0zy0i17kz0nyyxwa3shvhznfals0k";
+    url = "mirror://sourceforge/xine/${name}.tar.xz";
+    sha256 = "1wwylnckm5kfq5fi154w8jqf5cwvp7c1ani15q7sgfrfdkmy7caf";
   };
   
+  buildNativeInputs = [ xz pkgconfig shared_mime_info ];
+
   buildInputs =
-    [ pkgconfig xineLib libpng readline ncurses curl
+    [ xineLib libpng readline ncurses curl lirc
       xlibs.xlibs xlibs.libXext xlibs.libXv xlibs.libXxf86vm xlibs.libXtst xlibs.inputproto
-      xlibs.libXinerama xlibs.libXi
+      xlibs.libXinerama xlibs.libXi xlibs.libXft
     ];
 
-  preBuild = ''
-    sed -e '/curl.types.h/d' -i *.c *.h */*.c */*.h */*/*.c */*/*.h
-  '';
+  patchPhase = ''sed -e '/curl\/types\.h/d' -i src/xitk/download.c'';
 
   configureFlags = "--with-readline=${readline}";
   
-  NIX_LDFLAGS = "-lXext -lgcc_s";
+  LIRC_CFLAGS="-I${lirc}/include";
+  LIRC_LIBS="-L ${lirc}/lib -llirc_client";
+#NIX_LDFLAGS = "-lXext -lgcc_s";
 
   meta = { 
     homepage = http://www.xine-project.org/;