svn merge trunk

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

13 files changed, 91 insertions, 37 deletions

diff --git a/pkgs/development/libraries/boolstuff/default.nix b/pkgs/development/libraries/boolstuff/default.nix
index 419215a45a5b..c05fddc18cf0 100644
--- a/pkgs/development/libraries/boolstuff/default.nix
+++ b/pkgs/development/libraries/boolstuff/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "boolstuff-0.1.12";
+let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
+
+stdenv.mkDerivation rec {
+  name = "boolstuff-0.1.13";
 
   src = fetchurl {
-    url = http://perso.b2b2c.ca/sarrazip/dev/boolstuff-0.1.12.tar.gz;
-    sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9";
+    url = "${baseurl}/${name}.tar.gz";
+    sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
 
   meta = { 
     description = "Library for operations on boolean expression binary trees";
-    homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html;
+    homepage = "${baseurl}/boolstuff.html";
     license = "GPL";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix
index 2c577fbc2ef5..c5096ae9a771 100644
--- a/pkgs/development/libraries/haskell/clientsession/default.nix
+++ b/pkgs/development/libraries/haskell/clientsession/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3";
-  sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5";
+  version = "0.7.3.1";
+  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
   buildDepends = [
     base64Bytestring cereal cryptoApi cryptocipher skein
   ];
diff --git a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix b/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
index e3b80dd1edc9..1992be553b23 100644
--- a/pkgs/development/libraries/haskell/hamlet/0.10.1.nix
+++ b/pkgs/development/libraries/haskell/hamlet/0.10.2.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.1";
-  sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6";
+  version = "0.10.2";
+  sha256 = "1p4dz1h640ryhj7prks7qazqyx0l79hi7130ksfchlb5mprz6wq2";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];
diff --git a/pkgs/development/libraries/haskell/persistent-template/default.nix b/pkgs/development/libraries/haskell/persistent-template/default.nix
index af69ad9d2671..67d8e10a3ef9 100644
--- a/pkgs/development/libraries/haskell/persistent-template/default.nix
+++ b/pkgs/development/libraries/haskell/persistent-template/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.6.2";
-  sha256 = "1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx";
+  version = "0.6.3";
+  sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa";
   buildDepends = [ monadControl persistent text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";
diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix
index 9329faad3481..879edcbcb7b0 100644
--- a/pkgs/development/libraries/haskell/persistent/default.nix
+++ b/pkgs/development/libraries/haskell/persistent/default.nix
@@ -1,14 +1,14 @@
-{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
-, sqlite, text, time, transformers
+{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
+, pathPieces, pool, sqlite, text, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.2";
-  sha256 = "1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2";
+  version = "0.6.3";
+  sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx";
   buildDepends = [
-    blazeHtml enumerator monadControl mtl pathPieces pool text time
-    transformers
+    blazeHtml dataObject enumerator monadControl mtl pathPieces pool
+    text time transformers
   ];
   extraLibraries = [ sqlite ];
   meta = {
diff --git a/pkgs/development/libraries/haskell/shakespeare-css/default.nix b/pkgs/development/libraries/haskell/shakespeare-css/default.nix
index 0bc2f187fb2c..65f2debed9cf 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.1";
-  sha256 = "1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg";
+  version = "0.10.2";
+  sha256 = "181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4";
   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 064e1828f9df..5a402840d715 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.10.1";
-  sha256 = "0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3";
+  version = "0.10.2";
+  sha256 = "1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare-text/default.nix b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
index 7c8cfceef17d..58ffa1404fc5 100644
--- a/pkgs/development/libraries/haskell/shakespeare-text/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare-text/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "0.10.1";
-  sha256 = "1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j";
+  version = "0.10.2";
+  sha256 = "04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
diff --git a/pkgs/development/libraries/haskell/shakespeare/default.nix b/pkgs/development/libraries/haskell/shakespeare/default.nix
index 409b9b838a47..1c57e45713ca 100644
--- a/pkgs/development/libraries/haskell/shakespeare/default.nix
+++ b/pkgs/development/libraries/haskell/shakespeare/default.nix
@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+{ cabal, parsec, text }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "0.10.1";
-  sha256 = "1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f";
-  buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+  version = "0.10.1.1";
+  sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a";
+  buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
     description = "A toolkit for making compile-time interpolated templates";
diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix
index 3fa0595bc13c..2ef32922346d 100644
--- a/pkgs/development/libraries/haskell/wai-app-static/default.nix
+++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "0.3.3";
-  sha256 = "04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17";
+  version = "0.3.4";
+  sha256 = "0jxlm0qfv59c3q6ngvr94rzrn01byfn3wak208ws18xhk14cv058";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai
diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix
index 9fce21f06db3..7a06bfb1958d 100644
--- a/pkgs/development/libraries/haskell/wai-extra/default.nix
+++ b/pkgs/development/libraries/haskell/wai-extra/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.2";
-  sha256 = "1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y";
+  version = "0.4.3";
+  sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network text time transformers wai zlibBindings
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index acc5af0ca9e0..57a325a72349 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -1,18 +1,25 @@
 { stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
 
+let version = "0.3.3"; in
+
 stdenv.mkDerivation rec {
-  name = "liblastfm-0.3.0";
+  name = "liblastfm-${version}";
 
+  # Upstream does not package git tags as tarballs. Get tarball from github.
   src = fetchurl {
-    url = "http://cdn.last.fm/src/${name}.tar.bz2";
-    sha256 = "0vgpkbqmynm975nlcw3caxpz30wvvz35c7a9kfr2wjqizvxrfwnx";
+    url = "https://github.com/mxcl/liblastfm/tarball/${version}";
+    name = "${name}.tar.gz";
+    sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6";
   };
 
   prefixKey = "--prefix ";
   propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
-  buildInputs = [ ruby pkgconfig ];
+  buildNativeInputs = [ ruby pkgconfig ];
+
+  configureFlags = "--release";
 
-  patchPhase = "patchShebangs .";
+  patches = [ ./ruby-1.9.patch ];
+  postPatch = "patchShebangs .";
 
   meta = {
     homepage = http://github.com/mxcl/liblastfm;
diff --git a/pkgs/development/libraries/liblastfm/ruby-1.9.patch b/pkgs/development/libraries/liblastfm/ruby-1.9.patch
new file mode 100644
index 000000000000..ac6d175e73a4
--- /dev/null
+++ b/pkgs/development/libraries/liblastfm/ruby-1.9.patch
@@ -0,0 +1,45 @@
+From: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Subject: [PATCH] Fix compilation with ruby-1.9
+
+__FILE__ is a relative path in ruby-1.9
+
+---
+ admin/Makefile.rb |    4 ++--
+ admin/qpp         |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/admin/Makefile.rb b/admin/Makefile.rb
+index 592f5a5..33fe688 100755
+--- a/admin/Makefile.rb
++++ b/admin/Makefile.rb
+@@ -6,7 +6,7 @@
+ 
+ cwd = File.dirname( __FILE__ )
+ require 'find'
+-require "#{cwd}/platform.rb"
++require_relative 'platform'
+ 
+ 
+ ######################################################################### defs
+@@ -158,4 +158,4 @@ puts <<-EOS
+ .PHONY: dist
+ dist:
+ 	git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
+-EOS
+\ No newline at end of file
++EOS
+diff --git a/admin/qpp b/admin/qpp
+index 36b2d05..ee840fd 100755
+--- a/admin/qpp
++++ b/admin/qpp
+@@ -4,7 +4,7 @@
+ 
+ cwd=File.dirname __FILE__
+ require 'find'
+-require "#{cwd}/findsrc"
++require_relative 'findsrc'
+ 
+ sources = Array.new
+ headers = Array.new
+-- 
+tg: (f0b3239..) t/ruby19 (depends on: master)