svn merge ^/nixpkgs/trunk, no conflicts

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

pkgs/development/libraries/directfb/default.nix

@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha256 = s.hash;
   };
 
+  patches = [ ./ftbfs.patch ];
+
   buildNativeInputs = [ perl ];
 
   buildInputs = [ zlib libjpeg freetype giflib libpng ]

pkgs/development/libraries/directfb/ftbfs.patch

@@ -0,0 +1,25 @@
+From: André Draszik <andre.draszik@st.com>
+Date: Wed, 28 Sep 2011 17:36:00 +0000 (+0100)
+Subject: generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
+X-Git-Url: http://git.directfb.org/?p=core%2FDirectFB.git;a=commitdiff_plain;h=ef5e1398fe4037b63d6513e450f107fcfe91047f
+
+generic_stretch_blit: fix compilation due to undefined reference to DSPF_ARGBF88871
+
+../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c: In function 'stretch_hvx':
+../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: error: 'DSPF_ARGBF88871' undeclared (first use in this function)
+../../../../DirectFB/src/gfx/generic/generic_stretch_blit.c:444:21: note: each undeclared identifier is reported only once for each function it appears in
+---
+
+diff --git a/src/gfx/generic/generic_stretch_blit.c b/src/gfx/generic/generic_stretch_blit.c
+index 65076f4..6dd987b 100644
+--- a/src/gfx/generic/generic_stretch_blit.c
++++ b/src/gfx/generic/generic_stretch_blit.c
+@@ -441,7 +441,7 @@ stretch_hvx( CardState *state, DFBRectangle *srect, DFBRectangle *drect )
+                     }
+                     break;
+ 
+-               case DSPF_ARGBF88871:
++               case DSPF_RGBAF88871:
+                     if (state->blittingflags & DSBLIT_SRC_PREMULTIPLY) {
+                          for (i=0; i<gfxs->Blut->num_entries; i++) {
+                               int alpha = entries[i].a + 1;

pkgs/development/libraries/directfb/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.4.3";
-   name="directfb-1.4.3";
-   hash="0y79lwzq7srlbgrva7b5y8klbp6gmr8hxrayq8njaw7by3jald8l";
-   url="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-${version}.tar.gz";
-   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.4/DirectFB-1.4.3.tar.gz";
+   version="1.5.3";
+   name="directfb-1.5.3";
+   hash="1w2i4az6v4sh086s27qbyn5w02s67a7dfm2xdpdm4r2zpgl7axg5";
+   url="http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-${version}.tar.gz";
+   advertisedUrl="http://directfb.org/downloads/Core/DirectFB-1.5/DirectFB-1.5.3.tar.gz";
   
   
 }

pkgs/development/libraries/glib/2.28.x.nix

@@ -17,7 +17,8 @@ stdenv.mkDerivation rec {
   buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
   buildNativeInputs = [ perl pkgconfig gettext xz ];
 
-  propagatedBuildInputs = [ zlib ];
+  propagatedBuildInputs = [ zlib ]
+    ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
 
   # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
   postInstall = ''

pkgs/development/libraries/haskell/hakyll/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.4.0";
-  sha256 = "1hyvvcq4hvbwz8zaswi8949sqzjkby6754b0y5zp2cpax2ykkbgx";
+  version = "3.2.4.1";
+  sha256 = "0ijym3k8f9za6cd1dnf8qx0jk85r5kz4f8gy7bn50jclcslnfl0n";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash hamlet mtl pandoc parsec
     regexBase regexPcre snapCore snapServer tagsoup time

pkgs/lib/customisation.nix

@@ -42,9 +42,14 @@ rec {
     in newDrv //
       { meta = if drv ? meta then drv.meta else {};
         passthru = if drv ? passthru then drv.passthru else {};
-        hostDrv = overrideDerivation drv.hostDrv f;
-        buildDrv = overrideDerivation drv.buildDrv f;
-      };
+      }
+      //
+      (if (drv ? hostDrv && drv ? buildDrv)
+       then {
+         hostDrv = overrideDerivation drv.hostDrv f;
+         buildDrv = overrideDerivation drv.buildDrv f;
+       }
+       else { });
 
 
   # usage: (you can use override multiple times)

pkgs/misc/tex/texlive/moderncv.nix

@@ -1,9 +1,9 @@
 args: with args;
 rec {
-  name = "moderncv-2007.05.28";
+  name = "moderncv-2012.01.16";
   src = fetchurl {
     url = "http://mirror.ctan.org/macros/latex/contrib/moderncv.zip";
-    sha256 = "d479141e9ae6dad745b03af47541b1bf7d312613de42bb7984eb4b556854cb51";
+    sha256 = "a9d2de7fc03c35c4084915b2788c8d7acfb695f9e27f6cd81427a7dd1a64cb54";
   };
 
   buildInputs = [texLive unzip];

pkgs/tools/misc/grub/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoconf, automake, buggyBiosCDSupport ? true}:
 
 stdenv.mkDerivation {
-  name = "grub-0.97-patch-1.10";
+  name = "grub-0.97-patch-1.12";
   
   src = fetchurl {
     url = ftp://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz;
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   # failures on systems with more than 2 GiB RAM, and for booting from
   # ext3 filesystems with 256-byte inodes as well as ext4 filesystems.
   gentooPatches = fetchurl {
-    url = mirror://gentoo/distfiles/grub-0.97-patches-1.10.tar.bz2;
-    sha256 = "015hkmb2jd6jfzkfr13cdh16frvva04rwr4yahzyw5xhl634d1h9";
+    url = mirror://gentoo/distfiles/grub-0.97-patches-1.12.tar.bz2;
+    sha256 = "15xc5349hkzl03lbn2cadrmvjrf3s8sn147vv2142cwys9sdzkl0";
   };
 
   patches = [