svn merge ^/nixpkgs/trunk

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

9 files changed, 49 insertions, 40 deletions

diff --git a/pkgs/applications/editors/leksah/default.nix b/pkgs/applications/editors/leksah/default.nix
index f8a5d6a712fea..6ce382884ac28 100644
--- a/pkgs/applications/editors/leksah/default.nix
+++ b/pkgs/applications/editors/leksah/default.nix
@@ -1,6 +1,6 @@
-{ cabal, binary, binaryShared, deepseq, glib, gtk, gtksourceview2
-, hslogger, leksahServer, ltk, mtl, network, parsec, processLeksah
-, regexBase, regexTdfa, strict, time, utf8String
+{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk
+, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec
+, processLeksah, regexBase, regexTdfa, strict, time, utf8String
 }:
 
 cabal.mkDerivation (self: {
@@ -10,9 +10,9 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary binaryShared deepseq glib gtk gtksourceview2 hslogger
-    leksahServer ltk mtl network parsec processLeksah regexBase
-    regexTdfa strict time utf8String
+    binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2
+    hslogger leksahServer ltk mtl network parsec processLeksah
+    regexBase regexTdfa strict time utf8String
   ];
   noHaddock = true;
   meta = {
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 490793d29f6df..ad35b75123153 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.6.11";
+  name = "gimp-2.6.12";
   
   src = fetchurl {
     url = "ftp://ftp.gtk.org/pub/gimp/v2.6/${name}.tar.bz2";
-    sha256 = "18dhgicc3f04q0js521kq9w3gq8yqawpf6vdb7m14f9vh380hvcv";
+    sha256 = "0qpcgaa4pdqqhyyy8vjvzfflxgsrrs25zk79gixzlnbzq3qwjlym";
   };
   
   buildInputs = [
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index 88e3d32080c5e..0c00553f2711a 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -7,10 +7,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "paraview-3.10.1";
+  name = "paraview-3.12.0";
   src = fetchurl {
-    url = "http://www.paraview.org/files/v3.10/ParaView-3.10.1.tar.gz";
-    sha256 = "1z2wvywpd3rvz4jhfs3mi35hsx4yqkdim58d075jx9kg7gifwga5";
+    url = "http://www.paraview.org/files/v3.12/ParaView-3.12.0.tar.gz";
+    sha256 = "0n0n0hrv02rd9rb63z4baalf40m8v870027mr47b93scgp18qyim";
   };
 
   # [  5%] Generating vtkGLSLShaderLibrary.h
@@ -32,8 +32,7 @@ stdenv.mkDerivation rec {
 #    "-DPYTHON_LIBRARY="
   ];
 
-  # I don't enable it due to memory bounds
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   buildInputs = [ cmake qt4 hdf5 mpich2 python libxml2 mesa ];
 
diff --git a/pkgs/applications/misc/xmobar/default.nix b/pkgs/applications/misc/xmobar/default.nix
index 355deec4092fe..b6bfe8df25ecc 100644
--- a/pkgs/applications/misc/xmobar/default.nix
+++ b/pkgs/applications/misc/xmobar/default.nix
@@ -1,4 +1,5 @@
-{ cabal, libXrandr, mtl, parsec, stm, time, utf8String, X11, X11Xft
+{ cabal, filepath, libXrandr, mtl, parsec, stm, time, utf8String
+, X11, X11Xft
 }:
 
 cabal.mkDerivation (self: {
@@ -7,7 +8,9 @@ cabal.mkDerivation (self: {
   sha256 = "1y26b2a5v9hxv1zmjcb4m8j9qkqdn74mqc3q58vgp5cav45rphvh";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ mtl parsec stm time utf8String X11 X11Xft ];
+  buildDepends = [
+    filepath mtl parsec stm time utf8String X11 X11Xft
+  ];
   extraLibraries = [ libXrandr ];
   configureFlags = "-fwith_xft";
   meta = {
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix
index abb4eff6b57fd..4e02eb9f1e6aa 100644
--- a/pkgs/applications/networking/p2p/tribler/default.nix
+++ b/pkgs/applications/networking/p2p/tribler/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }:
+{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools
+, enablePlayer ? false, vlc ? null }:
 
-let rev = "24763"; in
+let rev = "24912"; in
 
 stdenv.mkDerivation {
-  name = "tribler-5.5.10";
+  name = "tribler-5.5.13-pre${rev}";
 
   src = fetchsvn {
     url = http://svn.tribler.org/abc/branches/release-5.5.x;
     inherit rev;
-    sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6";
+    sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g";
   };
 
   buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ];
@@ -34,7 +35,10 @@ stdenv.mkDerivation {
           --set _TRIBLERPATH $out/share/tribler \
           --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \
           --run 'cd $_TRIBLERPATH' \
-          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py"
+          --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \
+          ${stdenv.lib.optionalString enablePlayer ''
+            --prefix LD_LIBRARY_PATH : ${vlc}/lib
+          ''}
     '';
 
   meta = {
diff --git a/pkgs/applications/office/hledger-interest/default.nix b/pkgs/applications/office/hledger-interest/default.nix
index a400730878ea3..6715df077bf27 100644
--- a/pkgs/applications/office/hledger-interest/default.nix
+++ b/pkgs/applications/office/hledger-interest/default.nix
@@ -1,4 +1,4 @@
-{ cabal, hledgerLib, mtl, time }:
+{ cabal, Cabal, hledgerLib, mtl, time }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-interest";
@@ -6,7 +6,7 @@ cabal.mkDerivation (self: {
   sha256 = "0lm4jcxcig3yxzhbnka1q54fvshn5b9d91a5a2mbmkzbwhzjj0lg";
   isLibrary = false;
   isExecutable = true;
-  buildDepends = [ hledgerLib mtl time ];
+  buildDepends = [ Cabal hledgerLib mtl time ];
   meta = {
     homepage = "http://github.com/peti/hledger-interest";
     description = "computes interest for a given account";
diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix
index e3f1742ee594b..a76d5ad2eac86 100644
--- a/pkgs/applications/version-management/darcs/default.nix
+++ b/pkgs/applications/version-management/darcs/default.nix
@@ -1,6 +1,6 @@
-{ cabal, curl, extensibleExceptions, hashedStorage, haskeline, html
-, HTTP, mmap, mtl, network, parsec, random, regexCompat, tar
-, terminfo, text, zlib
+{ cabal, curl, extensibleExceptions, filepath, hashedStorage
+, haskeline, html, HTTP, mmap, mtl, network, parsec, random
+, regexCompat, tar, terminfo, text, zlib
 }:
 
 cabal.mkDerivation (self: {
@@ -10,8 +10,8 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    extensibleExceptions hashedStorage haskeline html HTTP mmap mtl
-    network parsec random regexCompat tar terminfo text zlib
+    extensibleExceptions filepath hashedStorage haskeline html HTTP
+    mmap mtl network parsec random regexCompat tar terminfo text zlib
   ];
   extraLibraries = [ curl ];
   meta = {
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 9e31e9906c62e..6e0f65d4caa9d 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -21,13 +21,13 @@ assert compressionSupport -> neon.compressionSupport;
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.2";
+  version = "1.7.3";
 
   name = "subversion-${version}";
 
   src = fetchurl {
     url = "mirror://apache/subversion//${name}.tar.bz2";
-    sha1 = "8c0824aeb7f42da1ff4f7cd296877af7f59812bb";
+    sha1 = "624d4070361c0e8d7cf4f5c667629e72459b122d";
   };
 
   buildInputs = [ zlib apr aprutil sqlite ]
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 8e11dd6068d67..02000ffeb2125 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -19,20 +19,23 @@ stdenv.mkDerivation rec {
     sha256 = "1h93jdx89dfgxlnw66lfcdk9kisadm689zanvgkzbfb3si2frv83";
   };
 
-  buildInputs = [
-    perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
-    dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
-    libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
-    udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
-    libkate libtiger libv4l samba liboggz libass libdvbpsi
-  ]
-  ++ (with xlibs; [ xlibs.xlibs libXv libXvMC libXpm xcbutil libva ]);
+  buildInputs =
+    [ perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
+      dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt
+      libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec
+      udev gnutls avahi libcddb jackaudio SDL SDL_image libmtp unzip taglib
+      libkate libtiger libv4l samba liboggz libass libdvbpsi libva
+      xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
+    ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  configureFlags = [ "--enable-alsa"
-    "--with-kde-solid=$out/share/apps/solid/actions"
-  ];
+  configureFlags =
+    [ "--enable-alsa"
+      "--with-kde-solid=$out/share/apps/solid/actions"
+    ];
+
+  enableParallelBuilding = true;
 
   preBuild = ''
     substituteInPlace modules/misc/freetype.c --replace \