Merge branch 'x-updates' into staging

...in preparation for a merge to master

nixos/modules/services/x11/desktop-managers/default.nix

@@ -17,7 +17,10 @@ in
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
-  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix ];
+  imports = [
+    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix
+    ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix
+  ];
 
   options = {
 

pkgs/applications/audio/lmms/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg
-, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
+, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype
 }:
 
 stdenv.mkDerivation  rec {
@@ -16,6 +16,11 @@ stdenv.mkDerivation  rec {
     libsndfile pkgconfig pulseaudio qt4
   ];
 
+  # work around broken build system of 0.4.*
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Linux MultiMedia Studio";
     homepage = "http://lmms.sourceforge.net";

pkgs/applications/display-managers/slim/default.nix

@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DUSE_PAM=1" ];
 
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype";
+
   enableParallelBuilding = true;
 
   buildInputs =

pkgs/applications/graphics/graphicsmagick/1.3.7.nix

@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   configureFlags = "--enable-shared";
 
   buildInputs =
-    [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
+    [ libpng bzip2 freetype ghostscript graphviz libjpeg libtiff libX11 libxml2
       zlib libtool
     ];
 

pkgs/applications/graphics/inkscape/default.nix

@@ -4,18 +4,17 @@
 , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.48.4";
+  name = "inkscape-0.48.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
-    sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7";
+    sha256 = "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b";
   };
 
   patches = [ ./configure-python-libs.patch ];
 
-  postPatch = ''
+  postPatch = stdenv.lib.optionalString doCheck
-    patch -p0 < ${./spuriouscomma.patch}
+    ''sed -i 's:#include "../../src:#include "src:' src/cxxtests.cpp'';
-  '';
 
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
@@ -31,6 +30,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-python";
 
+  enableParallelBuilding = true;
+  doCheck = true;
+  checkFlags = "-j1";
+
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     for i in "$out/bin/"*
@@ -44,9 +47,11 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lX11";
 
-  meta = {
+  meta = with stdenv.lib; {
     license = "GPL";
     homepage = http://www.inkscape.org;
+    description = "Vector graphics editor";
+    platforms = platforms.all;
     longDescription = ''
       Inkscape is a feature-rich vector graphics editor that edits
       files in the W3C SVG (Scalable Vector Graphics) file format.

pkgs/applications/graphics/inkscape/spuriouscomma.patch

@@ -1,11 +0,0 @@
---- src/widgets/desktop-widget.h~	2011-07-08 13:25:09.000000000 -0500
-+++ src/widgets/desktop-widget.h	2013-02-15 16:04:45.806910365 -0600
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);

pkgs/applications/misc/blender/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
+{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
 , zlib, fftw
@@ -26,6 +26,13 @@ stdenv.mkDerivation rec {
       substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
     '';
 
+  patches = [(fetchpatch { # fix parallel builds
+    url = "https://developer.blender.org/D619?download=true";
+    sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f";
+    name = "D619.diff";
+  })];
+  patchFlags = "-p0";
+
   cmakeFlags =
     [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
       "-DWITH_OPENCOLLADA=OFF"

pkgs/applications/misc/llpp/default.nix

@@ -20,11 +20,11 @@ stdenv.mkDerivation {
     ccopt="-O"
     ccopt="$ccopt -I ${jbig2dec}/include"
     ccopt="$ccopt -I ${libjpeg}/include"
-    ccopt="$ccopt -I ${freetype}/include"
+    ccopt="$ccopt -I ${freetype}/include/freetype2"
     ccopt="$ccopt -I ${openjpeg}/include"
     ccopt="$ccopt -I ${zlib}/include"
     ccopt="$ccopt -I ${mupdf}/include"
-    ccopt="$ccopt -include ${freetype}/include/ft2build.h"
+    ccopt="$ccopt -include ft2build.h"
     ccopt="$ccopt -D_GNU_SOURCE"
 
     cclib="$cclib -lmupdf"

pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix

@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
 , sqlite, libsoup, libnice, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.17.2";
+  name = "telepathy-gabble-0.18.2";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8";
+    sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9";
   };
 
   nativeBuildInputs = [ pkgconfig libxslt ];
-  buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
+  buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
+    ++ stdenv.lib.optional doCheck dbus_daemon;
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
 
-  meta = {
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = with stdenv.lib; {
     homepage = http://telepathy.freedesktop.org;
     description = "Jabber/XMPP connection manager for the Telepathy framework";
     platforms = stdenv.lib.platforms.gnu;

pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix

@@ -1,20 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.16.0";
+  name = "${pname}-5.16.2";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd";
+    sha256 = "1sk8f9jfaxgbsniz0n5hmrcwvxla3x8axjcnjbppg7nidk9gijrx";
   };
 
-  buildInputs = [ telepathy_glib makeWrapper ];
+  buildInputs = [ telepathy_glib makeWrapper upower ]; # ToDo: optional stuff missing
 
   nativeBuildInputs = [ pkgconfig libxslt ];
 
+  doCheck = true;
+
   preFixup = ''
     wrapProgram "$out/libexec/mission-control-5" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
+
+  meta = with stdenv.lib; {
+    description = "An account manager and channel dispatcher for the Telepathy framework";
+    homepage = http://telepathy.freedesktop.org/wiki/;
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+  };
 }

pkgs/applications/networking/mailreaders/thunderbird/default.nix

@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
+{ stdenv, fetchurl, pkgconfig, m4, gtk, pango, perl, python, zip, libIDL
-, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
+, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
-, libnotify, cairo, pixman, fontconfig
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
-, libjpeg
+, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
-, pythonPackages
+, hunspell, libevent, libstartup_notification, libvpx
-
+, cairo, gstreamer, gst_plugins_base, icu
+, debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Shredder", enable this option.  However, those
   # binaries may not be distributed without permission from the
@@ -12,59 +13,75 @@
   enableOfficialBranding ? false
 }:
 
-let version = "17.0.11"; in
+let version = "31.0"; in
-let verName = "${version}esr"; in
+let verName = "${version}"; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "thunderbird-${verName}";
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp";
+    sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5";
   };
 
-  #enableParallelBuilding = true;
+  buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
+    [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
+      python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+      xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+      alsaLib nspr nss libnotify xlibs.pixman yasm mesa
+      xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
+      xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
+      hunspell libevent libstartup_notification cairo icu
+    ] ++ [ m4 ];
 
-  buildInputs =
+  configureFlags = [ "--enable-application=mail" ]
-    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
+    # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx
-      libnotify cairo pixman fontconfig yasm mesa nss
+    ++ [
-      libjpeg pythonPackages.sqlite3
-    ];
-
-  configureFlags =
-    [ "--enable-application=mail"
-      "--enable-optimize"
-      "--with-pthreads"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-pthreads"
       "--with-system-jpeg"
-      #"--with-system-png"
       "--with-system-zlib"
       "--with-system-bz2"
       "--with-system-nspr"
       "--with-system-nss"
-      # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975
+      "--with-system-libevent"
-      #"--enable-system-cairo"
+      #"--with-system-libvpx"
+      "--with-system-png"
+      "--with-system-icu"
+      "--enable-system-ffi"
+      "--enable-system-hunspell"
+      "--enable-system-pixman"
+      "--enable-system-sqlite"
+      "--enable-system-cairo"
+      "--disable-gstreamer"
+      "--enable-startup-notification"
+      # "--enable-content-sandbox"            # available since 26.0, but not much info available
+      # "--enable-content-sandbox-reporter"   # keeping disabled for now
       "--disable-crashreporter"
-      "--disable-necko-wifi"
-      "--disable-webm"
       "--disable-tests"
-      "--enable-calendar"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
-      "--disable-ogg"
+      "--disable-installer"
+      "--disable-updater"
+      "--disable-pulseaudio"
+    ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
+                        else [ "--disable-debug" "--enable-release"
+                               "--enable-optimize" "--enable-strip" ])
+    ++ [
+      "--disable-javaxpcom"
+      "--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7
     ]
     ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
 
-  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
+  configurePhase = ''
-  # prefix, and PREFIX in some places where they are not set.  In
+    patchShebangs .
-  # particular, there are some linker flags like
-  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
-  # `-rpath-link=/bin', the build fails due to the purity checks in
-  # the ld wrapper.  So disable the purity check for now.
-  preBuild = "NIX_ENFORCE_PURITY=0";
 
-  # This doesn't work:
+    echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
-  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
+    echo "ac_add_options --prefix='$out'" >> .mozconfig
+    echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig
+
+    make ${makeFlags} configure
+  '';
+
+  makeFlags = "-f client.mk";
+  buildFlags = "build";
 
   postInstall =
     ''
@@ -84,7 +101,7 @@ stdenv.mkDerivation {
     '';
 
   meta = with stdenv.lib; {
-    description = "Mozilla Thunderbird, a full-featured email client";
+    description = "A full-featured e-mail client";
     homepage = http://www.mozilla.org/thunderbird/;
     license =
       # Official branding implies thunderbird name and logo cannot be reuse,

pkgs/applications/video/mpv/default.nix

@@ -57,11 +57,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.3.8";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "0k77rq17mslpvvgr4mvkj9bd5s1yhsigwvzym8blr1brxkj9pk3b";
+    sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn";
   };
 
   buildInputs = with stdenv.lib;

pkgs/applications/window-managers/weston/default.nix

@@ -2,16 +2,17 @@
 , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
 , libjpeg, pam, autoconf, automake, libtool, dbus }:
 
-let version = "1.4.0"; in
+let version = "1.5.0"; in
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl";
+    sha256 = "113nig2dmbgrjhi79k0zw77vicnx8vkaihawd0nsg6n79ah8nf06";
   };
 
+  #ToDo: libinput can be split away
   buildInputs = [
     pkgconfig wayland mesa libxkbcommon
     cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs

pkgs/desktops/e18/enlightenment.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit }:
+{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2 }:
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
   version = "0.18.8";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz";
     sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l";
   };
-  buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit ];
+  buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ];
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
   '';

pkgs/desktops/xfce/core/libxfce4util.nix

@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   p_name  = "libxfce4util";
   ver_maj = "4.10";
-  ver_min = "0";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89";
+    sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

pkgs/desktops/xfce/core/xfce4-appfinder.nix

@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-appfinder";
-  ver_maj = "4.9"; # no 4.10 (stable) release yet
+  ver_maj = "4.10";
-  ver_min = "4";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq";
+    sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch

@@ -1,307 +0,0 @@
-From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Tue, 23 Jul 2013 11:27:41 +0200
-Subject: Change brightness level from glong to gint32
-
-The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
-
-diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
-index aa1ef33..f1524cb 100644
---- a/common/xfpm-brightness.c
-+++ b/common/xfpm-brightness.c
-@@ -92,11 +92,11 @@ out:
- }
- 
- static gboolean
--xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
-+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
- {
-     unsigned long nitems;
-     unsigned long bytes_after;
--    long *prop;
-+    gint32 *prop;
-     Atom actual_type;
-     int actual_format;
-     gboolean ret = FALSE;
-@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
- }
- 
- static gboolean
--xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
-+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
- {
-     gboolean ret = TRUE;
- 
-@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
-     
-     if ( gdk_error_trap_pop () ) 
-     {
--	    g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
-+	    g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
- 	    ret = FALSE;
-     }
-     
-@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
- }
- 
- static gboolean
--xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
- {
--    long hw_level;
-+    gint32 hw_level;
-     gboolean ret = FALSE;
--    long set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-     
-@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-     
-     if ( !ret )
-     {
--	g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
- 	return FALSE;
-     }
- 	
-     /* Nothing changed in the hardware*/
-     if ( *new_level == hw_level )
-     {
--	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
- 	return FALSE;
-     }
-     
-@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
- }
- 
- static gboolean
--xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
- {
--    long hw_level;
-+    gint32 hw_level;
-     gboolean ret;
--    long set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-     
-@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-     
-     if ( !ret )
-     {
--	g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
- 	return FALSE;
-     }
-     
-     /* Nothing changed in the hardware*/
-     if ( *new_level == hw_level )
-     {
--	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
- 	return FALSE;
-     }
-     
-@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
- }
- 
- static gboolean
--xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
-+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
- {
-     int ret;
- 
-@@ -406,11 +406,11 @@ out:
- }
- 
- static gboolean
--xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
- {
--    glong hw_level;
-+    gint32 hw_level;
-     gboolean ret = FALSE;
--    gint set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-     
-@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
- }
- 
- static gboolean
--xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
- {
--    glong hw_level;
-+    gint32 hw_level;
-     gboolean ret;
--    gint set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-     
-@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
-     return FALSE;
- }
- 
--gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
- {
-     gboolean ret = FALSE;
-     
-@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-     return ret;
- }
- 
--gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
- {
-     gboolean ret = FALSE;
-     
-@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
-     return brightness->priv->max_level;
- }
- 
--gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
-+gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, gint32 *level)
- {
-     gboolean ret = FALSE;
-     
-@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
-     return ret;
- }
- 
--gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
-+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
- {
-     gboolean ret = FALSE;
-     
-diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
-index 0c4e3ed..26b3dbe 100644
---- a/common/xfpm-brightness.h
-+++ b/common/xfpm-brightness.h
-@@ -51,20 +51,20 @@ XfpmBrightness       	       *xfpm_brightness_new             (void);
- gboolean			xfpm_brightness_setup 		(XfpmBrightness *brightness);
- 
- gboolean			xfpm_brightness_up		(XfpmBrightness *brightness,
--								 glong *new_level);
-+								 gint32 *new_level);
- 
- gboolean			xfpm_brightness_down		(XfpmBrightness *brightness,
--								 glong *new_level);
-+								 gint32 *new_level);
- 
- gboolean			xfpm_brightness_has_hw 		(XfpmBrightness *brightness);
- 
- gint 				xfpm_brightness_get_max_level   (XfpmBrightness *brightness);
- 
- gboolean			xfpm_brightness_get_level	(XfpmBrightness *brightness,
--								 glong *level);
-+								 gint32 *level);
- 
- gboolean			xfpm_brightness_set_level	(XfpmBrightness *brightness,
--								 glong level);
-+								 gint32 level);
- 
- gboolean			xfpm_brightness_dim_down	(XfpmBrightness *brightness);
- 
-diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
-index 6e60c29..bd466c9 100644
---- a/panel-plugins/brightness/brightness-button.c
-+++ b/panel-plugins/brightness/brightness-button.c
-@@ -186,7 +186,7 @@ static gboolean
- brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
- {
-     gint x, y;
--    glong current_level = 0;
-+    gint32 current_level = 0;
-     GdkDisplay *display;
-     GdkScreen *screen;
-     BrightnessButton *button;
-@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
- static void
- range_value_changed (GtkWidget *widget, BrightnessButton *button)
- {
--    glong range_level, hw_level;
-+    gint32 range_level, hw_level;
-     
-     range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
-     
-@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
- static void
- brightness_button_up (BrightnessButton *button)
- {
--    glong level;
--    glong max_level;
-+    gint32 level;
-+    gint32 max_level;
-     
-     xfpm_brightness_get_level (button->priv->brightness, &level);
-     max_level = xfpm_brightness_get_max_level (button->priv->brightness);
-@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
- static void
- brightness_button_down (BrightnessButton *button)
- {
--    glong level;
-+    gint32 level;
-     xfpm_brightness_get_level (button->priv->brightness, &level);
-     
-     if ( level != 0 )
-diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
-index baeeb43..45c990f 100644
---- a/src/xfpm-backlight.c
-+++ b/src/xfpm-backlight.c
-@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
-     gboolean	    has_hw;
-     gboolean	    on_battery;
-     
--    glong            last_level;
--    glong 	    max_level;
-+    gint32          last_level;
-+    gint32 	    max_level;
-     
-     gboolean        dimmed;
-     gboolean	    block;
-@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
-     
-     if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
-     {
--	glong dim_level;
-+	gint32 dim_level;
- 	
- 	g_object_get (G_OBJECT (backlight->priv->conf),
- 		      backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
-@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
- 	 **/
- 	if (backlight->priv->last_level > dim_level)
- 	{
--	    XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
-+	    XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
- 	    backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
- 	}
-     }
-@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
-     {
- 	if ( !backlight->priv->block)
- 	{
--	    XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
-+	    XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
- 	    xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
- 	}
- 	backlight->priv->dimmed = FALSE;
-@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
- static void
- xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
- {
--    glong level;
-+    gint32 level;
-     gboolean ret = TRUE;
-     
-     gboolean enable_brightness, show_popup;
--- 
-cgit v0.10.1
-

pkgs/desktops/xfce/core/xfce4-power-manager.nix

@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf
 , libxfce4ui, libxfce4util, libnotify, xfce4panel }:
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-power-manager";
-  ver_maj = "1.2";
+  ver_maj = "1.3";
   ver_min = "0";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
+    sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5";
   };
 
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
-    [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util
+    [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util
       libnotify xfce4panel
     ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
-  patches = ./xfce4-power-manager-brightness.patch;
-
   meta = {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
     description = "A power manager for the Xfce Desktop Environment";

pkgs/development/compilers/hhvm/default.nix

@@ -1,8 +1,8 @@
-{ stdenv, fetchgit, cmake, boost, libunwind, mariadb, libmemcached, pcre
+{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, ocaml
+, libxslt, ocaml, freetype
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake boost libunwind mariadb libmemcached pcre libevent gd curl
+    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl
       libxml2 icu flex bison openssl zlib php expat libcap oniguruma
       libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
   MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
   MYSQL_DIR=mariadb;
 
+  # work around broken build system
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+
   patchPhase = ''
     substituteInPlace hphp/util/generate-buildinfo.sh \
       --replace /bin/bash ${stdenv.shell}

pkgs/development/compilers/llvm/3.4/clang.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "cfe" "1dvbkld0a1aqj6wcn0ia1wa8lwha30yfgq16j1r7akdka44z70xb"}
+    unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"}
     mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
     unpackFile ${clang-tools-extra_src}

pkgs/development/compilers/llvm/3.4/default.nix

@@ -15,13 +15,13 @@ let
 
   self = {
     llvm = callPackage ./llvm.nix rec {
-      version = "3.4.1";
+      version = "3.4.2";
       fetch = fetch_v version;
       inherit compiler-rt_src;
     };
 
     clang = callPackage ./clang.nix rec {
-      version = "3.4.1";
+      version = "3.4.2";
       fetch = fetch_v version;
       inherit clang-tools-extra_src;
     };

pkgs/development/compilers/llvm/3.4/llvm.nix

@@ -15,7 +15,7 @@
 }:
 
 let
-  src = fetch "llvm" "0fprxrilnlwk9qv7f0kplxc7kd8mp4x781asssv2nfi4r9pbna3x";
+  src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 

pkgs/development/interpreters/php/5.3-freetype-dirs.patch

@@ -0,0 +1,64 @@
+From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001
+From: Adam Harvey <aharvey@php.net>
+Date: Sat, 7 Dec 2013 19:39:40 -0800
+Subject: [PATCH] Switch to using freetype-config for freetype detection.
+
+This fixes GD compilation against libfreetype 2.5.1 and later after they made
+the rather interesting decision to change their include directory layout in a
+point release.
+
+The original suggestion in the bug was to use pkg-config, but my inclination is
+to use freetype-config instead: we should be able to get the same configuration
+information without actually needing pkg-config installed, since pkg-config is
+by no means guaranteed to exist on many Unices and distros, whereas
+freetype-config should always be present if a libfreetype build environment is
+installed. Let's try it out and see what happens.
+
+Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
+
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index 0e35ece..732e14c 100644
+--- a/ext/gd/config.m4
++++ b/ext/gd/config.m4
+@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/bin/freetype-config"; then
+         FREETYPE2_DIR=$i
+-        FREETYPE2_INC_DIR=$i/include/freetype2
++        FREETYPE2_CONFIG="$i/bin/freetype-config"
+         break
+       fi
+     done
+ 
+     if test -z "$FREETYPE2_DIR"; then
+-      AC_MSG_ERROR([freetype.h not found.])
++      AC_MSG_ERROR([freetype-config not found.])
+     fi
+ 
+-    PHP_CHECK_LIBRARY(freetype, FT_New_Face,
+-    [
+-      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+-      PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
+-      PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
+-      AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
+-      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+-      AC_DEFINE(ENABLE_GD_TTF,1,[ ])
+-    ],[
+-      AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
+-    ],[
+-      -L$FREETYPE2_DIR/$PHP_LIBDIR
+-    ])
++    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++
++    PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
++    PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
++    AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
++    AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
++    AC_DEFINE(ENABLE_GD_TTF,1,[ ])
+   else
+     AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
+   fi

pkgs/development/interpreters/php/5.3.nix

@@ -104,7 +104,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       gd = {
         configureFlags = [
           "--with-gd=${gd}"
-          "--with-freetype-dir=${freetype}"
           "--with-png-dir=${libpng}"
           "--with-jpeg-dir=${libjpeg}"
         ];
@@ -241,6 +240,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     platforms   = stdenv.lib.platforms.unix;
   };
 
-  patches = [./fix.patch];
+  patches = [ ./fix.patch ./5.3-freetype-dirs.patch ];
 
 })

pkgs/development/libraries/dbus/default.nix

@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
 
 let
-  version = "1.8.4";
+  version = "1.8.6";
-  sha256 = "1y0zcmd4jsf2gq5yymz9gcnwxijh0vxbmxz73q3l440is343vxiy";
+  sha256 = "0gyjxd0gfpjs3fq5bx6aljb5f3zxky5zsq0yfqr9ywbv03587vgd";
 
   inherit (stdenv) lib;
 

pkgs/development/libraries/farstream/default.nix

@@ -4,10 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "farstream-0.2.3";
+  name = "farstream-0.2.4";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
-    sha256 = "15h4qv30ql3rnmlm4ac3h7rplvj7125z14fbfh1zrkajjaa3bxdz";
+    sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j";
   };
 
   buildInputs = [ libnice python pygobject gupnp_igd libnice ];

pkgs/development/libraries/ffmpeg/0.10.nix

@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10.12";
+  name = "ffmpeg-0.10.14";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "00nvm3iysn8zincpvv1abqrxqj1ky0322dh2j9csjw983358538i";
+    sha256 = "1frkz3971zc2a60ras5ia26b2h8wbh017x1x80q8cfw0ycrpbxqy";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

pkgs/development/libraries/ffmpeg/1.x.nix

@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.6";
+  name = "ffmpeg-1.2.7";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "174rf3g2pqaxa8rzg03qmy4cn2gsy0p2mk26y9yk5ksq6kg59m19";
+    sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that

pkgs/development/libraries/ffmpeg/2.x.nix

@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.2.2";
+  name = "ffmpeg-2.3";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "062jn47sm1ifwswcd3lx47nff62rgcwp84964q0v983issnrfax4";
+    sha256 = "17l0bx95al6cjhz3pzfcbwg07sbfbwqbxg34zl5lhl89w9jbngbb";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;

pkgs/development/libraries/fontconfig/default.nix

@@ -8,18 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
   };
 
-  infinality_patch = with freetype.infinality; if useInfinality
+  infinality_patch =
-    then let subvers = "1";
+    let subvers = "1";
       in fetchurl {
         url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
         sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
       }
-    else null;
+    ;
 
   propagatedBuildInputs = [ freetype ];
   buildInputs = [ pkgconfig expat ];
 
-  configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
+  configureFlags = [
+    "--with-cache-dir=/var/cache/fontconfig"
+    "--disable-docs"
+    "--with-default-fonts="
+  ];
 
   # We should find a better way to access the arch reliably.
   crossArch = stdenv.cross.arch or null;
@@ -32,10 +36,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time.
+  doCheck = true;
-  installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy";
 
-  postInstall = stdenv.lib.optionalString freetype.infinality.useInfinality ''
+  # Don't try to write to /var/cache/fontconfig at install time.
+  installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
+
+  postInstall = ''
     cd "$out/etc/fonts" && tar xvf ${infinality_patch}
   '';
 

pkgs/development/libraries/fox/default.nix

@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     md5 = "b5897e9c664967f5042e57070037ff18";
   };
 
-  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
+  buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
 
   doCheck = true;
 

pkgs/development/libraries/freetype/default.nix

@@ -1,57 +1,56 @@
-{ stdenv, fetchurl, gnumake
+{ stdenv, fetchurl, fetchpatch, pkgconfig, which, zlib, bzip2, libpng, gnumake
   # FreeType supports sub-pixel rendering.  This is patented by
   # Microsoft, so it is disabled by default.  This option allows it to
   # be enabled.  See http://www.freetype.org/patents.html.
-, useEncumberedCode ? false
+, glib/*passthru only*/
-, useInfinality ? true
+, useEncumberedCode ? true
 }:
 
-assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense
-
 let
+  version = "2.5.3";
 
-  version = "2.4.12";
+  fetch_bohoomil = name: sha256: fetchpatch {
-
+    url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/8a155db28f264520596cc3e76eb44824bdb30f8e/01_freetype2-iu/ + name;
+    inherit sha256;
+  };
 in
-
+with { inherit (stdenv.lib) optional optionalString; };
 stdenv.mkDerivation rec {
   name = "freetype-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "10akr2c37iv9y7fkgwp2szgwjyl2g6qmk9z1m596iaw9cr41g2m7";
+    sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160";
   };
 
-  infinality_patch =
-    if useInfinality then fetchurl {
-      url = http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2;
-      sha256 = "1lg2nzvxmwzwdfhxranw8iyflhr72cw9p11rkpgq1scxbp37668m";
-    } else null;
-
-  configureFlags = "--disable-static";
-
-  NIX_CFLAGS_COMPILE = with stdenv.lib;
-    " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840
-    + optionalString useEncumberedCode " -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"
-    + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1";
-
   patches = [ ./enable-validation.patch ] # from Gentoo
-    ++ stdenv.lib.optional useInfinality [ infinality_patch ];
+    ++ [
+      (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn")
+      (fetch_bohoomil "fix_segfault_with_harfbuzz.diff" "1nx36inqrw717b86cla2miprdb3hii4vndw95k0jbbhfmax9k6fy")
+    ]
+    ++ optional useEncumberedCode
+      (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q")
+    ;
 
+  propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
+  # dependence on harfbuzz is looser than the reverse dependence
+  buildInputs = [ pkgconfig which ]
+    # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
+    ++ optional (!stdenv.isLinux) gnumake;
+
+  # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840
+  NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
   # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
+  CFLAGS = optionalString stdenv.isArm "-std=gnu99";
-
-  # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) gnumake;
 
   enableParallelBuilding = true;
 
   doCheck = true;
 
-  postInstall =
+  # compat hacks
-    ''
+  postInstall = glib.flattenInclude + ''
-      ln -s freetype2/freetype $out/include/freetype
+    ln -s . "$out"/include/freetype
-    '';
+  '';
 
   crossAttrs = {
     # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
@@ -60,13 +59,11 @@ stdenv.mkDerivation rec {
     configureFlags = "--disable-static CC_BUILD=gcc";
   };
 
-  passthru.infinality.useInfinality = useInfinality; # for fontconfig
+  meta = with stdenv.lib; {
-
-  meta = {
     description = "A font rendering engine";
     homepage = http://www.freetype.org/;
-    license = if useEncumberedCode then "unfree"
+    license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
-      else "GPLv2+"; # or the FreeType License (BSD + advertising clause)
+    #ToDo: encumbered = useEncumberedCode;
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

pkgs/development/libraries/gdk-pixbuf/default.nix

@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "6";
+  ver_min = "8";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "0nkz19xlh60bf9bqylh98n8rynpjyx1nzp1gcr6zljgvmnj4yfa3";
+    sha256 = "1gpqpskp4zzf7h35bp247jcvnk6rxc52r69pb11v8g8i2q386ls8";
   };
 
   setupHook = ./setup-hook.sh;

pkgs/development/libraries/gtk+/2.x.nix

@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.23";
+  name = "gtk+-2.24.24";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "0z2ic7fma1lmmv4ncgki3vadqp7d0qkj2d235impsplvgvi0d950";
+    sha256 = "0v9xxpkypizy9k866rvqc36zvj4kj9p8nd1nxf9znay8k3hv5khj";
   };
 
   enableParallelBuilding = true;

pkgs/development/libraries/harfbuzz/default.nix

@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.28";
+  name = "harfbuzz-0.9.32";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "0j70ppl2qrfx8yzdl8ki63wcxgrlhkyl31p1a6bhmbqqh32zfrx5";
+    sha256 = "1d4x9fcy2p9g67pb4nfzx6p4008dzn7g25lva9pv71rd9rs82323";
   };
 
   configureFlags = [

pkgs/development/libraries/libav/default.nix

@@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr";
+    libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685";
-    libav_9   = libavFun   "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g";
+    libav_9   = libavFun   "9.14" "07gn4lbqx6wfhb2h2ddj88hcsacwmzb4syalg211m55xmp1g1fp4";
-    libav_10  = libavFun  "10.1"  "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m";
+    libav_10  = libavFun  "10.2"  "06wvk51cnllw6367qagc90sva4jr5d0r6jx8183wcwzwzgv01w29";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {

pkgs/development/libraries/libc++/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }:
 
 let
-  version = "3.4";
+  version = "3.4.2";
 
 in stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz";
-    sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx";
+    sha256 = "0z3jdvgcq995khkpis5c5vaxhbmvbqjlalbhn09k6pgb5zp46rc2";
   };
 
   buildInputs = [ cmake libcxxabi python ];

pkgs/development/libraries/libpng/default.nix

@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.10";
+  version = "1.6.12";
-  sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0";
+  sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8";
+    sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 

pkgs/development/libraries/libvdpau/default.nix

@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, xlibs }:
+{ stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-0.7";
+  name = "libvdpau-0.8";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "1q5wx6fmqg2iiw57wxwh5vv4yszqs4nlvlzhzdn9vig8gi30ip14";
+    sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk";
   };
 
-  buildInputs = with xlibs; [ pkgconfig dri2proto libXext ];
+  buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
 
-  propagatedBuildInputs = [ xlibs.libX11 ];
+  propagatedBuildInputs = [ xorg.libX11 ];
 
   configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
-    license = "bsd";
+    license = licenses.mit;
   };
 }

pkgs/development/libraries/mesa/default.nix

@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "10.1.5";
+  version = "10.2.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1g2vy7zaamzs00xasiwg0d6cb5sclfd9v8jms14ll9bghg3mwv5w";
+    sha256 = "06l18j9vshq2xzhnp6zd6pw0dlfy0qg1cw4zyn1w51gb8h9398h6";
   };
 
   prePatch = "patchShebangs .";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     "--enable-glx-tls"
     "--enable-shared-glapi" "--enable-shared-gallium"
     "--enable-driglx-direct" # seems enabled anyway
-    "--enable-gallium-llvm" "--with-llvm-shared-libs"
+    "--enable-gallium-llvm" "--enable-llvm-shared-libs"
     "--enable-xa" # used in vmware driver
     "--enable-gles1" "--enable-gles2"
     "--enable-vdpau"

pkgs/development/libraries/nss/default.nix

@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.16.1";
+  version = "3.16.3";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_1_RTM/src/${name}.tar.gz";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_3_RTM/src/${name}.tar.gz";
-    sha1 = "450a88dde8c7e4533507ac8340dbf94be28a759b";
+    sha256 = "657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

pkgs/development/libraries/pixman/default.nix

@@ -1,16 +1,16 @@
-{ fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }:
+{ fetchurl, stdenv, pkgconfig, perl, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.32.4";
+  name = "pixman-0.32.6";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0";
+    sha256 = "0129g4zdrw5hif5783li7rzcr4vpbc2cfia91azxmsk0h0xx3zix";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
 
-  buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway
+  buildInputs = [ libpng ]; # NOT in closure anyway
 
   postInstall = glib.flattenInclude;
 

pkgs/development/libraries/podofo/default.nix

@@ -1,12 +1,14 @@
-{stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig,
+{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
-openssl, libpng, lua5}:
+, openssl, libpng, lua5 }:
 
 stdenv.mkDerivation rec {
   name = "podofo-0.9.2";
+
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
     sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
   };
+
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
   nativeBuildInputs = [ cmake ];
   buildInputs = [ lua5 stdenv.gcc.libc ];
@@ -17,6 +19,15 @@ stdenv.mkDerivation rec {
       lua5.crossDrv stdenv.gccCross.libc ];
   };
 
+  # fix finding freetype-2.5
+  preConfigure = ''
+    substituteInPlace ./CMakeLists.txt \
+      --replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \
+      --replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype'
+
+    rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake
+  '';
+
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
   meta = {

pkgs/development/libraries/poppler/default.nix

@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "0.24.5"; # even major numbers are stable
+  version = "0.26.2"; # even major numbers are stable
-  sha256 = "114zfm4771iq25wa4bsg4nc2gnr6waaj8936wd23r4hc2084jrd2";
+  sha256 = "09lm1mfpf0p6vzayl2nbwvsj5gl7sz8sfmwziix0p87bh8x9dn8x";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.24
       url = "git://github.com/giddie/poppler-qt4-cairo-backend.git";
-      rev = "c4578cde09834e0d70873f63b1c2a410f66bb4f9";
+      rev = "7b9e1ea763b579e635ee7614b10970b9635841cf";
-      sha256 = "07bs2phmp7f4mqrwqz2bgyw2gw7s00mwsm548bsikyz1cbj7fl93";
+      sha256 = "0cdq0qw1sm6mxnrhmah4lfsd9wjlcdx86iyikwmjpwdmrkjk85r2";
     }; in
       [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
         "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch"

pkgs/development/libraries/qt-3/default.nix

@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ which ];
-  propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
+  propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg];
 
   configureFlags = "
     -v

pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff

@@ -1,25 +0,0 @@
-diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
-index c2eac76..b3131f0 100644
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
- 
- MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-   IF(QT_VERSION_MAJOR MATCHES 4)
--    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-   ELSE(QT_VERSION_MAJOR MATCHES 4)
-     IF(QT_VERSION_MAJOR MATCHES 5)
--      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-     ENDIF(QT_VERSION_MAJOR MATCHES 5)
-   ENDIF(QT_VERSION_MAJOR MATCHES 4)
- ENDMACRO(QT_CREATE_MOC_COMMAND)

pkgs/development/libraries/telepathy/qt/default.nix

@@ -1,18 +1,25 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
 , telepathy_farstream, telepathy_glib, pythonDBus }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.3";
+  name = "telepathy-qt-0.9.4";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "1yabyhsikw828ns7cf6hvzbxdxh53na1ck0q7qsav1lvlyz5gzy0";
+    sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi";
   };
 
+  patches = [ ./farstream-0.2.diff ];
+
   nativeBuildInputs = [ cmake pkgconfig python libxslt ];
   propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
-  patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ];
+
+  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
+
   preBuild = ''
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
   '';
+
+  enableParallelBuilding = true;
+  doCheck = false; # giving up for now
 }

pkgs/development/libraries/wayland/default.nix

@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
 
-let version = "1.4.0"; in
+let version = "1.5.0"; in
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0n2sbh4xg8xkcjhyi3f4vwcv89krdriyfs0rzdibdj5l2ngkpwqq";
+    sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80";
   };
 
   buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];

pkgs/development/tools/build-managers/cmake/default.nix

@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
+{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
 }:
 
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches =
+    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
+      name = "FindFreetype-2.5.patch";
+      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
+      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
+    })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc. 
     optional (stdenv ? glibc) ./search-path.patch ++

pkgs/games/exult/default.nix

@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     ./64bits.patch
   ];
 
-  buildInputs = [SDL SDL_mixer zlib libpng unzip];
+  buildInputs = [libpng SDL SDL_mixer zlib unzip];
   
   NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL";
 

pkgs/games/neverball/default.nix

@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga";
   };
 
-  buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs];
+  buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs];
 
   dontPatchElf = true;
 

pkgs/os-specific/linux/alsa-lib/default.nix

@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.0.27.2";
+  name = "alsa-lib-1.0.28";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
      "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
     ];
-    sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9";
+    sha256 = "0vaafg5q1q1mqcsgin5v7xlmngl3cnbmg5a9xxw0xcz1vn2ln1rw";
   };
 
   patches = [
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
        See http://thread.gmane.org/gmane.linux.distributions.nixos/3435
     */
     ./alsa-plugin-dirs.patch
-
-    /* patch provided by larsc on irc.
-       it may be a compiler problem on mips; without this, alsa does not build
-       on mips, because lacks some symbols atomic_add/atomic_sub  */
-    ./mips-atomic.patch
   ];
 
   # Fix pcm.h file in order to prevent some compilation bugs
@@ -35,15 +30,13 @@ stdenv.mkDerivation rec {
     sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
   '';
 
-  configureFlags = "--disable-xmlto";
-
   crossAttrs = {
     patchPhase = ''
       sed -i s/extern/static/g include/iatomic.h
     '';
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture libraries";
 
@@ -52,6 +45,7 @@ stdenv.mkDerivation rec {
       MIDI functionality to the Linux-based operating system.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }

pkgs/os-specific/linux/alsa-lib/mips-atomic.patch

@@ -1,39 +0,0 @@
-diff --git a/include/iatomic.h b/include/iatomic.h
-index e92dbfd..364bc5c 100644
---- a/include/iatomic.h
-+++ b/include/iatomic.h
-@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t;
-  * Atomically adds @i to @v.  Note that the guaranteed useful range
-  * of an atomic_t is only 24 bits.
-  */
--extern __inline__ void atomic_add(int i, atomic_t * v)
-+static __inline__ void atomic_add(int i, atomic_t * v)
- {
- 	unsigned long temp;
- 
-@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v)
-  * Atomically subtracts @i from @v.  Note that the guaranteed
-  * useful range of an atomic_t is only 24 bits.
-  */
--extern __inline__ void atomic_sub(int i, atomic_t * v)
-+static __inline__ void atomic_sub(int i, atomic_t * v)
- {
- 	unsigned long temp;
- 
-@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v)
- /*
-  * Same as above, but return the result value
-  */
--extern __inline__ int atomic_add_return(int i, atomic_t * v)
-+static __inline__ int atomic_add_return(int i, atomic_t * v)
- {
- 	unsigned long temp, result;
- 
-@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v)
- 	return result;
- }
- 
--extern __inline__ int atomic_sub_return(int i, atomic_t * v)
-+static __inline__ int atomic_sub_return(int i, atomic_t * v)
- {
- 	unsigned long temp, result;

pkgs/os-specific/linux/alsa-oss/default.nix

@@ -1,12 +1,14 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-oss-1.0.25";
+  name = "alsa-oss-1.0.28";
 
   src = fetchurl {
-    url = "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2";
+    urls = [
-    # url = "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2";
+      "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"
-    sha256 = "ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3";
+      "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"
+    ];
+    sha256 = "1mbabiywxjjlvdh257j3a0v4vvy69mwwnvc3xlq7pg50i2m2rris";
   };
 
   buildInputs = [ alsaLib ncurses libsamplerate ];

pkgs/os-specific/linux/alsa-plugins/default.nix

@@ -11,16 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2";
   };
 
+  # ToDo: a52, etc.?
   buildInputs =
     [ pkgconfig alsaLib libogg ]
-    ++ stdenv.lib.optional (pulseaudio != null) pulseaudio
+    ++ lib.optional (pulseaudio != null) pulseaudio
-    ++ stdenv.lib.optional (jackaudio != null) jackaudio;
+    ++ lib.optional (jackaudio != null) jackaudio;
 
-  meta = { 
+  meta = with lib; {
     description = "Various plugins for ALSA";
     homepage = http://alsa-project.org/;
-    license = "GPL2.1";
+    license = licenses.gpl2;
-    maintainers = [lib.maintainers.marcweber];
+    maintainers = [maintainers.marcweber];
-    platforms = lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

pkgs/os-specific/linux/alsa-utils/default.nix

@@ -1,12 +1,14 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-1.0.27.2";
+  name = "alsa-utils-1.0.28";
 
   src = fetchurl {
-    # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
+    urls = [
-    url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2";
+      "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
-    sha256 = "1sjjngnq50jv5ilwsb4zys6smifni3bd6fn28gbnhfrg14wsrgq2";
+      "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
+    ];
+    sha256 = "1k1ach1jv0bf71klj9sqaijnw9wjrjad0g5in6bpfnhjn24lrzzk";
   };
 
   buildInputs = [ alsaLib ncurses libsamplerate ];

pkgs/os-specific/linux/upower/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
 , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
@@ -13,6 +13,20 @@ stdenv.mkDerivation rec {
     sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3";
   };
 
+  patches = [
+    (fetchpatch rec {
+      url = "http://anonscm.debian.org/gitweb/?p=pkg-utopia/upower.git;"
+        + "a=blob_plain;f=debian/patches/${name};hb=b424b2763fbbba95df8c6ab3feeb57d072a9ddf7";
+      sha256 = "0iq991abrn745icyz6x0wyixrjli01vbmbd9lnwwgyil58h3z8sp";
+      name = "no_deprecation_define.patch";
+    })
+    (fetchpatch {
+      url = "http://cgit.freedesktop.org/upower/patch/?id=22da1a0bc5943b683189418d8b0f766e91b2bdbe";
+      sha256 = "0yfgg6pw4bwskannvdwjxr75lgdrjpxhsskwlzm0frp8v5jy4k4z";
+      name = "clamp-battery-percentages.patch";
+    })
+  ];
+
   buildInputs =
     [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;

pkgs/servers/x11/xorg/default.nix

@@ -530,11 +530,11 @@ let
   })) // {inherit xproto ;};
 
   inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
-    name = "inputproto-2.3";
+    name = "inputproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/inputproto-2.3.tar.bz2;
+      url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2;
-      sha256 = "0by3aa8i1gki6i904i34vlrymv5p8il05gr83sf8x7v9ys9v29kx";
+      sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -570,11 +570,11 @@ let
   })) // {inherit fontsproto xproto xtrans ;};
 
   libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
-    name = "libICE-1.0.8";
+    name = "libICE-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2;
+      url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2;
-      sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94";
+      sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
   })) // {inherit xproto xtrans ;};
@@ -710,21 +710,21 @@ let
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
   libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
-    name = "libXft-2.3.1";
+    name = "libXft-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2;
+      url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
-      sha256 = "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz";
+      sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
-    name = "libXi-1.7.2";
+    name = "libXi-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2;
+      url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2;
-      sha256 = "03mj9i6h0n8icjkx5a16wh1gyyhfiayj02ydc6sy4i9nqqfph96z";
+      sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@@ -1210,11 +1210,11 @@ let
   })) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
-    name = "xcb-util-renderutil-0.3.8";
+    name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2;
+      url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2;
-      sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp";
+      sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
@@ -1260,11 +1260,11 @@ let
   })) // {inherit libX11 ;};
 
   xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
-    name = "xcursorgen-1.0.5";
+    name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2;
+      url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2;
-      sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw";
+      sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
   })) // {inherit libpng libX11 libXcursor ;};
@@ -1470,11 +1470,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-7.3.0";
+    name = "xf86-video-ati-7.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2;
+      url = mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2;
-      sha256 = "1zj6401km2zgc32vhw7jfkaklsllsm9xpbs79zh9da8r94n0fz0h";
+      sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1580,11 +1580,11 @@ let
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
-    name = "xf86-video-modesetting-0.8.1";
+    name = "xf86-video-modesetting-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2;
+      url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2;
-      sha256 = "1jhjhgji6169sj7489qahcnmi8cf7y22wvj8qsmrg537rgbxia1v";
+      sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
@@ -1970,11 +1970,11 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.14.6";
+    name = "xorg-server-1.14.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
+      url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2;
-      sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
+      sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};

pkgs/servers/x11/xorg/extra.list

@@ -4,5 +4,5 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2

pkgs/servers/x11/xorg/overrides.nix

@@ -73,6 +73,10 @@ in
       '';
   };
 
+  libXfont = attrs: attrs // {
+    propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
+  };
+
   libXxf86vm = attrs: attrs // {
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
@@ -111,6 +115,10 @@ in
   libXft = attrs: attrs // {
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    # the include files need ft2build.h, and Requires.private isn't enough for us
+    postInstall = ''
+      sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc"
+    '';
   };
 
   libXext = attrs: attrs // {

pkgs/servers/x11/xorg/tarballs-7.7.list

@@ -48,14 +48,14 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2
 mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2
-mirror://xorg/individual/proto/inputproto-2.3.tar.bz2
+mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2
 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
@@ -69,8 +69,8 @@ mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
+mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
@@ -106,7 +106,7 @@ mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2
+mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
 mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
@@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2
 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
@@ -137,7 +137,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2
+mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2

pkgs/servers/x11/xorg/xf86-video-intel-testing.nix

@@ -3,11 +3,11 @@
 with xorg;
 
 (stdenv.mkDerivation ({
-  name = "xf86-video-intel-2.99.911";
+  name = "xf86-video-intel-2.99.912";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://xorg/individual/driver/xf86-video-intel-2.99.911.tar.bz2;
+    url = mirror://xorg/individual/driver/xf86-video-intel-2.99.912.tar.bz2;
-    sha256 = "1mkhfa10304xvs763dz1kj93zkmdidlfxhsy5j8ljkfc3d4nhyjf";
+    sha256 = "00cmvs5jxaqnl1pwqvj1rwir4kbvf5qfng89cjn4rwsr5m4zr3vw";
   };
   buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
 })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;}

pkgs/top-level/all-packages.nix

@@ -9210,7 +9210,9 @@ let
     vdpauSupport = config.mplayer.vdpauSupport or false;
   };
 
-  mplayer2 = callPackage ../applications/video/mplayer2 { };
+  mplayer2 = callPackage ../applications/video/mplayer2 {
+    ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386
+  };
 
   MPlayerPlugin = browser:
     import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {
@@ -9696,9 +9698,7 @@ let
 
   telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { };
 
-  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
+  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };
-    inherit (pkgs.gnome) libsoup;
-  };
 
   telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};
 
@@ -9721,6 +9721,8 @@ let
 
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+    libpng = libpng_apng;
   };
 
   thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {