svn merge ^/nixpkgs/trunk

Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?

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

16 files changed, 221 insertions, 56 deletions

diff --git a/pkgs/development/libraries/aacskeys/default.nix b/pkgs/development/libraries/aacskeys/default.nix
new file mode 100644
index 0000000000000..3bed95e26714c
--- /dev/null
+++ b/pkgs/development/libraries/aacskeys/default.nix
@@ -0,0 +1,45 @@
+{stdenv, fetchurl, openssl, jdk, premake}:
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "aacskeys";
+    version  = "0.4.0c";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  patchPhase = ''
+    substituteInPlace "premake.lua" \
+      --replace "/usr/lib/jvm/java-6-sun/include" "${jdk}/include"
+  '';
+
+  src = fetchurl {
+    url = "http://debian-multimedia.org/pool/main/a/${baseName}/${baseName}_${version}.orig.tar.gz";
+    sha256 = "54ea78898917f4acaf78101dda254de56bc7696bad12cbf22ee6f09d4ee88a43";
+  };
+
+  buildInputs = [openssl jdk premake];
+
+  installPhase = ''
+    ensureDir $out/{bin,lib,share/${baseName}}
+
+    # Install lib
+    install -Dm444 lib/linux/libaacskeys.so $out/lib
+
+    # Install program
+    install -Dm555 bin/linux/aacskeys $out/bin
+
+    # Install resources
+    install -Dm444 HostKeyCertificate.txt $out/share/${baseName}
+    install -Dm444 ProcessingDeviceKeysSimple.txt $out/share/${baseName}
+  '';
+
+  meta = {
+    homepage = http://forum.doom9.org/showthread.php?t=123311;
+    description = "A library and program to retrieve decryption keys for HD discs";
+  };
+}
diff --git a/pkgs/development/libraries/haskell/cabal-file-th/default.nix b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
index 37350562eaccb..790ac305ac7d8 100644
--- a/pkgs/development/libraries/haskell/cabal-file-th/default.nix
+++ b/pkgs/development/libraries/haskell/cabal-file-th/default.nix
@@ -1,10 +1,10 @@
-{ cabal }:
+{ cabal, Cabal }:
 
 cabal.mkDerivation (self: {
   pname = "cabal-file-th";
-  version = "0.2.1";
-  sha256 = "0nczwicgf6kx3lk5m7wqf1wj6ghn8jfx112dzh7jh4f4xs66nsd1";
-  patchPhase = "sed -i cabal-file-th.cabal -e 's|Cabal >= 1.10 && < 1.13|Cabal|'";
+  version = "0.2.2";
+  sha256 = "1ql2gmg3mdfkmnk1m3966npr6l1in15fzlkbn7dr1cp4s90igqhy";
+  buildDepends = [ Cabal ];
   meta = {
     homepage = "http://github.com/nkpart/cabal-file-th";
     description = "Template Haskell expressions for reading fields from a project's cabal file";
diff --git a/pkgs/development/libraries/haskell/funcmp/default.nix b/pkgs/development/libraries/haskell/funcmp/default.nix
index 60e93c81b9464..1f26b0847d231 100755
--- a/pkgs/development/libraries/haskell/funcmp/default.nix
+++ b/pkgs/development/libraries/haskell/funcmp/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "funcmp";
-  version = "1.5";
-  sha256 = "f68807833f39178c99877321f0f335cfde12a5c4b38e6c51f33f8cab94b9e12e";
+  version = "1.6";
+  sha256 = "1l317gnav6adbdi849zdcgcvrlcs4mz4p0s67wg323prq713fkz0";
   buildDepends = [ filepath ];
   meta = {
     homepage = "http://savannah.nongnu.org/projects/funcmp/";
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 613399fa75b53..20e4650d05b7c 100644
--- a/pkgs/development/libraries/haskell/shakespeare-css/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.7";
-  sha256 = "0cla600s5715glimlf58gndpp7njhm26j78bfm16cxia5psp5zav";
+  version = "0.10.7.1";
+  sha256 = "0yi04ap2pl916ycs1wzaxrhjyx81lpmdad5in3qf1s4flfmi1h2k";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-js/default.nix b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
index b1dfc72ecec92..fc651a692824a 100644
--- a/pkgs/development/libraries/haskell/shakespeare-js/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-js/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.11.0.1";
-  sha256 = "01gmsk1q5iq23m93n8mcmm02jqv3i7ksf1jw4qnla1gssdkx8ggk";
+  version = "0.11.1";
+  sha256 = "1sqkfl6pwwmn72xz5qf1bh58jr95w59ry6zmy939x73g9jgpzn6x";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/web-routes/default.nix b/pkgs/development/libraries/haskell/web-routes/default.nix
index 0a6d10539e151..270328441e1a1 100644
--- a/pkgs/development/libraries/haskell/web-routes/default.nix
+++ b/pkgs/development/libraries/haskell/web-routes/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "web-routes";
-  version = "0.26.3";
-  sha256 = "1ldi4gjraga57qj9drknwp19vmy30fhcp6vw3y7xqcrarvp5n2mx";
+  version = "0.27.1";
+  sha256 = "0rbl57qnn908hwfhj14m8z11pscrv44rlg7c9y9rm6jvwy4v58qz";
   buildDepends = [
     blazeBuilder httpTypes mtl network parsec text utf8String
   ];
diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix
index 132d3de4a8fd0..056b8d53e6526 100644
--- a/pkgs/development/libraries/haskell/xml-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-conduit";
-  version = "0.5.2";
-  sha256 = "0wr9xbx2dwv0kmnx9jwlm1734a22mc79ydg4sh61335fdjvchfnd";
+  version = "0.5.3";
+  sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc";
   buildDepends = [
     attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
     conduit dataDefault failure systemFilepath text transformers
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
new file mode 100644
index 0000000000000..d8ace22bc2d8d
--- /dev/null
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchurl, libgcrypt}:
+
+# library that allows libbluray to play AACS protected bluray disks
+# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
+
+# Info on how to use / obtain aacs keys:
+# http://vlc-bluray.whoknowsmy.name/
+# https://wiki.archlinux.org/index.php/BluRay
+
+
+let baseName = "libaacs";
+    version  = "0.3.0";
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchurl {
+    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    sha256 = "bf92dab1a6a8ee08a55e8cf347c2cda49e6535b52e85bb1e92e1cfcc8ecec22c";
+  };
+
+  buildInputs = [libgcrypt];
+
+  meta = {
+    homepage = http://www.videolan.org/developers/libbluray.html;
+    description = "Library to access Blu-Ray disks for video playback";
+    license = stdenv.lib.licenses.lgpl21;
+  };
+}
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
new file mode 100644
index 0000000000000..03bbcc933f4a3
--- /dev/null
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchgit, autoconf, automake, libtool, libaacs ? null, jdk ? null, ant ? null, withAACS ? false}:
+
+assert withAACS -> jdk != null && ant != null && libaacs != null;
+
+# Info on how to use:
+# https://wiki.archlinux.org/index.php/BluRay
+
+let baseName = "libbluray";
+    version  = "0.2.1";
+
+in
+
+stdenv.mkDerivation {
+  name = "${baseName}-${version}";
+
+  src = fetchgit {
+    url = git://git.videolan.org/libbluray.git;
+    rev = "3b9a9f044644a6abe9cb09377f714ded9fdd6c87";
+    sha256 = "551b623e76c2dba44b5490fb42ccdc491b28cd42841de28237b8edbed0f0711c";
+  };
+
+  buildInputs = [autoconf automake libtool] ++ stdenv.lib.optionals withAACS [jdk ant libaacs];
+  NIX_LDFLAGS = stdenv.lib.optionalString withAACS "-laacs";
+
+  preConfigure = "./bootstrap";
+  configureFlags = ["--disable-static"] ++ stdenv.lib.optionals withAACS ["--enable-bdjava" "--with-jdk=${jdk}"];
+
+  meta = {
+    homepage = http://www.videolan.org/developers/libbluray.html;
+    description = "Library to access Blu-Ray disks for video playback";
+    license = stdenv.lib.licenses.lgpl21;
+  };
+}
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
index 17744bad32c58..d4fb593ca80c1 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all, xz }:
 
-let version = "4.5.1"; in
+let
+  version = "4.6.0";
+  pname = "phonon-backend-gstreamer";
+in
 
 stdenv.mkDerivation rec {
-  name = "phonon-backend-gstreamer-${version}";
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/phonon-backend-gstreamer/${version}/src/${name}.tar.bz2";
-    sha256 = "13m3kd0iy28nsn532xl97c50vq8ci3qs2i92yk4fw428qvknqck2";
+    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "0bwkd1dmj8p4m5xindh6ixfvifq36qmvfn246vx22syqfl6f1m2v";
   };
 
-  buildInputs =
-    [ cmake pkgconfig phonon qt4 automoc4
-      gst_all.gstreamer gst_all.gstPluginsBase
-    ];
+  buildInputs = [ phonon qt4 gst_all.gstreamer gst_all.gstPluginsBase ];
+
+  buildNativeInputs = [ cmake automoc4 xz pkgconfig ];
 
   meta = {
     homepage = http://phonon.kde.org/;
diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix
index 3763c474e73b5..faa88f8854f92 100644
--- a/pkgs/development/libraries/phonon-backend-vlc/default.nix
+++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix
@@ -1,20 +1,22 @@
-a@{ stdenv, fetchurl, qt4, vlc, automoc4, cmake, phonon }:
+{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, phonon }:
 
 let
-  pn = "phonon-backend-vlc";
-  v = "0.2.0";
-  vlc = a.vlc.override { inherit qt4; }; #Force using the same qt version
+  pname = "phonon-backend-vlc";
+  v = "0.5.0";
+  vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version
 in
 
 stdenv.mkDerivation {
-  name = "${pn}-${v}";
+  name = "${pname}-${v}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pn}/${v}/src/${pn}-${v}.tar.gz";
-    sha256 = "1sac7770vk0ppwbzl9nag387ks7sqmdnm7722kpzafhx1c2r7wsv";
+    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    sha256 = "1233szd05ahaxyk1sjis374n90m40svfks2aq9jx3g3lxygzwmi2";
   };
 
-  buildInputs = [ qt4 vlc cmake automoc4 phonon ];
+  buildNativeInputs = [ cmake automoc4 xz ];
+
+  buildInputs = [ qt4 vlc_ phonon ];
 
   meta = {
     description = "VideoLAN backend for Phonon multimedia framework";
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index c7de1df719094..2c70957746d27 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4 }:
+{ stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }:
 
 let
-  v = "4.5.1";
+  v = "4.6.0";
 in
 
 stdenv.mkDerivation rec {
@@ -9,20 +9,13 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/src/${name}.tar.xz";
-    sha256 = "1j7lw8w7h2z415vhbp2jlgv3mqwvrspf8xnzb8l0gsfanqfg1001";
+    sha256 = "2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4";
   };
 
-  buildInputs = [ qt4 ];
+  buildInputs = [ qt4 pulseaudio ];
 
   buildNativeInputs = [ cmake automoc4 ];
 
-  cmakeFlags = "-DPHONON_MKSPECS_DIR=mkspecs";
-  preConfigure =
-    ''
-      substituteInPlace designer/CMakeLists.txt \
-        --replace '{QT_PLUGINS_DIR}' '{CMAKE_INSTALL_PREFIX}/lib/qt4/plugins'
-    '';
-
   meta = {
     homepage = http://phonon.kde.org/;
     description = "Multimedia API for Qt";
diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index ee34161723083..465ec7eebb2b3 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -1,19 +1,29 @@
 { stdenv
 , fetchurl
 , gfortran
-, blas
 , liblapack
 }:
 stdenv.mkDerivation {
-  name = "qrupdate-1.1.1";
+  name = "qrupdate-1.1.2";
   src = fetchurl {
-    url = mirror://sourceforge/qrupdate/1.1/qrupdate-1.1.1.tar.gz ;
-    sha256 = "0ak68qd15zccr2d2qahxcxsrcdgxy7drg362jj9swv7rb39h00cz";  			
+    url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ;
+    sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2";  			
   };
   
-  preConfigure = ''
+  configurePhase = ''
     export PREFIX=$out
+    sed -i -e 's,^BLAS=.*,BLAS=-L${liblapack}/lib -L${liblapack.blas} -lcblas -lf77blas -latlas,' \
+      -e 's,^LAPACK=.*,LAPACK=-L${liblapack}/lib -llapack -lcblas -lf77blas -latlas,' \
+      Makeconf
   '';
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  buildTarget = "lib";
+
+  installTarget = "install-staticlib";
   
-  buildInputs = [gfortran blas liblapack] ;
+  buildInputs = [ gfortran liblapack ];
 }
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 1c5e0d9068e8b..74d206210898c 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -1,24 +1,46 @@
-{ stdenv, fetchurl, gfortran }:
+{ stdenv, fetchurl, gfortran, tolerateCpuTimingInaccuracy ? true }:
+
+let
+  optionalString = stdenv.lib.optionalString;
+in
 
 stdenv.mkDerivation {
   name = "atlas-3.9.67";
-  
+
   src = fetchurl {
     url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
     sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
   };
 
-  # configure outside of the source directory
+  # Configure outside of the source directory.
   preConfigure = '' mkdir build; cd build; configureScript=../configure; '';
 
-  # the manual says you should pass -fPIC as configure arg .. It works
-  configureFlags = "-Fa alg -fPIC";
+  # * The manual says you should pass -fPIC as configure arg. Not sure why, but
+  #   it works.
+  #
+  # * Atlas aborts the build if it detects that some kind of CPU frequency
+  #   scaling is active on the build machine because that feature offsets the
+  #   performance timings. We ignore that check, however, because with binaries
+  #   being pre-built on Hydra those timings aren't accurate for the local
+  #   machine in the first place.
+  configureFlags = "-Fa alg -fPIC"
+    + optionalString stdenv.isi686 " -b 32"
+    + optionalString tolerateCpuTimingInaccuracy " -Si cputhrchk 0";
 
   buildInputs = [ gfortran ];
 
+  doCheck = true;
+
   meta = {
-    description = "Atlas library";
+    homepage = "http://math-atlas.sourceforge.net/";
+    description = "Automatically Tuned Linear Algebra Software (ATLAS)";
     license = "GPL";
-    homepage = http://math-atlas.sourceforge.net/;
+
+    longDescription = ''
+      The ATLAS (Automatically Tuned Linear Algebra Software) project is an ongoing
+      research effort focusing on applying empirical techniques in order to provide
+      portable performance. At present, it provides C and Fortran77 interfaces to a
+      portably efficient BLAS implementation, as well as a few routines from LAPACK.
+    '';
   };
 }
diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix
index acede395c84da..28bfa4df8019b 100644
--- a/pkgs/development/libraries/science/math/liblapack/default.nix
+++ b/pkgs/development/libraries/science/math/liblapack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gfortran, atlas, cmake }:
+{ stdenv, fetchurl, gfortran, atlas, cmake, python }:
 
 stdenv.mkDerivation {
   name = "liblapack-3.4.0";
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [ atlas ];
   buildInputs = [ gfortran cmake ];
+  buildNativeInputs = [ python ];
 
   cmakeFlags = [
     "-DUSE_OPTIMIZED_BLAS=ON"
@@ -17,8 +18,19 @@ stdenv.mkDerivation {
     "-DCMAKE_Fortran_FLAGS=-fPIC"
   ];
 
+  doCheck = true;
+
+  checkPhase = "
+    sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py
+    ctest
+  ";
+
   enableParallelBuilding = true;
 
+  passthru = {
+    blas = atlas;
+  };
+
   meta = {
     description = "Linear Algebra PACKage";
     license = "revised-BSD";
diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix
new file mode 100644
index 0000000000000..cd0eb3fcdcbef
--- /dev/null
+++ b/pkgs/development/libraries/xmlrpc-c/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchsvn, curl }:
+
+let rev = "2262"; in
+stdenv.mkDerivation {
+  name = "xmlrpc-c-r${rev}";
+
+  buildInputs = [ curl ];
+
+  preInstall = "export datarootdir=$out/share";
+
+  src = fetchsvn {
+    url = http://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/advanced;
+    rev = "2262";
+    sha256 = "1grwnczp5dq3w20rbz8bgpwl6jmw0w7cm7nbinlasf3ap5sc5ahb";
+  };
+}