Merge branch 'staging' into closure-size

186 files changed, 3594 insertions, 3817 deletions

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index bdd0335fe3b5..91432f2f5a8a 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -17,7 +17,8 @@ stdenv.mkDerivation rec{
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
-                  miniupnpc utillinux protobuf ]
+                  miniupnpc protobuf ]
+                  ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 1bf8b0e5c7dc..afa8a94d200d 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, wxGTK, pkgconfig, gettext, gtk, glib, zlib, perl, intltool,
-  libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame,
+  libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch,
   expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */
   }:
 
@@ -11,6 +11,12 @@ stdenv.mkDerivation rec {
     url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz";
     sha256 = "15c5ff7ac1c0b19b08f4bdcb0f4988743da2f9ed3fab41d6f07600e67cb9ddb6";
   };
+  patches = [(fetchpatch {
+    name = "new-ffmpeg.patch";
+    url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk"
+      + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692";
+    sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf";
+  })];
 
   # fix with gcc-5 from http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-December/245884.html
   postPatch = ''
diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix
index 25cc33d6cb8a..1658d9c7449b 100644
--- a/pkgs/applications/audio/cdparanoia/default.nix
+++ b/pkgs/applications/audio/cdparanoia/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, IOKit, Carbon }:
 
 stdenv.mkDerivation rec {
   name = "cdparanoia-III-10.2";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = "unset CC";
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ 
+  patches = stdenv.lib.optionals stdenv.isDarwin [
     (fetchurl {
       url = "https://trac.macports.org/export/70964/trunk/dports/audio/cdparanoia/files/osx_interface.patch";
       sha1 = "c86e573f51e6d58d5f349b22802a7a7eeece9fcd";
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin [
+    Carbon
+    IOKit
+  ];
+
   meta = {
     homepage = http://xiph.org/paranoia;
     description = "A tool and library for reading digital audio from CDs";
diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 92ea6ee2faef..9afcae1901ef 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -1,21 +1,21 @@
 { stdenv, fetchurl, alsaLib, expat, glib, libjack2, libX11, libpng
-, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig
+, libpthreadstubs, libsmf, libsndfile, lv2, pkgconfig, zita-resampler
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.6";
+  version = "0.9.8.1";
   name = "drumgizmo-${version}";
 
   src = fetchurl {
     url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
-    sha256 = "1qs8aa1v8cw5zgfzcnr2dc4w0y5yzsgrywlnx2hfvx2si3as0mw4";
+    sha256 = "1plfjhwhaz1mr3kgf5imcp3kjflk6ni9sq39gmxjxzya6gn2r6gg";
   };
 
   configureFlags = [ "--enable-lv2" ];
 
   buildInputs = [
     alsaLib expat glib libjack2 libX11 libpng libpthreadstubs libsmf
-    libsndfile lv2 pkgconfig
+    libsndfile lv2 pkgconfig zita-resampler
   ];
 
   meta = with stdenv.lib; {
@@ -23,6 +23,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.drumgizmo.org;
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = [ maintainers.goibhniu maintainers.nico202 ];
   };
 }
diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix
index 63917cac6c09..f7330ee12f91 100644
--- a/pkgs/applications/audio/freewheeling/default.nix
+++ b/pkgs/applications/audio/freewheeling/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls33, freetype
+{ stdenv, fetchsvn, pkgconfig, autoreconfHook, gnutls33, freetype
 , SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, libjack2, libvorbis
 , libsndfile, libogg
 }:
@@ -13,12 +13,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    pkgconfig autoconf automake gnutls33 freetype SDL SDL_gfx SDL_ttf
+    pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf
     liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg
   ];
 
-  preConfigure = "autoreconf -vfi";
-
   patches = [ ./am_path_sdl.patch ./xml.patch ];
 
   meta = {
diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix
index 4da235dd8a9c..345e98e6989a 100644
--- a/pkgs/applications/audio/gmpc/default.nix
+++ b/pkgs/applications/audio/gmpc/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, libtool, intltool, pkgconfig, glib
 , gtk, curl, mpd_clientlib, libsoup, gob2, vala, libunique
-, libSM, libICE, sqlite, hicolor_icon_theme
+, libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup
     libunique libmpd gob2 vala libSM libICE sqlite hicolor_icon_theme
+    wrapGAppsHook
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
new file mode 100644
index 000000000000..b11e1ac0fa79
--- /dev/null
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pythonPackages, gettext, klick}:
+
+pythonPackages.buildPythonPackage rec {
+  name = "gtklick-${version}";
+  namePrefix = "";
+  version = "0.6.4";
+
+  src = fetchurl {
+    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    sha256 = "7799d884126ccc818678aed79d58057f8cf3528e9f1be771c3fa5b694d9d0137";
+  };
+
+  pythonPath = with pythonPackages; [
+    pyliblo
+    pyGtkGlade
+  ];
+
+  buildInputs = [ gettext ];
+
+  propagatedBuildInputs = [ klick ];
+
+  # wrapPythonPrograms breaks gtklick in the postFixup phase.
+  # To fix it, apply wrapPythonPrograms and then clean up the wrapped file.
+  postFixup = ''
+    wrapPythonPrograms
+
+    sed -i "/import sys; sys.argv\[0\] = 'gtklick'/d" $out/bin/.gtklick-wrapped
+  '';
+
+  meta = {
+    homepage = "http://das.nasophon.de/gtklick/";
+    description = "Simple metronome with an easy-to-use GTK interface";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 7706203104ca..74110c5924e3 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }:
 
-let version = "2.00"; in
+let version = "2.1"; in
 stdenv.mkDerivation {
   name = "keyfinder-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "16gyvvws93fyvx5qb2x9qhsg4bn710kgdh6q9sl2dwfsx6npkh9m";
+    sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn";
     rev = version;
     repo = "is_KeyFinder";
     owner = "ibsh";
@@ -29,7 +29,6 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 
-  # TODO: upgrade libav when "Audio sample format conversion failed" is fixed
   buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
 
   postPatch = ''
diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix
new file mode 100644
index 000000000000..20ac0f1aba66
--- /dev/null
+++ b/pkgs/applications/audio/klick/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, scons, pkgconfig
+, libsamplerate, libsndfile, liblo, libjack2, boost }:
+
+stdenv.mkDerivation rec {
+  name = "klick-${version}";
+  version = "0.12.2";
+
+  src = fetchurl {
+    url = "http://das.nasophon.de/download/${name}.tar.gz";
+    sha256 = "1289533c0849b1b66463bf27f7ce5f71736b655cfb7672ef884c7e6eb957ac42";
+  };
+
+  buildInputs = [ scons pkgconfig libsamplerate libsndfile liblo libjack2 boost ];
+
+  buildPhase = ''
+    mkdir -p $out
+    scons PREFIX=$out
+  '';
+
+  installPhase = "scons install";
+
+  meta = {
+    homepage = "http://das.nasophon.de/klick/";
+    description = "Advanced command-line metronome for JACK";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
+
diff --git a/pkgs/applications/audio/ladspa-plugins/git.nix b/pkgs/applications/audio/ladspa-plugins/git.nix
index e9ab932a88e4..e022a35f5c64 100644
--- a/pkgs/applications/audio/ladspa-plugins/git.nix
+++ b/pkgs/applications/audio/ladspa-plugins/git.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, automake, autoreconfHook, fftw, gettext, ladspaH, libxml2, pkgconfig, perl, perlPackages }:
+{ stdenv, fetchgit, autoreconfHook, automake, fftw, ladspaH, libxml2, pkgconfig
+, perl, perlPackages }:
 
 stdenv.mkDerivation {
   name = "swh-plugins-git-2015-03-04";
@@ -9,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "7d9aa13a064903b330bd52e35c1f810f1c8a253ea5eb4e5a3a69a051af03150e";
   };
 
-  buildInputs = [ automake autoreconfHook fftw gettext ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
+  buildInputs = [ autoreconfHook fftw ladspaH libxml2 pkgconfig perl perlPackages.XMLParser ];
 
   patchPhase = ''
     patchShebangs .
@@ -17,11 +18,6 @@ stdenv.mkDerivation {
     cp ${automake}/share/automake-*/mkinstalldirs .
   '';
 
-  configurePhase = ''
-    autoreconf -i
-    ./configure --prefix=$out
-  '';
-
   meta = with stdenv.lib; {
     homepage = http://plugin.org.uk/;
     description = "LADSPA format audio plugins";
diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix
index c10bb00909a2..c81de3e0d062 100644
--- a/pkgs/applications/audio/mopidy-soundcloud/default.nix
+++ b/pkgs/applications/audio/mopidy-soundcloud/default.nix
@@ -3,13 +3,13 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-soundcloud-${version}";
 
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy-soundcloud";
     rev = "v${version}";
-    sha256 = "05yvjnivj26wjish7x1xrd9l5z8i14b610a8pbifnq3cq7y2m22r";
+    sha256 = "13n44975n1wwcf7qg1c7drc2bavhjnr9hnq1v0n5hdgyx8ji67gi";
   };
 
   propagatedBuildInputs = [ mopidy ];
diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 8b67f38390e8..f1243b47b693 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-spotify-${version}";
-  version = "1.4.0";
+  version = "2.2.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "0cf97z9vnnp5l77xhwvmkbkqgpj5gwnm1pipiy66lbk4gn6va4z4";
+    sha256 = "0wrrkkrin92ad9k1rwgjbyv2whwrb5b66nmmykxxp6bqcdgdyl5i";
   };
 
   propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 6c9e7eb708ac..84fcd50adc05 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@ ladspaH, liblrdf, liblo, libsigcxx
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2015-10-6";
+  version = "2015-12-16";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "88fe7e7b97c97b8733506685f043cbc71b196646";
-    sha256 = "15cffp6c14rlssc8g3mrw8zvb88wffb8k8g1vhd299qlcgv7di2h";
+    rev = "5d274f430c867f73ed1dcb306b49be0371d28128";
+    sha256 = "1yckac3r1hqn5p450j4lf4349v4knjj7n9s5p3wdcvxhs0pjv2sy";
   };
 
     buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix
index 314ecc95c3f7..b55ea30bae05 100644
--- a/pkgs/applications/audio/opusfile/default.nix
+++ b/pkgs/applications/audio/opusfile/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, openssl, libogg, libopus}:
+{ stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }:
 
 stdenv.mkDerivation rec {
   name = "opusfile-0.6";
@@ -7,12 +7,14 @@ stdenv.mkDerivation rec {
     sha256 = "19iys2kld75k0210b807i4illrdmj3cmmnrgxlc9y4vf6mxp2a14";
   };
 
-  buildInputs = [ pkgconfig openssl libogg libopus ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ openssl libogg libopus ];
 
   meta = {
     description = "High-level API for decoding and seeking in .opus files";
     homepage = http://www.opus-codec.org/;
     license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix
index b76e1183c0ee..09bb75b2e411 100644
--- a/pkgs/applications/audio/pianobar/default.nix
+++ b/pkgs/applications/audio/pianobar/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, gnutls, libav }:
+{ fetchurl, stdenv, pkgconfig, libao, readline, json_c, libgcrypt, libav, curl }:
 
 stdenv.mkDerivation rec {
-  name = "pianobar-2014.09.28";
+  name = "pianobar-2015.11.22";
 
   src = fetchurl {
     url = "http://6xq.net/projects/pianobar/${name}.tar.bz2";
-    sha256 = "6bd10218ad5d68c4c761e02c729627d2581b4a6db559190e7e52dc5df177e68f";
+    sha256 = "0arjvs31d108l1mn2k2hxbpg3mxs47vqzxm0lzdpfcjvypkckyr3";
   };
 
   buildInputs = [
-    pkgconfig libao json_c libgcrypt gnutls libav
+    pkgconfig libao json_c libgcrypt libav curl
   ];
 
   makeFlags="PREFIX=$(out)";
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
   CC = "gcc";
   CFLAGS = "-std=c99";
 
-  configurePhase = "export CC=${CC}";
-
   meta = with stdenv.lib; {
     description = "A console front-end for Pandora.com";
     homepage = "http://6xq.net/projects/pianobar/";
diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index 6048ff88c35a..8abf7cea6eb0 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "snd-15.4";
+  name = "snd-15.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/${name}.tar.gz";
-    sha256 = "1dari02ind445h5hpb6dhi0kix1vmlk64lyxwv1zrqagw3ajmpwh";
+    sha256 = "0hs9ailgaphgyi3smnrpwksvdww85aa7szqgi6l6d2jwfx9g4bhd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 365332cb8a23..6e4bf1b73111 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,18 +1,18 @@
-{ fetchurl, stdenv, dpkg, xorg, qt4, alsaLib, makeWrapper, openssl_1_0_1, freetype
+{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, chromium, udev, fontconfig
-, dbus, expat, ffmpeg_0_10 }:
+, libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
 
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "0.9.17.1.g9b85d43.7";
+  version = "1.0.19.106.gb8a7150f";
 
   deps = [
     alsaLib
     atk
     cairo
     cups
+    curl
     dbus
     expat
     ffmpeg_0_10
@@ -26,19 +26,20 @@ let
     libpng
     nss
     pango
-    qt4
     stdenv.cc.cc
     udev
     xorg.libX11
     xorg.libXcomposite
+    xorg.libXcursor
     xorg.libXdamage
     xorg.libXext
     xorg.libXfixes
     xorg.libXi
     xorg.libXrandr
     xorg.libXrender
-    xorg.libXrender
     xorg.libXScrnSaver
+    xorg.libXtst
+    zlib
   ];
 
 in
@@ -48,8 +49,8 @@ stdenv.mkDerivation {
 
   src =
     fetchurl {
-      url = "http://repository.spotify.com/pool/non-free/s/spotify/spotify-client_${version}-1_amd64.deb";
-      sha256 = "0x87q7gd2997sgppsm4lmdiz1cm11x5vnd5c34nqb5d4ry5qfyki";
+      url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
+      sha256 = "be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be";
     };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -61,8 +62,8 @@ stdenv.mkDerivation {
       libdir=$out/lib/spotify
       mkdir -p $libdir
       dpkg-deb -x $src $out
-      mv $out/opt/spotify/* $out/
-      rm -rf $out/usr $out/opt
+      mv $out/usr/* $out/
+      rm -rf $out/usr
 
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
@@ -72,33 +73,22 @@ stdenv.mkDerivation {
       ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
 
-      mkdir -p $out/bin
-
-      rpath="$out/spotify-client/Data:$libdir:$out/spotify-client:${stdenv.cc.cc}/lib64"
-
-      ln -s $out/spotify-client/spotify $out/bin/spotify
+      rpath="$out/share/spotify:$libdir"
 
       patchelf \
         --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath $rpath $out/spotify-client/spotify
+        --set-rpath $rpath $out/share/spotify/spotify
 
-      patchelf \
-        --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper
-
-      preload=$out/libexec/spotify/libpreload.so
       librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir"
-      mkdir -p $out/libexec/spotify
-      gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC
-
-      wrapProgram $out/bin/spotify --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
-      wrapProgram $out/spotify-client/Data/SpotifyHelper --set LD_PRELOAD $preload --prefix LD_LIBRARY_PATH : "$librarypath"
+      wrapProgram $out/share/spotify/spotify \
+        --prefix LD_LIBRARY_PATH : "$librarypath" \
+        --prefix PATH : "${gnome.zenity}/bin"
 
       # Desktop file
       mkdir -p "$out/share/applications/"
-      cp "$out/spotify-client/spotify.desktop" "$out/share/applications/"
-      sed -i "s|Icon=.*|Icon=$out/spotify-client/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop"
-    ''; # */
+      cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
+      sed -i "s|Icon=.*|Icon=$out/share/spotify/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop"
+    '';
 
   dontStrip = true;
   dontPatchELF = true;
diff --git a/pkgs/applications/audio/spotify/preload.c b/pkgs/applications/audio/spotify/preload.c
deleted file mode 100644
index 42d482c21e43..000000000000
--- a/pkgs/applications/audio/spotify/preload.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Spotify looks for its theme data in /usr/share/spotify/theme.  This
-   LD_PRELOAD library intercepts open() and stat() calls to redirect
-   them to the corresponding location in $out. */
-
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <limits.h>
-
-char themeDir [] = "/usr/share/spotify/theme";
-char realThemeDir [] = OUT "/share/spotify/theme";
-
-const char * rewrite(const char * path, char * buf)
-{
-    if (strncmp(path, themeDir, sizeof(themeDir) - 1) != 0) return path;
-    if (snprintf(buf, PATH_MAX, "%s%s", realThemeDir, path + sizeof(themeDir) - 1) >= PATH_MAX)
-        abort();
-    return buf;
-}
-
-int open(const char *path, int flags, ...)
-{
-    char buf[PATH_MAX];
-    int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open");
-    mode_t mode = 0;
-    if (flags & O_CREAT) {
-        va_list ap;
-        va_start(ap, flags);
-        mode = va_arg(ap, mode_t);
-        va_end(ap);
-    }
-    return _open(rewrite(path, buf), flags, mode);
-}
-
-int open64(const char *path, int flags, ...)
-{
-    char buf[PATH_MAX];
-    int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64");
-    mode_t mode = 0;
-    if (flags & O_CREAT) {
-        va_list ap;
-        va_start(ap, flags);
-        mode = va_arg(ap, mode_t);
-        va_end(ap);
-    }
-    return _open64(rewrite(path, buf), flags, mode);
-}
-
-int __xstat64(int ver, const char *path, struct stat64 *st)
-{
-    char buf[PATH_MAX];
-    int (*___xstat64) (int ver, const char *, struct stat64 *) = dlsym(RTLD_NEXT, "__xstat64");
-    return ___xstat64(ver, rewrite(path, buf), st);
-}
-
-int access(const char *path, int mode)
-{
-    char buf[PATH_MAX];
-    int (*_access) (const char *path, int mode) = dlsym(RTLD_NEXT, "access");
-    return _access(rewrite(path, buf), mode);
-}
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index b7bf5ee56640..e4f68d786f40 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeQtWrapper, fetchFromGitHub
+{ stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch
 , cmake, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
 , themes
@@ -20,14 +20,20 @@ let
     patches = [
       ./0001-ignore-config-mtime.patch
       ./0002-fix-ConfigReader-QStringList-corruption.patch
+      (fetchpatch {
+        url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch;
+        sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj";
+      })
     ];
 
     nativeBuildInputs = [ cmake pkgconfig qttools ];
 
     buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd
+      libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd
     ];
 
+    propagatedBuildInputs = [ qtdeclarative ];
+
     cmakeFlags = [
       "-DCONFIG_FILE=/etc/sddm.conf"
       # Set UID_MIN and UID_MAX so that the build script won't try
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 13e00754acd3..7120b8f43ee9 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.3.1";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "17q5vrvjsyxcd8favp0sldfvhcwr0ba6ws32df6iv2iyla5h94y1";
+    sha256 = "0dipww58p0sm99jn1ariisha9wsnhl7rnd8achpxqkf4b3vwi5iz";
     name = "${name}.deb";
   };
 
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index f2cbdaaee824..05b64eaf7ab6 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     description = "GNU Emacs 24, the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];
+    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
     platforms   = platforms.all;
 
     # So that Exuberant ctags is preferred
diff --git a/pkgs/applications/editors/emacs-24/macport-24.3.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix
deleted file mode 100644
index edf8a28d6ff4..000000000000
--- a/pkgs/applications/editors/emacs-24/macport-24.3.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-}:
-
-stdenv.mkDerivation rec {
-  emacsName = "emacs-24.3";
-  name = "${emacsName}-mac-4.8";
-
-  #builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "1385qzs3bsa52s5rcncbrkxlydkw0ajzrvfxgv8rws5fx512kakh";
-  };
-
-  macportSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "194y341zrpjp75mc3099kjc0inr1d379wwsnav257bwsc967h8yx";
-  };
-
-  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
-
-  postUnpack = ''
-    mv $emacsName $name
-    tar xzf $macportSrc
-    mv $name $emacsName
-  '';
-
-  preConfigure = ''
-    patch -p0 < patch-mac
-
-    # The search for 'tputs' will fail because it's in ncursesw within the
-    # ncurses package, yet Emacs' configure script only looks in ncurses.
-    # Further, we need to make sure that the -L option occurs before mention
-    # of the library, so that it finds it within the Nix store.
-    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses.lib}/lib | sed 's#/#\\/#g')
-    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
-    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
-
-    configureFlagsArray=(
-      LDFLAGS=-L${ncurses.lib}/lib
-      --with-xml2=yes
-      --with-gnutls=yes
-      --with-mac
-      --enable-mac-app=$out/Applications
-    )
-    makeFlagsArray=(
-      CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses.lib}/lib"
-    );
-  '';
-
-  postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                             (split-string (getenv "NIX_PROFILES"))))
-                    load-path)))
-
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "GNU Emacs 24, the extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
-      programming language with extensions to support text editing.
-
-      The features of GNU Emacs include: content-sensitive editing modes,
-      including syntax coloring, for a wide variety of file types including
-      plain text, source code, and HTML; complete built-in documentation,
-      including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
-      Lisp code or a graphical interface; a large number of extensions that
-      add other functionality, including a project planner, mail and news
-      reader, debugger interface, calendar, and more.  Many of these
-      extensions are distributed with GNU Emacs; others are available
-      separately.
-
-      This is "Mac port" addition to GNU Emacs 24. This provides a native
-      GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
-      already contain the official GUI support via the NS (Cocoa) port for
-      Mac OS X 10.4 and later. So if it is good enough for you, then you
-      don't need to try this.
-    '';
-  };
-}
diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix
deleted file mode 100644
index b79ac6150edd..000000000000
--- a/pkgs/applications/editors/emacs-24/macport-24.4.nix
+++ /dev/null
@@ -1,101 +0,0 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-}:
-
-stdenv.mkDerivation rec {
-  emacsName = "emacs-24.4";
-  name = "${emacsName}-mac-5.3";
-
-  #builder = ./builder.sh;
-
-  src = fetchurl {
-    url = "mirror://gnu/emacs/${emacsName}.tar.xz";
-    sha256 = "1zflm6ac34s6v166p58ilxrxbxjm0q2wfc25f8y0mjml1lbr3qs7";
-  };
-
-  macportSrc = fetchurl {
-    url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0qzzqnql0z0a2p3ciccy8gq79v0s7s717lchcprn3wlaqcrk2g1p";
-  };
-
-  buildInputs = [ ncurses pkgconfig texinfo libxml2 gnutls ];
-
-  postUnpack = ''
-    mv $emacsName $name
-    tar xzf $macportSrc
-    mv $name $emacsName
-  '';
-
-  preConfigure = ''
-    substituteInPlace Makefile.in --replace "/bin/pwd" "pwd"
-    substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd"
-
-    patch -p0 < patch-mac
-
-    # The search for 'tputs' will fail because it's in ncursesw within the
-    # ncurses package, yet Emacs' configure script only looks in ncurses.
-    # Further, we need to make sure that the -L option occurs before mention
-    # of the library, so that it finds it within the Nix store.
-    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
-    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
-    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
-
-    configureFlagsArray=(
-      LDFLAGS=-L${ncurses}/lib
-      --with-xml2=yes
-      --with-gnutls=yes
-      --with-mac
-      --enable-mac-app=$out/Applications
-    )
-    makeFlagsArray=(
-      CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses}/lib"
-    );
-  '';
-
-  postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                             (split-string (getenv "NIX_PROFILES"))))
-                    load-path)))
-
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
-  '';
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "GNU Emacs 24, the extensible, customizable text editor";
-    homepage    = http://www.gnu.org/software/emacs/;
-    license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jwiegley ];
-    platforms   = platforms.darwin;
-
-    longDescription = ''
-      GNU Emacs is an extensible, customizable text editor—and more.  At its
-      core is an interpreter for Emacs Lisp, a dialect of the Lisp
-      programming language with extensions to support text editing.
-
-      The features of GNU Emacs include: content-sensitive editing modes,
-      including syntax coloring, for a wide variety of file types including
-      plain text, source code, and HTML; complete built-in documentation,
-      including a tutorial for new users; full Unicode support for nearly all
-      human languages and their scripts; highly customizable, using Emacs
-      Lisp code or a graphical interface; a large number of extensions that
-      add other functionality, including a project planner, mail and news
-      reader, debugger interface, calendar, and more.  Many of these
-      extensions are distributed with GNU Emacs; others are available
-      separately.
-
-      This is "Mac port" addition to GNU Emacs 24. This provides a native
-      GUI support for Mac OS X 10.4 - 10.9. Note that Emacs 23 and later
-      already contain the official GUI support via the NS (Cocoa) port for
-      Mac OS X 10.4 and later. So if it is good enough for you, then you
-      don't need to try this.
-    '';
-  };
-}
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 6b377abdda10..c778c42de857 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
-, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext
+, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit
+, ImageCaptureCore, GSS, ImageIO # These may be optional
 }:
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.13";
+  name = "${emacsName}-mac-5.15";
 
-  #builder = ./builder.sh;
+  builder = ./builder.sh;
 
   src = fetchurl {
     url = "mirror://gnu/emacs/${emacsName}.tar.xz";
@@ -15,17 +16,16 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0p8xpsnsdpwpfq4mz0fazm785d0my0pq4ifbw533g959jh17b36h";
+    sha256 = "1r47bm1pf5av2yr37byz91y7bp6vdw9smahiy18g5qp4jp6mz193";
   };
 
   enableParallelBuilding = true;
 
-  buildInputs = [
-    ncurses pkgconfig texinfo libxml2 gnutls
-  ];
+  buildInputs = [ ncurses libxml2 gnutls pkgconfig texinfo gettext ];
 
   propagatedBuildInputs = [
-    Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit
+    AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
+    ImageCaptureCore GSS ImageIO   # may be optional
   ];
 
   postUnpack = ''
@@ -34,46 +34,25 @@ stdenv.mkDerivation rec {
     mv $name $emacsName
   '';
 
-  preConfigure = ''
-    substituteInPlace lisp/international/mule-cmds.el --replace /usr $TMPDIR
-    substituteInPlace Makefile.in --replace "/bin/pwd" "pwd"
-    substituteInPlace lib-src/Makefile.in --replace "/bin/pwd" "pwd"
-
+  postPatch = ''
     patch -p1 < patch-mac
-
-    # The search for 'tputs' will fail because it's in ncursesw within the
-    # ncurses package, yet Emacs' configure script only looks in ncurses.
-    # Further, we need to make sure that the -L option occurs before mention
-    # of the library, so that it finds it within the Nix store.
-    sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
-    sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
-    sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
-
-    configureFlagsArray=(
-      LDFLAGS=-L${ncurses}/lib
-      --with-xml2=yes
-      --with-gnutls=yes
-      --with-mac
-      --enable-mac-app=$out/Applications
-    )
-    makeFlagsArray=(
-      CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses}/lib"
-    );
+    sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el
   '';
 
+  configureFlags = [
+    "LDFLAGS=-L${ncurses}/lib"
+    "--with-xml2=yes"
+    "--with-gnutls=yes"
+    "--with-mac"
+    "--enable-mac-app=$$out/Applications"
+  ];
+
+  CFLAGS = "-O3";
+  LDFLAGS = "-O3 -L${ncurses}/lib";
+
   postInstall = ''
-    cat >$out/share/emacs/site-lisp/site-start.el <<EOF
-    ;; nixos specific load-path
-    (when (getenv "NIX_PROFILES") (setq load-path
-                          (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/"))
-                             (split-string (getenv "NIX_PROFILES"))))
-                    load-path)))
-
-    ;; make tramp work for NixOS machines
-    (eval-after-load 'tramp '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin"))
-    EOF
+    mkdir -p $out/share/emacs/site-lisp/
+    cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el
   '';
 
   doCheck = true;
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index aa30d62c60a9..e88206fc8b73 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -50,7 +50,7 @@ in
 self:
 
   let
-    super = mapAttrs (mkPackage self) manifest;
+    super = removeAttrs (mapAttrs (mkPackage self) manifest) [ "dash" ];
 
     elpaBuild = import ../../../build-support/emacs/melpa.nix {
       inherit fetchurl lib stdenv texinfo;
@@ -64,23 +64,10 @@ self:
     };
 
     elpaPackages = super // {
-      ace-window = markBroken super.ace-window;
-      ada-mode = markBroken super.ada-mode;
-      beacon = markBroken super.beacon;
-      bug-hunter = markBroken super.bug-hunter;
-      company-math = markBroken super.company-math;
-      company-statistics = markBroken super.company-statistics;
-      context-coloring = markBroken super.context-coloring;
-      dict-tree = markBroken super.dict-tree;
+      # These packages require emacs-25
       el-search = markBroken super.el-search;
-      ergoemacs-mode = markBroken super.ergoemacs-mode;
-      exwm = markBroken super.exwm;
-      gnugo = markBroken super.gnugo;
       iterators = markBroken super.iterators;
       midi-kbd = markBroken super.midi-kbd;
       stream = markBroken super.stream;
-      tNFA = markBroken super.tNFA;
-      trie = markBroken super.trie;
-      xelb = markBroken super.xelb;
     };
   in elpaPackages // { inherit elpaBuild elpaPackages; }
diff --git a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
index 26f313f038df..d72ab12b580d 100644
--- a/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emacs-w3m/default.nix
@@ -1,4 +1,4 @@
-{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoconf }:
+{ fetchcvs, stdenv, emacs, w3m, imagemagick, texinfo, autoreconfHook }:
 
 let date = "2013-03-21"; in
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "1lmcj8rf83w13q8q68hh7sa1abc2m6j2zmfska92xdp7hslhdgc5";
   };
 
-  buildInputs = [ emacs w3m texinfo autoconf ];
+  buildInputs = [ emacs w3m texinfo autoreconfHook ];
 
   # XXX: Should we do the same for xpdf/evince, gv, gs, etc.?
   patchPhase = ''
@@ -26,11 +26,10 @@ stdenv.mkDerivation rec {
             s|(w3m-which-command "identify")|"${imagemagick}/bin/identify"|g'
   '';
 
-  configurePhase = ''
-    autoreconf -vfi && \
-    ./configure --prefix="$out" --with-lispdir="$out/share/emacs/site-lisp" \
-                --with-icondir="$out/share/emacs/site-lisp/images/w3m"
-  '';
+  configureFlags = [
+    "--with-lispdir=$out/share/emacs/site-lisp"
+    "--with-icondir=$out/share/emacs/site-lisp/images/w3m"
+  ];
 
   postInstall = ''
     cd "$out/share/emacs/site-lisp"
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index f7289a3b400c..1189fd1d6d15 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -1,16 +1,17 @@
-{ fetchurl, stdenv, emacs, texinfo, which, texLive, texLiveCMSuper
-, texLiveAggregationFun }:
+{ fetchurl, stdenv, emacs, texinfo, which, texlive }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.3.2";
+  name = "org-8.3.3";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "1f3mi1g4s8psfzq8mfbq3sccj7hsxvcfww0gf4337xs6jp8i3s4a";
+    sha256 = "1vhymmd41v7an457xdjhk5zfc4q1x7z64b25rs1ccam5p550cq65";
   };
 
   buildInputs = [ emacs ];
-  nativeBuildInputs = [ (texLiveAggregationFun { paths=[ texinfo texLive texLiveCMSuper ]; }) ];
+  nativeBuildInputs = [ (texlive.combine {
+    inherit (texlive) scheme-small cm-super;
+  }) texinfo ];
 
   configurePhase =
     '' sed -i mk/default.mk \
diff --git a/pkgs/applications/editors/emacs-modes/slime/default.nix b/pkgs/applications/editors/emacs-modes/slime/default.nix
deleted file mode 100644
index 4c6326425369..000000000000
--- a/pkgs/applications/editors/emacs-modes/slime/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchFromGitHub, emacs}:
-
-stdenv.mkDerivation rec {
-  name = "slime";
-  src = fetchFromGitHub {
-    owner = "slime";
-    repo = "slime";
-    rev = "f80c997ee9408a73637057759120c5b37b55d781";
-    sha256 = "06ncqxzidmis6d7xsyi5pamg4pvifmc8l854xaa847rhagsvw7ax";
-  };
-  buildInputs = [emacs];
-  installPhase = ''
-    rm -rf CVS
-    mkdir -p $out/share/emacs/site-lisp
-    cp -r . $out/share/emacs/site-lisp
-  '';
-  meta = {
-    homepage = "https://common-lisp.net/project/slime/";
-    description = "The Superior Lisp Interaction Mode for Emacs";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix
index 640b06d28071..eb1daa3ac3b2 100644
--- a/pkgs/applications/editors/flpsed/default.nix
+++ b/pkgs/applications/editors/flpsed/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, fltk13, ghostscript}:
 
 stdenv.mkDerivation {
-  name = "flpsed-0.7.2";
+  name = "flpsed-0.7.3";
 
   src = fetchurl {
-    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.2.tar.gz";
-    sha256 = "1132nlganr6x4f4lzcp9l0xihg2ky1l7xk8vq7r2l2qxs97vbif8";
+    url = "http://www.ecademix.com/JohannesHofmann/flpsed-0.7.3.tar.gz";
+    sha256 = "0vngqxanykicabhfdznisv82k5ypkxwg0s93ms9ribvhpm8vf2xp";
   };
 
   buildInputs = [ fltk13 ghostscript ];
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix
new file mode 100644
index 000000000000..96689fa75ad6
--- /dev/null
+++ b/pkgs/applications/editors/idea/common.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
+, coreutils, gnugrep, which, git, python, unzip, androidsdk }:
+
+{ name, product, version, build, src, meta, jdk } @ attrs:
+
+with stdenv.lib;
+
+let loName = toLower product;
+    hiName = toUpper product;
+    execName = concatStringsSep "-" (init (splitString "-" name));
+in
+
+with stdenv; lib.makeOverridable mkDerivation rec {
+  inherit name build src meta;
+  desktopItem = makeDesktopItem {
+    name = execName;
+    exec = execName;
+    comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
+    desktopName = product;
+    genericName = meta.description;
+    categories = "Application;Development;";
+    icon = execName;
+  };
+
+  buildInputs = [ makeWrapper patchelf p7zip unzip ];
+
+  patchPhase = ''
+      get_file_size() {
+        local fname="$1"
+        echo $(ls -l $fname | cut -d ' ' -f5)
+      }
+
+      munge_size_hack() {
+        local fname="$1"
+        local size="$2"
+        strip $fname
+        truncate --size=$size $fname
+      }
+
+      interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+      if [ "${stdenv.system}" == "x86_64-linux" ]; then
+        target_size=$(get_file_size bin/fsnotifier64)
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier64
+        munge_size_hack bin/fsnotifier64 $target_size
+      else
+        target_size=$(get_file_size bin/fsnotifier)
+        patchelf --set-interpreter "$interpreter" bin/fsnotifier
+        munge_size_hack bin/fsnotifier $target_size
+      fi
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
+    cp -a . $out/$name
+    ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
+    mv bin/fsnotifier* $out/libexec/${name}/.
+
+    jdk=${jdk.home}
+    item=${desktopItem}
+
+    makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
+      --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
+      --set JDK_HOME "$jdk" \
+      --set ${hiName}_JDK "$jdk" \
+      --set ANDROID_JAVA_HOME "$jdk" \
+      --set JAVA_HOME "$jdk"
+
+    ln -s "$item/share/applications" $out/share
+  '';
+
+}
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 117fa264f215..932f31d86509 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -1,78 +1,19 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip, jdk
-, coreutils, gnugrep, which, git, python, unzip, androidsdk
+{ stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
+, coreutils, gnugrep, which, git, python, unzip, p7zip
+, androidsdk, jdk, oraclejdk8
 }:
 
 assert stdenv.isLinux;
 
 let
 
-  mkIdeaProduct = with stdenv.lib;
-  { name, product, version, build, src, meta }:
-
-  let loName = toLower product;
-      hiName = toUpper product;
-      execName = concatStringsSep "-" (init (splitString "-" name));
-  in
-
-  with stdenv; lib.makeOverridable mkDerivation rec {
-    inherit name build src meta;
-    desktopItem = makeDesktopItem {
-      name = execName;
-      exec = execName;
-      comment = lib.replaceChars ["\n"] [" "] meta.longDescription;
-      desktopName = product;
-      genericName = meta.description;
-      categories = "Application;Development;";
-      icon = execName;
-    };
-
-    buildInputs = [ makeWrapper patchelf p7zip unzip ];
-
-    patchPhase = ''
-        get_file_size() {
-          local fname="$1"
-          echo $(ls -l $fname | cut -d ' ' -f5)
-        }
-
-        munge_size_hack() {
-          local fname="$1"
-          local size="$2"
-          strip $fname
-          truncate --size=$size $fname
-        }
-
-        interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
-        if [ "${stdenv.system}" == "x86_64-linux" ]; then
-          target_size=$(get_file_size bin/fsnotifier64)
-          patchelf --set-interpreter "$interpreter" bin/fsnotifier64
-          munge_size_hack bin/fsnotifier64 $target_size
-        else
-          target_size=$(get_file_size bin/fsnotifier)
-          patchelf --set-interpreter "$interpreter" bin/fsnotifier
-          munge_size_hack bin/fsnotifier $target_size
-        fi
-    '';
-
-    installPhase = ''
-      mkdir -p $out/{bin,$name,share/pixmaps,libexec/${name}}
-      cp -a . $out/$name
-      ln -s $out/$name/bin/${loName}.png $out/share/pixmaps/${execName}.png
-      mv bin/fsnotifier* $out/libexec/${name}/.
-
-      jdk=${jdk.home}
-      item=${desktopItem}
-
-      makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${execName}" \
-        --prefix PATH : "$out/libexec/${name}:${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \
-        --set JDK_HOME "$jdk" \
-        --set ${hiName}_JDK "$jdk" \
-        --set ANDROID_JAVA_HOME "$jdk" \
-        --set JAVA_HOME "$jdk"
-
-      ln -s "$item/share/applications" $out/share
-    '';
-
-  };
+  bnumber = with stdenv.lib; build: last (splitString "-" build);
+  mkIdeaProduct' = callPackage ./common.nix { };
+  mkIdeaProduct = attrs: mkIdeaProduct' ({
+      # After IDEA 15 we can no longer use OpenJDK.
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      jdk = if (bnumber attrs.build) < "143" then jdk else oraclejdk8;
+  } // attrs);
 
   buildAndroidStudio = { name, version, build, src, license, description }:
     let drv = (mkIdeaProduct rec {
@@ -235,6 +176,18 @@ in
     };
   };
 
+  idea14-community = buildIdea rec {
+    name = "idea-community-${version}";
+    version = "14.1.6";
+    build = "IC-141.3056.4";
+    description = "Integrated Development Environment (IDE) by Jetbrains, community edition";
+    license = stdenv.lib.licenses.asl20;
+    src = fetchurl {
+      url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz";
+      sha256 = "157969b37sbafby1r1gva2xm3a3y0dgj7pisgxmk8k1d5rgncvil";
+    };
+  };
+
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
     version = "15.0.2";
@@ -273,25 +226,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "5.0.1";
-    build = "143.595";
+    version = "5.0.3";
+    build = "143.1559.1";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "14m3imy64cp2l9pnmknxbjzj3z30rx88r4brz9d5xk5qailjg2wf";
+      sha256 = "1xb3qxhl8ln488v0hmjqkzpyypm7wh941c7syi4cs7plbdp6w4c2";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "5.0.1";
-    build = "143.595";
+    version = "5.0.3";
+    build = "143.1559.1";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "102sfjvchk80911w3qpjsp30wvq73kgpwyqcqdgqxcgm2vqh3183";
+      sha256 = "1v2g9867nn3id1zfbg4zwj0c0z9d72rl9c1dz6vs2c4j0y4gy9xl";
     };
   };
 
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index 3d6c9ffa859f..e2715b1499a5 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -108,26 +108,14 @@ composableDerivation {
 
       // edf {
         name = "python";
-        feat = "pythoninterp";
+        feat = "python${if python ? isPy3 then "3" else ""}interp";
         enable = {
           nativeBuildInputs = [ python ];
         } // lib.optionalAttrs stdenv.isDarwin {
           configureFlags
-            = [ "--enable-pythoninterp=yes"
-                "--with-python-config-dir=${python}/lib" ];
-        };
-      }
-
-      // edf {
-        name = "python3";
-        feat = "python3interp";
-        enable = {
-          nativeBuildInputs = [ pkgs.python3 ];
-        } // lib.optionalAttrs stdenv.isDarwin {
-          configureFlags
-            = [ "--enable-python3interp=yes"
-                "--with-python3-config-dir=${pkgs.python3}/lib"
-                "--disable-pythoninterp" ];
+            = [ "--enable-python${if python ? isPy3 then "3" else ""}interp=yes"
+                "--with-python${if python ? isPy3 then "3" else ""}-config-dir=${python}/lib"
+                "--disable-python${if python ? isPy3 then "" else "3"}interp" ];
         };
       }
 
@@ -160,7 +148,6 @@ composableDerivation {
   cfg = {
     luaSupport       = config.vim.lua or true;
     pythonSupport    = config.vim.python or true;
-    python3Support   = config.vim.python3 or false;
     rubySupport      = config.vim.ruby or true;
     nlsSupport       = config.vim.nls or false;
     tclSupport       = config.vim.tcl or false;
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index e5c49846b23c..2276b868b59a 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -5,10 +5,10 @@ let
   # TODO: qt = qt5.base; # should work but there's a mysterious "-silent" error
 in
 stdenv.mkDerivation rec {
-  name = "djview-4.10.3";
+  name = "djview-4.10.5";
   src = fetchurl {
     url = "mirror://sourceforge/djvu/${name}.tar.gz";
-    sha256 = "09dbws0k8giizc0xqpad8plbyaply8x1pjc2k3207v2svk6hxf2h";
+    sha256 = "0gbvbly7w3cr8wgpyh76nf9w7cf7740vp7k5hccks186f6005cx0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index bacfa500ede1..b0ad5be93717 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp
-, pkgconfig, freetype, fontconfig, which, imagemagick, curl, saneBackends
+, pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig which ];
   buildInputs =
     [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
-      imagemagick curl saneBackends
+      imagemagick curl sane-backends
     ];
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 7c394ae11c6f..954a1d4c19c9 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -4,11 +4,11 @@
 , python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }:
 
 stdenv.mkDerivation rec {
-  name = "gimp-2.8.14";
+  name = "gimp-2.8.16";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
-    sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d";
+    sha256 = "1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm";
   };
 
   buildInputs =
diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix
new file mode 100644
index 000000000000..5bb577011e71
--- /dev/null
+++ b/pkgs/applications/graphics/jpegoptim/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "1.4.3";
+  name = "jpegoptim-${version}";
+
+  src = fetchurl {
+    url = "http://www.kokkonen.net/tjko/src/${name}.tar.gz";
+    sha256 = "0k53q7dc8w5ashz8v261x2b5vvz7gdvg8w962rz9gjvkjbh4lg93";
+  };
+
+  # There are no checks, it seems.
+  doCheck = false;
+
+  buildInputs = [ libjpeg ];
+
+  meta = {
+    description = "Optimize JPEG files";
+    homepage = http://www.kokkonen.net/tjko/projects.html ;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.aristid ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix
new file mode 100644
index 000000000000..1b082de98bc7
--- /dev/null
+++ b/pkgs/applications/graphics/mozjpeg/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, file, pkgconfig, libpng, nasm }:
+
+stdenv.mkDerivation rec {
+  version = "3.1";
+  name = "mozjpeg-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mozilla/mozjpeg/releases/download/v${version}/mozjpeg-${version}-release-source.tar.gz";
+    sha256 = "07vs0xq9di7bv3y68daig8dvxvjqrn8a5na702gj3nn58a1xivfy";
+  };
+
+  postPatch = ''
+    sed -i -e "s!/usr/bin/file!${file}/bin/file!g" configure
+  '';
+
+  buildInputs = [ libpng pkgconfig nasm ];
+
+  meta = {
+    description = "Mozilla JPEG Encoder Project";
+    longDescription = ''
+      This project's goal is to reduce the size of JPEG files without reducing quality or compatibility with the
+      vast majority of the world's deployed decoders.
+
+      The idea is to reduce transfer times for JPEGs on the Web, thus reducing page load times.
+    '';
+    homepage = https://github.com/mozilla/mozjpeg ;
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.aristid ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index 6c6838daef17..1b1ccf4e5892 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2015-12-27";
+  version = "2016-01-09";
   src = fetchgit {
-    sha256 = "4bf6e8815d2edbbc75255928d0fb030639a9fea9a5aa953dcf1f00e167eff527";
-    rev = "cadb4b0fff00540159625320416e5601c4704627";
+    sha256 = "440f88a4126841cfd139b17902ceb940bbf189defe21b208e93bfd474cfb16e8";
+    rev = "f78e85cad666492fadd5612af77fa7c84e270a12";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })
diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix
index a0f6e5bac509..d7b066220559 100644
--- a/pkgs/applications/graphics/sane/frontends.nix
+++ b/pkgs/applications/graphics/sane/frontends.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, saneBackends, libX11, gtk, pkgconfig, libusb ? null}:
+{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}:
 
 stdenv.mkDerivation rec {
   name = "sane-frontends-1.0.14";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c
   '';
 
-  buildInputs = [saneBackends libX11 gtk pkgconfig] ++
+  buildInputs = [sane-backends libX11 gtk pkgconfig] ++
 	(if libusb != null then [libusb] else []);
 
   meta = {
diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix
index 9bca047a7cf1..751f31f73f29 100644
--- a/pkgs/applications/graphics/sane/xsane.nix
+++ b/pkgs/applications/graphics/sane/xsane.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, saneBackends, saneFrontends, libX11, gtk, pkgconfig, libpng
+{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng
 , libusb ? null
 , gimpSupport ? false, gimp_2_8 ? null
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     chmod a+rX -R .
   '';
 
-  buildInputs = [libpng saneBackends saneFrontends libX11 gtk pkgconfig ]
+  buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ]
     ++ (if libusb != null then [libusb] else [])
     ++ stdenv.lib.optional gimpSupport gimp_2_8;
 
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 5e5371166eee..3238a3ba974d 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -6,12 +6,12 @@
 # for dependencies see http://www.yorba.org/projects/shotwell/install/
 
 stdenv.mkDerivation rec {
-  version = "0.20.2";
+  version = "0.22.0";
   name = "shotwell-${version}";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/shotwell/0.20/${name}.tar.xz";
-    sha256 = "0h5pdczsrkplvlvq54zk3am4kjmfpd6pn2sz0ky8lfq1fngwiqip";
+    url = "mirror://gnome/sources/shotwell/0.22/${name}.tar.xz";
+    sha256 = "0cgqaaikrb10plhf6zxbgqy32zqpiwyi9dpx3g8yr261q72r5c81";
   };
 
   NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Popular photo organizer for the GNOME desktop";
-    homepage = http://www.yorba.org/projects/shotwell/;
+    homepage = https://wiki.gnome.org/Apps/Shotwell;
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [iElectric];
     platforms = platforms.linux;
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index c169d262fb63..a2b7fd77337b 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
-, libusb1, libxml2, pkgconfig, saneBackends, vala, wrapGAppsHook }:
+, libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }:
 
-let version = "3.19.3"; in
+let version = "3.19.4"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "0il7ikd5hj9mgzrivm01g572g9101w8la58h3hjyakwcfw3jp976";
+    sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83";
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 
-  buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 saneBackends
+  buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends
     vala ];
   nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ];
 
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index 67513bcf9230..069eea3b521b 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit,autoconf, automake, gcc, fltk13
-, libjpeg, libpng, libtool, mesa, pkgconfig }:
+{ stdenv, fetchgit, autoreconfHook, fltk13
+, libjpeg, libpng, mesa, pkgconfig }:
 
 stdenv.mkDerivation {
   name = "solvespace-2.0";
@@ -14,27 +14,15 @@ stdenv.mkDerivation {
   dontBuild = true;
   enableParallelBuilding = false;
 
-  buildInputs = [        
-    autoconf
-    automake
-    gcc
+  buildInputs = [
+    autoreconfHook
     fltk13
     libjpeg
     libpng
-    libtool
     mesa
     pkgconfig
-    stdenv
   ];
 
-  preConfigure = ''
-    aclocal
-    libtoolize
-    
-    autoreconf -i
-    automake --add-missing
-  '';
-
   meta = {
     description = "A parametric 3d CAD program";
     license = stdenv.lib.licenses.gpl3;
diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix
index 45813bbdb204..fe8911273ded 100644
--- a/pkgs/applications/graphics/sxiv/default.nix
+++ b/pkgs/applications/graphics/sxiv/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, libX11, imlib2, giflib, libexif }:
+{ stdenv, fetchFromGitHub, libX11, imlib2, giflib, libexif }:
 
-stdenv.mkDerivation {
-  name = "sxiv-2015.03.25";
-
-  src = fetchgit {
-    url = "https://github.com/muennich/sxiv.git";
-    rev = "01ed483b50f506fcba928af43e2ca017897e7c77";
-    sha256 = "18s64l3dvibqg9biznzy4mdkkn9qmmpqxpdx7ljx7c0832aqy94k";
+stdenv.mkDerivation rec {
+  name = "sxiv-${version}";
+  version = "v1.3.2";
+  #https://github.com/muennich/sxiv/archive/v1.3.2.zip
+  src = fetchFromGitHub {
+    owner = "muennich";
+    repo = "sxiv";
+    rev = version;
+    sha256 = "1f4gz1qjhb44bbb3q5fqk439zyipkwnr19zhg89yq2pgmzzzqr2h";
   };
 
   postUnpack = ''
diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix
index 3de3d6cdd5a9..23a37ab43ae6 100644
--- a/pkgs/applications/graphics/ufraw/default.nix
+++ b/pkgs/applications/graphics/ufraw/default.nix
@@ -1,18 +1,18 @@
 { fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib
-, libjpeg, libtiff, cfitsio, exiv2, lcms, gtkimageview, lensfun }:
+, libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }:
 
 stdenv.mkDerivation rec {
-  name = "ufraw-0.20";
+  name = "ufraw-0.22";
 
   src = fetchurl {
     # XXX: These guys appear to mutate uploaded tarballs!
     url = "mirror://sourceforge/ufraw/${name}.tar.gz";
-    sha256 = "1q51p0ynzayxwfpilj0s38aapgkfga00gbl7xi0ndx9q6bvk1kbd";
+    sha256 = "0pm216pg0vr44gwz9vcvq3fsf8r5iayljhf5nis2mnw7wn6d5azp";
   };
 
   buildInputs =
     [ pkgconfig gtk gtkimageview gettext bzip2 zlib
-      libjpeg libtiff cfitsio exiv2 lcms lensfun
+      libjpeg libtiff cfitsio exiv2 lcms2 lensfun
     ];
 
   meta = {
diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix
new file mode 100644
index 000000000000..053e1137e391
--- /dev/null
+++ b/pkgs/applications/graphics/xzgv/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, gtk, pkgconfig, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "xzgv-${version}";
+  version = "0.9.1";
+  src = fetchurl {
+    url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz";
+    sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph";
+  };
+  buildInputs = [ gtk pkgconfig texinfo ];
+  patches = [ ./fix-linker-paths.patch ];
+  postPatch = ''
+    substituteInPlace config.mk \
+      --replace /usr/local $out
+    substituteInPlace config.mk \
+      --replace "CFLAGS=-O2 -Wall" "CFLAGS=-Wall"
+    substituteInPlace Makefile \
+      --replace "all: src man" "all: src man info"
+  '';
+  meta = with stdenv.lib; {
+    homepage = http://sourceforge.net/projects/xzgv/;
+    description = "Picture viewer for X with a thumbnail-based selector";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/graphics/xzgv/fix-linker-paths.patch b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
new file mode 100644
index 000000000000..c5b1ae0879b5
--- /dev/null
+++ b/pkgs/applications/graphics/xzgv/fix-linker-paths.patch
@@ -0,0 +1,25 @@
+taken from http://sourceforge.net/p/xzgv/code/53/tree//trunk/xzgv/src/Makefile?diff=514dada434309d2ec11f5eff:52
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -9,8 +9,10 @@
+ # This gets definitions for CC, CFLAGS, BINDIR etc.
+ include ../config.mk
+ 
+-CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0`
+-LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0`
++CFLAGS+=`pkg-config --cflags gtk+-2.0` `pkg-config --cflags gdk-pixbuf-2.0` \
++	`pkg-config --cflags x11`
++LDFLAGS+=`pkg-config --libs gtk+-2.0` `pkg-config --libs gdk-pixbuf-2.0` \
++	`pkg-config --libs x11` -lm
+ 
+ all: xzgv
+ 
+@@ -23,7 +25,7 @@
+ 	backend.o
+ 
+ xzgv: $(OBJS)
+-	$(CC) $(LDFLAGS) -o xzgv $(OBJS)
++	$(CC) -o xzgv $(OBJS) $(LDFLAGS)
+ 
+ installdirs:
+ 	/bin/sh ../mkinstalldirs $(BINDIR)
diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix
index e96c0c2af331..15982cb5d64c 100644
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/applications/kde-apps-15.12/default.nix
@@ -39,7 +39,9 @@ let
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
+    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    kio-extras = callPackage ./kio-extras.nix {};
     konsole = callPackage ./konsole.nix {};
     libkdcraw = callPackage ./libkdcraw.nix {};
     libkexiv2 = callPackage ./libkexiv2.nix {};
diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
index 1a8c17d4ab56..93da9d332f7c 100755
--- a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
+++ b/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-WGET_ARGS='http://download.kde.org/stable/applications/15.12.0/ -A *.tar.xz'
+WGET_ARGS='http://download.kde.org/stable/applications/15.12.1/ -A *.tar.xz'
 
 mkdir tmp; cd tmp
 
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
new file mode 100644
index 000000000000..4e99a43b3913
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
@@ -0,0 +1,29 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcoreaddons
+, ki18n
+, kio
+, kwidgetsaddons
+, samba
+}:
+
+kdeApp {
+  name = "kdenetwork-filesharing";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kcoreaddons
+    ki18n
+    kio
+    kwidgetsaddons
+    samba
+  ];
+  meta = {
+    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/applications/kde-apps-15.12/kio-extras.nix
new file mode 100644
index 000000000000..77b42f1fc586
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.12/kio-extras.nix
@@ -0,0 +1,58 @@
+{ kdeApp, lib
+, extra-cmake-modules, kdoctools
+, shared_mime_info
+, exiv2
+, karchive
+, kbookmarks
+, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kguiaddons
+, kdnssd
+, kiconthemes
+, ki18n
+, kio
+, khtml
+, kdelibs4support
+, kpty
+, libmtp
+, libssh
+, openexr
+, openslp
+, phonon
+, qtsvg
+, samba
+, solid
+}:
+
+kdeApp {
+  name = "kio-extras";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools
+    shared_mime_info
+  ];
+  buildInputs = [
+    exiv2
+    karchive
+    kbookmarks
+    kconfig kconfigwidgets
+    kcoreaddons kdbusaddons kguiaddons
+    kdnssd
+    kiconthemes
+    ki18n
+    kio
+    khtml
+    kdelibs4support
+    kpty
+    libmtp
+    libssh
+    openexr
+    openslp
+    phonon
+    qtsvg
+    samba
+    solid
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/applications/kde-apps-15.12/srcs.nix
index a6f6c1107317..cd123f49f76b 100644
--- a/pkgs/applications/kde-apps-15.12/srcs.nix
+++ b/pkgs/applications/kde-apps-15.12/srcs.nix
@@ -3,1931 +3,1931 @@
 
 {
   akonadi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/akonadi-15.12.0.tar.xz";
-      sha256 = "0xqas8nbqvs4bvsqi234rwsbi06h5i7a07cjmd3ggrrg9p0nk2i8";
-      name = "akonadi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/akonadi-15.12.1.tar.xz";
+      sha256 = "1v9l1i9yny1ckyvq95wvd0bn3ain3fdlba76gf4f2zjwd57kw4il";
+      name = "akonadi-15.12.1.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/akonadi-calendar-15.12.0.tar.xz";
-      sha256 = "1cxz2vrd1b96azs5pkhs6agdamqxya4xsaalfqgl3ii65gm5s6gf";
-      name = "akonadi-calendar-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/akonadi-calendar-15.12.1.tar.xz";
+      sha256 = "120fzy2l7c3rl4jlvk021wsrkp0gihqxhihmk6jrlwj4v7nswp69";
+      name = "akonadi-calendar-15.12.1.tar.xz";
     };
   };
   akonadi-search = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/akonadi-search-15.12.0.tar.xz";
-      sha256 = "180d1591k1c6l0ky6x0clmif1fw7pwikz2pzrh9c7kzmmdrfr3xf";
-      name = "akonadi-search-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/akonadi-search-15.12.1.tar.xz";
+      sha256 = "1kzjhqxa3n8216x1cs2xkyqyzjq7i8py5y5d303yr38m62z3f4qr";
+      name = "akonadi-search-15.12.1.tar.xz";
     };
   };
   analitza = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/analitza-15.12.0.tar.xz";
-      sha256 = "1z2km469f7s3mfvrgsszvffnbnihd0cbs8hp15vrd9jpsl4p7kws";
-      name = "analitza-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/analitza-15.12.1.tar.xz";
+      sha256 = "0lvjsrraffqfl53gkdsbzmrsznrz1sqnhpsbx015v21pgiwnx6ll";
+      name = "analitza-15.12.1.tar.xz";
     };
   };
   ark = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ark-15.12.0.tar.xz";
-      sha256 = "0z5xhyyhs3gl7133qpa029b4gp44nql0576wczaqjy9p3hx7r9n3";
-      name = "ark-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ark-15.12.1.tar.xz";
+      sha256 = "0x61k21rjydcjz4b2z52xa559kymsji52ik0hjdkljvwhggcw96a";
+      name = "ark-15.12.1.tar.xz";
     };
   };
   artikulate = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/artikulate-15.12.0.tar.xz";
-      sha256 = "0w9bbkznxxiriml4kqmswdn02ygassx8rq87k6bhvrbqziwgb8as";
-      name = "artikulate-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/artikulate-15.12.1.tar.xz";
+      sha256 = "1nlpyslrsqs0zirkaryq4sk2cb53sh2b8mk3cdzpj9w9isx9565x";
+      name = "artikulate-15.12.1.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/audiocd-kio-15.12.0.tar.xz";
-      sha256 = "016bv43b3bfyx15npps7wm1zpkrfzbiyqv48p9wd32fg5blmxnd5";
-      name = "audiocd-kio-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/audiocd-kio-15.12.1.tar.xz";
+      sha256 = "0x9x25x096grhm5lb3zibvrdy1x0hf2ryqkgp3l05580iirdjwss";
+      name = "audiocd-kio-15.12.1.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/baloo-widgets-15.12.0.tar.xz";
-      sha256 = "0lbjnwb5k5rwz4jwig7b4cm9di0b6kdr7c35ib3cy34vk2jrfzp1";
-      name = "baloo-widgets-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/baloo-widgets-15.12.1.tar.xz";
+      sha256 = "01nrw2wrvzkvnh1xgzxqzy6zpx2p74iwrz44rrgr5dixciy5bqf5";
+      name = "baloo-widgets-15.12.1.tar.xz";
     };
   };
   blinken = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/blinken-15.12.0.tar.xz";
-      sha256 = "1r7wk11gqz1zklpcqb33vkqywad356g7py5967mi21nsflz00a6c";
-      name = "blinken-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/blinken-15.12.1.tar.xz";
+      sha256 = "1x9pdji26s0hwrni26wl8r0rqbykxdpl348671d0jwmnidq6rabv";
+      name = "blinken-15.12.1.tar.xz";
     };
   };
   bomber = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/bomber-15.12.0.tar.xz";
-      sha256 = "1rcp2qmazzdsvxzy1zky4jp0vygpab6z9pmpzbjdpki5smkmpdv4";
-      name = "bomber-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/bomber-15.12.1.tar.xz";
+      sha256 = "0666ghxjcpscnc4d0q1jh29kx6knabkglbvggpkk1zqq3zl0fw6y";
+      name = "bomber-15.12.1.tar.xz";
     };
   };
   bovo = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/bovo-15.12.0.tar.xz";
-      sha256 = "026sxcdbvpdq07miw5z107cjaclhsphr7i3w19kw7hx911chaipk";
-      name = "bovo-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/bovo-15.12.1.tar.xz";
+      sha256 = "0cma6b1896nj2m7gra5g7jc9lwb7m70mhd593nib93w1i2mkamfr";
+      name = "bovo-15.12.1.tar.xz";
     };
   };
   cantor = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/cantor-15.12.0.tar.xz";
-      sha256 = "09cyf50la3v91vqwiciq7i9c5mcjqlmq9hjrm717bcr9029abqma";
-      name = "cantor-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/cantor-15.12.1.tar.xz";
+      sha256 = "15bdh85hrcx54ynq70jh42aw4m46g9sszg1rvymjpqi0za80srrj";
+      name = "cantor-15.12.1.tar.xz";
     };
   };
   cervisia = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/cervisia-15.12.0.tar.xz";
-      sha256 = "1gx196x33k4nb3knrfzzksxhcy1vdcgnzx3pwqmz2w7bvsdcl1vx";
-      name = "cervisia-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/cervisia-15.12.1.tar.xz";
+      sha256 = "1kgnvv3az7mdl6q29wxwaj8k3cnxzyizri7l6zjkp6n5jywxpq5h";
+      name = "cervisia-15.12.1.tar.xz";
     };
   };
   dolphin = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/dolphin-15.12.0.tar.xz";
-      sha256 = "19bkrwn842qygv2a0kwf76d5aqfw7wa1348x8vny2hmmbwk7laha";
-      name = "dolphin-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/dolphin-15.12.1.tar.xz";
+      sha256 = "0lpc21abdw242cans08jnswbsf9avckf6v12za029g6p4nnvmspx";
+      name = "dolphin-15.12.1.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/dolphin-plugins-15.12.0.tar.xz";
-      sha256 = "0l74z0v55qki1xnwsdzq68i4qyxb16xw2g1fhlp069c975jlmakv";
-      name = "dolphin-plugins-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/dolphin-plugins-15.12.1.tar.xz";
+      sha256 = "0k438rhcscqin9735mjq8qrapc4ff4kimwp8bl6b77743b2bk59f";
+      name = "dolphin-plugins-15.12.1.tar.xz";
     };
   };
   dragon = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/dragon-15.12.0.tar.xz";
-      sha256 = "0afjl9758hb32hmiacx5bwg9paaxpxh1y4nh2r97wzb5krny3ghr";
-      name = "dragon-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/dragon-15.12.1.tar.xz";
+      sha256 = "0kqd7m8vjpc4ywz3hpqa8cy3fdlznnhv291wrgvvgm7dv83wylq3";
+      name = "dragon-15.12.1.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ffmpegthumbs-15.12.0.tar.xz";
-      sha256 = "1i5sci7q4d9dflkgn8h2gsnah6snhlajydlgpknjb5l4dxdqbcg4";
-      name = "ffmpegthumbs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ffmpegthumbs-15.12.1.tar.xz";
+      sha256 = "1apcafjdjzhpqm72h2rvzxcy00fjdl8dah49ss7mj2ld0f36vl07";
+      name = "ffmpegthumbs-15.12.1.tar.xz";
     };
   };
   filelight = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/filelight-15.12.0.tar.xz";
-      sha256 = "0q4xwi2nbap5f4fn5ym0azk0knp053qq3ix4vbyg2mkh9r268wd6";
-      name = "filelight-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/filelight-15.12.1.tar.xz";
+      sha256 = "0za42abixfhkxczcddy9n4b98ryf3wvq2gngnqwgrs0m4wv3y530";
+      name = "filelight-15.12.1.tar.xz";
     };
   };
   gpgmepp = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/gpgmepp-15.12.0.tar.xz";
-      sha256 = "1480kx5n14ipk7sxpqpwgf2dq6jyp2b3rf7rblkis0jwqrzy61k4";
-      name = "gpgmepp-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/gpgmepp-15.12.1.tar.xz";
+      sha256 = "0ygmdmampd3yc0mkfbw7ihrdc6vmxb178kd5y3dxms4kiilxw6lv";
+      name = "gpgmepp-15.12.1.tar.xz";
     };
   };
   granatier = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/granatier-15.12.0.tar.xz";
-      sha256 = "07l4aq2qfk7blmmkpc8w6xkgj7zz6qs4vv2ifpdvkjv621475bcp";
-      name = "granatier-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/granatier-15.12.1.tar.xz";
+      sha256 = "09v0fwwkz7k8dx2rqc18qdrlmzkbmxna0ppxwq4cdhxixyppi0py";
+      name = "granatier-15.12.1.tar.xz";
     };
   };
   gwenview = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/gwenview-15.12.0.tar.xz";
-      sha256 = "00rsw57ivicx4j9kyvx92nppxv7m2kr3p2skp5qlidpgygwig4n5";
-      name = "gwenview-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/gwenview-15.12.1.tar.xz";
+      sha256 = "1bqcq277h6421rwhqvy8b2dn95h0zqqiskw38xfzrablfmr4ba9h";
+      name = "gwenview-15.12.1.tar.xz";
     };
   };
   jovie = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/jovie-15.12.0.tar.xz";
-      sha256 = "107ga496j0li1bqmppc96r25iq40yby63qi4hxzr6rvql0sk4vq3";
-      name = "jovie-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/jovie-15.12.1.tar.xz";
+      sha256 = "0z6lxvzv92z5hkbin6l7d75l6alnk94l3mhdkfa6p9mfimxvzixy";
+      name = "jovie-15.12.1.tar.xz";
     };
   };
   juk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/juk-15.12.0.tar.xz";
-      sha256 = "0l0l72r6l2xpn7ym3zdvrpjl0qbn3jb4hdy371qn14s1gk1clai5";
-      name = "juk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/juk-15.12.1.tar.xz";
+      sha256 = "1k9js66kmbpc6wyxxgp3z2zx7zhyvdsawy8fra9j76zd2fjyja60";
+      name = "juk-15.12.1.tar.xz";
     };
   };
   kaccessible = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kaccessible-15.12.0.tar.xz";
-      sha256 = "0gg90sy5a8kmllcryj7xncbyn4w6rd0f19vnn5vgsdrhgh8b8kf8";
-      name = "kaccessible-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kaccessible-15.12.1.tar.xz";
+      sha256 = "1vjla5wf63h88y738f0p8prqkmzdifl0l6akmjvkasjipy3bcdw6";
+      name = "kaccessible-15.12.1.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kaccounts-integration-15.12.0.tar.xz";
-      sha256 = "1g5rbnhl7vfhh9ni2clrkszlns9iiibdpfxgpsjfjlljr8ai8fn8";
-      name = "kaccounts-integration-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kaccounts-integration-15.12.1.tar.xz";
+      sha256 = "1q7gjv4jr534q42am40x27kbk2sqs8im800xjw214y3dgw146g6d";
+      name = "kaccounts-integration-15.12.1.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kaccounts-providers-15.12.0.tar.xz";
-      sha256 = "12hq0rwlqz8pjnm4p0p44q4m4vj4z1r79z5pc5glv3r0rvmn05xk";
-      name = "kaccounts-providers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kaccounts-providers-15.12.1.tar.xz";
+      sha256 = "1ir7cb3ma8j1jfnjk4m9xx5mj7yj769pblsjz1v6nh6s846ri1fh";
+      name = "kaccounts-providers-15.12.1.tar.xz";
     };
   };
   kajongg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kajongg-15.12.0.tar.xz";
-      sha256 = "0qbyqixvcpn5z07cwv9jzvf0dawlcsgzq776lhh49ds6hh4xgdcw";
-      name = "kajongg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kajongg-15.12.1.tar.xz";
+      sha256 = "1dzw9dvh3an26i6w8zf319337x7d4iggfgz0v9c46kngh8b9lydx";
+      name = "kajongg-15.12.1.tar.xz";
     };
   };
   kalarmcal = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kalarmcal-15.12.0.tar.xz";
-      sha256 = "10lj01gsg2mr2kq39nih4cv1i48mp8b5i5s01kvaf2mwhwrj2hb5";
-      name = "kalarmcal-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kalarmcal-15.12.1.tar.xz";
+      sha256 = "1kdbqy6hb19sip49nca05375rjwj2502mq1vmylrqfggbrh277wz";
+      name = "kalarmcal-15.12.1.tar.xz";
     };
   };
   kalgebra = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kalgebra-15.12.0.tar.xz";
-      sha256 = "11d5yzwv9p5fa9rz06gv3b773kcqmxd9hmkraz6i3ph2z2xdyfmc";
-      name = "kalgebra-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kalgebra-15.12.1.tar.xz";
+      sha256 = "1f4kqjljw2rwzi82vzfbk7j9h4b9i127lnhklw47vyapllw2jjjc";
+      name = "kalgebra-15.12.1.tar.xz";
     };
   };
   kalzium = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kalzium-15.12.0.tar.xz";
-      sha256 = "1p26pz900yl8ig9vh3aa1xkxap4962477rgiysckzvil1b3z9jn4";
-      name = "kalzium-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kalzium-15.12.1.tar.xz";
+      sha256 = "00fh91p4rrw7y6qdkg33dqf74c15q4j76b8xp1a6ydcvwjjcp4cv";
+      name = "kalzium-15.12.1.tar.xz";
     };
   };
   kamera = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kamera-15.12.0.tar.xz";
-      sha256 = "1wa6ihbbxrdc3axj9g7ayizka2h5hv7890c8s23mrrnigf911s21";
-      name = "kamera-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kamera-15.12.1.tar.xz";
+      sha256 = "01vd2zg2gyzbzcgdk6yd10vndn41wrf4cqg6vk65y0idk2gqjfbi";
+      name = "kamera-15.12.1.tar.xz";
     };
   };
   kanagram = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kanagram-15.12.0.tar.xz";
-      sha256 = "03faj636jaf4r7sdp4zlkl0l4v66pdphw4yzw6lp8pg2mp6ydnjl";
-      name = "kanagram-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kanagram-15.12.1.tar.xz";
+      sha256 = "0pifl0qh33cm09m1fl8ma7p4nzd6bw2sisq3aj1x6r2yal48n5l7";
+      name = "kanagram-15.12.1.tar.xz";
     };
   };
   kapman = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kapman-15.12.0.tar.xz";
-      sha256 = "1m7dzspf7bg4z3v9slp6dr78gcmd6yn44mqx1ycmby85cwh5y39l";
-      name = "kapman-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kapman-15.12.1.tar.xz";
+      sha256 = "1fygp0v0s4dk6cb30samg63dbzdspx0fmd7shijhx4rdphq6jr5f";
+      name = "kapman-15.12.1.tar.xz";
     };
   };
   kapptemplate = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kapptemplate-15.12.0.tar.xz";
-      sha256 = "1inzkhg6acj2z3jlj04jf46xl6p9zc671j8j8mp8r2qdr6yiy0xa";
-      name = "kapptemplate-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kapptemplate-15.12.1.tar.xz";
+      sha256 = "045v0gb8gbhsnqk63zvwhmq7nncf6wd8zpbrp1s92sjkyjc7p8rn";
+      name = "kapptemplate-15.12.1.tar.xz";
     };
   };
   kate = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kate-15.12.0.tar.xz";
-      sha256 = "0vsj28xdx58sfyxjb0x03xn3d7hbwzq9rr81jwmdp3f1np1rm5xf";
-      name = "kate-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kate-15.12.1.tar.xz";
+      sha256 = "1nwg578z49pswj098awlqblxzj7a5isqg6j9fy28zdg29rzfwchx";
+      name = "kate-15.12.1.tar.xz";
     };
   };
   katomic = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/katomic-15.12.0.tar.xz";
-      sha256 = "0sgs46bqq52sy3rym5c7d4vyf20y517iykzk3c8wndg3bkmar18s";
-      name = "katomic-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/katomic-15.12.1.tar.xz";
+      sha256 = "1xvqpazmak4xdzg0wlan5ysn0xnpjqfz8c0j5vhsbglhfw8a71d6";
+      name = "katomic-15.12.1.tar.xz";
     };
   };
   kblackbox = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kblackbox-15.12.0.tar.xz";
-      sha256 = "0lphzs5fn7n8z0c0kmfpqfqv8mcgj420254csil9gsp994873hia";
-      name = "kblackbox-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kblackbox-15.12.1.tar.xz";
+      sha256 = "1dgla3c0wd1vl3yx8civn60xv10kab7nkngmclp6kw4v6f4vqk7q";
+      name = "kblackbox-15.12.1.tar.xz";
     };
   };
   kblocks = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kblocks-15.12.0.tar.xz";
-      sha256 = "1zbs48z358h35vplr32q5nhq9gp3rfmijwg2ird25mjmxwc87bi1";
-      name = "kblocks-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kblocks-15.12.1.tar.xz";
+      sha256 = "1zzdwg8bmf28r8yfjw4105j96xja30yq0aqg5cvpp0krmnr3254i";
+      name = "kblocks-15.12.1.tar.xz";
     };
   };
   kblog = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kblog-15.12.0.tar.xz";
-      sha256 = "0j6kcbzivz6ali3wyg7qyv936pvbjsf0f68xsfgci57hb4lam386";
-      name = "kblog-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kblog-15.12.1.tar.xz";
+      sha256 = "0yzi0q64szwgrda3x1w6vblfymgaqp3rq61z71fr327n8hngnpq8";
+      name = "kblog-15.12.1.tar.xz";
     };
   };
   kbounce = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kbounce-15.12.0.tar.xz";
-      sha256 = "0jgdjj7r966j1rm6vdhbdndrbiych4z1ndx5809mpxpg9b1lr427";
-      name = "kbounce-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kbounce-15.12.1.tar.xz";
+      sha256 = "18z8q2ny5m3fik4q0zi0hkqy3w87qfhbpffp9nd6vrsi3wdj013p";
+      name = "kbounce-15.12.1.tar.xz";
     };
   };
   kbreakout = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kbreakout-15.12.0.tar.xz";
-      sha256 = "1h9adxf4v0qb43avbamw73gzc3cij4i2z5z8fcznczb3gbmpp1h9";
-      name = "kbreakout-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kbreakout-15.12.1.tar.xz";
+      sha256 = "02d964h3ay2sr5xk2g2kam80w9pi8ah98k6ld3vx5l5mjs5qffib";
+      name = "kbreakout-15.12.1.tar.xz";
     };
   };
   kbruch = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kbruch-15.12.0.tar.xz";
-      sha256 = "0sr4nx9y15hkf74m86m1ghmw1i4jcvlxhbmh3d404z64yks97hv1";
-      name = "kbruch-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kbruch-15.12.1.tar.xz";
+      sha256 = "05s8ghmg562za2y7g9vqwdh4jbifz7kjd9fj45j9mjwb5rxdckpr";
+      name = "kbruch-15.12.1.tar.xz";
     };
   };
   kcachegrind = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcachegrind-15.12.0.tar.xz";
-      sha256 = "0gkafyf9980dryvv5mdgnv3fxxxfy5smpd1x8fmgjiyp8izg5nb9";
-      name = "kcachegrind-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcachegrind-15.12.1.tar.xz";
+      sha256 = "0v036sc9lmvc00gllyzzvlgbap3m7q2gx4m0c931iaw6sal473q0";
+      name = "kcachegrind-15.12.1.tar.xz";
     };
   };
   kcalc = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcalc-15.12.0.tar.xz";
-      sha256 = "0ybs87g6axmp3yip4wip0cf9lvyf37nhywravpk3z3284dl9z6cx";
-      name = "kcalc-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcalc-15.12.1.tar.xz";
+      sha256 = "1dgpifj3w26d595gbv6m4r16729i92lkwl6p8hk0l5v5hxx82dkw";
+      name = "kcalc-15.12.1.tar.xz";
     };
   };
   kcalcore = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcalcore-15.12.0.tar.xz";
-      sha256 = "1zbfcbl8b7vmvzwi8969zcwb4ini3mxdc1q6n47hkmyl2rsradiq";
-      name = "kcalcore-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcalcore-15.12.1.tar.xz";
+      sha256 = "14w47ljak5v5nnbcgilsqc1hxf212vi8vycfxddflvmxzcy6b9c3";
+      name = "kcalcore-15.12.1.tar.xz";
     };
   };
   kcalutils = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcalutils-15.12.0.tar.xz";
-      sha256 = "0ya2wgvv5vkxil6xcibrp0di6k18qfll173rw3h417ykgf11q0ir";
-      name = "kcalutils-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcalutils-15.12.1.tar.xz";
+      sha256 = "0p10vvbnn01qnaxgyinyil4dwqfbwgqk7ngkgblfbmfg9h8drwfp";
+      name = "kcalutils-15.12.1.tar.xz";
     };
   };
   kcharselect = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcharselect-15.12.0.tar.xz";
-      sha256 = "0pllisc3p8nlzx8pgfclr28zvnwzgb3yrlbx33l09g7x0spn5whd";
-      name = "kcharselect-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcharselect-15.12.1.tar.xz";
+      sha256 = "1jagbaxs9nfih2wic0i9cgbmz76kwnrscrmcvd0w8jg4w5rnf59d";
+      name = "kcharselect-15.12.1.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcolorchooser-15.12.0.tar.xz";
-      sha256 = "0qbl18q41jhra0arfvymhxd27y7hs6bmqwzfls80l9nxa16di57c";
-      name = "kcolorchooser-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcolorchooser-15.12.1.tar.xz";
+      sha256 = "1djcknlp97zlwvrs9fswg4v188qs2acb7lzw8y9j2p982d0g1idc";
+      name = "kcolorchooser-15.12.1.tar.xz";
     };
   };
   kcontacts = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcontacts-15.12.0.tar.xz";
-      sha256 = "1ijh9brvgqdva168a1inj8p8z837h2sg05smzxk4f56779z43cry";
-      name = "kcontacts-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcontacts-15.12.1.tar.xz";
+      sha256 = "0i6mx1ss19g86j55kj47qvrcvqwp6ax7wyg0ar436aa18digfa96";
+      name = "kcontacts-15.12.1.tar.xz";
     };
   };
   kcron = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kcron-15.12.0.tar.xz";
-      sha256 = "03b9zwa5fm8giynfz993y51cxpchi13k58afd6w4y19733scpc8w";
-      name = "kcron-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kcron-15.12.1.tar.xz";
+      sha256 = "04w3017y3955fj3z76ng28fksyzjbqlw09g6g6b9l8nyi5y1zgm0";
+      name = "kcron-15.12.1.tar.xz";
     };
   };
   kde-baseapps = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-baseapps-15.12.0.tar.xz";
-      sha256 = "10l7yr9jfmzb4jh59f8mdf36bvbr7da5wacyjpgvamjzcj87l5f3";
-      name = "kde-baseapps-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-baseapps-15.12.1.tar.xz";
+      sha256 = "0n0g7jjb2kf8h9nr9sc0l5ia796nc2nzlfxnibyvvlp68sj4ffwd";
+      name = "kde-baseapps-15.12.1.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdebugsettings-15.12.0.tar.xz";
-      sha256 = "0n9l6pish25a4wg1bbibfngdzwyy5lyxyjj4aicvcx415j9yzicf";
-      name = "kdebugsettings-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdebugsettings-15.12.1.tar.xz";
+      sha256 = "1b7w5rnbxg0m4xlrlisd1ipv4w0xl5125m5vxvrqdrcsl647xbk0";
+      name = "kdebugsettings-15.12.1.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-dev-scripts-15.12.0.tar.xz";
-      sha256 = "18xr7763778qmpg38avq23kaqcpyccr802wig5xy6b9dqv6jh894";
-      name = "kde-dev-scripts-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-dev-scripts-15.12.1.tar.xz";
+      sha256 = "1d2d1r11xnk3wbxgmnkm8k6azbjxz8gm0mpp37lrx5aq181i8598";
+      name = "kde-dev-scripts-15.12.1.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-dev-utils-15.12.0.tar.xz";
-      sha256 = "0707skcsnw5bzk7234w6jd1kwwqi010dyq4vnajxg52kmf4592j8";
-      name = "kde-dev-utils-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-dev-utils-15.12.1.tar.xz";
+      sha256 = "1igpf4qa502nsz7rxqmv3phrlj58fgjdbamlrz9fz4czlcd4j8fb";
+      name = "kde-dev-utils-15.12.1.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdeedu-data-15.12.0.tar.xz";
-      sha256 = "125rh8wmm5p9q6py1z25s22j1xfpn7dn1czd3l0s7diaygl28li3";
-      name = "kdeedu-data-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdeedu-data-15.12.1.tar.xz";
+      sha256 = "0avpy6w5n554hxi2qhsfi8n9m1x9wf3faklqzfj650j1574n17yj";
+      name = "kdeedu-data-15.12.1.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-mobipocket-15.12.0.tar.xz";
-      sha256 = "0jqz242p20xdwhy9ncxv2njksz4ymz9xh3zvynwljq5ixw6qjayz";
-      name = "kdegraphics-mobipocket-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-mobipocket-15.12.1.tar.xz";
+      sha256 = "0ya6cli7c0yh7myh00b818qydlm481cnszc39b3557iq43qrxd89";
+      name = "kdegraphics-mobipocket-15.12.1.tar.xz";
     };
   };
   kdegraphics-strigi-analyzer = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-strigi-analyzer-15.12.0.tar.xz";
-      sha256 = "10gqbnpmzlv2rijy6yszr92aq51bsb63ypkxxpw1r9q2yzjb974b";
-      name = "kdegraphics-strigi-analyzer-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-strigi-analyzer-15.12.1.tar.xz";
+      sha256 = "1i0sqdyl2fcg7v0q9c7pvk5v4klzsfphv82knapmkpvlddj7mwyz";
+      name = "kdegraphics-strigi-analyzer-15.12.1.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdegraphics-thumbnailers-15.12.0.tar.xz";
-      sha256 = "1lns9z65596rwc9899lrkw75lq8yk4hniys4c3q114s8gvqi89i5";
-      name = "kdegraphics-thumbnailers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdegraphics-thumbnailers-15.12.1.tar.xz";
+      sha256 = "03fvrlk6dgj6s6dr3vvhxn9877ay3798kf156hjn9pqx4iypqhz3";
+      name = "kdegraphics-thumbnailers-15.12.1.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ar-15.12.0.tar.xz";
-      sha256 = "1mhz3dylhndh3y8qxvmz41jq6rvya8l7bvd58m3lavbj1lx7n2ks";
-      name = "kde-l10n-ar-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ar-15.12.1.tar.xz";
+      sha256 = "1p417hkkikggy01awyazd1njyq2bs6y1jvspd7ijr3y4w1jia78q";
+      name = "kde-l10n-ar-15.12.1.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-bg-15.12.0.tar.xz";
-      sha256 = "1lnsz222jv1n3hn6ahyyshrxn33dypfdfxrfb9kqilrlqb147pv3";
-      name = "kde-l10n-bg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-bg-15.12.1.tar.xz";
+      sha256 = "1l2s8h2rpyp71xs8jkww6s5zi58xxizf38k5xh4jrvx9vias4cl8";
+      name = "kde-l10n-bg-15.12.1.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-bs-15.12.0.tar.xz";
-      sha256 = "1qb4axsj4832l0n6k2lrw50jjvc0pv6zs8g0yrnybpgyfmxa8157";
-      name = "kde-l10n-bs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-bs-15.12.1.tar.xz";
+      sha256 = "10a5680bl5w30ynndf019627l235bx2v5bi5yyx27l7ki3infs86";
+      name = "kde-l10n-bs-15.12.1.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ca-15.12.0.tar.xz";
-      sha256 = "016kqlllv3chwnryxg72p4g9n455q1xiyy5sqncpa3gw3w65c7s7";
-      name = "kde-l10n-ca-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ca-15.12.1.tar.xz";
+      sha256 = "1841vmsf1iya41zwkcpgmcs2agc825l8mjbpmvpa5d5xyh9nsyp3";
+      name = "kde-l10n-ca-15.12.1.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-15.12.0";
+    version = "ca_valencia-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ca@valencia-15.12.0.tar.xz";
-      sha256 = "1prm8lsfa9a72g9av6yl3zyjbpvfp8a6bwcqs65l98zlysb7qfma";
-      name = "kde-l10n-ca_valencia-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ca@valencia-15.12.1.tar.xz";
+      sha256 = "0yz30y1khvsng166wkq49kr17vv8y67n3cns5y6zrnq6wb7zplri";
+      name = "kde-l10n-ca_valencia-15.12.1.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-cs-15.12.0.tar.xz";
-      sha256 = "1xf1zsmw7c5rvk9557jlrm643x6wxflk3r4zg6ddgk7nxs6l1mg0";
-      name = "kde-l10n-cs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-cs-15.12.1.tar.xz";
+      sha256 = "1vvi8mlj3sxwvpbz5fp2yhkzm1933nfmmhhfklpj264dynw6jxzm";
+      name = "kde-l10n-cs-15.12.1.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-da-15.12.0.tar.xz";
-      sha256 = "033yy4p15994lraadsmhdfmz63cmp8pds65nsrmckbicb2a748id";
-      name = "kde-l10n-da-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-da-15.12.1.tar.xz";
+      sha256 = "00vy9if529za7iybb8i7xxdazd8f4y9kiy1yjpgky39yhsjp65bw";
+      name = "kde-l10n-da-15.12.1.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-de-15.12.0.tar.xz";
-      sha256 = "1pl0rj1i8zkra27c36bj4qh5vpgb9x71zzx3dszx8pmb0y88mp55";
-      name = "kde-l10n-de-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-de-15.12.1.tar.xz";
+      sha256 = "0s9ibm1sjw1xa4gx36g0midy2wvc8baixaq7ldv23a56gr9ls37a";
+      name = "kde-l10n-de-15.12.1.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-el-15.12.0.tar.xz";
-      sha256 = "1mza3kg2jha0c5bm0s9146yispp6rhx8z9lf0bis60ppn3zprmdi";
-      name = "kde-l10n-el-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-el-15.12.1.tar.xz";
+      sha256 = "16xfri6pv01vvxh47h0an2gy9hd38l0lvnmvq33kf60424p20iy9";
+      name = "kde-l10n-el-15.12.1.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-15.12.0";
+    version = "en_GB-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-en_GB-15.12.0.tar.xz";
-      sha256 = "07nlriiccl1zaywycg25ai92avy3k7glmxglidkkngjrkg6pfq04";
-      name = "kde-l10n-en_GB-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-en_GB-15.12.1.tar.xz";
+      sha256 = "170hd2g8a7dafsjr35lkpc9wwiwj0gsg0bmrir3dmqjw78fkfrjw";
+      name = "kde-l10n-en_GB-15.12.1.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-eo-15.12.0.tar.xz";
-      sha256 = "0rn8vp25s4lza4x6s4i72wkilf043idq6smdn2mndzvff0bcpjy1";
-      name = "kde-l10n-eo-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-eo-15.12.1.tar.xz";
+      sha256 = "0jrhrr4rxz9qfapx2gvw8i7q17fc4zzp45q1scz0h7cvnmw087ac";
+      name = "kde-l10n-eo-15.12.1.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-es-15.12.0.tar.xz";
-      sha256 = "02iamhlj3j4y6j1v7dd6scz4fffq0pn494gy8nvi343y3dbyvqvc";
-      name = "kde-l10n-es-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-es-15.12.1.tar.xz";
+      sha256 = "1f54wg365mqbcgf93rs6lay78ac9zijff0kszylzjm1k2a2vl5wj";
+      name = "kde-l10n-es-15.12.1.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-et-15.12.0.tar.xz";
-      sha256 = "1j26ig05xp45g3cbgw80kz6kzi3966wb1hk3lr4w0l80y5f4ygxg";
-      name = "kde-l10n-et-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-et-15.12.1.tar.xz";
+      sha256 = "0arrgznymzv4vfc97g40b51z3szbg7y4k1nncl01w0758szrp6c0";
+      name = "kde-l10n-et-15.12.1.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-eu-15.12.0.tar.xz";
-      sha256 = "1y0lzl5y05yv21blkllipzfjcs6k1s1znz7wkk0kcmqrvmwpx1r5";
-      name = "kde-l10n-eu-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-eu-15.12.1.tar.xz";
+      sha256 = "15dpm0isgh8645qwqw5mza295hb8ls6lp2pnil1iy2lpcmsr53cr";
+      name = "kde-l10n-eu-15.12.1.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fa-15.12.0.tar.xz";
-      sha256 = "09axzs55bnfdjwmlyanljnlcx7zb179hkc7i2179px4iywn4fcw5";
-      name = "kde-l10n-fa-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fa-15.12.1.tar.xz";
+      sha256 = "1867bxi0bvy5dgig41z4gwghnkjgy43h4i5w65al8djf0haqyr52";
+      name = "kde-l10n-fa-15.12.1.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fi-15.12.0.tar.xz";
-      sha256 = "141ikl2q9zhawg6ib6ppdsk03vs6fwlwzlxlg7bphfxr1nc202lw";
-      name = "kde-l10n-fi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fi-15.12.1.tar.xz";
+      sha256 = "1028psgc58wk5lp245jk905w54m654pmwkfj24g06jxas65pglrd";
+      name = "kde-l10n-fi-15.12.1.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-fr-15.12.0.tar.xz";
-      sha256 = "170ijawwvx6kqdph09w8kb9m7zzs6xya2f73an0qvvwz40aixvnn";
-      name = "kde-l10n-fr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-fr-15.12.1.tar.xz";
+      sha256 = "0hi3dzd07ns8hrm7rv6hxx1b6idwmgvr3jgdmzs2883gkjivv6g8";
+      name = "kde-l10n-fr-15.12.1.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ga-15.12.0.tar.xz";
-      sha256 = "1d3b3wqdn5n9lqdrf63la73hiacm95mbx0x9khc8navrcx17ybmv";
-      name = "kde-l10n-ga-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ga-15.12.1.tar.xz";
+      sha256 = "1gq7j053c3lv30pmf0q2xlsazyl21jgpcr0kfmza6yrg5cxaivjb";
+      name = "kde-l10n-ga-15.12.1.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-gl-15.12.0.tar.xz";
-      sha256 = "04d74sdqgdg5rzvzg0pnk1yj4x7x0i0k6ki2npyzd9jymcasckp7";
-      name = "kde-l10n-gl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-gl-15.12.1.tar.xz";
+      sha256 = "1pmizbmfqi95lcwbka5h87f015p3ml1vf59npkchfq6v7iv45zxf";
+      name = "kde-l10n-gl-15.12.1.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-he-15.12.0.tar.xz";
-      sha256 = "1r0j7fjg3k97dhs3q8myywm9n7cn073wy05hwv3zwc8124invgyb";
-      name = "kde-l10n-he-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-he-15.12.1.tar.xz";
+      sha256 = "1kyf48hpj42hzc75r1s1js730n0gw94ldcrap3ypd1vjzg67f6wn";
+      name = "kde-l10n-he-15.12.1.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hi-15.12.0.tar.xz";
-      sha256 = "1ki2hd2ixvyiqkldhinmidbg9gw1ivrwgynlcjx31c0aasyndbjj";
-      name = "kde-l10n-hi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hi-15.12.1.tar.xz";
+      sha256 = "0rarsx7y0plr1l0vh5nx4dm9xdq69wr3szcdcvlxx1xdx0f2xyxk";
+      name = "kde-l10n-hi-15.12.1.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hr-15.12.0.tar.xz";
-      sha256 = "0skqv67jnwaw2zcnb73w5yfdpqagmx1bm1p6vrbh31ra8gc0v32b";
-      name = "kde-l10n-hr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hr-15.12.1.tar.xz";
+      sha256 = "15gxrrla5gwvwsx5ncf97naj9p09x3g03jbxkpzjf2vn4xgkq7wf";
+      name = "kde-l10n-hr-15.12.1.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-hu-15.12.0.tar.xz";
-      sha256 = "0hm7lwajgnvqawpabbkb7i8w39xbl8dgnb8bbfxcaz9gilhzy4in";
-      name = "kde-l10n-hu-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-hu-15.12.1.tar.xz";
+      sha256 = "15cw97fjcbqn6n6h03mldf40vjsmzzjwgb63z0qlcg5s87yl8lik";
+      name = "kde-l10n-hu-15.12.1.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ia-15.12.0.tar.xz";
-      sha256 = "0kpj2zw1id9l9i9mhjq5wxmvx204aj1yk47yyrw6yca8mlsj3mzl";
-      name = "kde-l10n-ia-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ia-15.12.1.tar.xz";
+      sha256 = "1ab7pivq4xbzvjwq18rnw1c7lyaz0yyhfqkkw0w31qdvh8zx91xg";
+      name = "kde-l10n-ia-15.12.1.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-id-15.12.0.tar.xz";
-      sha256 = "0xwkfa5dd1bpi345aagrbimy0jkgswjvzq1wgz4n6p3d8kazyvj0";
-      name = "kde-l10n-id-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-id-15.12.1.tar.xz";
+      sha256 = "1w7s7m7p4mia0q9x32rcmdszsz0x7zw210pssw1zk3vh9dc29f1j";
+      name = "kde-l10n-id-15.12.1.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-is-15.12.0.tar.xz";
-      sha256 = "0n9ikkni821lsk6l3wvk8nir4rjnyb3pfl9dw1ffqh1q62wn8z7c";
-      name = "kde-l10n-is-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-is-15.12.1.tar.xz";
+      sha256 = "0w1b8fsw3q6ry63bs27s7rbv9q5cps3kd5rd4bhkja0v950p2lfg";
+      name = "kde-l10n-is-15.12.1.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-it-15.12.0.tar.xz";
-      sha256 = "0h5bjm754gcls7gnzdvdcggnvbbqx0l16902bygdh3z2gyp76avy";
-      name = "kde-l10n-it-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-it-15.12.1.tar.xz";
+      sha256 = "03cal5i75540q6vk8ln32lfg93s1hy02qnnajggm96ncpmlw1fp4";
+      name = "kde-l10n-it-15.12.1.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ja-15.12.0.tar.xz";
-      sha256 = "0ga202v7vi262khdwplkljc1hdf9y85dk0g09wb70gc0mm52zzyg";
-      name = "kde-l10n-ja-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ja-15.12.1.tar.xz";
+      sha256 = "1d8p2pvz5h9mr0agbazggjd363h4ggmxs35lfkc41sw2ka8wc7zk";
+      name = "kde-l10n-ja-15.12.1.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-kk-15.12.0.tar.xz";
-      sha256 = "0334ida4dhm8l6m1kqgksz68ckrfxas5b3vgnm7f4058dqvm1w6b";
-      name = "kde-l10n-kk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-kk-15.12.1.tar.xz";
+      sha256 = "06pr04sq9szkgvgrj0saiwc5axqv09sz48alz97qvhprfi63k7gm";
+      name = "kde-l10n-kk-15.12.1.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-km-15.12.0.tar.xz";
-      sha256 = "18ln6h2fiwspybiripqmglrkq81z0q4llnrqz7c7gzm1jg85k8w2";
-      name = "kde-l10n-km-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-km-15.12.1.tar.xz";
+      sha256 = "1j0jf01j12y1jsyx8n47nz5wjwk545z6wn3hp8shkf3gfrda6x8h";
+      name = "kde-l10n-km-15.12.1.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ko-15.12.0.tar.xz";
-      sha256 = "13a8iik27klxp07m798g66r5a547py2ii914pdbrx65hzgzvxn6l";
-      name = "kde-l10n-ko-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ko-15.12.1.tar.xz";
+      sha256 = "08hknapyy10205h71zapj3n5k46gqjjfd7acpqz85ff92l0iryxd";
+      name = "kde-l10n-ko-15.12.1.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-lt-15.12.0.tar.xz";
-      sha256 = "1ks9ywlhxzgick1iradagc78xcnfnwmcw49d3pqdjdpw6icz1xs8";
-      name = "kde-l10n-lt-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-lt-15.12.1.tar.xz";
+      sha256 = "0l844nsr0najfhfbqzwhi4pvagir9fvq2gx2p1xkfk06m1ki1krw";
+      name = "kde-l10n-lt-15.12.1.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-lv-15.12.0.tar.xz";
-      sha256 = "0l9shh6rg44qgw4lh9kp6b4rs51hn0w04dgrga0hrdm28cr1npl7";
-      name = "kde-l10n-lv-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-lv-15.12.1.tar.xz";
+      sha256 = "09pnn4m70655pn9ycqpmxlich8pih5j0kgqa64r3ip2gsw4gx5js";
+      name = "kde-l10n-lv-15.12.1.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-mr-15.12.0.tar.xz";
-      sha256 = "0liivk7bibz125hj1dcq8ilwyzhdlq7bs4adiicc26dp9r1way4c";
-      name = "kde-l10n-mr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-mr-15.12.1.tar.xz";
+      sha256 = "1nqvacfyar88zgq1h836r6amm56qk8whr4xh7q571969qmcbz8mc";
+      name = "kde-l10n-mr-15.12.1.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nb-15.12.0.tar.xz";
-      sha256 = "1glnp3qqrhsy7vkmljqzx8ghsl1qyvmdcpdvhnjw8rdfdss5pcx2";
-      name = "kde-l10n-nb-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nb-15.12.1.tar.xz";
+      sha256 = "0h9w9ya8ridprsav2ypn1rl92gdkx7cdnzjhjfyb028c6mrzx2xl";
+      name = "kde-l10n-nb-15.12.1.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nds-15.12.0.tar.xz";
-      sha256 = "1p1fm1jkic7gzw2n762yfq6w9laakx831mdgl3gdp0xgx7x8mg1q";
-      name = "kde-l10n-nds-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nds-15.12.1.tar.xz";
+      sha256 = "0xj644sdicdqg4f5qvvmb3gzdw46rcma1bz2wr19prismswm61q4";
+      name = "kde-l10n-nds-15.12.1.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nl-15.12.0.tar.xz";
-      sha256 = "1ki6bhw85zkgl132bf1q677r409sdvf7gfd51cj9p0fy63r87wym";
-      name = "kde-l10n-nl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nl-15.12.1.tar.xz";
+      sha256 = "00wimacv53ggjrccm33mm406yd501c57pkvzdvzzx6ljdq0gz3j1";
+      name = "kde-l10n-nl-15.12.1.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-nn-15.12.0.tar.xz";
-      sha256 = "1hrsk4kdk5w2bf0iplhpmajkrzflgxbwdks3vd2q5zrqkzx3ykgd";
-      name = "kde-l10n-nn-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-nn-15.12.1.tar.xz";
+      sha256 = "13cb7inz00i0cj9da3zhlbh6mb3rrya4c79ydy2gvwj5p54bdbxy";
+      name = "kde-l10n-nn-15.12.1.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pa-15.12.0.tar.xz";
-      sha256 = "1kyqdz490ix0qm3ck2c9grqkdiqdf7aw659kvdjsh34f818ns5sq";
-      name = "kde-l10n-pa-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pa-15.12.1.tar.xz";
+      sha256 = "1f58fnmlzgsyfmn9f2lfsla1v0ynpmg4d5x6kk8b92a6ad2an9dc";
+      name = "kde-l10n-pa-15.12.1.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pl-15.12.0.tar.xz";
-      sha256 = "1p3z3anik2fh9wi36ag11kyk4mfv6gjx9sgkxxdzkyd2i67jig2y";
-      name = "kde-l10n-pl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pl-15.12.1.tar.xz";
+      sha256 = "0wfl6sgdbzwbg00c8rqj9i2avi46vdppdjk48w222j9cibf1ifwp";
+      name = "kde-l10n-pl-15.12.1.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pt-15.12.0.tar.xz";
-      sha256 = "04slrcs6f3bbi73l51lga42srx022x00lzlmn8m2617922kag92f";
-      name = "kde-l10n-pt-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pt-15.12.1.tar.xz";
+      sha256 = "0ljxz362ahz1r8hvvh8zliiki3jmsqzx656jn5f6g3c4xjxmmhd9";
+      name = "kde-l10n-pt-15.12.1.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-15.12.0";
+    version = "pt_BR-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-pt_BR-15.12.0.tar.xz";
-      sha256 = "1n38d2p47bavmn248sdpb0w8k9kqxpas7rkh3dgnfwsjgd7bsb6g";
-      name = "kde-l10n-pt_BR-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-pt_BR-15.12.1.tar.xz";
+      sha256 = "072jn9r4sfi62mb5yh6ayisana18da0xrvdf9r2c03rhl1hlqiiq";
+      name = "kde-l10n-pt_BR-15.12.1.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ro-15.12.0.tar.xz";
-      sha256 = "0m9lx63d0q53c3rxmznmrsyi3kpgflg8giqgspni1pkx3injzdyv";
-      name = "kde-l10n-ro-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ro-15.12.1.tar.xz";
+      sha256 = "0pp328zj5v50paf7xgajh2l4mk75hg3am6xyiw7p94fx3m6lnw9g";
+      name = "kde-l10n-ro-15.12.1.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ru-15.12.0.tar.xz";
-      sha256 = "0ki1cj9bngzjjqmlsi6rgbvrkxbsr53qdyfxqndbab5r76yzkjnz";
-      name = "kde-l10n-ru-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ru-15.12.1.tar.xz";
+      sha256 = "1sg38y0778ld1cjvvm2zfn8gmav195dak52596lpzklh6ahnp9dc";
+      name = "kde-l10n-ru-15.12.1.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sk-15.12.0.tar.xz";
-      sha256 = "1hsi3simcyc1239rjiybzv7jmcrmmc9js543s1nw9y84jn6kk78k";
-      name = "kde-l10n-sk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sk-15.12.1.tar.xz";
+      sha256 = "16nxrz95x558n5kqvs8q0rdy8lqas0w7zlgr910v92497hsmxmsg";
+      name = "kde-l10n-sk-15.12.1.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sl-15.12.0.tar.xz";
-      sha256 = "0fld0lgr070w1v9830700182lslm7pmkyrxarwbf11g7a4wzsc1s";
-      name = "kde-l10n-sl-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sl-15.12.1.tar.xz";
+      sha256 = "128jp5pis4np8734dn8j77xf2h8a8hq041gnjdlfd0yvq61pn9dk";
+      name = "kde-l10n-sl-15.12.1.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sr-15.12.0.tar.xz";
-      sha256 = "028frgvzy000l38kpixyfxvcx9skwf9w2x5xl31172icwzyfvj28";
-      name = "kde-l10n-sr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sr-15.12.1.tar.xz";
+      sha256 = "0cmchn7niddx48lvjflzvqv0xlbp1fxwr492ldb8vs0l71ifsl6v";
+      name = "kde-l10n-sr-15.12.1.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-sv-15.12.0.tar.xz";
-      sha256 = "0i2qkz02nfcxi3s41as65d0m1bcp85j1024vyd0g746dy9d4qq8b";
-      name = "kde-l10n-sv-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-sv-15.12.1.tar.xz";
+      sha256 = "02sh0z394bd03m0as4n6qdk9mm8yy8z80b2xk9d42f27v6snqr29";
+      name = "kde-l10n-sv-15.12.1.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-tr-15.12.0.tar.xz";
-      sha256 = "1biw08ad87l3bpg39iz42a5chdbmarp7jq9gk6zd1z76iv930may";
-      name = "kde-l10n-tr-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-tr-15.12.1.tar.xz";
+      sha256 = "18rlg2xdif54npfi2dhw2my494pbg089r3wvl6msc17nf0c72w10";
+      name = "kde-l10n-tr-15.12.1.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-ug-15.12.0.tar.xz";
-      sha256 = "1lhmxa9k7n0za60c9l4x0k002mzgd5hyjf2y8jwh2788vd6760fq";
-      name = "kde-l10n-ug-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-ug-15.12.1.tar.xz";
+      sha256 = "1dkv3vqa66fvyksqxjdvrm6jmks07dp34934ccx9dm2kqq0nciz9";
+      name = "kde-l10n-ug-15.12.1.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-uk-15.12.0.tar.xz";
-      sha256 = "0mwmzf5zqda3py1xd6sk3wsz4636h0mg6mvd05raajiz7986bp30";
-      name = "kde-l10n-uk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-uk-15.12.1.tar.xz";
+      sha256 = "15vl45g85f9xncn2dxz527kxig151iddf1pbh57hngdhdirz98cd";
+      name = "kde-l10n-uk-15.12.1.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-wa-15.12.0.tar.xz";
-      sha256 = "184syr1kydbykyjprpvh1mhhi31snjadjphzapcb1d656rlw99ig";
-      name = "kde-l10n-wa-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-wa-15.12.1.tar.xz";
+      sha256 = "192rb9hrfw9b525czwc33x2djjg9klm5icdx4l7jp0qsrwzdgr0g";
+      name = "kde-l10n-wa-15.12.1.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-15.12.0";
+    version = "zh_CN-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-zh_CN-15.12.0.tar.xz";
-      sha256 = "1jyqcaa1xbgf27bpjwjyks93zj940j4f1i7ngs5d379w2g8jp8d1";
-      name = "kde-l10n-zh_CN-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-zh_CN-15.12.1.tar.xz";
+      sha256 = "055prxx6dspsyp3j51a8chmg6fdzl0ncjkhhyr21hlfiwv91fac0";
+      name = "kde-l10n-zh_CN-15.12.1.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-15.12.0";
+    version = "zh_TW-15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-l10n/kde-l10n-zh_TW-15.12.0.tar.xz";
-      sha256 = "0wpw1shcp2bp55smcx0xxw7g7r1rd5sm9ca9zgx979mddv8gmil3";
-      name = "kde-l10n-zh_TW-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-l10n/kde-l10n-zh_TW-15.12.1.tar.xz";
+      sha256 = "14kargm5s1vb6ylf7nrnv1s3pbjaplmbi8kr4qrggcyinda4wp74";
+      name = "kde-l10n-zh_TW-15.12.1.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.15";
+    version = "4.14.16";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdelibs-4.14.15.tar.xz";
-      sha256 = "0698nbih5sgkr08rrsap64kpc3vil84hzgdyara62v0wmffdr7a7";
-      name = "kdelibs-4.14.15.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdelibs-4.14.16.tar.xz";
+      sha256 = "1amkwrwjm2v0jd1rl1n0pfi8ahvzaszj03093bmxqllrqhqbkxkv";
+      name = "kdelibs-4.14.16.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdenetwork-filesharing-15.12.0.tar.xz";
-      sha256 = "03npxv2p9hy7dl6h7d1yn4f8caycgfxvgq6r8rar3lq8c170bqgj";
-      name = "kdenetwork-filesharing-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdenetwork-filesharing-15.12.1.tar.xz";
+      sha256 = "15fj3kk76gg6vk43yiz508cks1l9yazlhmqf7s4q0b9xwmvdahsj";
+      name = "kdenetwork-filesharing-15.12.1.tar.xz";
     };
   };
   kdenetwork-strigi-analyzers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdenetwork-strigi-analyzers-15.12.0.tar.xz";
-      sha256 = "01axll3636r5xqzrwjwqgq8gcnm6dcbmxfr07g81wb4q479py78g";
-      name = "kdenetwork-strigi-analyzers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdenetwork-strigi-analyzers-15.12.1.tar.xz";
+      sha256 = "1nwckiggwrmvsdhyfmhqv1w79zcvzh4s2jyivyprvk418c1qy69b";
+      name = "kdenetwork-strigi-analyzers-15.12.1.tar.xz";
     };
   };
   kdenlive = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdenlive-15.12.0.tar.xz";
-      sha256 = "1y7vhd0i3pw67lh20f52ngcc3japnisqgs7blf84pih7ppj4lvss";
-      name = "kdenlive-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdenlive-15.12.1.tar.xz";
+      sha256 = "1j7mpjwis9n99dsyax7swqmx45g9mw46lcn063m0rsdzsh905yrk";
+      name = "kdenlive-15.12.1.tar.xz";
     };
   };
   kdepim = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdepim-15.12.0.tar.xz";
-      sha256 = "0qh5iw8w3b2n1zv9c5hh0bcwrfisfk7ks0xmiqc711zc5r9a5nwh";
-      name = "kdepim-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdepim-15.12.1.tar.xz";
+      sha256 = "0r1l3za5jbdvr4x6hv0d94d8lwa1a5qcg3q83wn1jrb6mlfc1f03";
+      name = "kdepim-15.12.1.tar.xz";
     };
   };
   kdepimlibs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdepimlibs-15.12.0.tar.xz";
-      sha256 = "1zyjsq8fmrs2xy1zxcpkjz70sxx7nvnvgvxnx9q2dc4ikyqf1hqr";
-      name = "kdepimlibs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdepimlibs-15.12.1.tar.xz";
+      sha256 = "1f5j4alzmpm4scvn6k4mg9ykdsi0b6r28h2bisq39apn0k6fzadl";
+      name = "kdepimlibs-15.12.1.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdepim-runtime-15.12.0.tar.xz";
-      sha256 = "0d9p6wvg05y54mi2aa6x6882rgk6hqr9z85iqmcd4lfsw50lp7v3";
-      name = "kdepim-runtime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdepim-runtime-15.12.1.tar.xz";
+      sha256 = "0l6la5jds6byg9ibphlbf8yywgfjyin4w02ik16h3mm01rl5d1mn";
+      name = "kdepim-runtime-15.12.1.tar.xz";
     };
   };
   kde-runtime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kde-runtime-15.12.0.tar.xz";
-      sha256 = "1qlqqicnysqfl32rpddklv1qhy8wqnhvchl7dm62i94w50w86am6";
-      name = "kde-runtime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kde-runtime-15.12.1.tar.xz";
+      sha256 = "19arkcj95dysxhanbh0armwimxph3s7ljhvgbzdi7r4glm9aq0kn";
+      name = "kde-runtime-15.12.1.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdesdk-kioslaves-15.12.0.tar.xz";
-      sha256 = "1rgynw1zzn72sslgkxihrx4swx0sbz72a52smkjjhbykj10nlp54";
-      name = "kdesdk-kioslaves-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdesdk-kioslaves-15.12.1.tar.xz";
+      sha256 = "198i8cfz194smlhj8rafmkjbgzk1wmiw1gki4mb9vvk1gddgxc65";
+      name = "kdesdk-kioslaves-15.12.1.tar.xz";
     };
   };
   kdesdk-strigi-analyzers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdesdk-strigi-analyzers-15.12.0.tar.xz";
-      sha256 = "0cxrrv6ry4bjhyqw8nlzin4wajqcf0rshaiq4scgb8iy5g2cpfr5";
-      name = "kdesdk-strigi-analyzers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdesdk-strigi-analyzers-15.12.1.tar.xz";
+      sha256 = "0lcn0b58574kwsg7j5qyf46vjkbvsl7w8y9wi983rd06dhfgql5l";
+      name = "kdesdk-strigi-analyzers-15.12.1.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdesdk-thumbnailers-15.12.0.tar.xz";
-      sha256 = "0w1lcvv2h4ndv91i4di9v5m6d9df5a8r93cblzm57z3izflpvf89";
-      name = "kdesdk-thumbnailers-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdesdk-thumbnailers-15.12.1.tar.xz";
+      sha256 = "18fbgwb8bil90arbylw4605xk240g21saaw39zlx203q8bmnm7cm";
+      name = "kdesdk-thumbnailers-15.12.1.tar.xz";
     };
   };
   kdewebdev = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdewebdev-15.12.0.tar.xz";
-      sha256 = "1xq0ayrnbskb0g6bmvcayfxkb6sws4vvjhv3s65im1rmsrqnrgly";
-      name = "kdewebdev-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdewebdev-15.12.1.tar.xz";
+      sha256 = "1zmbagi1fqlr2y74hghlbs8y7kbaxx739vjhxxvd8qn4akhgij92";
+      name = "kdewebdev-15.12.1.tar.xz";
     };
   };
   kdf = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdf-15.12.0.tar.xz";
-      sha256 = "0gahpl2la6xkhbkh607b3p07csja1v43i3m29q47f3gaxj4dxpln";
-      name = "kdf-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdf-15.12.1.tar.xz";
+      sha256 = "0g0b2hqsls8nrwrqj78v6m38h4szsr0hs9bwfbrv63ppjm6a8272";
+      name = "kdf-15.12.1.tar.xz";
     };
   };
   kdiamond = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kdiamond-15.12.0.tar.xz";
-      sha256 = "04w7sc22cf1rvgqav2vdj1msbdggq77a8znsqgy0my2mbsqwa175";
-      name = "kdiamond-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kdiamond-15.12.1.tar.xz";
+      sha256 = "12xl2h3hcb4c7sm1v9p9cqcflqi30cfqhjj6vjwwb474pjffxfdw";
+      name = "kdiamond-15.12.1.tar.xz";
     };
   };
   kfloppy = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kfloppy-15.12.0.tar.xz";
-      sha256 = "1ihbbrrxdhgkh7nk8wmpvibxiw4a7nazw0pi88pxflbjjc4f67sn";
-      name = "kfloppy-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kfloppy-15.12.1.tar.xz";
+      sha256 = "1hrr4rfk63q4r7lbqq6nn96camcm5jq41qnvx6cm4pqqd4a8z6hp";
+      name = "kfloppy-15.12.1.tar.xz";
     };
   };
   kfourinline = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kfourinline-15.12.0.tar.xz";
-      sha256 = "1z8y1q7ij9pc5wzfhpvy16yh6c000gwhas9kq3sjhzz9qynw9bd1";
-      name = "kfourinline-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kfourinline-15.12.1.tar.xz";
+      sha256 = "1xj3krs20j3df3mkbav1nmwjaw524kif6g5qp36jipv9f58zw73g";
+      name = "kfourinline-15.12.1.tar.xz";
     };
   };
   kgeography = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kgeography-15.12.0.tar.xz";
-      sha256 = "1sj25ijc3n1xl8xmmkg784dxjcwxg4nviw89114qllbiy6q3lczh";
-      name = "kgeography-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kgeography-15.12.1.tar.xz";
+      sha256 = "0rvq9a4l4yjyk2bmlwppjmik3pfkhbxrp9105136n4vskizhrm8h";
+      name = "kgeography-15.12.1.tar.xz";
     };
   };
   kget = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kget-15.12.0.tar.xz";
-      sha256 = "0n9ah65c000x6xm04704pj6gxcgsbjfscw3gccv73vwin54y2ij5";
-      name = "kget-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kget-15.12.1.tar.xz";
+      sha256 = "1nqiw64yaz7kw58cldjjwdmlilrg9hxrlqwd2r7d0ip3mid5clkj";
+      name = "kget-15.12.1.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kgoldrunner-15.12.0.tar.xz";
-      sha256 = "0lril6s1m9frvkac531myg3jsx2xd1pp2ggnx0463hvfzgk73nd7";
-      name = "kgoldrunner-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kgoldrunner-15.12.1.tar.xz";
+      sha256 = "0rlhqvksyi0b79z955d3anagk5p5k4b9nikr8fsb64xzq7pjwn42";
+      name = "kgoldrunner-15.12.1.tar.xz";
     };
   };
   kgpg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kgpg-15.12.0.tar.xz";
-      sha256 = "04y6amdjmnqg80zsrwxwixgazr3ar90a7w9mj7fiv1982xcl6wis";
-      name = "kgpg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kgpg-15.12.1.tar.xz";
+      sha256 = "1ylns50237qr3af9i66n3v31qm6n1dd64j09smbjy6ij010ja4l3";
+      name = "kgpg-15.12.1.tar.xz";
     };
   };
   khangman = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/khangman-15.12.0.tar.xz";
-      sha256 = "1d8sf29ib1v06f4apg7g40qbf61zhgpw48pkgwxs01fdax0fahlz";
-      name = "khangman-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/khangman-15.12.1.tar.xz";
+      sha256 = "12xkqa8i53km3nwi9kzlclr29hg185pcjmsd6grzkyh3brqz40y2";
+      name = "khangman-15.12.1.tar.xz";
     };
   };
   kholidays = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kholidays-15.12.0.tar.xz";
-      sha256 = "0nclblhfjanvisn8xnis2b5y06cgk5wgqwzakywr74rffsg7nsqh";
-      name = "kholidays-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kholidays-15.12.1.tar.xz";
+      sha256 = "01ycl8j4nsc454wkk7ir5q38j4xlqcq05bgapks04s9lws1582dz";
+      name = "kholidays-15.12.1.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kidentitymanagement-15.12.0.tar.xz";
-      sha256 = "04x01w4lvn07nybsivzh0a44cf9axxn7k8m1gdwhynqd4pjlsv4h";
-      name = "kidentitymanagement-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kidentitymanagement-15.12.1.tar.xz";
+      sha256 = "12adkn01h5392fqixiap62cql20sijjm23c666kabwdmji98183p";
+      name = "kidentitymanagement-15.12.1.tar.xz";
     };
   };
   kig = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kig-15.12.0.tar.xz";
-      sha256 = "00163mm6ac3njw1farwm4rml1c9pkxp0583w10siwq7sfz28kx72";
-      name = "kig-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kig-15.12.1.tar.xz";
+      sha256 = "0x3g1ipxrqvd7pxpc2kccv0r4m2qnasarjcxz6ljz3227xzcc5zf";
+      name = "kig-15.12.1.tar.xz";
     };
   };
   kigo = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kigo-15.12.0.tar.xz";
-      sha256 = "15r298wxxl2ja6awmsvdxjrkp02hb70q097ry5vg2cmbay96drkj";
-      name = "kigo-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kigo-15.12.1.tar.xz";
+      sha256 = "0b3ngl9ndgfbbihp1dikii40r8kbpi8yz9s0f4jadp6gqna6xjl5";
+      name = "kigo-15.12.1.tar.xz";
     };
   };
   killbots = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/killbots-15.12.0.tar.xz";
-      sha256 = "1kgs427jxdg7kl7vp7a4ycf2bcpr3dcbyaimyi0c77vcsa9n3jq5";
-      name = "killbots-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/killbots-15.12.1.tar.xz";
+      sha256 = "1qvy6y4rbapp2y7vd2ammbiqxxqp3dbpyy16fyd7h08639wbrl7f";
+      name = "killbots-15.12.1.tar.xz";
     };
   };
   kimap = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kimap-15.12.0.tar.xz";
-      sha256 = "0xc3dki8qxwax89ic2qxc6kwxxc45fyg6lchm0j0n1b7h2z0d1km";
-      name = "kimap-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kimap-15.12.1.tar.xz";
+      sha256 = "0q1n8p4h7n5zad0lwaawh5kb5k6z4wzdr8kbpvhlw0dkp8a504ds";
+      name = "kimap-15.12.1.tar.xz";
     };
   };
   kio-extras = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kio-extras-15.12.0.tar.xz";
-      sha256 = "0l697zllgd1myhabsj0sg4yrk1qlhap80r82im7lil48nzj9lh77";
-      name = "kio-extras-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kio-extras-15.12.1.tar.xz";
+      sha256 = "0crl21kq8ya49hhcgfcch4x9xxjakwgs90yv0qp8zj19k12kl8fn";
+      name = "kio-extras-15.12.1.tar.xz";
     };
   };
   kiriki = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kiriki-15.12.0.tar.xz";
-      sha256 = "0xfg70wd93hqzlvdaarv2nni35641gyp9in9k0fr17q7h8znpmak";
-      name = "kiriki-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kiriki-15.12.1.tar.xz";
+      sha256 = "04zyq7nmdlnskzlw0hn78hpcf8rwjq53d7imnai7gvbxgcv2qf7a";
+      name = "kiriki-15.12.1.tar.xz";
     };
   };
   kiten = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kiten-15.12.0.tar.xz";
-      sha256 = "194f85p7kg0z2jd5r229nawzqi091c4giwms99hf0dj9sl0mga3r";
-      name = "kiten-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kiten-15.12.1.tar.xz";
+      sha256 = "0wr3zr26y07m911fy6ar4n53fp8b9jvms49i9cf7qwx4dc4a0wvr";
+      name = "kiten-15.12.1.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kjumpingcube-15.12.0.tar.xz";
-      sha256 = "0zhl528h38x64r1mq0bjmh67487np3izcfij6d1w603mabhp146n";
-      name = "kjumpingcube-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kjumpingcube-15.12.1.tar.xz";
+      sha256 = "1xsza01v0c6d1p6ydng1pkqq8g9397x1xbzfzq3fal8l8bf1nnl7";
+      name = "kjumpingcube-15.12.1.tar.xz";
     };
   };
   kldap = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kldap-15.12.0.tar.xz";
-      sha256 = "110pfp650w2ll02xcc0wb7d0fj3bp88k4l1mnyad0xw9acsd2l8r";
-      name = "kldap-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kldap-15.12.1.tar.xz";
+      sha256 = "1dr8pavgr3hrlk0xxvfnsk9p05bzg9rgwzgqw4xci9cx22jmyaxi";
+      name = "kldap-15.12.1.tar.xz";
     };
   };
   klettres = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/klettres-15.12.0.tar.xz";
-      sha256 = "016hnl7pihikanapn79qj49q5fc3pgx7pdmqhs8v6kqic20wgrj1";
-      name = "klettres-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/klettres-15.12.1.tar.xz";
+      sha256 = "0b1sw7x3miqivryc6bq1qn5gnfm8x8ns5v8qpvq5a2j76ifwkj54";
+      name = "klettres-15.12.1.tar.xz";
     };
   };
   klickety = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/klickety-15.12.0.tar.xz";
-      sha256 = "092x764bflnwjlmw4mdzpi4q6i206axy711h3fibkdlmnir7yj9w";
-      name = "klickety-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/klickety-15.12.1.tar.xz";
+      sha256 = "1cfrn7fvrrvn9s22d8ry1nck6h0hg0l8ccdy6405wjiks9wb5jra";
+      name = "klickety-15.12.1.tar.xz";
     };
   };
   klines = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/klines-15.12.0.tar.xz";
-      sha256 = "0qs93fl1snsycbzy074xx96p5s29fjs8qwz84jz2qh1p7jb0kdn1";
-      name = "klines-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/klines-15.12.1.tar.xz";
+      sha256 = "1b0plhc79cpxag02ij5zj3ix1hg4rpsnbc272gdy6kzl2862brdd";
+      name = "klines-15.12.1.tar.xz";
     };
   };
   kmag = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmag-15.12.0.tar.xz";
-      sha256 = "1bx65bz7j4ab3zmc4sl6j9hdp7bmr3287ly66n3bidyc9rn25w02";
-      name = "kmag-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmag-15.12.1.tar.xz";
+      sha256 = "1j7vgzpl61b2bm4csh6y9m58451nj0d7sxvjhxbimz0vzv9hh90x";
+      name = "kmag-15.12.1.tar.xz";
     };
   };
   kmahjongg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmahjongg-15.12.0.tar.xz";
-      sha256 = "1m56qq98f344g9snnpfg1z26xnca6zr6av29i4fnx4p33hcbg9rx";
-      name = "kmahjongg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmahjongg-15.12.1.tar.xz";
+      sha256 = "1ng2495vrk7czfd1zlmij1qch6ir3vm2dfm63y8vnyf1dj39g1z3";
+      name = "kmahjongg-15.12.1.tar.xz";
     };
   };
   kmailtransport = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmailtransport-15.12.0.tar.xz";
-      sha256 = "1v20v0cy34cpp559zcn5cbbqv6gxy60msmyar5dlyx2xxi7jrzrc";
-      name = "kmailtransport-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmailtransport-15.12.1.tar.xz";
+      sha256 = "04c9pq16aaf1fmyy25jlnq2wcsninbr19j7ygaaiqm2scj2mikk3";
+      name = "kmailtransport-15.12.1.tar.xz";
     };
   };
   kmbox = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmbox-15.12.0.tar.xz";
-      sha256 = "0kygxv69zcsf3zjdlnxcxbnbv2zdsx8n4z2ai4smdkwm3gp15h34";
-      name = "kmbox-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmbox-15.12.1.tar.xz";
+      sha256 = "17ri9ay28v7f8yar8a33gx2wm99shby8bi9pj0sflxnzvawnlrwq";
+      name = "kmbox-15.12.1.tar.xz";
     };
   };
   kmime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmime-15.12.0.tar.xz";
-      sha256 = "1gzir5bz2rbd24hwr9v7k6ri86ga5c7l1xgyr15pzdpa4q5nr975";
-      name = "kmime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmime-15.12.1.tar.xz";
+      sha256 = "0r5scbsq21zhxs6c2lj0ay6sizrkyfczzjrnyv15izxh18jm7h7d";
+      name = "kmime-15.12.1.tar.xz";
     };
   };
   kmines = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmines-15.12.0.tar.xz";
-      sha256 = "07pn7k9ls8h8xc4wap3zgrz2z0x4yf9krmb8qgjk7k5basr6bcmy";
-      name = "kmines-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmines-15.12.1.tar.xz";
+      sha256 = "0za53gh6v74c2rwmm2f084z80w9gqrdx5g6zqdlxwiml8m9ybzq1";
+      name = "kmines-15.12.1.tar.xz";
     };
   };
   kmix = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmix-15.12.0.tar.xz";
-      sha256 = "0cfs6xgj1yqv5ig8hx2m43a1yzjmbxkqhwj4gfpzl1anmhywmqz0";
-      name = "kmix-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmix-15.12.1.tar.xz";
+      sha256 = "10vbb5x9hbd124avs68x39zlp7jrqww0gp2avsgvgv8hr7caxwlv";
+      name = "kmix-15.12.1.tar.xz";
     };
   };
   kmousetool = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmousetool-15.12.0.tar.xz";
-      sha256 = "08mbjbf4i9xfadblwrviq9l3hfc2l0zpfhv1v6a1piz1cijr3zlz";
-      name = "kmousetool-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmousetool-15.12.1.tar.xz";
+      sha256 = "16lr93v2jmj0851afiz63p317fbnfdjavi2f2j49dxd51dayxydl";
+      name = "kmousetool-15.12.1.tar.xz";
     };
   };
   kmouth = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmouth-15.12.0.tar.xz";
-      sha256 = "1hxy6hk40s4kasv5qwhjhsq5k6lf2cfvvkwmh46rc3z7g6q02i10";
-      name = "kmouth-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmouth-15.12.1.tar.xz";
+      sha256 = "0hfkmj3gd71fjp3fvqyv2ds42rlrgyzd1g0scrjpaql9d28g5q7f";
+      name = "kmouth-15.12.1.tar.xz";
     };
   };
   kmplot = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kmplot-15.12.0.tar.xz";
-      sha256 = "0fs5zvpfb8plpijsibqygcqhwxx9h2aqjkcfha7lpi6wscb33j21";
-      name = "kmplot-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kmplot-15.12.1.tar.xz";
+      sha256 = "1bniv6aahgmdh4kqkcvhi34jpd5i6g4q9s1gyjsfi4b65lhvb908";
+      name = "kmplot-15.12.1.tar.xz";
     };
   };
   knavalbattle = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/knavalbattle-15.12.0.tar.xz";
-      sha256 = "18idqx5nrfp3fwb1xjk1l4pf5wak1pmym87xvnwg4xbiv26gv6v9";
-      name = "knavalbattle-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/knavalbattle-15.12.1.tar.xz";
+      sha256 = "1ky6wx26l1dk244py2j59rh1yyyhdv00kv698i44w71g21g0zg2h";
+      name = "knavalbattle-15.12.1.tar.xz";
     };
   };
   knetwalk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/knetwalk-15.12.0.tar.xz";
-      sha256 = "1h7bqh83ykjhmv6xfn2wkq6ki7p1zpf7q18rypbchlkl8qm2q992";
-      name = "knetwalk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/knetwalk-15.12.1.tar.xz";
+      sha256 = "0zxq3rcs62q2q393b5nrf9496h0ahja7rwydgqmim0gywfnq1xk6";
+      name = "knetwalk-15.12.1.tar.xz";
     };
   };
   kolf = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kolf-15.12.0.tar.xz";
-      sha256 = "0xbxvd1zwsqxsdnidizp83fydz42700bh9zp8wr4kymf6rjr43g4";
-      name = "kolf-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kolf-15.12.1.tar.xz";
+      sha256 = "182196bjz721vxll4d1j6kflrpqnzrx2ws369p2wm7sy72md5d9s";
+      name = "kolf-15.12.1.tar.xz";
     };
   };
   kollision = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kollision-15.12.0.tar.xz";
-      sha256 = "1d4msxppm4f01dmi5lmivx7rzn070clg1gcxknf05i2kdkrfsal0";
-      name = "kollision-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kollision-15.12.1.tar.xz";
+      sha256 = "09cf6dkq499wlafdlzvgkvs4vbkz4pws1q2x1w8ayl0qg4d85a5g";
+      name = "kollision-15.12.1.tar.xz";
     };
   };
   kolourpaint = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kolourpaint-15.12.0.tar.xz";
-      sha256 = "0931r80xdwxbqja59qrr9rsmkksyr2dimak2b757klsbnmpyb9kv";
-      name = "kolourpaint-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kolourpaint-15.12.1.tar.xz";
+      sha256 = "1dnzgyd61n09ia4nvzdc94z2w82akv386kqvla85yrjyr11jcr2j";
+      name = "kolourpaint-15.12.1.tar.xz";
     };
   };
   kompare = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kompare-15.12.0.tar.xz";
-      sha256 = "1cvigjqzzf7jinw69nxhx7n87wv6wf1rchfb0mcq86bhjfc8f5fi";
-      name = "kompare-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kompare-15.12.1.tar.xz";
+      sha256 = "00mibqn1ca09z3i12ic7vkpdr48sh6ry302jmlcbbmx9pfwlnvdv";
+      name = "kompare-15.12.1.tar.xz";
     };
   };
   konquest = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/konquest-15.12.0.tar.xz";
-      sha256 = "1c87d6xjp2dz1s0r6pa7vcn5waw2m21i5z7r3mlcaj0gk4s8wmgj";
-      name = "konquest-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/konquest-15.12.1.tar.xz";
+      sha256 = "1lhfv8l2yn49bdbkh41pjdjin7g1xgy6qh5hcixvh5sizhnax3yd";
+      name = "konquest-15.12.1.tar.xz";
     };
   };
   konsole = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/konsole-15.12.0.tar.xz";
-      sha256 = "1mabhr3pm59558592gjkp6h1hsrna582lixy6rranrzh6mk9rswh";
-      name = "konsole-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/konsole-15.12.1.tar.xz";
+      sha256 = "0vpaq3081y8x0sybnnkhq6sz6gdpsl73yvzpgnbmshxr34xnn26z";
+      name = "konsole-15.12.1.tar.xz";
     };
   };
   kontactinterface = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kontactinterface-15.12.0.tar.xz";
-      sha256 = "0n934mrm8kn1b8kqf51xv9ax0b7jfi9729rvnjr0mblpj506bnzq";
-      name = "kontactinterface-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kontactinterface-15.12.1.tar.xz";
+      sha256 = "1j95qcfiwbij7l2fwls4wmpsad2mzsrzg82cdfy6wddgl86v1i1n";
+      name = "kontactinterface-15.12.1.tar.xz";
     };
   };
   kopete = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kopete-15.12.0.tar.xz";
-      sha256 = "0c3cydhaa20mcz2g8d3gcsrclfzsfwd6cqajsvh7ns5xjvkkw4g0";
-      name = "kopete-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kopete-15.12.1.tar.xz";
+      sha256 = "0cv22hx0xk2yfwbqh7dqhpdsifb63gyjng2k4zbjjgiixhyg82z8";
+      name = "kopete-15.12.1.tar.xz";
     };
   };
   kpat = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kpat-15.12.0.tar.xz";
-      sha256 = "0nqv8pmarj0lf50f6szn20j05i2c238hk2nvslbazsqjyqcadm5s";
-      name = "kpat-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kpat-15.12.1.tar.xz";
+      sha256 = "1qjrs2sblwkhb9avrjsximfshabpc0gqznhq6lwwm41i8kql261m";
+      name = "kpat-15.12.1.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kpimtextedit-15.12.0.tar.xz";
-      sha256 = "1gvnnfkwj3qayb500xhja1x467j3qrj9bgcjvkdrwbgg3s82pias";
-      name = "kpimtextedit-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kpimtextedit-15.12.1.tar.xz";
+      sha256 = "1qgr5bcqmlqngi1g2ylxik80pixa5nijj2ii8qvjh7wkbd7m549y";
+      name = "kpimtextedit-15.12.1.tar.xz";
     };
   };
   kppp = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kppp-15.12.0.tar.xz";
-      sha256 = "07x1603sfgxjd51dwrdwd1gwwypklbzib9wxi8r6d24f1mgiv9c1";
-      name = "kppp-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kppp-15.12.1.tar.xz";
+      sha256 = "0v03mp295h184dhx0kps7r1aygmbdyxr7yz2ab8m259pzb6mfv5l";
+      name = "kppp-15.12.1.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kqtquickcharts-15.12.0.tar.xz";
-      sha256 = "1rp1kg8mm5p9h4h8n9js5l0xvvhiqbca2hbaywckr1ckwwiy16is";
-      name = "kqtquickcharts-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kqtquickcharts-15.12.1.tar.xz";
+      sha256 = "1vwx3qb8hrwn4r89a9kb8ycvgv43d94zhfi46l0a5msl94k2kigr";
+      name = "kqtquickcharts-15.12.1.tar.xz";
     };
   };
   krdc = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/krdc-15.12.0.tar.xz";
-      sha256 = "00q8lddqabbkb5lscsxq7sqny07zi1l449vhrahjxygqjivzrif8";
-      name = "krdc-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/krdc-15.12.1.tar.xz";
+      sha256 = "1vhxl6h4xjqvckl2zxhfcb633wllj1xx5dv4lwpvpqk2zpihkrli";
+      name = "krdc-15.12.1.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kremotecontrol-15.12.0.tar.xz";
-      sha256 = "1vlzrc9p4icw4rniwhnjqw75h7r43n70rbbjmlir2py7cxybgmip";
-      name = "kremotecontrol-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kremotecontrol-15.12.1.tar.xz";
+      sha256 = "0v59y8ilgyyjl327qf25d21z0gr7ii2p9wd985xj9lcdx2gax811";
+      name = "kremotecontrol-15.12.1.tar.xz";
     };
   };
   kreversi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kreversi-15.12.0.tar.xz";
-      sha256 = "09zbbvpllx4q2q1x0c5m1924a7vf8m0x55qb670fnx9cgybygvdm";
-      name = "kreversi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kreversi-15.12.1.tar.xz";
+      sha256 = "1hlh2ddxg1kcg9pmd0pmw8kwnnvv7jy45sq8dhw1wnfmqxyni5m9";
+      name = "kreversi-15.12.1.tar.xz";
     };
   };
   krfb = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/krfb-15.12.0.tar.xz";
-      sha256 = "1zi84gzy7k7rvn9z5anphgqjnv19sb4kls2gw483isc6dp5xlrm7";
-      name = "krfb-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/krfb-15.12.1.tar.xz";
+      sha256 = "1dw7jwny6qqffykdkv1ic0xb4qbn5kymxv3rpy9g0gzwgyphgg3c";
+      name = "krfb-15.12.1.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kross-interpreters-15.12.0.tar.xz";
-      sha256 = "0ycs9agc872l1kcbcbhibyyv8xznww8qazh5z2db1w3c0380g4hv";
-      name = "kross-interpreters-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kross-interpreters-15.12.1.tar.xz";
+      sha256 = "1lwxk5p5mb4760bwi5b10yqdrbr7vw1g4xq9g8krd9k3nz5gkkqg";
+      name = "kross-interpreters-15.12.1.tar.xz";
     };
   };
   kruler = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kruler-15.12.0.tar.xz";
-      sha256 = "1gzbsl6xw5x5kcf52gal8f07rxz2xilr541j14isp5qnl1qlym6p";
-      name = "kruler-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kruler-15.12.1.tar.xz";
+      sha256 = "0y7cli4k0hhdrsw1c0mldlrw9nh7smsayik108na5wyd10ps2yyl";
+      name = "kruler-15.12.1.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksaneplugin-15.12.0.tar.xz";
-      sha256 = "1zwdxa91j6yh5607aawg1jcn02fnp17ydf2q0fzq5211b0ly6hvf";
-      name = "ksaneplugin-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksaneplugin-15.12.1.tar.xz";
+      sha256 = "1fs19rs6kkh2vq5kg1i2n1650349qanw03v6wziqnar4ay243grp";
+      name = "ksaneplugin-15.12.1.tar.xz";
     };
   };
   kscd = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kscd-15.12.0.tar.xz";
-      sha256 = "1x0pw2cbkm4x9phb0j4ac9kc5w6ikvhz2a4bf5p1asidpcd0vfw0";
-      name = "kscd-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kscd-15.12.1.tar.xz";
+      sha256 = "16hzmxgc73p0n154clnyqz5hc3xliqcra37hrsbx2g0mkbm15p8g";
+      name = "kscd-15.12.1.tar.xz";
     };
   };
   kshisen = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kshisen-15.12.0.tar.xz";
-      sha256 = "1azqrg8268557wa7y4l4z667pvgk40nzn9cq5h7i2s6spqbirj1a";
-      name = "kshisen-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kshisen-15.12.1.tar.xz";
+      sha256 = "1kkzpf4dvlfaqs6f5rxabjn0n95nqxadfw1rp6aqxj0v2qb60pcp";
+      name = "kshisen-15.12.1.tar.xz";
     };
   };
   ksirk = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksirk-15.12.0.tar.xz";
-      sha256 = "04pyppz7pnj8ivlv2aqdjawcjlgbra7zxdsmbb1f7x1il0hdwwhy";
-      name = "ksirk-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksirk-15.12.1.tar.xz";
+      sha256 = "1hfq7c77y9wia4534j4cwai3xj4xn4nny9mxx6jwj9hfw6yh3lj6";
+      name = "ksirk-15.12.1.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksnakeduel-15.12.0.tar.xz";
-      sha256 = "1pmk7v8djcq3jkw77g074xi5j7sds6nn0y87vxl7fpldn7xj1msh";
-      name = "ksnakeduel-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksnakeduel-15.12.1.tar.xz";
+      sha256 = "0mdfv4slh2nj50jc27p2hslqxzghyv0mvx270wk2b1n53zg079q9";
+      name = "ksnakeduel-15.12.1.tar.xz";
     };
   };
   kspaceduel = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kspaceduel-15.12.0.tar.xz";
-      sha256 = "14z3wgzjdc28a4rkv99r9m4am9qprnf3m8sgdgjcvq478308z2qc";
-      name = "kspaceduel-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kspaceduel-15.12.1.tar.xz";
+      sha256 = "0wi6zcmgihw42w4hxrcwc5bq3cksgc71m4a53hqs9j3pq1lz1ykr";
+      name = "kspaceduel-15.12.1.tar.xz";
     };
   };
   ksquares = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksquares-15.12.0.tar.xz";
-      sha256 = "1w5z1j99gjizzd3zdym9q6frjfybyk4zjhvv8r788562j3qm1iiz";
-      name = "ksquares-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksquares-15.12.1.tar.xz";
+      sha256 = "0cmls8lpm271m55wflg1cbj88nvqzfawqn27nxfrg313j7n3a04b";
+      name = "ksquares-15.12.1.tar.xz";
     };
   };
   kstars = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kstars-15.12.0.tar.xz";
-      sha256 = "1qf0ir0s3bw7dxv74w88y4165s87ah8hi1ivwi4391wm1qkijm00";
-      name = "kstars-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kstars-15.12.1.tar.xz";
+      sha256 = "1jfha7s54rcs76kzw2v445k4s0qnkfdfipbylhkd0jd50a5j7wvl";
+      name = "kstars-15.12.1.tar.xz";
     };
   };
   ksudoku = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksudoku-15.12.0.tar.xz";
-      sha256 = "14m8alqgyc8lc4jmca3lfgw4lhigj7xy7ibyilc7d5ql9fwl8aqm";
-      name = "ksudoku-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksudoku-15.12.1.tar.xz";
+      sha256 = "0pm0a3b59wv30pkl50mcaqn37pmq4yjyviy2l62gbvb229sw9cl2";
+      name = "ksudoku-15.12.1.tar.xz";
     };
   };
   ksystemlog = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ksystemlog-15.12.0.tar.xz";
-      sha256 = "1gqarafcn6j0ingkdn5mnwcv3y7rw6i564dmwjsncn3jsk4217v2";
-      name = "ksystemlog-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ksystemlog-15.12.1.tar.xz";
+      sha256 = "0k3bwjmxs0xzxdvmq6s5sm1x84bfglf347f5bxdcfjmv95vp9bq6";
+      name = "ksystemlog-15.12.1.tar.xz";
     };
   };
   kteatime = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kteatime-15.12.0.tar.xz";
-      sha256 = "089gpi9gd0gk5pmikziz8jgzjvm2n60bmiyv13w955dsldqr04bv";
-      name = "kteatime-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kteatime-15.12.1.tar.xz";
+      sha256 = "12fjqq5n6305203b05q1lkwq7a56jynlkwykjai0yfjg2phxwa1c";
+      name = "kteatime-15.12.1.tar.xz";
     };
   };
   ktimer = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktimer-15.12.0.tar.xz";
-      sha256 = "1zjv9nqx8ij66r2ig7ran9wzlffiw13kyjili4mxyvlg1gq2piwc";
-      name = "ktimer-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktimer-15.12.1.tar.xz";
+      sha256 = "0nwjyd7z6gz45291w50qa356nlbva6mc4qa53z8jl8nqn6c74iwn";
+      name = "ktimer-15.12.1.tar.xz";
     };
   };
   ktnef = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktnef-15.12.0.tar.xz";
-      sha256 = "15qyvyqww4fhhwb6ms0wakvs7lxi7pgljyjw9vxc73ppmn3i69ps";
-      name = "ktnef-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktnef-15.12.1.tar.xz";
+      sha256 = "178r4ql1jyfk40l6s3jwabqvx5i25fzq3kv83csvd7p3y2299xbh";
+      name = "ktnef-15.12.1.tar.xz";
     };
   };
   ktouch = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktouch-15.12.0.tar.xz";
-      sha256 = "1yh9jdl45vq99ra9lp759c6gh4zs8s9nnb58f3kbhhqn8sphw4qx";
-      name = "ktouch-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktouch-15.12.1.tar.xz";
+      sha256 = "1d7nkq060h5wvjxrgsqdjhmilgaaakk48a6qnx4yv5bc0gpd47rl";
+      name = "ktouch-15.12.1.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-accounts-kcm-15.12.0.tar.xz";
-      sha256 = "1az0048wzq1kx2c4si4k2470mpskcan904l4biqflqsdy2zfg7rj";
-      name = "ktp-accounts-kcm-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-accounts-kcm-15.12.1.tar.xz";
+      sha256 = "1nfk33cxl278p4a3f3hiwxn25crvc0bvggfsmmkqd5m1iq1y2vid";
+      name = "ktp-accounts-kcm-15.12.1.tar.xz";
     };
   };
   ktp-approver = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-approver-15.12.0.tar.xz";
-      sha256 = "0gcyvkrpj91hvyzvgk4anj51xni6xzp9vb6cb6afp2g72nvhzqsm";
-      name = "ktp-approver-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-approver-15.12.1.tar.xz";
+      sha256 = "10h40f8hhxv5a50yby728znfsl8w3jhy4cpp3a15bl21y0javb8p";
+      name = "ktp-approver-15.12.1.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-auth-handler-15.12.0.tar.xz";
-      sha256 = "00ipr6936j0iwdy9c6r1x57was9f7g17sh5r5nb1fgdk0rfvnpm4";
-      name = "ktp-auth-handler-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-auth-handler-15.12.1.tar.xz";
+      sha256 = "00r0r46vqd4y89djmkdibb566i23nkd0viz7rfp46s35mlwlfylf";
+      name = "ktp-auth-handler-15.12.1.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-common-internals-15.12.0.tar.xz";
-      sha256 = "11ad84y8x4nac9f5bqzwhmwjigdx69z2zfiwfjzxv6fjkf02gz2m";
-      name = "ktp-common-internals-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-common-internals-15.12.1.tar.xz";
+      sha256 = "0bswmvzr78amwpcrmsvpr49854rcq6c9d1g475bgwwi9h2qjajqg";
+      name = "ktp-common-internals-15.12.1.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-contact-list-15.12.0.tar.xz";
-      sha256 = "0l1k1spnsf8s3h6ivamihl3bfwhy5y4f0jv44nr2qlk370ip404c";
-      name = "ktp-contact-list-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-contact-list-15.12.1.tar.xz";
+      sha256 = "1awidixqp12i29bm15vr1c6lf6m5mwqs9yvfczdvhxmq1vkniwxr";
+      name = "ktp-contact-list-15.12.1.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-contact-runner-15.12.0.tar.xz";
-      sha256 = "17vkp9idmywbrxjlrmaxkhv75iv1nqfqvmgisxdi1rv224rayif3";
-      name = "ktp-contact-runner-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-contact-runner-15.12.1.tar.xz";
+      sha256 = "0b7gj3vandgqyd27rc7cdr61l7f7ph0whq9pggfxcbly7xmhyhh1";
+      name = "ktp-contact-runner-15.12.1.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-desktop-applets-15.12.0.tar.xz";
-      sha256 = "01pnr2nvlz1hg4s6w1xlxi42k1m53k0zlzzjjw0hzpjyjvvqybpw";
-      name = "ktp-desktop-applets-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-desktop-applets-15.12.1.tar.xz";
+      sha256 = "0h6zw79canpwlnngkn9w7qnz4jch0ksqvn2vw4vfqgy3w91dxxkj";
+      name = "ktp-desktop-applets-15.12.1.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-filetransfer-handler-15.12.0.tar.xz";
-      sha256 = "0hq1jws3fknl0xsy4j4i72af0s700l065ikfcjlmqfkmr9kvgf3j";
-      name = "ktp-filetransfer-handler-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-filetransfer-handler-15.12.1.tar.xz";
+      sha256 = "13mzc2brzfxfpsqya35iyf76mllp7bhs6yjfcy4rhvazdf79p3dm";
+      name = "ktp-filetransfer-handler-15.12.1.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-kded-module-15.12.0.tar.xz";
-      sha256 = "0cmgcfg3aw9dqjf6x0vb040mji4wfp8fxrs89916hhh7icavcab7";
-      name = "ktp-kded-module-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-kded-module-15.12.1.tar.xz";
+      sha256 = "1bn22k1ai2bsncim1k55nm0k0k34xkxs2cvvf4f8y4za5s0hsyix";
+      name = "ktp-kded-module-15.12.1.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-send-file-15.12.0.tar.xz";
-      sha256 = "1rasdrdydv5mmq2nkgb5nflklid02pbwb2kff6dfkz45xbsjirqa";
-      name = "ktp-send-file-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-send-file-15.12.1.tar.xz";
+      sha256 = "18l6il6b70bqs9ggjah2yrmbw229k8cjr8gf1kvkckwh1rv3z343";
+      name = "ktp-send-file-15.12.1.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktp-text-ui-15.12.0.tar.xz";
-      sha256 = "1hzsgl9rcvqsadvaksiqg6cfrgds2w5pxq4s0i1swqmssxnlvnhl";
-      name = "ktp-text-ui-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktp-text-ui-15.12.1.tar.xz";
+      sha256 = "0ydk503b8gn84jk5l1v061g9zdi79mb5xjpa7lffgqzjippsb5y1";
+      name = "ktp-text-ui-15.12.1.tar.xz";
     };
   };
   ktuberling = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/ktuberling-15.12.0.tar.xz";
-      sha256 = "0sp4hbqi84b2ndavc19jnij76s8x06hz4sg8rjlbk3v86d7gsh7y";
-      name = "ktuberling-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/ktuberling-15.12.1.tar.xz";
+      sha256 = "1rxn6ih2jy36jisaxf8gxs6rnsdbgmbhv0xmczn74vlzfi35izja";
+      name = "ktuberling-15.12.1.tar.xz";
     };
   };
   kturtle = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kturtle-15.12.0.tar.xz";
-      sha256 = "04xa4rr03gr3qbb45ab1paq4jxq297xdg8gmg47mzl81i803hxcl";
-      name = "kturtle-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kturtle-15.12.1.tar.xz";
+      sha256 = "1d3vmkjww7zc0blc0i62jbay3mqgcccnkr6wxfabmcsz8cp062f4";
+      name = "kturtle-15.12.1.tar.xz";
     };
   };
   kubrick = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kubrick-15.12.0.tar.xz";
-      sha256 = "0p4y9q6f7l6hmk8ip84wbm30p1w8mk54i65gqb3qrbqyxgrw3bdp";
-      name = "kubrick-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kubrick-15.12.1.tar.xz";
+      sha256 = "1r2pwrj8hd5vb18m3ad72cfka6kjz9rab0nsk33sp2yg23zwrg2y";
+      name = "kubrick-15.12.1.tar.xz";
     };
   };
   kuser = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kuser-15.12.0.tar.xz";
-      sha256 = "1hhglba2jxy56aziyy45d0g5mn2fadn092j6qd81d91qpp41syf5";
-      name = "kuser-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kuser-15.12.1.tar.xz";
+      sha256 = "1qg67d6r2ng217r5f36qgqyyvy16bv1pv0xy3i35d1qpq6y7indy";
+      name = "kuser-15.12.1.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kwalletmanager-15.12.0.tar.xz";
-      sha256 = "1sb1dq7ngvy0mmjm2dch05d5iifw49kvvdxqz1xhycy7ld09a9nf";
-      name = "kwalletmanager-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kwalletmanager-15.12.1.tar.xz";
+      sha256 = "09801vnq6c2cq10ywg68fddwbmvly6lyaybdffw27h8cl4qkxy9f";
+      name = "kwalletmanager-15.12.1.tar.xz";
     };
   };
   kwordquiz = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/kwordquiz-15.12.0.tar.xz";
-      sha256 = "0mswx58i3zcwzf8m424vsh1rck4vmbjjsy98adyyhhj0szr356sf";
-      name = "kwordquiz-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/kwordquiz-15.12.1.tar.xz";
+      sha256 = "1brihl4a488nmi5s1yk4jy8bb1a5l5576j9vldh2ad9y5mqdq68d";
+      name = "kwordquiz-15.12.1.tar.xz";
     };
   };
   libkcddb = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkcddb-15.12.0.tar.xz";
-      sha256 = "1n40p6byankdwlm2097pnn3lx1hkxhxpr9fw4mjwc40h0185yzl7";
-      name = "libkcddb-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkcddb-15.12.1.tar.xz";
+      sha256 = "0y5jsimz71a8dilb3gwa8xa2r6bgfh3giwqbg0vl5xsnmq5q282k";
+      name = "libkcddb-15.12.1.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkcompactdisc-15.12.0.tar.xz";
-      sha256 = "1wpkhm3y499wllifqvbcgfypgkl81m0xbdbmji9drvhw59bj287h";
-      name = "libkcompactdisc-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkcompactdisc-15.12.1.tar.xz";
+      sha256 = "1cmabgzv1lliqlc0yc3y365g5rdvqpjfs8am4179h2mr1vibvx6b";
+      name = "libkcompactdisc-15.12.1.tar.xz";
     };
   };
   libkdcraw = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkdcraw-15.12.0.tar.xz";
-      sha256 = "10l3il1slpwk2djkgv5sh6mfv866mjlv7y799g2qx1kns6pkzf9k";
-      name = "libkdcraw-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkdcraw-15.12.1.tar.xz";
+      sha256 = "0gl1a5dk63jmdh7ip8b1z8179daz1hx0w0p2pqgyklaxg883r88v";
+      name = "libkdcraw-15.12.1.tar.xz";
     };
   };
   libkdeedu = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkdeedu-15.12.0.tar.xz";
-      sha256 = "07i5ibd1p0sxqhv4rc6hl88198nvnrxwhkfd36rfg44n3353gdvi";
-      name = "libkdeedu-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkdeedu-15.12.1.tar.xz";
+      sha256 = "1fp41cx2gsdax8iqx2kw790i8j718q46ss4c5zhxagshnkd3czmz";
+      name = "libkdeedu-15.12.1.tar.xz";
     };
   };
   libkdegames = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkdegames-15.12.0.tar.xz";
-      sha256 = "1x3303lpks1bh5bpj4slhlqs1b2ajrdwgsipqxvy96qpdbj00lvv";
-      name = "libkdegames-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkdegames-15.12.1.tar.xz";
+      sha256 = "003ypjiqi3mk00a6iv9d8nf6d4kq7l6nflgwf0d3sq0y4cbkix0m";
+      name = "libkdegames-15.12.1.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkeduvocdocument-15.12.0.tar.xz";
-      sha256 = "0vpa5f3wgvxw2ib5sfngnl1wj1f8z1xq4qrgxs3qhfcl5ci4mcfz";
-      name = "libkeduvocdocument-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkeduvocdocument-15.12.1.tar.xz";
+      sha256 = "0v1ssh4m59kb7b82r06fwgb0cmj9xm5yy9vcrmhs1167l1s8vr6w";
+      name = "libkeduvocdocument-15.12.1.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkexiv2-15.12.0.tar.xz";
-      sha256 = "0gmaris7jjcq8990ccahs00k9yrik077kppxjh4l41ipr3g3kwn2";
-      name = "libkexiv2-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkexiv2-15.12.1.tar.xz";
+      sha256 = "1z4z77psaiqwh62spsvqpkd21agsfjjrpaiiqdaxinsimw5pagb0";
+      name = "libkexiv2-15.12.1.tar.xz";
     };
   };
   libkface = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkface-15.12.0.tar.xz";
-      sha256 = "0zdvwzna9x9d9fdzs7nzrqsfiq6z2f11aj97xl3lhfryqcbwdfyj";
-      name = "libkface-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkface-15.12.1.tar.xz";
+      sha256 = "0x6pz72vxmrsncc0kkwdaci9i9nxkdqkdklwlg7q4wbn8kxxa8n6";
+      name = "libkface-15.12.1.tar.xz";
     };
   };
   libkgeomap = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkgeomap-15.12.0.tar.xz";
-      sha256 = "0l4pfv5a2nq4s4m8xp0s08khlvzd97pfjr6ghlx4wrcygnsqwwy7";
-      name = "libkgeomap-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkgeomap-15.12.1.tar.xz";
+      sha256 = "127flkwgkmcdkd40ccrvxmyq2nzb1jshpj79pjyhwirh9iqbw773";
+      name = "libkgeomap-15.12.1.tar.xz";
     };
   };
   libkipi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkipi-15.12.0.tar.xz";
-      sha256 = "047ga97fapnk39xcz41c4l6hdvxh4f0zjajl9ll116c20whbi8g1";
-      name = "libkipi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkipi-15.12.1.tar.xz";
+      sha256 = "0x14adzkla7cpiwbs75n87x5gb8ifcby1zkw2f2i69g6w9x8nnps";
+      name = "libkipi-15.12.1.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkmahjongg-15.12.0.tar.xz";
-      sha256 = "0dgvxc2v48j17n0b547h74w9g8v7n975szzr3bgwkxljkcw99zgc";
-      name = "libkmahjongg-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkmahjongg-15.12.1.tar.xz";
+      sha256 = "1q04c91j78hzk5x7iiwxkn2is3c5cy7wca1wmxlbqbw3q3zc5jlh";
+      name = "libkmahjongg-15.12.1.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libkomparediff2-15.12.0.tar.xz";
-      sha256 = "1spxzl7a6blyfwndissf489dixndycwigcpav5qfdav00s20vbdx";
-      name = "libkomparediff2-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libkomparediff2-15.12.1.tar.xz";
+      sha256 = "0vkndb5l5lv50id8fik6zbg0ph5mv0kmcxz6ywh2i6mh3nf5h0m2";
+      name = "libkomparediff2-15.12.1.tar.xz";
     };
   };
   libksane = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/libksane-15.12.0.tar.xz";
-      sha256 = "1262gvy61a07vgam4ws6vjy7q0d7pz9q05d24bcy0dqi6wvlsbwp";
-      name = "libksane-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/libksane-15.12.1.tar.xz";
+      sha256 = "112w0hpnq4rzp40rq68wjdkx0w2p06z1chxribgh032wh09j21by";
+      name = "libksane-15.12.1.tar.xz";
     };
   };
   lokalize = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/lokalize-15.12.0.tar.xz";
-      sha256 = "0nmqp78a2amgyiisvhqcpxjrvv1p3ssx4wg3gyqz9rw5x7yzh1v7";
-      name = "lokalize-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/lokalize-15.12.1.tar.xz";
+      sha256 = "0ldmw4rgli64dq4xllxbrgvc8wz52a5xhmbcb7m31yr7vpsav533";
+      name = "lokalize-15.12.1.tar.xz";
     };
   };
   lskat = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/lskat-15.12.0.tar.xz";
-      sha256 = "0nwbsfz6hi20rv8w1hm4lblwifmnyvdyv9icn5z8hlqf2wz0kn73";
-      name = "lskat-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/lskat-15.12.1.tar.xz";
+      sha256 = "116vfahyh65bhfp8z5ay2xj8gb7s935d3cbd4f9ppidva493lpvp";
+      name = "lskat-15.12.1.tar.xz";
     };
   };
   marble = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/marble-15.12.0.tar.xz";
-      sha256 = "01hdndic1k5f6fr75152adi0ph8q0ypxhj15yr02l7i2lcwzk9va";
-      name = "marble-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/marble-15.12.1.tar.xz";
+      sha256 = "15zybdm28a0q3nanv43y5g3xbl2gpi19fdx1smslypkz33srfwlm";
+      name = "marble-15.12.1.tar.xz";
     };
   };
   mplayerthumbs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/mplayerthumbs-15.12.0.tar.xz";
-      sha256 = "0ghqfcys8qkr7jm5g7i4753bisg6ah36f0i3bm437r27gf8jy2xk";
-      name = "mplayerthumbs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/mplayerthumbs-15.12.1.tar.xz";
+      sha256 = "16wgsg3s0a0mcn1p3ixy8xw8qci082qq415hcy4vr1ycbxzypcd0";
+      name = "mplayerthumbs-15.12.1.tar.xz";
     };
   };
   okteta = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/okteta-15.12.0.tar.xz";
-      sha256 = "01fa1ai0c6ifh8gjzhv9jrmpr43h84bj17m22g8z3aa0yci25mfq";
-      name = "okteta-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/okteta-15.12.1.tar.xz";
+      sha256 = "1fzk1qlsxw5mkvk5sbzaxs902waagf9i8rggis00c6cpgd2il75q";
+      name = "okteta-15.12.1.tar.xz";
     };
   };
   okular = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/okular-15.12.0.tar.xz";
-      sha256 = "17bbns5r43h05say0drqyc9w1lfm8vwsqrknaj16cgd2kz23rxwq";
-      name = "okular-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/okular-15.12.1.tar.xz";
+      sha256 = "17d2xhwdlqf2jcx34hh0l7gj3n3lpidv9wha8xp2vww8hibmdmn3";
+      name = "okular-15.12.1.tar.xz";
     };
   };
   palapeli = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/palapeli-15.12.0.tar.xz";
-      sha256 = "18c70brh5gw2rnl4xwxa32avcyv5nmj8q2l826ah9gbx74y0ffjw";
-      name = "palapeli-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/palapeli-15.12.1.tar.xz";
+      sha256 = "1kq06xi6d6f47chzzcknr1v1jd3pajzg7s45zc78sfwvq1lkcwpj";
+      name = "palapeli-15.12.1.tar.xz";
     };
   };
   parley = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/parley-15.12.0.tar.xz";
-      sha256 = "0sj5mgbj77p0kj1nylnrjr010nw53a0x3lqfbhxmv09bhszpfnqs";
-      name = "parley-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/parley-15.12.1.tar.xz";
+      sha256 = "1imkxanm5nzjkvgyskj3bcnn7rz7hwggspg3iyq75vmrqvmnd17y";
+      name = "parley-15.12.1.tar.xz";
     };
   };
   picmi = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/picmi-15.12.0.tar.xz";
-      sha256 = "02p2c14bis99f1ylkdclk95awx6b87n2ln555dyy2m3sf7pjdllg";
-      name = "picmi-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/picmi-15.12.1.tar.xz";
+      sha256 = "0ka8ksq2v7j313i0iki07d2rn6d0ga7qi5zmwvz0c7c0yk1ndpd0";
+      name = "picmi-15.12.1.tar.xz";
     };
   };
   poxml = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/poxml-15.12.0.tar.xz";
-      sha256 = "0l5y2a68yikwjp83c65wyb589yf6jxlj3432wcrj3zkx46l8rwd0";
-      name = "poxml-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/poxml-15.12.1.tar.xz";
+      sha256 = "08qyhw1x4lf5lgbi55cdvvlizbfjjrg2xncgnnvcc2xvs0vbsdrx";
+      name = "poxml-15.12.1.tar.xz";
     };
   };
   print-manager = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/print-manager-15.12.0.tar.xz";
-      sha256 = "09vfs3gj46asyqq1dxwil4rvd7pm0svbq4kfj76s0b4likmwn34b";
-      name = "print-manager-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/print-manager-15.12.1.tar.xz";
+      sha256 = "0n11ras6zk68zb901jwg5dkay04cl4qwplh57yvcvkaqzp7dx29h";
+      name = "print-manager-15.12.1.tar.xz";
     };
   };
   rocs = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/rocs-15.12.0.tar.xz";
-      sha256 = "1sgf2ppiwj7yn1yc08lvrd0pfrdfyaxjm1hm5c7mbz2bfz48mv6v";
-      name = "rocs-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/rocs-15.12.1.tar.xz";
+      sha256 = "1car9wdw3jrnczcws8hp15nky6fm04asqh6z64v1x46xpgqq15s8";
+      name = "rocs-15.12.1.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/signon-kwallet-extension-15.12.0.tar.xz";
-      sha256 = "17wwdxyv7w8y7v6kl23czg1ffbhx9yv5siln923zw52wvfd23gwb";
-      name = "signon-kwallet-extension-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/signon-kwallet-extension-15.12.1.tar.xz";
+      sha256 = "1s96924sahamdiw6gs42c7f6fmxacccy0x7a7vcm25jrdw2y8rny";
+      name = "signon-kwallet-extension-15.12.1.tar.xz";
     };
   };
   spectacle = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/spectacle-15.12.0.tar.xz";
-      sha256 = "0ynffi4k52g1wgdqgswdn4q48zv2z2wa9k7l34m2kqs4qlwlffrh";
-      name = "spectacle-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/spectacle-15.12.1.tar.xz";
+      sha256 = "0ikv29g85fzk4k84a3p56krsabg92na1kc3r1dvg6vmhprr5ar0y";
+      name = "spectacle-15.12.1.tar.xz";
     };
   };
   step = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/step-15.12.0.tar.xz";
-      sha256 = "050nk1kqwjl687x2fd1zslpsjibkq6qsjl61naslrp58xsvninnl";
-      name = "step-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/step-15.12.1.tar.xz";
+      sha256 = "0g85cwr4ixh254i75af0pvqs6rp9zmzifnn8757dmqb0z0l31l9r";
+      name = "step-15.12.1.tar.xz";
     };
   };
   svgpart = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/svgpart-15.12.0.tar.xz";
-      sha256 = "01lib7f7nngypxj3fz367fa4hikfh3v03405idsrqb80fm1jwwjr";
-      name = "svgpart-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/svgpart-15.12.1.tar.xz";
+      sha256 = "1l86kvgrjbhyqaldw3cdm483lc1j9lrf8rif059qnq20r35llfp0";
+      name = "svgpart-15.12.1.tar.xz";
     };
   };
   sweeper = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/sweeper-15.12.0.tar.xz";
-      sha256 = "0p5lz1zzxsvy0frjzjhn1g8z60qy8ffb69qy6gnkzm5qz2b7c0gc";
-      name = "sweeper-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/sweeper-15.12.1.tar.xz";
+      sha256 = "1ykk3msicf71p3p9y6135hdrv3szjfv9khb0bl2nzqg2i28psdad";
+      name = "sweeper-15.12.1.tar.xz";
     };
   };
   syndication = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/syndication-15.12.0.tar.xz";
-      sha256 = "1awsqsz2603iik7qajv8m19ygyyj16i5iyz24cp2dabxy5zhhn4i";
-      name = "syndication-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/syndication-15.12.1.tar.xz";
+      sha256 = "1kq97rid82dv70ii4imh6aq1bwc2i0x7yzw95g855khxbd485a1m";
+      name = "syndication-15.12.1.tar.xz";
     };
   };
   umbrello = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/umbrello-15.12.0.tar.xz";
-      sha256 = "09lkqdialqvx3qgj25gx3wqyz2qfwgy27ahmlac0zg7grjpf0gf9";
-      name = "umbrello-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/umbrello-15.12.1.tar.xz";
+      sha256 = "1qxqkqvkp19vj8zkl39cwn077sncl3wqkgv0a1a16cdxhhvfbf23";
+      name = "umbrello-15.12.1.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "15.12.0";
+    version = "15.12.1";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.0/src/zeroconf-ioslave-15.12.0.tar.xz";
-      sha256 = "1mly8j549yd1azc5g5clglypbadxngzml75wvi2irvwsvmzwshf7";
-      name = "zeroconf-ioslave-15.12.0.tar.xz";
+      url = "${mirror}/stable/applications/15.12.1/src/zeroconf-ioslave-15.12.1.tar.xz";
+      sha256 = "0q9q1vj62h3lw0451csg4sa2cgm9h5r9jxbgn8yg4xa31vx1cw03";
+      name = "zeroconf-ioslave-15.12.1.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/3dfsb/default.nix b/pkgs/applications/misc/3dfsb/default.nix
deleted file mode 100644
index fe173b21b571..000000000000
--- a/pkgs/applications/misc/3dfsb/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, makeWrapper, glibc, fetchgit, pkgconfig, SDL, SDL_image, SDL_stretch,
-  mesa, mesa_glu, freeglut, gst_all_1, gtk2, file, imagemagick }:
-
-stdenv.mkDerivation {
-  name = "3dfsb-1.0";
-
-  meta = with stdenv.lib; {
-    description = "3D File System Browser - cleaned up and improved fork of the old tdfsb which runs on GNU/Linux and should also run on BeOS/Haiku and FreeBSD";
-    homepage = "https://github.com/tomvanbraeckel/3dfsb";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ eduarrrd ];
-  };
-
-  src = fetchgit {
-    url = "git://github.com/tomvanbraeckel/3dfsb.git";
-    rev = "a69a9dfad42acbe2816328d11b58b65f4186c4c5";
-    sha256 = "191ndg4vfanjfx4qh186sszyy4pphx3l41rchins9mg8y5rm5ffp";
-  };
-
-  buildInputs = with gst_all_1; [ makeWrapper glibc pkgconfig SDL SDL_image SDL_stretch mesa_glu freeglut gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gtk2 file imagemagick ];
-
-  buildPhase = "sh ./compile.sh";
-  dontStrip = true;
-
-  installPhase = "mkdir -p $out/bin/ && cp 3dfsb $out/bin/";
-
-  preFixup = ''
-    wrapProgram $out/bin/3dfsb \
-     --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-    '';
-}
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 46b09609d0bf..62da092470ab 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,21 +1,27 @@
 { stdenv, fetchurl, python, pyqt5, sip_4_16, poppler_utils, pkgconfig, libpng
 , imagemagick, libjpeg, fontconfig, podofo, qtbase, icu, sqlite
-, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
+, makeWrapper, unrarSupport ? false, chmlib, pythonPackages, xz, libusb1, libmtp
 , xdg_utils
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.46.0";
+  version = "2.49.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0ig1pb62w57l6nhwg391mkjhw9dyicix6xigpdyw0320jdw9nlkb";
+    sha256 = "0jc476pg07c0nwccprhwgjdlvvb2fdzza9xrjqzc0c42c5v7qzxa";
   };
 
   inherit python;
 
-  patchPhase = ''
+  patches = [
+    # Patch from Debian that switches the version update change from
+    # enabled by default to disabled by default.
+    ./no_updates_dialog.patch
+  ] ++ stdenv.lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+
+  prePatch = ''
     sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':"  \
       setup/build_environment.py
   '';
@@ -53,7 +59,6 @@ stdenv.mkDerivation rec {
 
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
-                     --prefix LD_LIBRARY_PATH : ${unrar}/lib \
                      --prefix PATH : ${poppler_utils}/bin
     done
   '';
@@ -61,7 +66,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
-    license = licenses.gpl3;
+    license = with licenses; if unrarSupport then unfreeRedistributable else gpl3;
     maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ];
     platforms = platforms.linux;
     inherit version;
diff --git a/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
new file mode 100644
index 000000000000..c910be89a5f1
--- /dev/null
+++ b/pkgs/applications/misc/calibre/dont_build_unrar_plugin.patch
@@ -0,0 +1,47 @@
+Author: Dmitry Shachnev <mitya57@gmail.com>
+Description: do not build unrar extension as we strip unrar from the tarball
+Forwarded: not-needed
+Last-Update: 2013-04-04
+
+Index: calibre/setup/extensions.py
+===================================================================
+--- calibre.orig/setup/extensions.py	2014-02-02 10:42:14.510954007 +0100
++++ calibre/setup/extensions.py	2014-02-02 10:42:14.502954007 +0100
+@@ -209,24 +209,6 @@
+                 sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
+                 ),
+ 
+-    Extension('unrar',
+-              ['unrar/%s.cpp'%(x.partition('.')[0]) for x in '''
+-               rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o
+-               filefn.o filcreat.o archive.o arcread.o unicode.o system.o
+-               isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o
+-               timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o
+-               secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o
+-               volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o
+-               '''.split()] + ['calibre/utils/unrar.cpp'],
+-              inc_dirs=['unrar'],
+-              cflags=[('/' if iswindows else '-') + x for x in (
+-                  'DSILENT', 'DRARDLL', 'DUNRAR')] + (
+-                  [] if iswindows else ['-D_FILE_OFFSET_BITS=64',
+-                                        '-D_LARGEFILE_SOURCE']),
+-              optimize_level=2,
+-              libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else []
+-              ),
+-
+     ]
+ 
+ 
+Index: calibre/src/calibre/ebooks/metadata/archive.py
+===================================================================
+--- calibre.orig/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.510954007 +0100
++++ calibre/src/calibre/ebooks/metadata/archive.py	2014-02-02 10:42:14.502954007 +0100
+@@ -42,7 +42,7 @@
+     description = _('Extract common e-book formats from archives '
+         '(zip/rar) files. Also try to autodetect if they are actually '
+         'cbz/cbr files.')
+-    file_types = set(['zip', 'rar'])
++    file_types = set(['zip'])
+     supported_platforms = ['windows', 'osx', 'linux']
+     on_import = True
+ 
diff --git a/pkgs/applications/misc/calibre/no_updates_dialog.patch b/pkgs/applications/misc/calibre/no_updates_dialog.patch
new file mode 100644
index 000000000000..52364f64dac7
--- /dev/null
+++ b/pkgs/applications/misc/calibre/no_updates_dialog.patch
@@ -0,0 +1,16 @@
+# Description: Disable update check by default.
+Index: calibre/src/calibre/gui2/main.py
+===================================================================
+--- calibre.orig/src/calibre/gui2/main.py	2014-02-02 10:41:28.470954623 +0100
++++ calibre/src/calibre/gui2/main.py	2014-02-02 10:41:56.546954247 +0100
+@@ -37,8 +37,8 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True, action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 890bc2c016b0..92328ab9846c 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }:
+{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
+qtquickcontrols, qtgraphicaleffects }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -15,7 +16,7 @@ stdenv.mkDerivation rec {
     sed -i -e '/qmltermwidget/d' cool-retro-term.pro
   '';
 
-  buildInputs = [ qtbase qtquick1 qmltermwidget ];
+  buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
   nativeBuildInputs = [ makeQtWrapper ];
 
   configurePhase = "qmake PREFIX=$out";
diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix
index 1891c4f21749..ce35593d91d1 100644
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchgit, cmake, file, qtbase, qttools, qtx11extras, solid }:
 
 let
-  version = "git-2015-07-25";
+  version = "git-2016-01-10";
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   name = "dfilemanager-${version}";
   src = fetchgit {
     url = "git://git.code.sf.net/p/dfilemanager/code";
-    rev = "99afcde199378eb0d499c49a9e28846c22e27483";
-    sha256 = "1dd21xl24xvxs100j8nzhpaqfqk8srqs92al9c03jmyjlk31s6lf";
+    rev = "2c5078b05e0ad74c037366be1ab3e6a03492bde4";
+    sha256 = "1qwhnlcc2j8sr1f3v63sxs3m7q7w1xy6c2jqsnznjgm23b5h3hxd";
   };
 
-  buildInputs = [ cmake qtbase qttools qtx11extras file solid ];
+  buildInputs = [ cmake qtbase qttools file solid ];
 
   cmakeFlags = "-DQT5BUILD=true";
 
diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix
index a044eb1df920..46634e2698cf 100644
--- a/pkgs/applications/misc/ding/default.nix
+++ b/pkgs/applications/misc/ding/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
 
     sed -i "s@/usr/bin/fortune@fortune@g" ding
 
+    sed -i "s@/usr/bin/ding@$out/bin/ding@g" ding.desktop
+
     cp ding $out/bin/
     cp de-en.txt $out/share/dict/
     cp ding.1 $out/share/man/man1/
diff --git a/pkgs/applications/misc/evtest/default.nix b/pkgs/applications/misc/evtest/default.nix
index bccfd95e32bf..330970b498ba 100644
--- a/pkgs/applications/misc/evtest/default.nix
+++ b/pkgs/applications/misc/evtest/default.nix
@@ -1,11 +1,9 @@
-{ stdenv, fetchgit, autoconf, automake, pkgconfig, libxml2 }:
+{ stdenv, fetchgit, autoreconfHook, automake, pkgconfig, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "evtest-1.32";
 
-  preConfigure = "autoreconf -iv";
-
-  buildInputs = [ autoconf automake pkgconfig libxml2 ];
+  buildInputs = [ autoreconfHook pkgconfig libxml2 ];
 
   src = fetchgit {
     url = "git://anongit.freedesktop.org/evtest";
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix
index dead3b83dcf8..04d3b7874b44 100644
--- a/pkgs/applications/misc/gpsprune/default.nix
+++ b/pkgs/applications/misc/gpsprune/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "gpsprune-${version}";
@@ -13,6 +13,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ jre8 ];
 
+  desktopItem = makeDesktopItem {
+    name = "gpsprune";
+    exec = "gpsprune";
+    icon = "gpsprune";
+    desktopName = "GpsPrune";
+    genericName = "GPS Data Editor";
+    comment = meta.description;
+    categories = "Education;Geoscience;";
+  };
+
   installPhase = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/gpsprune.jar
@@ -21,6 +31,11 @@ stdenv.mkDerivation rec {
     exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@"
     EOF
     chmod 755 $out/bin/gpsprune
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/pixmaps/gpsprune.png
   '';
 
   meta = with stdenv.lib; {
@@ -28,5 +43,6 @@ stdenv.mkDerivation rec {
     homepage = http://activityworkshop.net/software/gpsprune/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
new file mode 100644
index 000000000000..1736581a30f1
--- /dev/null
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, fftwFloat, qt5 }:
+
+stdenv.mkDerivation rec {
+  name = "inspectrum-${version}";
+  version = "20160103";
+
+  src = fetchFromGitHub {
+    owner = "miek";
+    repo = "inspectrum";
+    rev = "a60d711b46130d37b7c05074285558cd67a28820";
+    sha256 = "1q7izpyi7c9qszygiaq0zs3swihxlss3n52q7wx2jq97hdi2hmzy";
+  };
+
+  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat ];
+  
+  meta = with stdenv.lib; {
+    description = "Tool for analysing captured signals from sdr receivers";
+    homepage = https://github.com/miek/inspectrum;
+    maintainers = with maintainers; [ mog ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/applications/misc/jekyll/Gemfile b/pkgs/applications/misc/jekyll/Gemfile
index 0a5688503cac..060f7e6a1ff0 100644
--- a/pkgs/applications/misc/jekyll/Gemfile
+++ b/pkgs/applications/misc/jekyll/Gemfile
@@ -1,5 +1,4 @@
-source "https://rubygems.org"
-
+source 'https://rubygems.org'
 gem 'jekyll'
 gem 'rdiscount'
 gem 'RedCloth'
diff --git a/pkgs/applications/misc/jekyll/Gemfile.lock b/pkgs/applications/misc/jekyll/Gemfile.lock
index ec81bc703c68..7bd270732dab 100644
--- a/pkgs/applications/misc/jekyll/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/Gemfile.lock
@@ -2,68 +2,34 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    blankslate (2.1.2.4)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    classifier-reborn (2.0.3)
-      fast-stemmer (~> 1.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
     colorator (0.1)
-    execjs (2.5.2)
-    fast-stemmer (1.0.2)
-    ffi (1.9.8)
-    hitimes (1.2.2)
-    jekyll (2.5.3)
-      classifier-reborn (~> 2.0)
+    ffi (1.9.10)
+    jekyll (3.0.1)
       colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
       jekyll-sass-converter (~> 1.0)
       jekyll-watch (~> 1.1)
       kramdown (~> 1.3)
-      liquid (~> 2.6.1)
+      liquid (~> 3.0)
       mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
+      rouge (~> 1.7)
       safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.2.1)
-    jekyll-paginate (1.1.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
-    jekyll-watch (1.2.1)
-      listen (~> 2.7)
-    kramdown (1.7.0)
-    liquid (2.6.2)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    jekyll-sass-converter (1.4.0)
+      sass (~> 3.4)
+    jekyll-watch (1.3.0)
+      listen (~> 3.0)
+    kramdown (1.9.0)
+    liquid (3.0.6)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     mercenary (0.3.5)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.11)
-    pygments.rb (0.6.3)
-      posix-spawn (~> 0.3.6)
-      yajl-ruby (~> 1.2.0)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdiscount (2.1.8)
-    redcarpet (3.2.3)
+    rouge (1.10.1)
     safe_yaml (1.0.4)
-    sass (3.4.13)
-    timers (4.0.1)
-      hitimes
-    toml (0.1.2)
-      parslet (~> 1.5.0)
-    yajl-ruby (1.2.1)
+    sass (3.4.20)
 
 PLATFORMS
   ruby
diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix
index 5e9505e9f320..e9536055ca3b 100644
--- a/pkgs/applications/misc/jekyll/default.nix
+++ b/pkgs/applications/misc/jekyll/default.nix
@@ -1,15 +1,14 @@
-{ stdenv, lib, bundlerEnv, ruby_2_1, curl }:
+{ stdenv, lib, bundlerEnv, ruby_2_2, curl }:
 
-bundlerEnv {
-  name = "jekyll-2.5.3";
+bundlerEnv rec {
+  name = "jekyll-${version}";
+  version = "3.0.1";
 
-  ruby = ruby_2_1;
+  ruby = ruby_2_2;
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
 
-  buildInputs = [ curl ];
-
   meta = with lib; {
     description = "Simple, blog aware, static site generator";
     homepage    =  http://jekyllrb.com/;
diff --git a/pkgs/applications/misc/jekyll/gemset.nix b/pkgs/applications/misc/jekyll/gemset.nix
index f6ad34fcad98..6d45aef5e545 100644
--- a/pkgs/applications/misc/jekyll/gemset.nix
+++ b/pkgs/applications/misc/jekyll/gemset.nix
@@ -6,51 +6,6 @@
       sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
     };
   };
-  "blankslate" = {
-    version = "2.1.2.4";
-    source = {
-      type = "gem";
-      sha256 = "0jnnq5q5dwy2rbfcl769vd9bk1yn0242f6yjlb9mnqdm9627cdcx";
-    };
-  };
-  "celluloid" = {
-    version = "0.16.0";
-    source = {
-      type = "gem";
-      sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
-    };
-    dependencies = [
-      "timers"
-    ];
-  };
-  "classifier-reborn" = {
-    version = "2.0.3";
-    source = {
-      type = "gem";
-      sha256 = "0vca8jl7nbgzyb7zlvnq9cqgabwjdl59jqlpfkwzv6znkri7cpby";
-    };
-    dependencies = [
-      "fast-stemmer"
-    ];
-  };
-  "coffee-script" = {
-    version = "2.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
-    };
-    dependencies = [
-      "coffee-script-source"
-      "execjs"
-    ];
-  };
-  "coffee-script-source" = {
-    version = "1.9.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5";
-    };
-  };
   "colorator" = {
     version = "0.1";
     source = {
@@ -58,123 +13,71 @@
       sha256 = "09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs";
     };
   };
-  "execjs" = {
-    version = "2.5.2";
-    source = {
-      type = "gem";
-      sha256 = "0y2193yhcyz9f97m7g3wanvwzdjb08sllrj1g84sgn848j12vyl0";
-    };
-  };
-  "fast-stemmer" = {
-    version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh";
-    };
-  };
   "ffi" = {
-    version = "1.9.8";
-    source = {
-      type = "gem";
-      sha256 = "0ph098bv92rn5wl6rn2hwb4ng24v4187sz8pa0bpi9jfh50im879";
-    };
-  };
-  "hitimes" = {
-    version = "1.2.2";
+    version = "1.9.10";
     source = {
       type = "gem";
-      sha256 = "17y3ggqxl3m6x9gqpgdn39z0pxpmw666d40r39bs7ngdmy680jn4";
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
     };
   };
   "jekyll" = {
-    version = "2.5.3";
+    version = "3.0.1";
     source = {
       type = "gem";
-      sha256 = "1ad3d62yd5rxkvn3xls3xmr2wnk8fiickjy27g098hs842wmw22n";
+      sha256 = "107svn6r7pvkg9wwfi4r44d2rqppysjf9zf09h7z1ajsy8k2s65a";
     };
     dependencies = [
-      "classifier-reborn"
       "colorator"
-      "jekyll-coffeescript"
-      "jekyll-gist"
-      "jekyll-paginate"
       "jekyll-sass-converter"
       "jekyll-watch"
       "kramdown"
       "liquid"
       "mercenary"
-      "pygments.rb"
-      "redcarpet"
+      "rouge"
       "safe_yaml"
-      "toml"
-    ];
-  };
-  "jekyll-coffeescript" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "19nkqbaxqbzqbfbi7sgshshj2krp9ap88m9fc5pa6mglb2ypk3hg";
-    };
-    dependencies = [
-      "coffee-script"
     ];
   };
-  "jekyll-gist" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "10hywgdwqafa21nwa5br54wvp4wsr3wnx64v8d81glj5cs17f9bv";
-    };
-  };
-  "jekyll-paginate" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8";
-    };
-  };
   "jekyll-sass-converter" = {
-    version = "1.3.0";
+    version = "1.4.0";
     source = {
       type = "gem";
-      sha256 = "1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1";
+      sha256 = "095757w0pg6qh3wlfg1j1mw4fsz7s89ia4zai5f2rhx9yxsvk1d8";
     };
     dependencies = [
       "sass"
     ];
   };
   "jekyll-watch" = {
-    version = "1.2.1";
+    version = "1.3.0";
     source = {
       type = "gem";
-      sha256 = "0p9mc8m4bggsqlq567g1g67z5fvzlm7yyv4l8717l46nq0d52gja";
+      sha256 = "1mqwvrd2hm6ah5zsxqsv2xdp31wl94pl8ybb1q324j79z8pvyarg";
     };
     dependencies = [
       "listen"
     ];
   };
   "kramdown" = {
-    version = "1.7.0";
+    version = "1.9.0";
     source = {
       type = "gem";
-      sha256 = "070r81kz88zw28c8bs5p0p92ymn1nldci2fm1arkas0bnqrd3rna";
+      sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0";
     };
   };
   "liquid" = {
-    version = "2.6.2";
+    version = "3.0.6";
     source = {
       type = "gem";
-      sha256 = "1k7lx7szwnz7vv3hqpdb6bgw8p73sa1ss9m1m5h0jaqb9xkqnfzb";
+      sha256 = "033png37ym4jrjz5bi7zb4ic4yxacwvnllm1xxmrnr4swgyyygc2";
     };
   };
   "listen" = {
-    version = "2.10.0";
+    version = "3.0.5";
     source = {
       type = "gem";
-      sha256 = "131pgi5bsqln2kfkp72wpi0dfz5i124758xcl1h3c5gz75j0vg2i";
+      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
     };
     dependencies = [
-      "celluloid"
       "rb-fsevent"
       "rb-inotify"
     ];
@@ -186,39 +89,11 @@
       sha256 = "0ls7z086v4xl02g4ia5jhl9s76d22crgmplpmj0c383liwbqi9pb";
     };
   };
-  "parslet" = {
-    version = "1.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0qp1m8n3m6k6g22nn1ivcfkvccq5jmbkw53vvcjw5xssq179l9z3";
-    };
-    dependencies = [
-      "blankslate"
-    ];
-  };
-  "posix-spawn" = {
-    version = "0.3.11";
-    source = {
-      type = "gem";
-      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
-    };
-  };
-  "pygments.rb" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "160i761q2z8kandcikf2r5318glgi3pf6b45wa407wacjvz2966i";
-    };
-    dependencies = [
-      "posix-spawn"
-      "yajl-ruby"
-    ];
-  };
   "rb-fsevent" = {
-    version = "0.9.4";
+    version = "0.9.7";
     source = {
       type = "gem";
-      sha256 = "12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7";
+      sha256 = "1xlkflgxngwkd4nyybccgd1japrba4v3kwnp00alikj404clqx4v";
     };
   };
   "rb-inotify" = {
@@ -238,11 +113,11 @@
       sha256 = "0vcyy90r6wfg0b0y5wqp3d25bdyqjbwjhkm1xy9jkz9a7j72n70v";
     };
   };
-  "redcarpet" = {
-    version = "3.2.3";
+  "rouge" = {
+    version = "1.10.1";
     source = {
       type = "gem";
-      sha256 = "0l6zr8wlqb648z202kzi7l9p89b6v4ivdhif5w803l1rrwyzvj0m";
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
     };
   };
   "safe_yaml" = {
@@ -253,37 +128,10 @@
     };
   };
   "sass" = {
-    version = "3.4.13";
-    source = {
-      type = "gem";
-      sha256 = "0wxkjm41xr77pnfi06cbwv6vq0ypbni03jpbpskd7rj5b0zr27ig";
-    };
-  };
-  "timers" = {
-    version = "4.0.1";
-    source = {
-      type = "gem";
-      sha256 = "03ahv07wn1f2g3c5843q7sf03a81518lq5624s9f49kbrswa2p7l";
-    };
-    dependencies = [
-      "hitimes"
-    ];
-  };
-  "toml" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1wnvi1g8id1sg6776fvzf98lhfbscchgiy1fp5pvd58a8ds2fq9v";
-    };
-    dependencies = [
-      "parslet"
-    ];
-  };
-  "yajl-ruby" = {
-    version = "1.2.1";
+    version = "3.4.20";
     source = {
       type = "gem";
-      sha256 = "0zvvb7i1bl98k3zkdrnx9vasq0rp2cyy5n7p9804dqs4fz9xh9vf";
+      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 275cc8ff2adb..9bd7bbb4385c 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -1,18 +1,28 @@
-{ fetchurl, stdenv, bash, jre8 }:
+{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }:
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "9060";
+  version = "9329";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0c1q0bs3x1j9wzmb52xnppdyvni4li5khbfja7axn2ml09hqa0j2";
+    sha256 = "084a3pizmz09abn2n7brhx6757bq9k3xq3jy8ip2ifbl2hcrw7pq";
   };
 
   phases = [ "installPhase" ];
 
   buildInputs = [ jre8 ];
 
+  desktopItem = makeDesktopItem {
+    name = "josm";
+    exec = "josm";
+    icon = "josm";
+    desktopName = "JOSM";
+    genericName = "OpenStreetMap Editor";
+    comment = meta.description;
+    categories = "Education;Geoscience;Maps;";
+  };
+
   installPhase = ''
     mkdir -p $out/bin $out/share/java
     cp -v $src $out/share/java/josm.jar
@@ -21,6 +31,11 @@ stdenv.mkDerivation rec {
     exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@"
     EOF
     chmod 755 $out/bin/josm
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png
   '';
 
   meta = with stdenv.lib; {
@@ -28,5 +43,6 @@ stdenv.mkDerivation rec {
     homepage = https://josm.openstreetmap.de/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
index 5e72b02045c7..aa184cbe1a48 100644
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@@ -12,7 +12,12 @@ stdenv.mkDerivation rec {
   };
 
   meta = with stdenv.lib; {
-    description = "a plugin for KTextEditor (Kate, KDevelop, among others) that provides basic code completion for the Go programming language. Uses gocode as completion provider";
+    description = "Go code completion for Kate, KDevelop and others";
+    longDescription = ''
+      A plugin for KTextEditor (Kate, KDevelop, among others) that provides
+      basic code completion for the Go programming language.
+      Uses gocode as completion provider.
+    '';
     homepage    = https://bitbucket.org/lucashnegri/kgocode/overview;
     maintainers = with maintainers; [ qknight ];
     license = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 9bed20c0c736..687584de553d 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.80";
+  version = "0.7.81";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10";
+    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index b45bee56de04..50454308fd20 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.80";
+  version = "0.7.81";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "12iwiw4vcmyi8l04j540kbqifmr1wnlfw5cway185iqia43s6c10";
+    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index d9ce635f80bb..056edd801c07 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, makeWrapper, autoconf, automake, boost, file, gettext
+{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file
 , glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool
 , libctemplate, libglade
 , libiodbc
-, libgnome, libsigcxx, libtool, libuuid, libxml2, libzip, lua, mesa, mysql
+, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql
 , pango, paramiko, pcre, pexpect, pkgconfig, pycrypto, python, sqlite, sudo
 }:
 
@@ -16,18 +16,14 @@ stdenv.mkDerivation rec {
     sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6";
   };
 
-  buildInputs = [ autoconf automake boost file gettext glib glibc libgnome_keyring gtk gtkmm intltool
-    libctemplate libglade libgnome libiodbc libsigcxx libtool libuuid libxml2 libzip lua makeWrapper mesa
+  buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool
+    libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa
     mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
   preConfigure = ''
     substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv"
   '';
 
-  postConfigure = ''
-    autoreconf -fi
-  '';
-
   postInstall = ''
     patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh
 
diff --git a/pkgs/applications/misc/pt/.bundle/config b/pkgs/applications/misc/pt/.bundle/config
new file mode 100644
index 000000000000..88cb2d529351
--- /dev/null
+++ b/pkgs/applications/misc/pt/.bundle/config
@@ -0,0 +1,2 @@
+---
+BUNDLE_NO_INSTALL: true
diff --git a/pkgs/applications/misc/pt/Gemfile b/pkgs/applications/misc/pt/Gemfile
new file mode 100644
index 000000000000..ed2136ea5b85
--- /dev/null
+++ b/pkgs/applications/misc/pt/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'pt'
diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/applications/misc/pt/Gemfile.lock
new file mode 100644
index 000000000000..db023c59d7fd
--- /dev/null
+++ b/pkgs/applications/misc/pt/Gemfile.lock
@@ -0,0 +1,45 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    builder (3.2.2)
+    colored (1.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    domain_name (0.5.25)
+      unf (>= 0.0.5, < 1.0.0)
+    highline (1.7.8)
+    hirb (0.7.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    netrc (0.11.0)
+    nokogiri (1.6.7.1)
+      mini_portile2 (~> 2.0.0.rc2)
+    nokogiri-happymapper (0.5.9)
+      nokogiri (~> 1.5)
+    pivotal-tracker (0.5.13)
+      builder
+      crack
+      nokogiri (>= 1.5.5)
+      nokogiri-happymapper (>= 0.5.4)
+      rest-client (>= 1.8.0)
+    pt (0.7.3)
+      colored (>= 1.2)
+      highline (>= 1.6.1)
+      hirb (>= 0.4.5)
+      pivotal-tracker (>= 0.4.1)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    safe_yaml (1.0.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pt
diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix
new file mode 100644
index 000000000000..d85a3266bdf8
--- /dev/null
+++ b/pkgs/applications/misc/pt/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, ruby }:
+
+bundlerEnv {
+  name = "pt-0.7.3";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "Minimalist command-line Pivotal Tracker client";
+    homepage    = http://www.github.com/raul/pt;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ ebzzry ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/pt/gemset.nix b/pkgs/applications/misc/pt/gemset.nix
new file mode 100644
index 000000000000..cde3c386fb5c
--- /dev/null
+++ b/pkgs/applications/misc/pt/gemset.nix
@@ -0,0 +1,164 @@
+{
+  "builder" = {
+    version = "3.2.2";
+    source = {
+      type = "gem";
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+    };
+  };
+  "colored" = {
+    version = "1.2";
+    source = {
+      type = "gem";
+      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+    };
+  };
+  "crack" = {
+    version = "0.4.3";
+    source = {
+      type = "gem";
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+    };
+    dependencies = [
+      "safe_yaml"
+    ];
+  };
+  "domain_name" = {
+    version = "0.5.25";
+    source = {
+      type = "gem";
+      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
+    };
+    dependencies = [
+      "unf"
+    ];
+  };
+  "highline" = {
+    version = "1.7.8";
+    source = {
+      type = "gem";
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+    };
+  };
+  "hirb" = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      sha256 = "0mzch3c2lvmf8gskgzlx6j53d10j42ir6ik2dkrl27sblhy76cji";
+    };
+  };
+  "http-cookie" = {
+    version = "1.0.2";
+    source = {
+      type = "gem";
+      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
+    };
+    dependencies = [
+      "domain_name"
+    ];
+  };
+  "mime-types" = {
+    version = "2.99";
+    source = {
+      type = "gem";
+      sha256 = "1hravghdnk9qbibxb3ggzv7mysl97djh8n0rsswy3ssjaw7cbvf2";
+    };
+  };
+  "mini_portile2" = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+    };
+  };
+  "netrc" = {
+    version = "0.11.0";
+    source = {
+      type = "gem";
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
+    };
+  };
+  "nokogiri" = {
+    version = "1.6.7.1";
+    source = {
+      type = "gem";
+      sha256 = "12nwv3lad5k2k73aa1d1xy4x577c143ixks6rs70yp78sinbglk2";
+    };
+    dependencies = [
+      "mini_portile2"
+    ];
+  };
+  "nokogiri-happymapper" = {
+    version = "0.5.9";
+    source = {
+      type = "gem";
+      sha256 = "0xv5crnzxdbd0ykx1ikfg1h0yw0h70lk607x1g45acsb1da97mkq";
+    };
+    dependencies = [
+      "nokogiri"
+    ];
+  };
+  "pivotal-tracker" = {
+    version = "0.5.13";
+    source = {
+      type = "gem";
+      sha256 = "0vxs69qb0k4g62250zbf5x78wpkhpj98clg2j09ncy3s8yklr0pd";
+    };
+    dependencies = [
+      "builder"
+      "crack"
+      "nokogiri"
+      "nokogiri-happymapper"
+      "rest-client"
+    ];
+  };
+  "pt" = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      sha256 = "0bf821yf0zq5bhs65wmx339bm771lcnd6dlsljj3dnisjj068dk8";
+    };
+    dependencies = [
+      "colored"
+      "highline"
+      "hirb"
+      "pivotal-tracker"
+    ];
+  };
+  "rest-client" = {
+    version = "1.8.0";
+    source = {
+      type = "gem";
+      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
+    };
+    dependencies = [
+      "http-cookie"
+      "mime-types"
+      "netrc"
+    ];
+  };
+  "safe_yaml" = {
+    version = "1.0.4";
+    source = {
+      type = "gem";
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+    };
+  };
+  "unf" = {
+    version = "0.1.4";
+    source = {
+      type = "gem";
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+    };
+    dependencies = [
+      "unf_ext"
+    ];
+  };
+  "unf_ext" = {
+    version = "0.0.7.1";
+    source = {
+      type = "gem";
+      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix
index 574b73f56726..1a3f1399fe76 100644
--- a/pkgs/applications/misc/qpdfview/default.nix
+++ b/pkgs/applications/misc/qpdfview/default.nix
@@ -5,10 +5,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="qpdfview";
-    version = "0.4.15";
+    version = "0.4.16";
     name="${baseName}-${version}";
     url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz";
-    sha256 = "0wgj02zpbyq4m2ix8rljiz312l2xk81gpy030vy424icq4xsip52";
+    sha256 = "0zysjhr58nnmx7ba01q3zvgidkgcqxjdj4ld3gx5fc7wzvl1dm7s";
   };
   buildInputs = [
     qt4 poppler_qt4 pkgconfig djvulibre libspectre cups file ghostscript
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 3d45ef6884c4..940aa8eb4bf4 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "0c07bd1eb9e5336c0225f891e5b9a9df103f218619cf7ec6311edf654e8db281";
+    sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qtbase qttools ];
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 5fcb028f0cd9..3c13623af948 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, python, w3m }:
+{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }:
 
 buildPythonPackage rec {
   name = "ranger-1.7.1";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
   };
 
-  propagatedBuildInputs = with python.modules; [ curses ];
+  propagatedBuildInputs = [ python.modules.curses file ];
 
   preConfigure = ''
     substituteInPlace ranger/ext/img_display.py \
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index ad2f5f74cce3..abe25afda5f7 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -7,18 +7,21 @@
 }:
 
 let
-  version = "1.10";
-  mkFlag = flag: name: if flag then "--enable-${name}" else "--disable-${name}";
+  version = "1.11";
+  mkFlag = flag: name: if flag
+    then "--enable-${name}"
+    else "--disable-${name}";
 in
 stdenv.mkDerivation {
   name = "redshift-${version}";
   src = fetchurl {
-    sha256 = "19pfk9il5x2g2ivqix4a555psz8mj3m0cvjwnjpjvx0llh5fghjv";
+    sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh";
     url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
   };
 
   buildInputs = [ geoclue2 ]
-    ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python pygobject3 pyxdg ]
+    ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python
+      pygobject3 pyxdg ]
     ++ stdenv.lib.optionals drmSupport [ libdrm ]
     ++ stdenv.lib.optionals randrSupport [ libxcb ]
     ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ];
@@ -31,6 +34,8 @@ stdenv.mkDerivation {
     (mkFlag vidModeSupport "vidmode")
   ];
 
+  enableParallelBuilding = true;
+
   preInstall = stdenv.lib.optionalString guiSupport ''
     substituteInPlace src/redshift-gtk/redshift-gtk \
       --replace "/usr/bin/env python3" "${python}/bin/${python.executable}"
@@ -41,6 +46,8 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share"
+
+    install -Dm644 {.,$out/share/doc/redshift}/redshift.conf.sample
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 5899708a6825..9f11a141ff43 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,25 +1,21 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig
-, libX11, libXinerama, libXft, pango, cairo
+{ stdenv, fetchurl, autoreconfHook, pkgconfig
+, libX11, libXinerama, pango, cairo
 , libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.10";
+  version = "0.15.12";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "0wwdc9dj8qfmqv4pcllq78h38hqmz9s3hqf71fsk71byiid69ln9";
+    sha256 = "112fgx2awsw1xf1983bmy3jvs33qwyi8qj7j59jqc4gx07nv1rp5";
   };
 
-  buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
+  buildInputs = [ autoreconfHook pkgconfig libX11 libXinerama pango
                   cairo libstartup_notification
                 ] ++ stdenv.lib.optional i3Support i3;
 
-  preConfigure = ''
-    autoreconf -vif
-  '';
-
   meta = {
       description = "Window switcher, run dialog and dmenu replacement";
       homepage = https://davedavenport.github.io/rofi;
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index c1d74c247cef..d30c2761f73c 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -4,7 +4,7 @@
 
 let
   name = "rxvt-unicode";
-  version = "9.20";
+  version = "9.21";
   n = "${name}-${version}";
 in
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation (rec {
 
   src = fetchurl {
     url = "http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-${version}.tar.bz2";
-    sha256 = "e73e13fe64b59fd3c8e6e20c00f149d388741f141b8155e4700d3ed40aa94b4e";
+    sha256 = "0swmi308v5yxsddrdhvi4cch88k2bbs2nffpl5j5m2f55gbhw9vm";
   };
 
   buildInputs =
diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix
index c337cd329c92..7ca5f962403c 100644
--- a/pkgs/applications/misc/terminator/default.nix
+++ b/pkgs/applications/misc/terminator/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "terminator-${version}";
-  version = "0.97";
+  version = "0.98";
   
   src = fetchurl {
     url = "https://launchpad.net/terminator/trunk/${version}/+download/${name}.tar.gz";
-    sha256 = "1xykpx10g2zssx0ss6351ca6vmmma7zwxxhjz0fg28ps4dq88cci";
+    sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a";
   };
   
   buildInputs = [
diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix
index 7616eddd16be..291f18d5965e 100644
--- a/pkgs/applications/misc/viking/default.nix
+++ b/pkgs/applications/misc/viking/default.nix
@@ -1,14 +1,14 @@
 { fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl
 , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper
-, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel }:
+, docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }:
 
 stdenv.mkDerivation rec {
   name = "viking-${version}";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/viking/viking/viking-${version}.tar.bz2";
-    sha256 = "0ic445f85z1sdx1ifgcijn379m7amr5mcjpg10343972sam4rz1s";
+    sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz";
   };
 
   buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils
@@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/viking \
-      --prefix PATH : "${gpsbabel}/bin"
+      --prefix PATH : "${gpsbabel}/bin" \
+      --prefix PATH : "${expect}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix
new file mode 100644
index 000000000000..8d46738327ff
--- /dev/null
+++ b/pkgs/applications/misc/xxkb/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake
+, svgSupport ? true, librsvg, glib, gdk_pixbuf, pkgconfig
+}:
+
+assert svgSupport ->
+  librsvg != null && glib != null && gdk_pixbuf != null && pkgconfig != null;
+
+stdenv.mkDerivation rec {
+  name = "xxkb-1.11.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/xxkb/${name}-src.tar.gz";
+    sha256 = "0hl1i38z9xnbgfjkaz04vv1n8xbgfg88g5z8fyzyb2hxv2z37anf";
+  };
+
+  buildInputs = [
+    imake
+    libX11 libXt libXext libXpm
+  ] ++ stdenv.lib.optional svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
+
+  configurePhase = ''
+    xmkmf ${stdenv.lib.optionalString svgSupport "-DWITH_SVG_SUPPORT"}
+  '';
+
+  preBuild = ''
+    makeFlagsArray=( BINDIR=$out/bin PIXMAPDIR=$out/share/xxkb XAPPLOADDIR=$out/etc/X11/app-defaults MANDIR=$out/man )
+  '';
+
+  installTargets = "install install.man";
+
+  meta = {
+    description = "A keyboard layout indicator and switcher";
+    homepage = "http://xxkb.sourceforge.net/";
+    license = stdenv.lib.licenses.artistic2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index 83b6151e4f79..1ae3041b4da9 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "9e1427b7a6c6e960a378b97ac458ad53c445457ed0e5c8bf693f446597377b78"
-    else if stdenv.system == "i686-linux" then "4d446255ff6332da9a244737d6c20e7dcd32d24a8eaabffbaf73147e5898ed8f"
+  sha256 = if stdenv.system == "x86_64-linux" then "1ldhi0ydpxdbpd0ak5c3zv93wif5sqsgfj4ggav2b0djm76al2gb"
+    else if stdenv.system == "i686-linux" then "1fhki13isw3g7785b5jdl4warayg94ihah6wsr5h9gljjjghgi1c"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "2.0.105";
+  version = "2.2.7";
 
   src  = fetchurl {
     url  = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index c1f2cbbce4d5..2fb33fda6105 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -34,7 +34,7 @@ mkChromiumDerivation (base: rec {
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
-    maintainers = with maintainers; [ chaoflow aszlig ];
+    maintainers = with maintainers; [ chaoflow ];
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index bf870e144e56..c0c5e485e59c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -64,20 +64,17 @@ let
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
-  buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins;
+  buildInputs = [ makeWrapper ];
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
-    mkEnvVar = key: val: "--set '${key}' '${val}'";
-    envVars = chromium.plugins.settings.envVars or {};
-    flags = chromium.plugins.settings.flags or [];
+    getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
-    makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
-      --add-flags "${concatStringsSep " " flags}"
+    eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
     ln -s "${chromium.browser}/share/icons" "$out/share/icons"
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 0b0e5bd08382..dda976905610 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -8,6 +8,34 @@
 with stdenv.lib;
 
 let
+  # Generate a shell fragment that emits flags appended to the
+  # final makeWrapper call for wrapping the browser's main binary.
+  #
+  # Note that this is shell-escaped so that only the variable specified
+  # by the "output" attribute is substituted.
+  mkPluginInfo = { output ? "out", allowedVars ? [ output ]
+                 , flags ? [], envVars ? {}
+                 }: let
+    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
+    shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
+    # We need to triple-escape "val":
+    #  * First because makeWrapper doesn't do any quoting of its arguments by
+    #    itself.
+    #  * Second because it's passed to the makeWrapper call separated by IFS but
+    #    not by the _real_ arguments, for example the Widevine plugin flags
+    #    contain spaces, so they would end up as separate arguments.
+    #  * Third in order to be correctly quoted for the "echo" call below.
+    shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'";
+    mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'";
+    mkFlag = flag: ["--add-flags" (shEsc flag)];
+    mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)];
+    envList = mapAttrsToList mkEnvVar envVars;
+    quoted = map mkSh (flatten ((map mkFlag flags) ++ envList));
+  in ''
+    mkdir -p "''$${output}/nix-support"
+    echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
+  '';
+
   plugins = stdenv.mkDerivation {
     name = "chromium-binary-plugins";
 
@@ -61,40 +89,29 @@ let
 
       install -vD PepperFlash/libpepflashplayer.so \
         "$flash/lib/libpepflashplayer.so"
-      mkdir -p "$flash/nix-support"
-      cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT
-        { flags = [
-            "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'"
-            "--ppapi-flash-version=$flashVersion"
-          ];
-        }
-      NIXOUT
+
+      ${mkPluginInfo {
+        output = "flash";
+        allowedVars = [ "flash" "flashVersion" ];
+        flags = [
+          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
+          "--ppapi-flash-version=$flashVersion"
+        ];
+      }}
 
       install -vD libwidevinecdm.so \
         "$widevine/lib/libwidevinecdm.so"
       install -vD libwidevinecdmadapter.so \
         "$widevine/lib/libwidevinecdmadapter.so"
-      mkdir -p "$widevine/nix-support"
-      cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT
-        { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ];
-          envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
-        }
-      NIXOUT
+
+      ${mkPluginInfo {
+        output = "widevine";
+        flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
+        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+      }}
     '';
 
-    passthru = let
-      enabledPlugins = optional enablePepperFlash plugins.flash
+    passthru.enabled = optional enablePepperFlash plugins.flash
                     ++ optional enableWideVine    plugins.widevine;
-      getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix";
-      mergeAttrsets = let
-        f = v: if all isAttrs v then mergeAttrsets v
-          else if all isList  v then concatLists   v
-          else if tail v == []  then head          v
-          else head (tail v);
-      in fold (l: r: zipAttrsWith (_: f) [ l r ]) {};
-    in {
-      inherit enabledPlugins;
-      settings = mergeAttrsets (map getNix enabledPlugins);
-    };
   };
 in plugins
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 57f0550a793d..14806cef25a1 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "43.0.2";
+  version = "43.0.4";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "da9307cb24c75665adc6a5e02d3045eac9babd33c6da778167644d13cc685de2"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "1a8f13b44107e9689aa339f19c8247142ce82ef9a63bb4be077c212d4d4ad03c"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "b8dcbf287b350becd7a4e1d812a2251bf10861fe6fe3c85ea9b56e4aafa2a156"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "241a503d4cd2793c538a5cc1ad0990b2a5cd40a584504cf5dde77a28d2f47049"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "530f5e4743384e543e4cf829f00e5f37adccf64b4af5067aab1e316aba72c579"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "1bbde5a3c897ebed7c7820362257626835c1adfafb29a20e80bcc4b1c40407b4"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "f254b2f7117b866e2c8611d5367fc1e2a8e20e1997746204234ae6869c01f6e9"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "bec6a50c9ce11906edb09591ed1f37d94291fb67b2d4ab9a8f5f87b0e837c0be"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "b894da79ba753489a3f0509aa54abb9cf67c84e80a73bc00d0e7e7483e1c4ac9"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "ef435b67eac29cf4024ad8df1d4efd413ea58fd76c0e4ec2f2595e7c90743953"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "96566e2de543bb4b3bba195b99efb8ec1c01f6ec969dc75293ed66033b52a92b"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "29f9ccdfc93a72db314df43564fce754ddc678b89a55035f23582bf4a7c66135"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "cc58914388b53df51d5bd78f0e63286166bbf278e691b8589bc7db18257627c5"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "7f1db3428190e1bbc01506a029df8c81a0ea67b301f161a5bb297c47d5db41d8"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "c8bd88c4ffb98d8611d760b144f46ab3cef4f7808f2b1008cd5aa75eadaf02eb"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "1b063e4e4a33b9d29f01d7c98a942446d738b195877a617dd454c2697fd6a539"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "1186851b6a27a2d23572c9fa0a9bfabcfca1925d36e7fa79e5918541892bcda9"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "d185c5eb1640d13ee9fd049db41d267af728de56f833bc32a182f69c4921d1c0"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "fcc0a0c46e913cb7b4d44c502f62ece83ae8d22703419edafd15321b77758625"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "d1e066c2347e109fab28e525b5780edb9c5c063322745d971e4ad79a110568f6"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3a85767878b840411c57d176af597666aaeaede9a290032f374629eac536eeca"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "a3314e2a9f74d9f2c85e592a74e1353b2f048349ba65bf4cfdf35c72b130cd61"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "a6cd3445e65ca3c818856d6a3b9069aa437ea638f11bb8be520db73604150090"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "9c9f5720b568d768933d7d55bfa7853bb7918bcc651b7c2e281ccf3d2a5e2218"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "9c0844cc1dde7712219626148988df642ab10e81494d4794a51a61bb92ddd110"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "44d91b25d18aa108adf49677069ebd75236f82c7016ee9d518e2ff3f6ad40ffb"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "5669828dec411832064e790e65203dabd3703a86090e87a931c6bd495fd39bc7"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "1e1cec512fb7038327488ce884e171ecda23ae26f98d39159ca96b8acea2029a"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "a7bdf99153ae8351c3f4f98db5e65d2a0598457dc0774508fc6ebe26c40ff43e"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "16fd46498fa33334a5bd1cf06351b410f7df41526c195de21959bf837ce5d488"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "8a251c77bbdb6a44163285cacb3a78ffe85835cbe0b9156ad300e733c9ee3934"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "61f2b6b13d9ce1066b6207b16865a038cb35c51f61a5bc05503cf948704320f7"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "d1e5d20f7b396bb8b823e7a15a6e220fb930601c2df6e9fc5ca588d3ffce1698"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "a5f20fb678a51a526ebd135b149c6769dda46827174259cabbc4912c6f0619d5"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "74e9e40b191fd56e99708910c8798d4a8588271a90eef6f7658e042a0765d0e5"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "470781e1debb2085fa538008cd3203c64b534b5a88c6a6ac01418a3ef344216b"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "459e0d6c55ad822bae10a47a7b14004153a3f3363026556568d7108411318104"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "97fd138bb33c80a3213b33d4796573b65d4659b888959730cc02e726bcc65388"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "41b684530ed9bd80c03cb0cd8b1e4de8b3af383f611884965e98215ade1dd8c7"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "b1a7f2a4de87510b9630c6cade94b7f628bbf04289119d3912ea0eb5260b55b2"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "3c40217b451bd28dd5f1aebcb9a9f7aafdfa3c9c7fd635d69674912a9e73f77c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "6aa6cd0945bbe97b30e431fdb09a4deb45a0aba6e1283f881a35732b7403e247"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "dd6c585c24e1e9212b65eabee8e52c5dbc9e4acce4fc51c32aacd82b3c6333e3"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "9c56ff8734eb860a6038f6bd00d98aeabe57037e230c66d551aac451a27efa79"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "0335775eb1a073d1889e8a43f913ea096bbd735a0b98687c75c7fde5eb636f44"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "5ab68e226bfc141167a477779181c48a84cabe80f250c874182ad0364d0c3dd5"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "99a0cf562a067cd30d1047814c1984364b1702e93e638016a4fe8910868cfcdf"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "ba0bc0093bf2b0ea82eb958fdf06683f4941bd9a44138c793175a0b9e5a86ad4"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "3adaec2ccb2b1949492c27c466daa5809afc690bf0559418d2d60faae0b5456a"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "67f774442c64d653d624a270eea1202fad389f926c6b7dee56ef965e65311ef0"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ee56546d943795434a6759a55dec6e848f244691dc234f4c62746aa1f73cb85d"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "cdbf12f21efb2e18d23ef9c6322c96469c72140200fa47c554067df3a9f89b8d"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "d3518ffe26d3c21beb009c657b93cf2f01be416f697d89beac497c71044f134a"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ae34d9f586b28b1063cfebb755edc2a11214085f3a185f31d757c2358493ed13"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "09a03624363efba7e5d707c312f58e577019b8b7987d817fe1cf77bf2afa7dfc"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "820c50a0991779f664be8013e10a6db2833caa4b1fed370a7d6a8eb71f5766f3"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "bb2d259606836c5d01d149f2735639cad7411efcd5e0e5deacdc3f1bbae8d80d"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "17265f828cb3232cca73b3bf5b806cf361769c77bfef0e6571a16eb73036cccb"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "0bedcadc3b60ecb58af25d5950fe693063eb80f65d6d85e72ff0cdab3e7f2030"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "371d5648c7ffaf325ef34030ad0a9971246bc1df354fc11dd66bc461dce303fc"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "a7c55492f08e5f44d5cccb015d00abf8b8e74dec7da37e937f8d0f76a4c49338"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "6fe831c56d96dbed1c4a6859ba58dc20bbdf43efbc2bb225a707df7966f8b9dc"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "5cf4f3235db02c385ffc355e0fa1060b79afd5a8899ff31da1d0dad4d065e4cf"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "0576772ddcbdbe3d26ae20dd47b4e635de709c34eb6a797afab7743ac68815bf"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "8edd2e8058fc848456b2dc1bb54f669159b232b5423dcde6638e5d61294f1ffe"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "94bd189308502abea3d6d762378220097d3d743cc42872e6c43cdcd86aa51b4f"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "652f87501ba2a5baf1de865d7a607837a9ed623834c2d796baf4e3891fc78a6b"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "94c3725ea6fc2a7833e9ee60fdcd0ae3a53c80ce7f13ca00634b5d99b12a4607"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "8d9ed839afa148da954acfdca139dbcf9f235c097fc7c562a8ab52f9ece68b4b"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "650c8a50b8473fd09dbcd1c818ca8c3ab0c6618696198124f32e0153307e2aa3"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "a70af727b36bc7d084211a880318f3a9f73977ff75f728b50cc4bfa9398c61d2"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "01d3635c38068facc135fcca979517d729999db52f4a00c0b2ee27cf830df870"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "9763cbe0387cb86f91cdd6b1dfa6e257cc40c4525c753869ee091bfe49f172e8"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "16d3452fdbabada41626d981dee0e48282d672d9d6073b363ede9e86c4ed56ce"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "facde8f17e2f90e49a02b36d016535e1123c7f78ac44ee1110c80dc472e84133"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b0955c4381f7f0013e9e0b1dcf8d8c53a3bf694af6970638b2e88dc080771ed7"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "cb42e0750736bd14c81bbb76bb05e02c97e798b01d9f41bad091295f9bbb5655"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "c497650eda2e4fc0f99b9d9c1ef0df33b0ea7b6e32d2eb7d4ee109e5ae1f2add"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "d4cc561b6ce55f0820e6bd8479de9fd1ed53fd228e7cef28a890aebd687c26aa"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "9294083a0ce8b06cc565c9d643d3e45d50393a5abff230dde8fe42aa29d8b870"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "3493dda678fe94e13d34a62d194b612037f472546b96a94de2390706139636ef"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "db45625e758d3db82705373004cc16176f8376bf087ac11da06c7c22e613dc2a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "227399d033c4a7877387ac965d84ac265600bc16614de1b99618f39808b92894"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "a4f061ed24c66f936da13f8d93eb311f8fda7cc468d7cc9f71a4c747bbd9af19"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "41bc010d4cca63bc77b8d637e6ca2731e3c5900b6783955335aae0ee3d2eedae"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "4618d03269cad3fe8ca3d618de581d37fef37b9276e72613d2c12b212bb2c894"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "be456ef5df061985f7413fc7af45b4f0b86ac4a99a57d3574d8ad6dba727a8fe"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "c229ca2c9fba2ac98e912e5c5f4500d423b1f2cbf768e539112e97c0f0fe410b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "0a569d1b8c8d685c3eb5701471420aa47110c737504a105f660dca72a82490af"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "b15c86feb6d69005244f409290489d8f5ffaff0c85ec876ba931be38c7de07b0"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "dc8ca98414ccc67087c896c84a0a223026f12ed9fec499eba6203b8ec0b3e6e7"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "6a831ab4c2605fdbac15ac81853a19f5c8633756ad5136f93c3eb76637e2b997"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "02e9a2022c0da27e069689d25ba80c1d04dc29e6a045833fa1c5e503b5ca9f9a"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "0ffd2b8f1fdafd91ae4e089c075446f57adcc748bea4994d40207e5cba9a5655"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "f84d5304a37e33883322c9c508f4d342f99901c9339d293308ef78bb561a3c40"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "78c5cb912d6c24d5a7636fd400470d298e4f58493ca6fd3e5f6b88e4b8037e77"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "a3d563846ef60176712574a9f66d24a785f749390afde21cbc4823e9d30cc3ba"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "56bdf673d645dff09e96970fc4cb33b1810d57051e7c12f6fe1ba01fa971e293"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "a5b10502bacf265e2157b7246457c33adcf037e4e28291e26a7fdd9f53f94638"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "2a7c74168d040653cbc31d6d03846b9165f617cebb74388818d73d681056561d"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "26e696f0a03d7d6c3541563f89ba08d06a47039ca93f15d2f1909db7ca1b8d08"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "18676450680d18631a855dcf91fd4592f8e3e908b04122476ae62d619bfbdd4f"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "cf6c95c0f06381f3aa4eb03c8854a530e63b0b5c6d971dc019a5c6cf81f80b0b"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "fabd1b824a4593454f8c9d7c6c47f7244ec9d1800cbe397042fb3bc41a75d09b"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "d3d9ff36de18ca424511df1ddbd4c49c84499491510a064a6f55f15599e1c172"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "e8eef3e4c6201e1d1e936ee6ec53f875b6c2a0496d308b8fbe03b5cbdf229bec"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "de6b35a675539d1bf0ff1c8f3837ba030da64b0e51c30e594515ac13578495f5"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "9d2351a7bed09127b618cfd86f2d394fdefcbbf2801da3a60a697982b5bbb9f1"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "5e5c3d5083b8d71a249f9e5009072132c9524063fa0cdb1f47ad0ff5260725c7"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "c57df2ce20d09070514f783a12e179ff05a4ac14e7ec67b0081f284f70079468"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "30267f85939965eab0ec50f4c869a0a42fa0d0775ae516088f9a3ff57f1bf3d2"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "c1389231d627df347910d28172a823da18f2ebd5697093035faa499da24755eb"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "6dec829e1ea28f8c4480d0517f72909d2d652fd827693dc919298906b62b47d2"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "29ed57ad173243d7cc2460a534c3f63709e235db74810a0d6f12dc460c5f4a52"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "98d4c529ca979e4ba03b3c1640feb0c93ca1ac2a92ac07403a39a07adce8df44"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "53d6752d67e3277afe3ea239ceb1f890edc5a15fe078d41bc074246598376603"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "321d682e8e1e42e8e4522d791e7e7ae13d1622d740038f3586813099f0275d96"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "f0dfba4cd8fd961ef6c088ef9139b8ce5e33fcefa8cda142c9f51bfae663c092"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "b40b8fbbe5ab56055d57f7b9a67ff00e84b7c7d19afc7bb07b4311ef3fb6c66b"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "3bb64e13d59a1c65460282e4236655a0c2997d894e9b897a8dc3b20a4baca3c9"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "15aeda467f0c0c893dd923ee56fcf2547242f0a4089709ce0cbdb27778c71b1b"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "32cea21ff68efd7c384746c32c0138464fbae4d25065fe58d6d56e191ee5b082"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "371af3de1ae68ba242cc55cb7c080008ca305c61d5c8c4e687f53568bcb8f416"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "54e17787e0d31893dcba314e98cfb795fd6f85e335a0e84ce35a0f44a56b6e1d"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "92df7a99107ccd938800161e759beb6269a6a30f69c892064e130280a3caa692"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "41c1bfc828917d58cf8f334b8d2b333ddb50dd416faaae41a0c063bd8c23942c"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "ad96e3c670c244d366ce0d600d87a308d95e51309ab86becf1c8c69245dbed0f"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "eee10d92a2bcc32507936c3c2c5c2c220a4de955aa8b48d23f0d923c9b0faa48"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "1ddaa000c9b3d5a7dccdddaeb8fda53ba821935bf24ee5c2ca0053e3b2900bd7"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "0d62ab80bdd5853d8dfae01d9420929d9321d1f6b9f40d372c6241f1345de76a"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "accdde423ac5c518d14b435d00e1f536cd240f31108b58f0b5e1a925637faab4"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "89ae2f460c6fdab846d6b41dba84f63c94a7bfc1f61e3e79da5d643d4c1a1fca"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "d8e043d8ba0c223f0232facef10b6d2e2ee13733bf8670a9101796bfddb3c2f1"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "f6ada91433d48b699c02fddf22e2d8aa36e6b0cc365b73625bf6fb80ed3fb877"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "b2d294d7761cfc3c8a58ee072bb8a0b82cc79724f6b103073632e682fda32f60"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "642c56b5d510f5efc8a365be956789d7760bfe983aa397ae194eef5bd15f601b"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "6bc224414c39047c42040ebaaa7e7d61bb09939a9878ec4a2d7d7e8c31a7ecfc"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "cc00a2fb38fed6ffef5a6a6931b043c65948c18f3d502a0e3ae641a1847203b7"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "2cebf2678e1a469447205a7495f17185259d73a72439f8fd400eee957e571bbc"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "32fe2ef01b0d495476768eff7e4750c2c82196e60f50c2e824adbf611f275289"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "289cef6b438a59bac459c203a6b1b2965b089f1487ea78ff524a6a68f5996862"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "7df67b1a5a12297a214d1f794c84b58ca12a182ee780e2574116214dfc785388"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "65fd6a9a90b4e5c8fc784850dd5bce41901b0d241dae9c37110bf99643d52d32"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "585683dca4c427ecbcc17d42465b6e374a76d5266b908df1b47f4a1ad81e7794"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "6567d5ab15a1bd20426569a6480d6e44f2c1917145fa607357f0d3d0502c840a"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "f0aad93013b6070516851a13352d1aabd0d10bd7891eaea878d3632c1b295296"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "c6da9d539302dca6ad8e3165ca595eb80438fb4caea11979c0e07ca215696929"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "236dd9171f471849e8cddb2b8ff0166e41bdedcb0bb3c1662fdffa83c3e89374"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "4b9160bfa7579fc893a40387f0185cb74d7db2cfb0eabd2aa032259ed53b7a97"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "56bc853e4e5e21d08b2ccd04687388473c45ac4403d0b51ed41d8a6a3a26e396"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "b73fcee703ce937ec25993da5e09163541fef9eaa4e65ec7d5358f1dfa1b596f"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "95ef838ac58e82ec435ddf7e2ea0bbf8b8d1bdb34832aa664d1ad8f5abbd9a13"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "370313d2cf543ab3aeaa5de11f748d69a168a82d6e29c27d4c398bb577fdb06d"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "a86a6604169ab6d9bc2657a0d26db0a3f96b2927223c5a43128dcf49bad243f1"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "a7ad2ec678944f37cfee69025871369b658013f77df9df0f1bbfd9cbc03666d2"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "b081bc35064722b4de95f4e29c4ee203bca124ebe0c33bbf91f0e11f904928f7"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "5a6fe1f1c7e1d5bd91a0c82e47ce5b88e31611cf51d6452afde3ef06d2d1a695"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "9a09a020acabfaef4fa25d94723fa437c57761f0dbd9bda880b8ca3acb5248df"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "0e0839d5a899576f3fd796079748dba8612526bd5f855e8718eccb3ed05944c0"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "cdcd8e06216289df7cdb4f82f01207a7112fa4f52040bd70c2f497b3d701730a"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "e4609f803edb243ba8c8fbfb7ecea2e652a9e94adeec2f6c03af42c2e8bc5b74"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "b9151a27be6a8de94fa25b53dfb85e765cc2ff823c2de6a0d0583883fc30ea48"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "48349866a10948cc0b4f8b6bc2fecd5dcbd4d09ff4ba569f7fb3e569edadd976"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "ef38e6a99cc8cb9e32e95af0ae7f7c99b82310e28b082b6aa085aa80f180ef60"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "fbad5fa2196dddb5061fec1f47fa7af85c0a824f520588b7446d2740928e34cd"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "c644f251f1e43acc3baa550b540750fb7d11c2f440c7906e1955d34694a0d718"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "9db7dc494734011ed61c5286fcb1f4b4dfb418528792ef92fbfc3734a9618129"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "06cbcceb189bad7174cf46678535cd4bfb1062e5ac878fd313fc341315001106"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "cfa94474277edc7739c11795b2907b894c87f5c573c43aaf5a951a2f13a9c8ef"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "e3a581e965fbb3711e6ca6d6d5b378eded8e8ea9767f94993c50632b6f4a7aed"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "ecd4a5b8fa66e78cdb93b04eb2b3a5ac354bd5e231d8f4bcbf2acfb94b5190b5"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "1d52852d973d5d6bea8ef860b216aff4eea59dff576f13ae67aa9b96ef0c9878"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "24befe5e2fe2001ab3827543f97b52ecd15f5cbad89d977584aa4dc08a0e9c11"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "4cafc2a6028d8141e47b09a9d8d96404cb4b5806cfaab452566f9a7baff89f25"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "80ec43ed8918fa452271988d53875f184196460b15086fe793af4842458ab790"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "1d3fc933a5b3f4082fac9176f6a802e01f8a26d711c339116799e58629843f27"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "a255ce81f6ac1774ae6c8a5b9208169864a672f22f7037c93f01758c4eaa357b"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "27b048c3df2ff25fd6f7c33cc30016e8a657a2f30ef7b0da9a2f4097c1b5e494"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "88e62cbc7a46a4bdc9822a7155a7a92fd856472323fe93c2c6684262b8e71056"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "e0eb56995f078a72c0bcf8a38a68e3087ca6c229181d0ca75052d2b784acd6f3"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "826a7c46b08813698c6fc6cfa3faf8d8fb3c6bfa2d9126d2668f91f34fa5874a"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "74efde0018f1c0a0d8afab8a069c7dc2ace12a9c2e8ccc5021601aa472581ea1"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "bd7c8cd1473fa7b15905fc2a9aa5595a7ffe4e6a53a4c832dfbe3393236a2706"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "73e97be9965dea6416d88b7edb609ed1c7cecbb48c363370dec68854ebcc2b05"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "30fbc1adfda1487093ed3ca3571bc4c02132b8fd65a67c937e10d5a53fffe2c5"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "5c7b899f37cd894b79c74e95c03e131e8809fd147316d21ac5d9e0165840bdbb"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "2dc43867cd934830c79050e2080570e86fe63ab9ce80252599a7ac29ef21408a"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "73c6712729087bbebc335e631505dca89fbfc9eedf6fcec220f66f50e013f938"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "3b76e984e74737f0bd22e10c017bbfc3ff9346a9bf83ec09d959cdc0c5b4c36c"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b9b732d19498b78c72d8f0bcf0852c7d209c3a3e0c891fbef6be753e39bc9a3"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "8889cf66294a788b59754a4331c6fe4ceccf5d4efedb402d144f27384e491b46"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "cca620118720374edf45b8dba81ffa5086f640bb1c10b67cfe6286aa2afc3a6f"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "33543ed7c2f68457573729fa95fb306a3c509d8ecda937d5d638d6d158979ced"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "58c567f2b6657f533bcc20d39f29715a503a0a9d59e05ccf9b4f3f3ba64280ca"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "5b87663b5887a8eeceee3c0e54c99c66ca673bbf78b434cdcac659891c1f3333"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "ebcf93c8b5ae952f244426988defbfe0638cf81a8dc4c372613be08f9e0d8f45"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30af81108a6f9ea31a623666ebfb68d99ec256e27cc8d18921bfe2780753ba4c"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "082ddb0fce87e1399dc95cb94fcc71ebe334f7e611497c0b0bb8186edf46e8e5"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3e8af6555a65ee403b8fdd3a78842ec4f7c16fb3c590f77d9ddd76e9631d564c"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "78bf008a03318c1d58788433a07b71b63bd52cd2befcc68f8c6320d5ff5dc387"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "77ff1b40b9cc81b1c6bc63d74e68687ad92f5eb0cee265cd5d9528c38a36bd12"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "a4784a6b2d356f633deefefbc237f5aa662334765a334f968d60afc0aa76ccab"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "5fc7d9cbd892c83f40e0cda6b8e6b4e993948530bef355457015a6976ce097f6"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "4fc83306fca0a6458e66fa082eb8afe6d07ecbf5a3b309d3906ca16f00fc5d31"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "c72b7f343e62f479dd2fc37f22af3c462890a886727a2b5a1f140992e3069c92"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "81d44ab8e493816180ce46d86a0b061ddada85b820c21b91d18f62b3fdfa455e"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "c2fb062c3fce0c4c174bcf3987108176d9cbe8da19a06b5db46e0b6d65b244ec"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "81afcae57081c20a7a1e03c28a4d8dd26b3c89608591b7a7171be91bd24789d6"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "bf5f4bdb6fbaea7d0de662921d5e6096d413f799fd3ca1876d42146f14667e5d"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "cc4057fb04da6db0d2ba315fe9ff015a0e0fc1542843adb4a65621936f849d98"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "10468470db91eccc1234b34fc4f933b909df68284f9cee8125fbdb5c5802a45a"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "34e29284e753686f00e4019902b75aa071d0eb87bafec8c31cc4029989ec210f"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "f5b2e2c7fdbd0f91e0ce581dfcbbb253d627a4aac45a914eab763de6b2fb6750"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "7366de80f3717f62768055613bb6767a39716808e394d623cff18e649b1a5a02"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "1a69cb59bd213323ddf5576f2f060def74735b50576c5048f030170a8e4a54d1"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "89c431dc58a91ff9c7b31b9a5f988aabd7265a23697e870cd746320c0dde9760"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "cb6c72d842895714a7ce5f0acc7e2de721befd8605ce567811f5e626f9349a50"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "8b33af54b8e00acba75446a5921ebf41e570f66cf86d38bf46b9238d2b2b57ef"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "17685f4d47efa9ca8a2ca220960d7819e11c728516d4c0f67f789f5dc29e9606"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "702f8da239eadcbf92cc8e286716836ec889a64276a92e51ee26cc5338e4398e"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "be03a282b7da67899c988f89423594b91e017ce5f4569d55ea23f6ba28f59414"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "0ba5a1868386c715ea1f48393b035305d4bef67ed1838b7bfacf5bff8b36716f"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "790462e745744b05a5fc27d9518f02e88f678bc1f95140dad970abdff0ec7aaf"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "ab1ff49b84beb7a5a02a70cbaba9d3110cdd76653486799038fd05936b9db499"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "d6be5d333050ca0d1ecd78082b9daf7955a068915af6ef2694b3f6d60595cd94"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "6ea5dd2bd55bd0211ce67f398b24a37f26b012250b8e7b1b4a9d5ef619e19051"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "1b16ed83eed980b0ea8b99e989bab1882b6d2a497fd643f109f0610425c693d8"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3aad55c9d10012c5b22154e8562a034e30ce6ef0b579047649a43afd0645d6e2"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "f22705f5dee51be7bdced48c6c8f48780529f22a566d9d8784a10c2fe8427b92"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "8dc4c8854169db3c22c09b723002852c452cdcf8d0bde94b089af9fcf0ae0f28"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "7bd24886bc72db5479c1aa2c8a48359858c1e87e8444a5cc8f0ef3e141744806"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c69a6be864d1c865013b00a1b8fb748da96be2ddc65cb178eeca6e165aa1ccff"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "a52775fe1038fbef208d760c4069187943387b0717076b32a54647d9e319890b"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "56c2e14770c2c6d40213f159715a3c269bf3b6c5985ddb4851b6f50f2ca93a39"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "648fbeb1dc15d76685d80afdad2b6a797eb25f30b27bb405e11725ccc53ef164"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "400f9cd73854034edd7b392367a7961638c921e78885064bdbc567ed3c508d38"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "727e0d1d692be4f472f1172d8901d94d58e201ab9c2e30b80684564b3ecaf325"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "476f207657fb9a5c3bc89493b06900b4fe46a06aca7854e4f37bbe8c8d98c064"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "2de4b2b0f02918c8ff538db66272196479ad95cf8e239ccf9e1a244d5553456e"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "3c04ec5ebd27b815a215ff815dcc86ec05f81a5a0d606e60ed14135b76679fe2"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "07b19ce6be53c16c6f299a2640a3a597475644fef63edf702242e245001b1eb0"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "d0a4e2d3b155c0fd5fa12162dd73d6077be30a9cdd3ccdf5566748a7af4fe2c6"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "f5e9e4222bfc1c34d58befaccf501d741cdcf3ee9bfda034ea8600a906c9a912"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "d48f0673a768b6265119a3097061ae437711a81fbf7f665b8fec079f0516b1ca"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "67eb797623354f037b49745c9ef7ddfa3a0cfce03f984add560a33ab2955fc97"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "6bcba534539f9b5f42397c82e2c1a6affa6eec473c09e6d71c5315f9acef35b0"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "fe4b44c9b50abc001bb4bcf6e046a9b18f30a42170b4662daf5d35c17089f4ad"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "8238342ac06af2d4e0b7ef8ea26d1960af996ac7d401f0e11b3b666ebafe0df8"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9f59d32123141d624b9fa16f885ff9e1cc989628e33074bb2a546d9c54be07eb"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "29785a5a2cc09750c8ea391ca6b2d8812e5a68185807d76ec295c3ca86c21da9"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "bd4dcb330e8733c3443e763a2fcd49085b5027ec032ee6f641ac1211534fdb6a"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "5508260caa85a450a2496a7e261aebff847301d4f981bd0caf0208aa65c0bc10"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "7e6df6be5937c01d8bbf65cd6d107fba76f1c59794f7e2ed81ac9db1384abe34"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b5370fd005569fa1544099fb4629ea344f81b43fc10188dbb3cbc5926b5df53a"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "5256e889efd097decc2b55f4d928c9847f6e9499b25947de068d357db4d70c59"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "2b51d50b49965c766081d35b1a426e1c3a858038bb88807522a7dcbc8c97b815"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "b71d83c274d82f63ab175978bd661e047ad73586249f6e24d33d17c1e9ba4ec6"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "4c3dd5066a9b5ca04ab222af8d7009419fe34d0bc41bf5f78e6370d6e975c4e5"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "33f3591e2d75bcc539cc57e68e865183b307a8eb8153c0b48bacc0bc62ea48f4"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "25eef40150db99b56dc46deaf78525951d8ae838886427838c9d78bab41c6b7e"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "d83ab7b48cd7fc4637fbb4c19edd0974db121186289b04da01414fbdc78ad7e9"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "8a1d3055aedc504cf0f34e41931464752148dd1859c807f689978fb80504a5ab"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "d9dfc43216b0c6281a311edc6c0fed79344cbb4f4cfdcf153f3ba37a4221199b"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "2ec46b326249e0049de0a110896672191edf0837d4f224ff3b0f88a21edf1a22"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "6c7cecaf0865bd80eceefe2541b5cbdbdc457a367b66a3cb7f8f3d73cf3118f4"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d33903cda04f3be9e147dd69c55a58fa76f1bfc0abdb8346c641b76c5f20aacf"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "a7006e239fc119c1af332e1fdcd3ed42aed59deb6e22a092c9d3ed5c7eafa11e"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "89b0def0f9d9177fa0c0f1f7630d52bf3d6380ab27c475019fc6b1dddeca32b6"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "15fd16ebb3c82755a1ff70a172658c3928ad495194b975de8270b0dadf8fd10b"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "7cfe30a94db8722d0cf3c5f68f636c76e7e98c8f34f67f95724c80499c89ec64"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "0a066fed6ed9ca4a1514166c8b1ac5e097b5d32522dc39bee3a644f241f7448a"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "4fbef4c8c25690e3c23f3fcd27196714c691c9ea023d81b82763867a7547deab"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "451b17760fd2f3b99cda0f1711fc3e74320ef0e86b41ea89205c00395b1ac46a"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "e12206fd4993e75ecd3398130758cb1cc4f103c5792a9b59956766d975840653"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "ef954070ef7f3eafb9727ee848627145dfc884fc46445374d5b618d344359432"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "6795c8d63e2cbad65d347bb07503725f85ef464767020df605bdc5dfbdd4cf60"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "752594014a72770d33784a99782b24bebaadeb83bda57880f3d0bdb94c2ef56e"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "a5b26f9f5b9194592e4749770e85cfe35d308ce5cffceea00e9aea5a90a5ef95"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "57c6072b4dd026daa11b7877fc05ff8aea383eb1d0a8cd1798bd26246f013145"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "fe5a4aae238d74a26614014547294226b49155a7c7fe5fe8a4d2955ee9bfc457"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "53b5a81b33115e6892dc6d98a275d675a576eb721290af271262314f33a8a5d3"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "7a73aea8c228b3491c12735240fbdb8715d8236e89b8634f8b8eae435a6b33f2"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "7060ad8b0e78eaebcb6ef7b4976866ddbcca8123daca4ebd7e0ace9792c55a00"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "b3858ed759dc5c3bf383bff0620d28e939e2a906b266bf9ad28409c45835da82"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "efda293d3583806b80695c0f102151574623180a192826e66e90c34599e13444"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "235138d5b83242a50e194c09d687edfad8a4f912d8434c749dec15a271a38d8e"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "0fccd7402f84ef47bc14cd91da4c9aecfceda90588293e47c3473ba5849e8ba2"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "de27a346f47ad06ade89b4da1809b7ab8aff10e491352b88185d4fab1aaa5613"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "e4daced301792d86a7d5bb194da1ff4b9fb1ab7e8583ff3810ed5dca2c57c2c2"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "e6f6b914d0b8e1a349087c893cd91807e6d8159f4f8db27c2c89b8304a21aca8"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "f61a475f0646b6935abf6ca4b07d88a65e782ad6a5fbd17ab2c7cbc0e386f9b0"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "091597ef122a51e27e69aa02d84c0de37b3bcc4aab38326a160d8836f82d9235"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "336f74b4f6f0fc0ca24af1b287bb049ba37aedd760c60b71560c32aa21d902a4"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "7026aaee3d615fd5401881728fce02d69a74dd08bcf4ad32cdbde6e48e9750fa"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "412212198a4bfb35964baa84d55bdec89a30ad47be0e54c7be64e3bbaa8166f9"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "50c0c3f6931e6a1a498d075847dec4796db804d296b0bcb7254576d910c88f51"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "f457de6b5e6692cdac57f9cc8b5bace0f3c678cb40848963f91dad36aa53e7cb"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "9a88a56a56d5448e6ffdcc2aa15b70bc6300750dae11c25047036873bd0f1bf7"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "1254482bd8d0c2fef0a728415e0053b1e68951c1a4de32ea38e3a8435ef8be11"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "6daecbd8ab6eaeab01139037a950e5e48766f20290bd13daa9f2177a0bed7a37"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ae92dcc94f43a80e335b9dcbc82a1831ede646e173eb1a6b76a3a5c076f70598"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "813d1965cd6b15e8bd1b40f77e787086ff38dfbafbfdb6ef3d958543ec566d9e"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "bfe3bd48305674bc3e7f9edc318585e605e31e59bf55c1095ba08f82f1e92fe6"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "d9f6062d09d4c505656e4f1c3fe098b896beffb9ee299ba5d544a91d97288d8c"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "9c5b3343070f2f986aa13cd6f03a184643cfa5a0214fe2d3696cfd5f81efa4cb"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "bb128791f7f9dc18b282aec0892987b2d315103bd56d646b22113f74e379db0f"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "2a5e0a25d654015bec541cca26491312746552b052a6ff1e93daa7e83d5c5539"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "97f524aa830ebbbe80396db69b798463c1bb973a57edb3bf04350cf343b9f345"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "f4e38e9124fc916766c1b7d3b1eb5612e5358d5ff7cb60127f6c9ef00360ca2f"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "415b0f6e0c9ca0c9a415d96c821ab72c15b5d2863109c6411d1d35f3835fc92a"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "d001a0047d2ef866ae2ad7675b3e45a7055ceaf84e031a24c72b239b42fdd98e"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "cbea32c4b8989fc5f0bf948ab5d80ab715fac7fcc179dee169ac9d725ab2b43a"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ea9073faecd9cb850dae9c69a85368f9ad8ec9e00c9aba988205aedfc2e63bd3"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "c3c57dcc4a5790b36668b8e255674945e61ee9d6ef69704f39d499ad57510a79"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "854692a0be4be1b34e958c34a7318dd818e310439d01ee552910a067cf6f6624"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0143d2dc4cf2979f8744dd282f937f9e8084393e4c7836219eb182618062d1cc"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "81f96f818ce68ee25fe1ed7b1c831ed95d26a3fb034bac836707bf93ffaa140a"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "3824d40ecbebc2df46f865e0375119c9fe5dd1dd5a0f4c193de984134ee6e7c7"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "218b36a99038e08dde7677bc8e89f1b74b5456da2f5e5e1a081eea7ab19bb7e5"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "2007623afeacb1b11ed4e93dafad6f47d1365ff8505282c858168ef95d31b724"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "708780c7f96b0f48f177780fe48c4613b3548eb5b08ba37d1471781de2fe5653"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "589e950adc3258ad2064233ecfc5e385d301096e0fc08b3a5cc9eebc0454ac6e"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "eec26f6c23c5e58913387264ad9cd52d5571ad95b1047490530c2c7cecee4584"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "3c71e67434e42be6ef9970c948030c58198cb941ee39d50845afc2a96c85abe0"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "558f5ab75ade19ac57fc939c4314233004fbafb2232e9d4bdc6ee938cf0d0e2c"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "d8a19e75930a0e902b261b6a4872f47daa16baa736fcf4b6e86ba3e947a05fb2"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "c69f8782bdfddc06e4fcce994ce8bf79031c47fd60132fbdab42083d7645fbac"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ed1da31169d61b4eb6f3f7858dfd5ab7bb436a9c3ae66882d00a19929d48ded0"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "e1e4b663f699ed623ccf4d91966d1d0b6f17aa831a14b86316898590b559790f"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "5c51bfb471b8870aa04d3e66bb1cc465a7e3d7f36badb91bb0cdd56789ba9657"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "7523bdbc44826267f710d1758c3d64fc5b2711ea26559e8eee8d803174a5f801"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "929bca0a3d2eb67d02c1af5df073fca04db1e70ec95cae622f87c70c5138559c"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "464da5be343009f180d829cc88e01cc7eaef953195f4b3396156a019fd17a36e"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "f84234ba1c6c0eaaf9b73d40546e482dd024bad6bc1aa9b0f19351af064abacf"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "c1c25d2226f47102969272777fa985694430e227a6e58c1a3fc3da479ed6a69f"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "10ae8036fc64d7bd0226ec9b8e9614b5bb24d995d0701d23b471f65767de81cf"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "ca3fb46ad1d80fb9d37bc0b3844b8d3972640772edba1ab6485eaf10d257654f"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "f8d229cb8257262adac057831f7080f431e356eb4ffdd512e8ea8b6ba8e6d702"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "78d326fc7baed0aee612b542fda5333a83d2874c20a396a4cea0ae4d4c9b45e3"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "fc827807c3793c15fa7650614da558773fd884d5aabf8e181c8822e4109a6832"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "37681476c04f02dd5fe3e815da3c6569cfedf1d1627826122c934caab8bca74c"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "d63640093f26d53257b5f1b6ea3c8b620498a21cd7ad1144bb3b5d85d63967ac"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "a37e2833f4ad4e9c13d4da88f22f8a9cf7ad77b238f2d00f914a27f276ba99da"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "869fc9c719a7a619e15b98007f60b3f92dd8f7c46fd27e4fc864a8b829e13da0"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "c832506a00c22cbc2589814642340bbb1067fd31e414db4f426a8a451991083e"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "9597216b353369221867741de9f9fcd030adccf1d9ffe2b127c7b858b51e04f4"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "d67274f1e39b479674b4909b0e072dff712db0146577f4ea36736ac0d94e3dae"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "95477afad170df8efcedb493e5ffa9366f1abc8d451860b899457c8a296afbe0"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "d453f7cb7f1fd662d1a1fecc701880a3d45c223d842d91061ab5f815333b8680"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "f19bf0b83a4389aa4bb1e1f7d434be12c266c0575b13cabed541a4ac38c2d810"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "4d1c8c365511b195da7e18c10cda8f6599d840598e4623bffb445a67a42590cf"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "607a62d71718fb2ba89c2a3b75acc13fde048f5d05a692783da955af344a16d1"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "635a980f48bd8c0f93ff2666ad7f761e80a255fb54647704e2514c6ba7b9bf60"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3eb083c8de026db0727b4fd206fc9045981c5672af7ebf6e0653ee28f5aa8bc0"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "515749c690b64a7d047df00291aed071dc90e5582e9ab0e4bc560635ef7d888a"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "256316348c9d5cf525f0b2f2c09db968714135e21677d122b6bca6e87471a9f3"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 6ee926db693d..566247fc0d43 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -19,7 +19,7 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
 let
 
 common = { pname, version, sha256 }: stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
+  name = "${pname}-unwrapped-${version}";
 
   src = fetchurl {
     url =
@@ -83,8 +83,8 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
     ''
       mkdir ../objdir
       cd ../objdir
-      if [ -e ../${name} ]; then
-        configureScript=../${name}/configure
+      if [ -e ../${pname}-${version} ]; then
+        configureScript=../${pname}-${version}/configure
       else
         configureScript=../mozilla-*/configure
       fi
@@ -99,7 +99,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
   postInstall =
     ''
       # For grsecurity kernels
-      paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container}
+      paxmark m $out/lib/${pname}-${version}/{firefox,firefox-bin,plugin-container}
 
       # Remove SDK cruft. FIXME: move to a separate output?
       rm -rf $out/share/idl $out/include $out/lib/firefox-devel-*
@@ -131,16 +131,16 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
 
 in {
 
-  firefox = common {
+  firefox-unwrapped = common {
     pname = "firefox";
-    version = "43.0";
-    sha256 = "1slg5m05z67q29mrpjv0a753c4vy1vxhx7p3f75494yfvi0ngcd5";
+    version = "43.0.4";
+    sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn";
   };
 
-  firefox-esr = common {
+  firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "38.5.0esr";
-    sha256 = "086vkhrls9g0cxf50izfzcf2h60syswqrlzyi2z21awhwg7r07ra";
+    version = "38.5.2esr";
+    sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m";
   };
 
 }
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index db51dc8b148b..8c805b0bf5fe 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -1,11 +1,58 @@
-{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, gst_plugins, libs, gtk_modules
-, browserName, desktopName, nameSuffix, icon, libtrick ? true
+{ stdenv, lib, makeDesktopItem, makeWrapper, config
+
+## various stuff that can be plugged in
+, gnash, flashplayer, hal-flash
+, MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra
+, supportsJDK, jrePlugin, icedtea_web
+, trezor-bridge, bluejeans, djview4
+, google_talk_plugin, fribid, gnome3/*.gnome_shell*/
+}:
+
+## configurability of the wrapper itself
+browser :
+{ browserName ? (lib.head (lib.splitString "-" browser.name))  # name of the executable
+, name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
+, desktopName ? # browserName with first letter capitalized
+  (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)
+, nameSuffix ? ""
+, icon ? browserName, libtrick ? true
 }:
 
-let p = builtins.parseDrvName browser.name; in
+let
+  cfg = stdenv.lib.attrByPath [ browserName ] {} config;
+  enableAdobeFlash = cfg.enableAdobeFlash or false;
+  enableGnash = cfg.enableGnash or false;
+  jre = cfg.jre or false;
+  icedtea = cfg.icedtea or false;
 
+  plugins =
+     assert !(enableGnash && enableAdobeFlash);
+     assert !(jre && icedtea);
+     ([ ]
+      ++ lib.optional enableGnash gnash
+      ++ lib.optional enableAdobeFlash flashplayer
+      ++ lib.optional (cfg.enableDjvu or false) (djview4)
+      ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser)
+      ++ lib.optional (cfg.enableGeckoMediaPlayer or false) gecko_mediaplayer
+      ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin
+      ++ lib.optional icedtea icedtea_web
+      ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin
+      ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid
+      ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
+      ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
+      ++ lib.optional (cfg.enableBluejeans or false) bluejeans
+     );
+  libs = [ gst_all.gstreamer gst_all.gst-plugins-base ]
+         ++ lib.optionals (cfg.enableQuakeLive or false)
+         (with xorg; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ])
+         ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash
+         ++ lib.optional (config.pulseaudio or false) libpulseaudio;
+  gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ];
+  gtk_modules = [ libcanberra ];
+
+in
 stdenv.mkDerivation {
-  name = "${p.name}-with-plugins-${p.version}";
+  inherit name;
 
   desktopItem = makeDesktopItem {
     name = browserName;
@@ -26,7 +73,7 @@ stdenv.mkDerivation {
     ];
   };
 
-  buildInputs = [makeWrapper] ++ gst_plugins;
+  buildInputs = [makeWrapper] ++ gst-plugins;
 
   buildCommand = ''
     if [ ! -x "${browser}/bin/${browserName}" ]
@@ -82,11 +129,15 @@ stdenv.mkDerivation {
   libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
   gtk_modules = map (x: x + x.gtkModule) gtk_modules;
 
-  meta = {
+  passthru = { unwrapped = browser; };
+
+  meta = browser.meta // {
     description =
       browser.meta.description
       + " (with plugins: "
       + lib.concatStrings (lib.intersperse ", " (map (x: x.name) plugins))
       + ")";
+    hydraPlatforms = [];
+    priority = (browser.meta.priority or 0) - 1; # prefer wrapper over the package
   };
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 5b3ceeae70a0..80c9b1b31d8e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -17,11 +17,11 @@ in
 stdenv.mkDerivation rec {
   name = "bluejeans-${version}";
 
-  version = "2.100.102.8";
+  version = "2.125.24.5";
 
   src = fetchurl {
     url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb";
-    sha256 = "18f8jmhxvqy1yiiwlsssj7rjlfcb41xn16hnl6wv8r8r2mmic4v8";
+    sha256 = "0lxxd7icfqcpg5rb4njkk4ybxmisv4c509yisznxspi49qfxirwq";
   };
 
   phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index d60ae8ea1dbc..9521e1debd7c 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -57,11 +57,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "11.2.202.554";
+  version = "11.2.202.559";
 
   src = fetchurl {
     url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "0pjan07k419pk3lmfdl5vww0ipf5b76cxqhxwjrikb1fc4x993fi";
+    sha256 = "1vb01pd1jhhh86r01nwdzcf66d72jksiyiyp92hs4khy6n5qfsl3";
   };
 
   buildInputs = [ unzip ];
diff --git a/pkgs/applications/networking/browsers/netsurf/default.nix b/pkgs/applications/networking/browsers/netsurf/default.nix
deleted file mode 100644
index 07184bfd9f2c..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ pkgs }:
-with pkgs;
-
-rec {
-
-  libParserUtils = import ./libParserUtils.nix {
-    inherit fetchurl pkgconfig stdenv lib;
-  };
-
-  libCSS = import ./libCSS.nix {
-    inherit fetchurl sourceFromHead stdenv lib pkgconfig libParserUtils
-      libwapcaplet;
-  };
-
-  libnsbmp = import ./libnsbmp.nix {
-    inherit fetchurl stdenv lib;
-  };
-
-  libnsgif = import ./libnsgif.nix {
-    inherit fetchurl stdenv lib;
-  };
-
-  libwapcaplet = import ./libwapcaplet.nix {
-    inherit fetchurl sourceFromHead stdenv lib;
-  };
-
-  libsvgtiny = import ./libsvgtiny.nix {
-    inherit fetchurl sourceFromHead stdenv lib pkgconfig gperf libxml2;
-  };
-
-  hubub = stdenv.mkDerivation {
-    name = "Hubbub-0.0.1";
-
-    src = fetchurl {
-      url = http://www.netsurf-browser.org/projects/releases/hubbub-0.0.1-src.tar.gz;
-      sha256 = "1pwcnxp3h5ysnr3nxhnwghaabri5zjaibrcarsrrnhkn2gvvv81v";
-    };
-
-    installPhase = "make PREFIX=$out install";
-    buildInputs = [pkgconfig libParserUtils];
-
-    meta = { 
-      description = "HTML5 compliant parsing library, written in C";
-      homepage = http://www.netsurf-browser.org/projects/hubbub/;
-      license = stdenv.lib.licenses.mit;
-      maintainers = [lib.maintainers.marcweber];
-      platforms = lib.platforms.linux;
-    };
-  };
-
-  /*
-  # unfinished - experimental
-  libdom = stdenv.mkDerivation {
-    name = "libdom-devel";
-
-    # REGION AUTO UPDATE:     { name="libdom"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/dom"; groups = "netsurf_group"; }
-    src= sourceFromHead "libdom-9721.tar.gz"
-                 (fetchurl { url = "http://mawercer.de/~nix/repos/libdom-9721.tar.gz"; sha256 = "ca4b94a8dd32036787331a14133c36a49daded40bdb4c04edc3eab99e2193abc"; });
-    # END
-    installPhase = "make PREFIX=$out install";
-    buildInputs = [pkgconfig];
-
-    meta = { 
-      description = "implementation of the W3C DOM, written in C";
-      homepage = http://www.netsurf-browser.org/projects/hubbub/;
-      license = stdenv.lib.licenses.mit;
-      maintainers = [lib.maintainers.marcweber];
-      platforms = lib.platforms.linux;
-    };
-  };
-  */
-
-  netsurfHaru = import ./haru.nix {
-    inherit fetchurl sourceFromHead stdenv lib zlib libpng; 
-  };
-
-  browser = import ./netsurf.nix {
-    inherit fetchurl sourceFromHead stdenv lib pkgconfig
-      libnsbmp libnsgif libsvgtiny libwapcaplet hubub libParserUtils
-      libpng libxml2 libCSS lcms curl libmng glib gtk;
-    libharu = netsurfHaru;
-    inherit (gnome) libglade;
-  };
-
-
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/haru.nix b/pkgs/applications/networking/browsers/netsurf/haru.nix
deleted file mode 100644
index 7aa362c613fd..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/haru.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-
-  name = "netsurf-haru-trunk";
-
-  # REGION AUTO UPDATE:     { name="netsurf_haru"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libharu"; groups = "netsurf_group"; }
-  src= sourceFromHead "netsurf_haru-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf_haru-9721.tar.gz"; sha256 = "8113492823e1069f428ef8970c2c7a09b4c36c645480ce81f8351331ce097656"; });
-  # END
-
-  preConfigure = "cd upstream";
-  configureFlags = "--with-zlib=${zlib} --with-png=${libpng}";
-
-  buildInputs = [zlib libpng];
-
-  installPhase = "make PREFIX=$out install";
-
-  meta = {
-    description = "cross platform, open source library for generating PDF files";
-    homepage = http://libharu.org/wiki/Main_Page;
-    license = with stdenv.lib.licenses; [ libpng zlib ];
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libCSS.nix b/pkgs/applications/networking/browsers/netsurf/libCSS.nix
deleted file mode 100644
index 99192fda113a..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libCSS.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libCSS-devel";
-
-  # REGION AUTO UPDATE:       { name="libCSS"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libcss"; groups = "netsurf_group"; }
-  src= sourceFromHead "libCSS-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/libCSS-9721.tar.gz"; sha256 = "47b44653f7b53c21da6224ffb1f81df934cc711d6a5795c5584755a8bd48e5ac"; });
-  # END
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [pkgconfig libParserUtils libwapcaplet];
-
-  meta = { 
-    description = "A CSS parser and selection engine, written in C"; # used by netsurf
-    homepage = http://www.netsurf-browser.org/projects/libcss/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix b/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
deleted file mode 100644
index 3c2b7693be7f..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libParserUtils.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libParserUtils-0.0.1";
-
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/projects/releases/libparserutils-0.0.1-src.tar.gz;
-    sha256 = "0r9ia32kgvcfjy82xyiyihyg9yhh3l9pdzk6sp6d6gh2sbglxvas";
-  };
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [pkgconfig];
-
-  meta = { 
-    description = "A library for building efficient parsers, written in C";
-    homepage = http://www.netsurf-browser.org/projects/libparserutils/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
deleted file mode 100644
index 083850bb5450..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libnsbmp-0.0.1";
-
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/projects/releases/libnsbmp-0.0.1-src.tar.gz;
-    sha256 = "1ldng20w5f725rhfns3v58x1mh3d93zwrx4c8f88rsm6wym14ka2";
-  };
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [];
-
-  meta = { 
-    description = "A decoding library for BMP and ICO image file formats"; # used by netsurf
-    homepage = http://www.netsurf-browser.org/projects/libnsbmp/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix b/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
deleted file mode 100644
index 5e2acb4f313f..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libnsgif.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libnsgif-0.0.1";
-
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/projects/releases/libnsgif-0.0.1-src.tar.gz;
-    sha256 = "0lnvyhfdb9dm979fly33mi2jlf2rfx9ldx93viawvana63sidwsl";
-  };
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [];
-
-  meta = {
-    description = "A decoding library for gif image file formats"; # used by netsurf
-    homepage = http://www.netsurf-browser.org/projects/libnsgif/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
deleted file mode 100644
index 1e9f74a1ffd4..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libsvgtiny-devel";
-
-  # REGION AUTO UPDATE:      { name="libsvgtiny"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libsvgtiny"; groups = "netsurf_group"; }
-  src= sourceFromHead "libsvgtiny-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; });
-  # END
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [pkgconfig gperf libxml2];
-
-  meta = { 
-    description = "implementation of SVG Tiny, written in C";
-    homepage = http://www.netsurf-browser.org/projects/libsvgtiny/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
deleted file mode 100644
index a4cd09d1d860..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "libwapcaplet-devel";
-
-  # REGION AUTO UPDATE:     { name="libwapcaplet"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/libwapcaplet"; groups = "netsurf_group"; }
-  src= sourceFromHead "libwapcaplet-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/libwapcaplet-9721.tar.gz"; sha256 = "7f9f32ca772c939d67f3bc8bf0705544c2b2950760da3fe6a4e069ad0f77d91a"; });
-  # END
-
-  NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
-
-  installPhase = "make PREFIX=$out install";
-  buildInputs = [];
-
-  meta = { 
-    description = "A string internment library, written in C";
-    homepage = http://www.netsurf-browser.org/projects/libwapcaplet/;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/netsurf/netsurf.nix b/pkgs/applications/networking/browsers/netsurf/netsurf.nix
deleted file mode 100644
index f7e90b61a941..000000000000
--- a/pkgs/applications/networking/browsers/netsurf/netsurf.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-
-  name = "netsurf-devel";
-  # REGION AUTO UPDATE:      { name="netsurf"; type = "svn"; url = "svn://svn.netsurf-browser.org/trunk/netsurf"; groups = "netsurf_group"; }
-  src= sourceFromHead "netsurf-9721.tar.gz"
-               (fetchurl { url = "http://mawercer.de/~nix/repos/netsurf-9721.tar.gz"; sha256 = "4705f059596fbd95b1a80d9a6c5d08daf051fd0e5e868ccd40b30af8a45e8f56"; });
-  # END
-
-  # name = "netsurf-2.1";
-  /*
-  src = fetchurl {
-    url = http://www.netsurf-browser.org/downloads/releases/netsurf-2.1-src.tar.gz;
-    sha256 = "10as2skm0pklx8bb8s0z2hh72f17snavkhj7dhi8r4sjr10wz8nd";
-  };
-  */
-
-  buildInputs = [pkgconfig
-    libnsbmp libnsgif libwapcaplet libsvgtiny hubub libParserUtils
-    curl libpng libxml2 lcms glib libharu libmng
-    gtk libglade libCSS];
-
-  buildPhase = "make PREFIX=$out";
-  installPhase = "make PREFIX=$out install";
-
-  meta = with args.lib; {
-    description = "free, open source web browser";
-    homepage = http://www.netsurf-browser.org;
-    license = with licenses; [
-      gpl2
-      mit /* visual work */
-    ];
-    maintainers = with maintainers; [ marcweber ];
-    platforms = platforms.linux;
-  };
-
-}
-
diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix
index 089bc1b23db7..fcaaec63b9e6 100644
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/networking/browsers/surf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "surf-${version}";
-  version="0.6";
+  version="0.7";
 
   src = fetchurl {
     url = "http://dl.suckless.org/surf/surf-${version}.tar.gz";
-    sha256 = "01b8hq8z2wd7ssym5bypx2b15mrs1lhgkrcgxf700kswxvxcrhgx";
+    sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m";
   };
 
   buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ];
@@ -16,12 +16,10 @@ stdenv.mkDerivation rec {
 
   buildPhase = " make ";
 
-# `-lX11' to make sure libX11's store path is in the RPATH
+  # `-lX11' to make sure libX11's store path is in the RPATH
   NIX_LDFLAGS = "-lX11";
-  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
-  installPhase = ''
-    make PREFIX=/ DESTDIR=$out install
-  '';
+  preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
+  installFlags = [ "PREFIX=/" "DESTDIR=$(out)" ];
 
   preFixup = ''
     wrapProgram "$out/bin/surf" \
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index d67c8abf4569..ddaaa68f60d4 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "vimb-${version}";
-  version = "2.9";
+  version = "2.11";
 
   src = fetchurl {
     url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
-    sha256 = "0h9m5qfs09lb0dz8a79yccmm3a5rv6z8gi5pkyfh8fqkgkh2940p";
+    sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f";
   };
 
   buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ];
diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix
index 6f37477c1b37..076b3faf11f5 100644
--- a/pkgs/applications/networking/browsers/w3m/default.nix
+++ b/pkgs/applications/networking/browsers/w3m/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, fetchpatch
+{ stdenv, fetchgit, fetchpatch
 , ncurses, boehmgc, gettext, zlib
 , sslSupport ? true, openssl ? null
 , graphicsSupport ? true, imlib2 ? null
 , x11Support ? graphicsSupport, libX11 ? null
 , mouseSupport ? !stdenv.isDarwin, gpm-ncurses ? null
-, perl, man
+, perl, man, pkgconfig
 }:
 
 assert sslSupport -> openssl != null;
@@ -15,11 +15,12 @@ assert mouseSupport -> gpm-ncurses != null;
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "w3m-0.5.3";
+  name = "w3m-0.5.3-2015-12-20";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/w3m/${name}.tar.gz";
-    sha256 = "1qx9f0kprf92r1wxl3sacykla0g04qsi0idypzz24b7xy9ix5579";
+  src = fetchgit {
+    url = "git://anonscm.debian.org/collab-maint/w3m.git";
+    rev = "e0b6e022810271bd0efcd655006389ee3879e94d";
+    sha256 = "1vahm3719hb0m20nc8k88165z35f8b15qasa0whhk78r12bls1q6";
   };
 
   NIX_LDFLAGS = optionalString stdenv.isSunOS "-lsocket -lnsl";
@@ -29,44 +30,17 @@ stdenv.mkDerivation rec {
   PERL = "${perl}/bin/perl";
   MAN = "${man}/bin/man";
 
-  # the Arch patches were pulled from:
-  # https://aur.archlinux.org/cgit/aur.git/?h=w3m-mouse
   patches = [
     ./RAND_egd.libressl.patch
     (fetchpatch {
-      name = "file_handle.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/file_handle.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "0kkqm68ig9d658kf1iwa1dwcf651f6dy2j98gplcks1mn3bdlak4";
-    })
-    (fetchpatch {
-      name = "form_unknown.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/form_unknown.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "1mbfclid3bihb1xv7sxcahprn3slzd6ga8rjzlq4rbq80bl053fw";
-    })
-    (fetchpatch {
-      name = "gc72.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/gc72.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "1n6anaw17by0s6rn25bwkgj2mck7ffspizpwbijvx1ynk451459a";
-    })
-    (fetchpatch {
       name = "https.patch";
       url = "https://aur.archlinux.org/cgit/aur.git/plain/https.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
       sha256 = "08skvaha1hjyapsh8zw5dgfy433mw2hk7qy9yy9avn8rjqj7kjxk";
     })
-    (fetchpatch {
-      name = "perl.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/perl.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "15cq7cwh0d2v64i8by44rgxw48156sgh872921hxrqdakr95p3gy";
-    })
-    (fetchpatch {
-      name = "w3m_rgba.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/w3m_rgba.patch?h=w3m-mouse&id=5b5f0fbb59f674575e87dd368fed834641c35f03";
-      sha256 = "1dhp1p6z621ayyl9zip9w35x2cxyhhj72jv5dvf0zp4rk6cjm781";
-    })
   ] ++ optional (graphicsSupport && !x11Support) [ ./no-x11.patch ]
     ++ optional stdenv.isCygwin ./cygwin.patch;
 
-  buildInputs = [ncurses boehmgc gettext zlib]
+  buildInputs = [ pkgconfig ncurses boehmgc gettext zlib ]
     ++ optional sslSupport openssl
     ++ optional mouseSupport gpm-ncurses
     ++ optional graphicsSupport imlib2
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index dcfef83f1bec..6e20f7c23038 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
+{ stdenv, buildEnv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
 , ruby, libxslt, libxml2, sqlite, openssl, docker
-, dataDir ? "/var/lib/panamax-api" }:
+, dataDir ? "/var/lib/panamax-api" }@args:
 
 with stdenv.lib;
 
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
     gemset = ./gemset.nix;
     gemfile = ./Gemfile;
     lockfile = ./Gemfile.lock;
-    buildInputs = [ openssl ];
   };
-  bundler = bundler_HEAD.override { inherit ruby; };
+
+  bundler = args.bundler.override { inherit ruby; };
 
   database_yml = builtins.toFile "database.yml" ''
     production:
diff --git a/pkgs/applications/networking/cluster/panamax/ui/default.nix b/pkgs/applications/networking/cluster/panamax/ui/default.nix
index 3dac10613625..88e0efc18a64 100644
--- a/pkgs/applications/networking/cluster/panamax/ui/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/ui/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler_HEAD
-, ruby, rubygemsFun, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}:
+{ stdenv, fetchgit, fetchurl, makeWrapper, bundlerEnv, bundler
+, ruby, openssl, sqlite, dataDir ? "/var/lib/panamax-ui"}@args:
 
 with stdenv.lib;
 
@@ -13,10 +13,9 @@ stdenv.mkDerivation rec {
     gemset = ./gemset.nix;
     gemfile = ./Gemfile;
     lockfile = ./Gemfile.lock;
-    buildInputs = [ openssl ];
   };
 
-  bundler = bundler_HEAD.override { inherit ruby; };
+  bundler = args.bundler.override { inherit ruby; };
 
   src = fetchgit {
     rev = "refs/tags/v${version}";
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index c9fecd9daeda..21dc23739775 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -44,25 +44,19 @@ in stdenv.mkDerivation {
       patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} "$binary"
     done
 
-    # Older versions of this package happily installed broken copies of
-    # anything other than CopyConsole - which was then also mangled to
-    # copy_console for some reason. Keep backwards compatibility (only
-    # for CopyConsole) for now; the NixOS service is already fixed.
-    ln -sv "$out/bin"/{CopyConsole,copy_console}
-
     RPATH=${libPaths}:$out/${appdir}
     echo "Updating rpaths to $RPATH in:"
     find "$out/${appdir}" -type f -a -perm -0100 \
       -print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://copy.com;
     description = "Copy.com graphical & command-line clients";
     # Closed Source unfortunately.
-    license = stdenv.lib.licenses.unfree;
-    maintainers = with stdenv.lib.maintainers; [ nathan-gs nckx ];
+    license = licenses.unfree;
+    maintainers = with maintainers; [ nathan-gs nckx ];
     # NOTE: Copy.com itself only works on linux, so this is ok.
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
index 8158c458afc7..ec604e9918bf 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, sqlite, curl, pkgconfig, libxml2, stfl, json-c-0-11, ncurses
-, gettext, libiconv, makeWrapper, perl }:
+, gettext, libiconv, makeWrapper, perl, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "newsbeuter-2.9";
@@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
     export LDFLAGS=-lncursesw
   '';
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/akrennmair/newsbeuter/commit/cdacfbde9fe3ae2489fc96d35dfb7d263ab03f50.patch";
+      sha256 = "1lhvn63cqjpikwsr6zzndb1p5y140vvphlg85fazwx4xpzd856d9";
+    })
+  ];
+
   installFlags = [ "DESTDIR=$(out)" "prefix=" ];
 
   installPhase = stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 231b3195b5f0..749e1864fda9 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,21 +1,24 @@
 { stdenv, fetchurl, pythonPackages }:
 
+let version = "2.21"; in
 pythonPackages.buildPythonPackage rec {
-  name = "rawdog-2.20";
+  name = "rawdog-${version}";
 
   src = fetchurl {
     url = "http://offog.org/files/${name}.tar.gz";
-    sha256 = "0a63b26cc111b0deca441f498177b49be0330760c5c0e24584cdb9ba1e7fd5a6";
+    sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030";
   };
 
   propagatedBuildInputs = with pythonPackages; [ feedparser ];
 
   namePrefix = "";
   
-  meta = {
+  meta = with stdenv.lib; {
+    inherit version;
     homepage = "http://offog.org/code/rawdog/";
-    description = "An RSS Aggregator Without Delusions Of Grandeur";
-    license = stdenv.lib.licenses.gpl2;
-    platform = stdenv.lib.platforms.unix;
+    description = "RSS Aggregator Without Delusions Of Grandeur";
+    license = licenses.gpl2;
+    platform = platforms.unix;
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 2b60b3a7a463..a2f9ebc83173 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.15";
+  version = "0.4.16";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "13712li6y3ikwzl17j46w25xyv3z98yqj7zpr3jifyvbna9ls5r3";
+    sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b2325e87e0d5..fa61876bf161 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -7,6 +7,7 @@
 , enableRST ? true
 , enableSpelling ? true, gtkspell ? null
 , enableNotifications ? false
+, extraPythonPackages ? pkgs: []
 }:
 
 assert enableJingle -> farstream != null && gst_plugins_bad != null
@@ -20,11 +21,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.4";
+  version = "0.16.5";
 
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "0zyfs7q1qg8iqszr8l1gb18gqla6zrrfsgpmbxblpi9maqxas5i1";
+    sha256 = "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55";
   };
 
   patches = [
@@ -61,7 +62,8 @@ stdenv.mkDerivation rec {
   ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
     ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils
-    ++ optional enableNotifications pythonPackages.notify;
+    ++ optional enableNotifications pythonPackages.notify
+    ++ extraPythonPackages pythonPackages;
 
   postInstall = ''
     install -m 644 -t "$out/share/gajim/icons/hicolor" \
diff --git a/pkgs/applications/networking/instant-messengers/gale/default.nix b/pkgs/applications/networking/instant-messengers/gale/default.nix
new file mode 100644
index 000000000000..65f6cab6e81c
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gale/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, adns, boehmgc, openssl, automake, m4, autoconf
+, libtool, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "gale-1.1happy";
+
+  src = fetchFromGitHub {
+    owner = "grawity";
+    repo = "gale";
+    rev = "b34a67288e8bd6f0b51b60abb704858172a3665c";
+    sha256 = "19mcisxxqx70m059rqwv7wpmp94fgyckzjwywpmdqd7iwvppnsqf";
+  };
+
+  nativeBuildInputs = [ m4 libtool automake autoconf ];
+  buildInputs = [ boehmgc openssl adns pkgconfig ];
+
+  patches = [ ./gale-install.in.patch ];
+
+  preConfigure = ''
+    substituteInPlace configure.ac --replace \$\{sysconfdir\} /etc
+    ./bootstrap
+  '';
+  configureArgs = [ "--sysconfdir=/etc" ];
+
+  meta = with stdenv.lib; {
+    homepage = "http://gale.org/";
+    description = "chat/messaging system (server and client)";
+    platforms = platforms.all;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
new file mode 100644
index 000000000000..f9c3e3c55922
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/gale/gale-install.in.patch
@@ -0,0 +1,339 @@
+diff --git a/gale-install.in b/gale-install.in
+index 50e8ad8..eec0ed2 100644
+--- a/gale-install.in
++++ b/gale-install.in
+@@ -29,22 +29,78 @@ testkey_stdin() {
+ 	gkinfo -x 2>/dev/null | qgrep "^Public key: <$1>"
+ }
+ 
+-if [ -n "$GALE_SYS_DIR" ]; then
+-	SYS_DIR="$GALE_SYS_DIR"
+-elif [ -n "$sysconfdir" ]; then
+-	SYS_DIR="$sysconfdir/gale"
++INST_SYS_DIR="$sysconfdir/gale"
++
++if [ `id -u` -eq 0 ]; then
++	is_root=yes
++	SYS_DIR=/etc/gale
++else
++	is_root=no
++	SYS_DIR="$HOME/.gale"
++fi
++
++if [ -f /etc/NIXOS ]; then
++	is_nixos=yes
++else
++	is_nixos=no
++fi
++
++if [ -u /var/setuid-wrappers/gksign ]; then
++	cat <<EOM
++
++Gale appears to have already been set up via the NixOS module system (check
++/etc/nixos/configuration.nix).
++
++EOM
++
++	exit 0
++fi
++
++if [ $is_root = yes ]; then
++	cat <<EOM
++
++You are running gale-install as root, so I'm going to assume you want to set up
++Gale for system-wide use.  Unfortunately, Gale expects to be able to run the
++"gksign" program via setuid, and we can't change gksign's permissions once it's
++already been installed because the Nix store is immutable by design.
++
++EOM
++
++	if [ $is_nixos = no ]; then
++		cat <<EOM
++
++This isn't a NixOS system.  Gale can only be installed for a single user on
++non-NixOS systems.  If you want a system-wide installation, you'll have to
++install Gale the old-fashioned way.  Sorry.
++
++EOM
++
++		exit 1
++	fi
++	cat <<EOM
++
++This script will generate a domain key for you, and after you get it signed, you
++can finish the setup process by configuring Gale via the NixOS module system
++(i.e. /etc/nixos/configuration.nix).
++
++EOM
++
+ else
+-	echo "Error: cannot locate Gale system configuration directory."
+-	exit 1
++	cat <<EOM
++
++Hi.  You are running gale-install as a normal user, so I'm going to assume you
++want to set up Gale for your own (i.e. non-system-wide) use.
++
++EOM
++
+ fi
+ 
+-CONF="$SYS_DIR/conf"
+ umask 022
+-PATH="$bindir:$sbindir:$PATH:/usr/ucb"
++PATH="$bindir:$sbindir:$PATH"
+ export PATH
+ 
+-if [ -f "$CONF" ]; then
+-	exec 3<"$CONF"
++if [ -n "$SYS_DIR" ] && [ -f "$SYS_DIR/conf" ]; then
++	exec 3<"$SYS_DIR/conf"
+ 
+ 	while read var value <&3 ; do
+ 		case "$var" in
+@@ -58,52 +114,14 @@ if [ -f "$CONF" ]; then
+ 	exec 3<&-
+ fi
+ 
+-USER="`whoami`"
+-if [ -z "$USER" ]; then
+-	echo "Error: cannot determine your username."
+-	exit 1
+-fi
+-
+-# -----------------------------------------------------------------------------
+-# check directory structure
+-
+-if [ ! -d "$SYS_DIR" ]; then
+-	echo "Error: Invalid SYS_DIR: \"$SYS_DIR\"."
+-	exit 1
+-fi
+-
+ # -----------------------------------------------------------------------------
+-# get settings for important variables: user, domain, server
++# get settings for important variables: domain, server
+ 
+-[ -n "$CONF_GALE_USER" ] && GALE_USER="$CONF_GALE_USER"
+ [ -n "$CONF_GALE_DOMAIN" ] && GALE_DOMAIN="$CONF_GALE_DOMAIN"
+ [ -n "$CONF_GALE_SERVER" ] && GALE_SERVER="$CONF_GALE_SERVER"
+ 
+-if [ -z "$GALE_USER" ]; then
+-cat << EOM
+-
+-Hi.  You need to denote a user to own the Gale domain secret key.  You must
+-trust this user with Gale authentication for your domain; the "gksign" program
+-will run as this user.  I recommend using a special "gale" user; if you don't
+-have administrative privileges here, you'll probably have to use your own
+-account.  I do not recommend the use of "root".
+-
+-No harm done if you stop this script now to set up such a user.
+-
+-EOM
+-
+-	printf "Enter the Gale username: "
+-	read GALE_USER
+-	if [ -z "$GALE_USER" ]; then
+-		echo "Error: Invalid username or no home dir: \"$GALE_USER\"."
+-		exit 1
+-	fi
+-else
+-	echo "Using \"$GALE_USER\" as the Gale owner."
+-fi
+-
+ if [ -z "$GALE_DOMAIN" ] ; then
+-cat << EOM
++	cat << EOM
+ 
+ You need to identify the name of your Gale domain for two purposes:
+ 
+@@ -140,97 +158,56 @@ else
+ fi
+ 
+ # -----------------------------------------------------------------------------
+-# create configuration file
+-
+-if [ ! -f "$CONF" ]; then
+-cat > "$CONF" <<EOM
+-# $CONF -- created by Gale installer; edit to suit.
+-EOM
++# create configuration file (if this is a single-user setup)
++
++if [ $is_root = no ]; then
++	CONF="$SYS_DIR/conf"
++
++	if [ ! -d "$SYS_DIR" ]; then
++		run mkdir -m 0700 -p "$SYS_DIR"
++		run mkdir -m 0700 -p "$SYS_DIR/auth"
++		run mkdir -m 0755 -p "$SYS_DIR/auth/trusted"
++		run cp -f "$INST_SYS_DIR/auth/trusted/ROOT" "$SYS_DIR/auth/trusted"
++		run mkdir -m 0700 -p "$SYS_DIR/auth/private"
++		run mkdir -p "$SYS_DIR/auth/local" "$SYS_DIR/auth/cache"
++	fi
+ 
+-cat <<EOM
++	if [ ! -f "$CONF" ]; then
++		cat <<EOM
+ 
+ *** Creating "$CONF".
+ Examine and edit this file to your taste and local needs.
+ If you want to recreate it from scratch, remove it and re-run this.
+-EOM
+-fi
+-
+-[ -n "$CONF_GALE_USER" ] || cat >> "$CONF" <<EOM
+ 
+-# The user who owns the domain secret key.  (Used in installation and upgrade)
+-GALE_USER $GALE_USER
+ EOM
+ 
+-[ -n "$CONF_GALE_DOMAIN" ] || cat >> "$CONF" << EOM
++		cat > "$CONF" <<EOF
++# $CONF -- created by Gale installer; edit to suit.
+ 
+ # The authentication domain to use.  (Mandatory)
+ GALE_DOMAIN $GALE_DOMAIN
+-EOM
+-
+-# -----------------------------------------------------------------------------
+-# make gksign setuid
++EOF
+ 
+-gksign="$sbindir/gksign"
+-readlink="`which readlink 2>/dev/null`"
+-[ -x "$readlink" ] && gksignlink="`"$readlink" "$gksign" 2>/dev/null`"
+-[ -f "$gksignlink" ] && gksign="$gksignlink"
+-
+-echo ""
+-if copy chown "$GALE_USER" "$gksign" ; then
+-	:
+-else
+-	echo "*** We need to chown $GALE_USER '$gksign'."
+-	echo "    Please run this script as a user that can do so,"
+-	echo "    or do so yourself and re-run this script."
+-	exit 1
++	fi
+ fi
+-run chmod 4755 "$gksign"
+ 
+-# -----------------------------------------------------------------------------
+-# create a domain, if necessary
++if [ $is_root = no ]; then
++	GALE_SYS_DIR="$SYS_DIR"
++	export GALE_SYS_DIR
+ 
+-echo ""
+-if test -u "$gksign" || copy chmod u+s "$gksign" ; then
+-	:
++	testkey "$GALE_DOMAIN" && exit 0
++	echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"."
++	GALE="$SYS_DIR"
+ else
+-	echo "*** We need to chmod u+s '$gksign'."
+-	echo "    Please run this script as a user that can do so,"
+-	echo "    or do so yourself and re-run this script."
+-	exit 1
+-fi
+-
+-testkey "$GALE_DOMAIN" && exit 0
+-echo "*** You lack a signed key for your domain, \"$GALE_DOMAIN\"."
+-
+-if [ "x$GALE_USER" != "x$USER" ]; then
+-cat <<EOM
+-Become user "$GALE_USER" (you are now "$USER") and run this script again
+-to create a new domain; contact your domain administrator if you wish to 
+-become part of an existing domain.
+-EOM
+-	exit 1
+-fi
+-
+-if [ -z "$HOME" ]; then
+-	cd
+-	HOME="`pwd`"
+-	echo "Warning: \$HOME not set, assuming \"$HOME\"."
+-fi
+-
+-GALE="$HOME/.gale"
+-mkdir -p "$GALE"
+-if [ ! -w "$GALE" ]; then
+-	echo "Error: Cannot create \"$GALE\"."
+-	exit 1
++	GALE="`pwd`"
+ fi
+ 
+ unsigned="$GALE/$GALE_DOMAIN.unsigned"
+ signer="`echo "$GALE_DOMAIN" | sed 's%^[^.@:/]*[.@:/]%%'`"
+ [ -z "$signer" ] && signer="ROOT"
+ 
+-if [ -f "$unsigned" ]; then
+-
+-cat << EOM
++if [ $is_root = no ] && [ -f "$unsigned" ]; then
++	cat << EOM
+ 
+ Okay, so we've already been here.  Last time, I created the file
+ "$unsigned" for you to have signed.
+@@ -275,16 +252,12 @@ EOM
+ 		exit 1
+ 	fi
+ 
+-cat << EOM
+-
+-The domain should be properly configured now.  Assuming users can access a
+-version of "gksign" setuid to "$GALE_USER" (this user), they should be
+-able to start running clients and generating IDs for themselves.
++	cat << EOM
+ 
+-The installation process is complete!
++The domain should be properly configured now.  The installation process is
++complete!
+ 
+ EOM
+-
+ 	exit 0
+ fi
+ 
+@@ -300,7 +273,10 @@ printf "Enter the description: "
+ read descr
+ 
+ echo "We will generate the key now.  Have patience."
+-gkgen -r "$GALE/auth/private/$GALE_DOMAIN.gpri" \
++if [ $is_root = no ]; then
++	install_gpri=auth/private/
++fi
++gkgen -r "$GALE/${install_gpri}$GALE_DOMAIN.gpri" \
+       -u "$unsigned" "$GALE_DOMAIN" /"$descr" || exit 1
+ 
+ cat << EOM
+@@ -311,8 +284,29 @@ the owner of the "$signer" domain through appropriate means.
+ Take care to preseve the file's binary data; you may need to uuencode it.
+ 
+ Assuming they trust you with your subdomain, they should pass the key through
+-"gksign" as a filter, returning the signed output to you.  When you have this
+-signed key file available, re-run this script, and we will move on to the
+-next step.
++"gksign" as a filter, returning the signed output to you.
++
++EOM
++
++if [ $is_nixos = yes ]; then
++	cat <<EOM
++
++When you have this signed key file available, you can finish the setup process
++by placing the private key and signed public key in a directory (they will be
++copied) and setting "services.gale.keyPath" in /etc/nixos/configuration.nix.
+ 
+ EOM
++else
++	cat <<EOM
++
++When you have this signed key file available, re-run this script, and we will
++move on to the next step.
++
++*** IMPORTANT ***
++You must set GALE_SYS_DIR="$GALE_SYS_DIR" in your environment before re-running
++this script and before running any Gale programs once setup is finished!  Make
++sure to set it now, and consider setting it via your shell initialization files
++so that you don't forget to do it next login.
++
++EOM
++fi
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
index 7cfa12eccb4d..367c837228a7 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoconf, automake, libtool
-, libsodium } :
+{ stdenv, fetchFromGitHub, libtoxcore, pidgin, autoreconfHook, libsodium }:
 
 let
   version = "dd181722ea";
@@ -17,11 +16,9 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lssp -lsodium";
 
-  preConfigure = "autoreconf -vfi";
-
   postInstall = "mv $out/lib/purple-2 $out/lib/pidgin";
 
-  buildInputs = [ libtoxcore pidgin autoconf automake libtool libsodium ];
+  buildInputs = [ libtoxcore pidgin autoreconfHook libsodium ];
 
   meta = {
     homepage = http://tox.dhs.org/;
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
new file mode 100644
index 000000000000..c19b5ff31f9d
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "pybitmessage-${version}";
+
+  version = "0.4.4";
+
+  src = fetchFromGitHub {
+    owner = "bitmessage";
+    repo = "PyBitmessage";
+    rev = "v${version}";
+    sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";
+  };
+
+  buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ];
+
+  preConfigure = ''
+    substituteInPlace Makefile \
+      --replace "PREFIX?=/usr/local" "" \
+      --replace "/usr" ""
+  '';
+
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/pybitmessage \
+      --replace "exec python2" "exec ${python}/bin/python" \
+      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/"
+    wrapProgram $out/bin/pybitmessage \
+      --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://bitmessage.org/;
+    description = "The official Bitmessage client";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgillich ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 0a7b44ba8cbc..72619e417adb 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,26 +1,27 @@
 { stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv,
   libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
   pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper,
-  qtbase, qtsvg, qttools, qttranslations }:
+  qtbase, qtsvg, qttools, qttranslations, sqlcipher }:
 
 let
-  revision = "1673b43e26c853f6446f228fec083af166cbf446";
+  revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1";
 in
 
 stdenv.mkDerivation rec {
-  name = "qtox-dev-20150925";
+  name = "qtox-dev-20151221";
 
   src = fetchgit {
       url = "https://github.com/tux3/qTox.git";
       rev = "${revision}";
-      md5 = "785f5b305cdcdf777d93ee823a5b9f49";
+      md5 = "a93a63d35e506be4b21abda0986f19e7";
   };
 
   buildInputs =
     [
       libtoxcore-dev openal opencv libsodium filter-audio
-      qtbase qttools libXScrnSaver glib gtk2 cairo
+      qtbase qttools qtsvg libXScrnSaver glib gtk2 cairo
       pango atk qrencode ffmpeg qttranslations makeWrapper
+      sqlcipher
     ];
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 17a7f11cccea..61b7e8ec5105 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,35 +1,38 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l
-, libXrender, fontconfig, libXext, libXft }:
+{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, dbus, libvpx, libX11, openal, freetype, libv4l
+, libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
 
 let
 
   filteraudio = stdenv.mkDerivation rec {
-    name = "filter_audio-20150128";
+    name = "filter_audio-20150516";
 
     src = fetchFromGitHub {
       owner = "irungentoo";
       repo = "filter_audio";
-      rev = "76428a6cda";
-      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+      rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
+      sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
     };
 
+    buildInputs = [ utillinux ];
+
     doCheck = false;
 
     makeFlags = "PREFIX=$(out)";
   };
 
 in stdenv.mkDerivation rec {
-  name = "utox-dev-20150130";
+  name = "utox-dev-20151220";
 
   src = fetchFromGitHub {
-    owner = "notsecure";
+    owner = "GrayHatter";
     repo = "uTox";
-    rev = "cb7b8d09b08";
-    sha256 = "0vg9h07ipwyf7p54p43z9bcymy0skiyjbm7zvyjg7r5cvqxv1vpa";
+    rev = "7e2907470835746b6819d631b48dd54bc9c4de66";
+    sha256 = "074wa0np8hyqwy9xqgyyds94pdfv2i1jh019m98d8apxc5vn36wk";
   };
 
-  buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft filteraudio ];
+  buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
+                  libv4l libXrender fontconfig libXext libXft filteraudio 
+                  git libsodium ];
 
   doCheck = false;
   
diff --git a/pkgs/applications/networking/irc/chatzilla/default.nix b/pkgs/applications/networking/irc/chatzilla/default.nix
index 765066bb4371..82d9912192ed 100644
--- a/pkgs/applications/networking/irc/chatzilla/default.nix
+++ b/pkgs/applications/networking/irc/chatzilla/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, firefox, makeWrapper }:
+{ stdenv, fetchurl, unzip, firefox-unwrapped, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "chatzilla-0.9.91";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     mkdir -p $out/libexec/chatzilla
     unzip $src -d $out/libexec/chatzilla
 
-    makeWrapper ${firefox}/bin/firefox $out/bin/chatzilla \
+    makeWrapper ${firefox-unwrapped}/bin/firefox $out/bin/chatzilla \
       --add-flags "-app $out/libexec/chatzilla/application.ini"
 
     sed -i $out/libexec/chatzilla/application.ini -e 's/.*MaxVersion.*/MaxVersion=99.*/'
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
new file mode 100644
index 000000000000..05a597199025
--- /dev/null
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -0,0 +1,30 @@
+{ fetchgit, libcommuni, qt5, stdenv
+}:
+
+stdenv.mkDerivation rec {
+  name = "communi-${version}";
+  version = "2016-01-03";
+
+  src = fetchgit {
+    url = "https://github.com/communi/communi-desktop.git";
+    rev = "ad1b9a30ed6c51940c0d2714b126a32b5d68c876";
+    sha256 = "0gk6gck09zb44qfsal7bs4ln2vl9s9x3vfxh7jvfc7mmf7l3sspd";
+  };
+
+  buildInputs = [ libcommuni qt5.qtbase ];
+
+  enableParallelBuild = true;
+
+  configurePhase = ''
+    export QMAKEFEATURES=${libcommuni}/features
+    qmake -r COMMUNI_INSTALL_PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A simple and elegant cross-platform IRC client";
+    homepage = https://github.com/communi/communi-desktop;
+    license = licenses.bsd3;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrdinka ];
+  };
+}
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix
index dfe5c3b0182f..65d365b5981c 100644
--- a/pkgs/applications/networking/irc/hexchat/default.nix
+++ b/pkgs/applications/networking/irc/hexchat/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
     desktop_file_utils hicolor_icon_theme
   ];
 
+ #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path
+  patchPhase = ''
+    sed -i "s,libenchant.so.1,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c
+  '';
+
   configureFlags = [ "--enable-shm" "--enable-textfe" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/irc/xchat/default.nix b/pkgs/applications/networking/irc/xchat/default.nix
deleted file mode 100644
index 1999bd030cbc..000000000000
--- a/pkgs/applications/networking/irc/xchat/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{stdenv, fetchurl, pkgconfig, tcl, gtk}:
-
-stdenv.mkDerivation {
-  name = "xchat-2.8.8";
-  src = fetchurl {
-    url = http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2;
-    sha256 = "0d6d69437b5e1e45f3e66270fe369344943de8a1190e498fafa5296315a27db0";
-  };
-  buildInputs = [pkgconfig tcl gtk];
-  configureFlags = "--disable-nls";
-
-  patches = [ ./glib-top-level-header.patch ];
-
-  meta = {
-    description = "IRC client using GTK";
-    homepage = http://www.xchat.org;
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch b/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch
deleted file mode 100644
index b1413b357537..000000000000
--- a/pkgs/applications/networking/irc/xchat/glib-top-level-header.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c xchat-2.8.8/src/common/dbus/dbus-plugin.c
---- xchat-2.8.8-orig/src/common/dbus/dbus-plugin.c	2009-08-16 05:40:15.000000000 -0400
-+++ xchat-2.8.8/src/common/dbus/dbus-plugin.c	2012-07-15 23:07:33.678948703 -0400
-@@ -24,7 +24,7 @@
- #include <config.h>
- #include <dbus/dbus-glib.h>
- #include <dbus/dbus-glib-lowlevel.h>
--#include <glib/gi18n.h>
-+#include <glib.h>
- #include "../xchat-plugin.h"
- 
- #define PNAME _("remote access")
-diff -Naur xchat-2.8.8-orig/src/common/modes.c xchat-2.8.8/src/common/modes.c
---- xchat-2.8.8-orig/src/common/modes.c	2010-05-29 21:52:18.000000000 -0400
-+++ xchat-2.8.8/src/common/modes.c	2012-07-15 23:07:33.654948723 -0400
-@@ -20,7 +20,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <glib.h>
--#include <glib/gprintf.h>
-+#include <glib.h>
- 
- #include "xchat.h"
- #include "xchatc.h"
-diff -Naur xchat-2.8.8-orig/src/common/servlist.c xchat-2.8.8/src/common/servlist.c
---- xchat-2.8.8-orig/src/common/servlist.c	2010-05-16 03:24:26.000000000 -0400
-+++ xchat-2.8.8/src/common/servlist.c	2012-07-15 23:07:33.643948732 -0400
-@@ -24,7 +24,7 @@
- #include <unistd.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- 
- #include "cfgfiles.h"
- #include "fe.h"
-diff -Naur xchat-2.8.8-orig/src/common/text.c xchat-2.8.8/src/common/text.c
---- xchat-2.8.8-orig/src/common/text.c	2010-05-29 22:14:41.000000000 -0400
-+++ xchat-2.8.8/src/common/text.c	2012-07-15 23:07:33.671948706 -0400
-@@ -28,7 +28,7 @@
- #include <sys/mman.h>
- 
- #include "xchat.h"
--#include <glib/ghash.h>
-+#include <glib.h>
- #include "cfgfiles.h"
- #include "chanopt.h"
- #include "plugin.h"
-diff -Naur xchat-2.8.8-orig/src/common/util.c xchat-2.8.8/src/common/util.c
---- xchat-2.8.8-orig/src/common/util.c	2009-08-16 05:40:16.000000000 -0400
-+++ xchat-2.8.8/src/common/util.c	2012-07-15 23:07:33.649948724 -0400
-@@ -39,7 +39,7 @@
- #include <errno.h>
- #include "xchat.h"
- #include "xchatc.h"
--#include <glib/gmarkup.h>
-+#include <glib.h>
- #include <ctype.h>
- #include "util.h"
- #include "../../config.h"
-diff -Naur xchat-2.8.8-orig/src/common/xchat.h xchat-2.8.8/src/common/xchat.h
---- xchat-2.8.8-orig/src/common/xchat.h	2009-08-16 05:40:16.000000000 -0400
-+++ xchat-2.8.8/src/common/xchat.h	2012-07-15 23:08:20.855910521 -0400
-@@ -1,10 +1,6 @@
- #include "../../config.h"
- 
--#include <glib/gslist.h>
--#include <glib/glist.h>
--#include <glib/gutils.h>
--#include <glib/giochannel.h>
--#include <glib/gstrfuncs.h>
-+#include <glib.h>
- #include <time.h>			/* need time_t */
- 
- #ifndef XCHAT_H
diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix
index d7aff753e237..1aa30ddcb67e 100644
--- a/pkgs/applications/networking/mailreaders/imapfilter.nix
+++ b/pkgs/applications/networking/mailreaders/imapfilter.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, lua, pcre }:
 
 stdenv.mkDerivation rec {
-  name = "imapfilter-2.5.7";
+  name = "imapfilter-2.6.3";
 
   src = fetchurl {
-    url = "https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz";
-    sha256 = "1l7sg7pyw1i8cxqnyb5xv983fakj8mxq6w44qd7w3kc7l6ixd4n7";
+    url = "https://github.com/lefcha/imapfilter/archive/v2.6.3.tar.gz";
+    sha256 = "0i6j9ilzh43b9gyqs3y3rv0d9yvbbg12gcbqbar9i92wdlnqcx0i";
   };
 
   makeFlagsArray = "PREFIX=$(out)";
diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
new file mode 100644
index 000000000000..3b90bc9f0ac1
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, pkgconfig, glib, notmuch }:
+
+stdenv.mkDerivation rec {
+  name = "notmuch-addrlookup-${version}";
+  version = "7";
+
+  src = fetchFromGitHub {
+    owner = "aperezdc";
+    repo = "notmuch-addrlookup-c";
+    rev ="v${version}";
+    sha256 = "0mz0llf1ggl1k46brgrqj3i8qlg1ycmkc5a3a0kg8fg4s1c1m6xk";
+  };
+
+
+  buildInputs = [ pkgconfig glib notmuch ];
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp notmuch-addrlookup "$out/bin"
+  '';
+
+
+
+  meta = with stdenv.lib; {
+    description = "Address lookup tool for Notmuch in C";
+    homepage = https://github.com/aperezdc/notmuch-addrlookup-c;
+    maintainers = with maintainers; [ mog ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index 8b06d083dc0e..b758bf996d26 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "38.5.0";
+  version = "38.5.1";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "29237bd1fff3790d891fcfa18959b808afa88c35b9c7036cc3cf79737560c3a5"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "480120055452c284eef26329419faa176cc5abff90c3dd986ea1d3478b869984"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "e659e19bc053a95bb4d753ff452637a29f792e61247fd1b70f70e90f62e8a268"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "1755ad5c097b92342224f7d659fc1c0db899b15f6874fcd256f76fac1bf27488"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "3682652d2aae978ceef32b4dccb2e20c4dc5584b6840df823664c214495e89bd"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "99a5e05ea1cd5a302b24b0bf8a87e495de1bd044d7335609016fbae49786a6b0"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "cd0b6cf8b620d619040a64f8692f78fcacf5500b5c092a6a40552397f56e2757"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "4001a26df6cee9182b85370e51d9e54284a066e8f8002c6dafc2ca872153ca36"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "bcdc5791b3a95c12e8cb19f92d57191360fff12ddf116d92b8ca1b32aa977827"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "037459abe2bf39d0ca05b0abfb18d112b9e56b4888b64ae956a6317800cc0047"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "1c907debf9f9c9a949bd1c7e7329ebc2fbdd6ff19ecf9411a67ce27079dae1ee"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "ace19a987e0a5fb10cf73d1b031e96c9333054083ab380e9a602f00b3347f334"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "5553dcde7e432643516405f465a981f52d5eaf3e53f7cec7d179034778d74122"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "1d3ee5b1487ff62243147aaaa1ba984976a969ddc0c7697b1f361db6a5d66023"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "d22a52c3e5d66a4cb8d084e7127f0acf79a36fbc1e96cccbb66adb205a4eb7a6"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "f75b81a8a984ef52bd5a11fbd98f00b16a1696c5dca9b2315ca35d23ed6ad4b9"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "0cae8f5bcff66cea0ea7a92f4503039078402eb149bca9a1bbbb170423a9625f"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "e4d5c5d920489ad73ceb2a0582285d35bc9fdf2e817a14a20d563b3f36dca71b"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "7cdbc0622b71ead86d7d180fab328b4346bba324f43381680cb9e4cad026667d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "95cb578a1b9d271c7597852be14c18bd057eae01ef62429197ea47cb97f367b7"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "5e7a7d84bba7e3ce06a31678e2b97439597b5185866586c69f61d3eeaead7bf8"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "6d221dc885188ae683eb0c103b8551d25f2c26a82456abfcaea695b4555c83e1"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "d5cc9990acc678c483bc19649d67af96dda0308f66eea61f5917fcb40db13a4f"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "01ad8dbd1b9fac2dfe269ed171ab6fe32751892147f136f9ab8c8d023ed0fe11"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "7040a9d0c51ce310e74e9d3b1c04f5088ba688212100700f78e1c7b4f8722739"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "e2a3b0f3b022c320b0b7b372442cb85ac716f85e757cdf107246a6b7d4715835"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "c7258c7864087eb90d59f763ed0b23ee99f2a6a45c433d97e89583ea37ccdb32"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "af32ae7ba6d7b61d46c074ec0086fce4150b5b6255eb43c3c17c97f597b688d1"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "c7794f3e1d51fa7e0935d689078b348114d3abf010a0525b22e5375950b6098e"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "01bb4a3bd43aa5dde30197178cb50ac35ac62cde637227aca8bdd410c9f62546"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "f89e5f28d792161cd5b791ad68eb64c6a55a5de15dc00d5b042153b8fe549ab4"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "a7c3102c5c5c6999723fa889af88f1d14630867334db8703ca9b5f5368359127"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "a01fc84e9ce676f9b163e882cee5b6ca70b98a43b2937c6f5298f800b7ee3d78"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "030840e14241776d60cbd1ce9d0790df4e4f7b1fd5f554df9a3a51c9421af573"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "f6da6a171f4a00afaf5af2fbcc6cdd7504e00cc38f62baad1f9aad51467ef191"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "8fed1407c48e0f7f39c888f08001ec0705c09b587a6921b2644e91020e8f2763"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "0f1c30b2e5c6d1a2359a1714605ab382c617a00fb2a3ab9aa0570c27df6bc1a6"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5192b9230659a8ec35abf4353201d6f2ac66c1ffce33d0dd68c38dbb1302029c"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "5812be19808c789c6f36484aad72ead4a5b75ce52d91047794da0c5919a4f68f"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "64243724356329e81f8754f4bc1d3e848a6544f598ceec44ac63a69d52003944"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "63117d10a3fa00b86eaf9023d562ca817ea44b89788de190d7870c22df6ee5b1"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "22715532882458ff60ccf52c5502eddb5f7a9ef646a22915c3928ff6ca244bdf"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "9be2f10d9f5dcddc7b5119609ac9b864aa61b2e1839e3bdce3f4e742f5e94c12"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "a71900daca5ac832240fa27c15ad76afca75b8b86c101899c58f6ee20bd33fc2"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "4426fcb698d40fc796a3affafda1f142e4f252e3861354915a8ba4db41e28754"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "a7533879eda14dd1b6e8ce4e68006fd1d1fff9b7fec12c14f30871084625581c"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "82593c88c14b6ac518d0da17aced0ffe4a78e06faf4275508218fd09da535f4b"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "3ec0a23d6ac098dd97dec52778202d6dc24cd76d7f142a452b4309be32d9cc29"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "64cd467c054da7506b5e72e159c0829a6d41db1482d9343a8cdd5b0bf7166d0f"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "a9ec09c8cbc54f071f80226bb203f4f5823f71cf376978d0e69cefc5562cd5bf"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "bb21099de57446c1a9284fa54ed491bbd1d104b64f9c479b8d0ded607fb79c7d"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "4397b52af2d90e0642b7e66fc39b60987dbba94737666e205df8b1b0b4c280de"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "65164ae7e551458bcb8afef5da13d1a632c7ddb181e112833b1fe0a0ab391c17"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "e026eae7e0eb85558ad58616a90240e14bd9011bbe6ed5bcf68788ad21d182eb"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "c2bd24db8c46a11108241a3aa6f57f234aa52e982af013e081c4b45621878b7b"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "b01690e94a2f8b5d8049ac62061206fc296b6a7e2c609d3368facefa246f06e5"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "7ea9be32fc7b198e300273a973162364a4dbe17bfa6b7e5fe39bd01fbd93c79e"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d9ca99cb52265fe8cf89c9b48469479dcb9e251f8c3f3527540c19f44439234b"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "899906072114caaab0e7f48a7b67f77dbeca7d2130171a2277c98116479951ea"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "6a636b312c1a38474cd26700b0419e2cb174c440e4ac652a6d29bf6837a2bdd1"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "9827c378de89d3eed6bd297233c934fa7a84796efb02d82a4be1f8235c2dbe6c"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "23075b98ac7a1674cd1189806680062eb0eb35cbe08d7d0592242295184932bc"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "e64f2b7dfa4654bb681bfa5c34adc9d64400c3c7dfb1f9dd7ab0c04d998c6784"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "2049e8c19e3a58f1f0f08926e786c3a2d81292d94eb0346b54ae86edba35bf3b"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "12941cb1feec8beacc8cf62b94f902ddacadc424abe511226be2e85248496a60"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "9da22cef1e8b5d92c048c8bee59ca88b9801f95073083c218412de0406af6dc4"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "bdd5fee3bc2d807b1b6329f0f8f14bed85f8eacfc1210f4a5204687b7c0e250b"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "c48477523b11d7ec6314f54c2d0d62b35c6474b06bbd7c0bd0317971303a1073"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "d887a32f4073231856522ba034c4e952eb56d7ed06895e0d26dfc3d3a7488b0f"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "c02ff12289d32d5d3ad5f88a5c851f46f8d31c66ce8013622959f537cae1101b"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "99095f5f55c3ce6d0bb485d25eff1afdadb63e8f41caaddacceced71a92bbb9e"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "a4de32255d7334bf1eabda06332f8665a9d60bdf667a43c219ba2de08865f1e8"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8b547faa6f76d1aa1f0f33235380e5379663c5d6e66e55ea0baa61a62f37e272"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "17873b2664d665d1d53fe69c4041aa6474f58a18cf5dc0f86b739d95d193bb48"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "ba36cb5c4b008f878b181ed3ff56198cd83739fb9d2018d6710288daafa6df7a"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "04afe1c59bfdfb9573623e9e84165863465356ec7872f1afc448c841c4e9392d"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "2fa6cc0e585574d3460597b25c6549b2aebd2b2af203edef960dea2b81bae954"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ca8bdb92d16a89f7baca59e0c11662d2dfead62eb209746d738fbccbea8d00c5"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "79575806b00f77adae3b2ad794c2e268436e2b4b2904186ea88caa2bbcc5e232"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "2220b6bc45f98f088c653ee255718613b43e93691173441f0825c39e3ea8c263"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "829788db6afdb0f09b23d0230abf176153a252a76964ae4ad6df161568e03b6b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "89792685c6ff26bae9d42326dbe0ca77b6a651df51ba02bd76a85692c83aba5a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "b7898b8fde2c32c8d7fe105ab88751fb9acaa756f3826dfaab3fa33fa7bfd5a4"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "691e722d24695960574fb5423d2d5713d3729a0cf3bbffdbe3f550b1b0a8a91b"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "06e9c005c45b6d71e4f4957ae0d92578baf2b0ff783f38dca4a5018f84319bfd"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "5422bf1e694a462864759374bc3afdf9f0033121b879413a3edc18a20d406b4e"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "54c0f6dfc40b748f74ab9fd79dd4b0987ce17eced23b293cf83b1867f38d7c53"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "a164dfa18736b3f84ce2a80fea1f6441bbd3de113c26eab503ab7710866f7555"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "3135adfb8c2b674545d3e80a8f3d77a89332dbe4cdff0f05817d5ae2edac8025"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "7a95f8853d5776267ab62fcc208214a7a4f2a7d82350ac7967ca90ab2178e737"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "df9cb429c6fe10e7aeae06d49329fed27cf9cd84b3b28e7fef82008399dfe453"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "aa97b360bd5cfd0686b0d75df21500249e0f7ab1586e37774d60040abdd2ecd8"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "ba1ef9b8576589a9bf8523f26fe42416f14f4c38b74b4519792aff6896a4c34b"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "bcd73d4a1187d8e43dcbfd7bb4df3c0f7893175785d633113b0a5b526bb718d8"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "004423ed395fcc4cba02e703f5086f9255758edd2bd3125adeb8fb006a4f769e"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "9abb27a35c2076fc3c85e18b20f909ba41b4618afda51f2adbb0ef960b67483f"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "ff2dca954720bcb1947c18b1013666c6568f6638b204adf5a0277e6bff64f468"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "a334a65d54efaacdafcddad336f313d24b594c14bfc874159cd9a4ca9ded2b03"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "b5e53cd682a8b4494074c1c0c7e4d4fb94a36a06e81522cb4b7289b4ed6bd486"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "747174de108fcf0a7201e22df90f613846a0b66384b007ccddeb51b6dc651aca"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "fa53bfe3c00878b462e6aa3a0bf76a6e1e4dc6d9095f2104a355ac5b773e936c"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "308965f1b97405e7c6db95e7cffae69fe6a899539782c06b1446ab97ddb19d45"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "0b2e6e13cd30b46b81c8fb9fd195d27ce96c40f03d17ba0f8095d4ddd226ff45"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "dc47f9c38a845461db14a08d67f143c8b5ba04aa441aeecae8bd8f3cbf79fca6"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "3f5afc0975aebe8981202927fe5507065c47ccd64f1ddd8adb426c0032ee267e"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "8a9b241836c0b495865e9d64d2e89cb054a01e8e3fb55ee8a1cbbd0def7d5a93"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "c104cbdfaee89946ab11b3bc0de6cfaf5d88f5e18a6be400dc573e7b1c10319d"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "717c460478cdb986fbfcd5fcd16f7fb66af930e3ca2826176b7158ff865d51a5"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "dcfbdd8ba1897bdfcb26b0ec1c50a88808c2ca988418cca56eab74e1f870ba1c"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "648764a8aad2ea954416f2293023598cd26d4bae1bb44da1406868d1286c3f58"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "2b938e4c4614de013b9e0f7d4bdde0353cea42c7651491f2d92323a25d9157d6"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "82571f95eaf3a88c7cc7fc056779ed4f4ea5664333c5e015ccd4995fc48ca0a7"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "db6a5619c7fcd9487ecd5518590a7ad28ee4a9fd12348c950ce1b12de5232dfe"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "36ac3599d3bba4a4e982df6cbb355becc0e0e237b127c3b2afea3618754fafbe"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "269dccd617074567654a053186d6830fff38503431156db5a00d70bef093bf0e"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c78e2ad7df58f86a26bb81c13a27a8722884573278a1dd179ffba577902c92e5"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "428fb92fe6a30f528c13f59d321eb479638133b98692e9abb2821550312027ed"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "aaa65b171336d8fac42d94f2b7e41ea286415ee0337afcff2c8dc55ea4d01d09"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "432e71e48a46bc7e90bfac8820b470346fe6b95e8545a7b6a8b5e799c7658fb6"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "d8ee8d92f9635396cfe8a27dc57b407a428a0fb210c849b5faa9d7a1458328db"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "19b33c2683b5ee20264533d64c717320fb82187074c1b4d42e902b3021ac8907"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "8b7659c5327cd6552c4a743cd92100bbdc10b6623021eab79265027b9a0f1550"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "02a0d0858de83abb9c732787522b45e8cfad419b765a0922426197c9f9a00f9f"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "dd0ae9d067365b66a55e337c6b294d672c997c88024b17223583d9ccfb667488"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "422b42cc56b3fda6aecece1e0d934f43970fa7a8dfed0bbe859bf0e7daf6f8fd"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "f4edee91b6101aa4b8c308cf02d1cb926cff4beb44f840b86e0d01232dc5b88f"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "d64078fe9092e9288cb270b0d35be25a5d8d225f70d4a902d8a5c89b36b0a1a2"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "68b3234560f9678f3b9b1f11ccdfa2109026ca3dce321bb2732b024fbd77ce0e"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "a7082da8adf2098449ecaf6750607e394fb03e3e1ba974852bf596c4dc961531"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "6a81e6713b0b4e01d575c4709137eb8b50811f3ce4fb7222c3466e5dcedcd244"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "512a02a544c522b59fd86705668264b2fa85fc738dd93878289230e05f38bd71"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "809ff680e80ffc8b5aaa631b346d8a34df4b99362e048d16e4d415f32d721710"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "c0a3b6f3e8b78e624a7b8f3d68185063fcc2cfb4b8f06942586a384de738eabb"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "bba5556ed1f3873b9111d47ff978a2ca5fd43a48e7e32bf25cc7ad4650d5b37b"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "4b296fdd61f2cdf2d644503befafed114f5d18fd8e8bbd37d3f6a06275e8d11d"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "30fd49c129cee05a86a60147ea706286c0dd9a48fe6b43178d80b2a2726fcc48"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "814d073fc127b74d9edcace83c38ad2e80c74bafa327d2eac44de7673e0b2958"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "00dfd1ed1b981ba5bb66dc86ded8a7aee25e1a67d0c5e739a5ec252e4b4f0764"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "97473204548f40f6b806c1de5835477998f58ad4e9be8a1eb2bc7097def7ceb6"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "42042946079e486c24ff5e76c2e572d81a4e996dfb9ca37a9b19417933defd32"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "9056a466e7e99efa10b30be00d7f0ff2c64c077725a57397ea7462fa2de6bac0"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "06b223ca8ec5e47b2876c7261b94fbb82fefec50527a777802c74ebbc71c6256"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "8f74bee700e9d6414d379e723e5be952725a96fc4155f1652701327fe36b493c"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "dccdf5e29b19852895eccfd479c2d04d7ae3d7847af050028a6cada9700ef948"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "d2d564f048a9cbc9a956fb1b937c0d43758c97315fd19bde79d63bb0bdd7b9a5"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "70a8bdd408cea0d015a560969083445046c3a8e02c7777b2b22eedf6b46888b6"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "c03ca2ea86db9dc6428e96f50cf8fc86343faa539b5ebff0e476f0e0bcb2c6c3"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "eedc718bc25219803666e95870ce4a0ddfec7443392aa0f3840b2689bb09ab55"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "962de04ebaa81296a04c84e1dd3574ec1ed5fe1784f1b0345b30fdf6de214301"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3821a77b83cfe174b10a9b472d8a4a29dc069a8e1c82b536923d90761fa31a4d"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "17ee3d2c863d7e8c0562a1ba75d7b1b6e469e93d3665aa2de662e98eaff1d921"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "84ffe20179728d1ab3dffd93428b330c6958b3c825ffdca6c8cf63dc831a7519"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "424de9056f295b710be3db287a9ee48759efed25e311881750a49c1b30c33fe1"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5fdaafd1b691d29df5d1056555a052a0feeaa6d7b01a0383241bbc8b988da7d2"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "1037c3d031d00eb4fea5aab50215108d0fcce6668d7226e594f47784a8aa3edb"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "71f6a24995b16b1e5dfcdd5b3758940a69bf348430d71f800522bc1c0eeb6341"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "095f6a9c8876aabbd890a97724060a704336605655a7b1feb890b05e051ae810"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "97f3b49f91724608520202384d82accd3705290cb6c295dfd88d49ec33dd76c4"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "59be75d317a2ebef649adf7eff64a8e9706d5e6f58971e12ab3de3e9da306fe7"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b5c4dc6e07d17fb4150d04e5c377e4c2ec18fe6304fb84a2bb19bdf554113b4a"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "59afa36ca0b31e9f0cfdaedb5e49889ef1d5d1f9c08b6fb9e6cd21a282ecacae"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "6e9c48d531cc65f08e08f54170721ce0cecde785978cbca0bffad6847433a5e3"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "2c6e63a2c89f74df52d06c8bb6bd46871c04b4c91506c166acd28de1aeba8d8a"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "73c4923a5a425e2b96cf1e1b05584e282f5802b76337a5180b9c89c0163fb47f"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "4ca2c0ab487eb79272fcfe253cef93838eb57925bb2631c29de36f2510fedc1d"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "7b731eb0ece93a1944ffd8dd7b0f91cad1292955e967a511ab72080b3dc66fdf"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "056cff554994ef984356b7fb27759548ac546c10b918c727e130adb970430018"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "5592613852a34b7b5990a06ba31b1713bb9b277a5472e153a26e780f0620f2c4"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "abe18e183a2b26315dbad115c187eb56fe70daffd8eac3465e1ee2c3b2f364b6"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "d657795e84fe1ca238e986438d5501e4baf628a890835258bcbd3a32040fef4c"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "806e9da32095fbb5dd6610f715006a3cf0732b69759e8b88d6c3f39617a9fd2c"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "3c0c1cdd739d1d82aef6ce864e0a65c735591acdb127a50ebdb8e5999a524b17"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "a052932572784bdc90e8a16ffafa855a5817ea28bdd3365fa18f40685bb2f77e"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "1f98b63f900ab64989ee8860ce3580394dad438078e574e4c7d997bf5a840fd9"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "b7148002a1f1790bbc52c1c3fbab837acc9a7681077aad115cc81bd05f1e1a33"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "cc18eaa5b72c57438c11b8fd5a77f677218d1323ad844f8eb8d294132e40d86c"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "a1c7fadbb96293391e99ee0abe16b20331a9ee274e5c56d5972a339ccf62b1da"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "7ac143a557c5f913966c81235f6dd398516c3e153e667442297cef82024f2af9"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "f884769780d273d7e921a236ad6fc21b1749ae8c1c483b9b57943e42bc23206e"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "b10fd3af349285bcecbf0334ec22b93b6811abb9c580f5a38e84b5dede4264d1"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "1ac48c611c6ae2163ae27970dcef5c20e1ba932a2210eec659ea31cb4967dfd1"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "23930f00a7b9b47d43a23611d4f804025d11aa489101c120449428d866179517"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "148df7f75b69757a64427bb96bcb9a2a0d8f885b907130c1d7c519bf6e7a1718"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "4992ae5d3f348648a9febadb058f558dce7659d18065e352a1d560e552d27e6e"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "b4f9668d9d56b15c6af69d7a23716c70074adbb90100725c951d913682003789"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "43f134ad246b5896a003cb75c73339cc27cc7bdf02584d5b5455a4606112a7a3"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "b3e48defce4416d32c968056f07498c268428746c2e99f68c91c08cd623f2741"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "f8cb85d3f033e6a7c6ea8d7af7e31604a3f67e2435557d108d8bff18a5612785"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ebe6134f09bcd52b7da5461247372b5e352aa78b882039993f0f7e6d08e19047"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "c2137e014c37c149dfe847dd4516af45307f1ee7ae9f915b48c78b882f7e4b0b"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "d2edd221ef00a02a38b037f961671a8f82595ea6796556bbc5cb94041a2e131c"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "af2110f44b303d5182140771001d3d10b9ed7b44c31261f740b15ea4caa21545"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "c0db7cd88d5f0e38e6683181729a2de5ba63abdc4d0af17fbd72de723c909426"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "040da2abe7aaef427386e31aa24e67aeb389f8294f14f445ab68fb8714f74094"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "ca2e02b0ac8f4b5ab6b4af3e905a1c65274dd17bea6c4b84bfa0afa99f5bb6d3"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "3324461c1d47872b96d6fcfdfe10971e70b7698789fa8a7b439d5d226f87d0fb"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "2094e2136ccdac7572203772b0a2cfed2f78116e2ee72c7038137ca198b0f404"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "59f9d72974f84c2b349a7fd7c614b7473b6dba4fdaf0c57b267369624b13f2b6"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "beeb965afb626565155ca1f882ed27fc5489ab650f3eee94064227c213aa9100"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "a72296d59a7971aaba395fa058b8ecfa4889ccbede3ee0161744b70e848436df"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "b8e0925a64aab9e23bf13bd9b2afd1baab7d964e6c1c3af3973201fc6b7a71c9"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bd12cfcb485b85bc0444111f7bf7f1e9ecff42a1bf03515e46aeff668da690a8"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "220767594e50de01d636d29d38ef87d0ad4871c718ba2f5e9c8f8bdc13023408"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "298f69008f20a23eda68a92912fbd050eff73f806e0cb8ce0c40f1fc53b76fc2"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "3be80143bb1affa8df3c94bcb048bcd2f22f39f60db02d2f9afeeb44b45c67ae"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "715963ac282e8f972e22f3fcc5b51e03346f011b8848f16b8a8cb9b6a23c864c"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "0c793708c8501df82582f5d820c65ee11a46819f012b7d616c7fd4b1424e7eef"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5f4fbfaa52b4eca748dd12da12c6bc38286e5fdee2fd81d337d926ea4e0df378"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "ede99dd26481f9864dbd0ad276f3b10a1bea8a2267a3f0055f10de4c185a3e3d"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "15ca9bb30fe45879bfaac936187951f36af45a134cdf756314e7c1b1d508db22"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "9ac426f0148d232de2c11fb0404bfd317aa26d0fecca710c63dda52eb73841d5"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "8f67b9449e4b0759b82d748c1c0aab3ba42da1c3643e1579f3f0e1cda00cf61f"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "12d52efd990e472230cbee546b544f01b2aa7bf8e1812cc561102e9cba58bfa0"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "432071992c94ae8964db97f02d7c26d1584ab6ba43a3bb87bb605d9933f37673"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "b070ecb797dae27d66c449feb34c57d383f64ddbe6dc37cd836658e3e8c28e54"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "065eebd594fa00315bd017f76eb35ff64e371347b346ec54eef6edbc738476b4"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "a76a9b519fbfa5e3ac305522fe313c3f1c52c2bdb1c44878341a0ff5f50c5a36"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "e90a8c3dd54d69de3e092d1e63288365807238ec3ab01383778bb10aa9799309"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "da60ffb3131d7ff150d9a2f70b1071d0399cfaf671003c5b5b598911561eddb8"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "686162ef37b00757ff49784fb6c2fd04ea55103c78af6f97bf5e7e6be34cb46a"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ad8702ca5223fd9a17dce9e71360299938f53548e357d93a5bc23d24cbec8039"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "f6178474338c75f1b216176ae40a9e09df68697d9cc1ccdc661293b51ae133ed"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "54c88fd15417a271368a981b79467064a968993e7076e2f4a87f0cb280b4954f"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "d1943ef072cfc40ab90d0b008527d6e4607db2299eb536573db5a7e832babb9c"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "276ed6dac2090fdd53c967daadda3d39c8f05b70f6d91779af2998b446a831dd"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "f18455e1df20364ff0c4e2f44397b068faf387f7efa25941f167750f349f93a5"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "3a72f5935f32de88a0bf88eb5252864b19b8bdd1f01fa49b14d54021a88fb2cf"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "3f53c378fce2c5a7245103510714b2d99b8915ef78452d469cbd4f0343a3767d"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "6ac29a8081a339f334ea0b22ac49b81d79d26a22995ea592f1a78fe9c66a4edc"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "82733b4f96f42fe3d0fd7e429e8f23bd1aa059890a6403cc991b3236f31399c6"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "4d376644e762630bd7e9077d616cd4b4c0175ea3fd3df04c4c76ac489d87cecf"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "0044c3e78014df76fd09009142d75858fd8ac5abea54920d52870bf2d6599310"; }
   ];
 }
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index dac1a9ada3b4..12c250ab28bb 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -54,6 +54,8 @@ let
       cp man/mum* $out/share/man/man1
     '' + (overrides.installPhase or "");
 
+    enableParallelBuilding = true;
+
     meta = {
       description = "Low-latency, high quality voice chat software";
       homepage = "http://mumble.sourceforge.net/";
@@ -95,7 +97,7 @@ let
     type = "murmur";
 
     postPatch = optional iceSupport ''
-      sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
+      grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g'
     '';
 
     configureFlags = [
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index fecc88d36bfc..8948ca22ee93 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A GTK-based news feed agregator";
+    description = "A GTK-based news feed aggregator";
     homepage = http://lzone.de/liferea/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ vcunat romildo ];
diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix
index 6aa1ec762532..dcfadbfa05f0 100644
--- a/pkgs/applications/networking/newsreaders/slrn/default.nix
+++ b/pkgs/applications/networking/newsreaders/slrn/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, slang, ncurses }:
+, slang, ncurses, openssl }:
 
 let version = "1.0.2"; in
 
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
       -e "s|/bin/rm|rm|"
   '';
 
-  configureFlags = "--with-slang=${slang}";
+  configureFlags = "--with-slang=${slang} --with-ssl=${openssl}";
 
-  buildInputs = [ slang ncurses ];
+  buildInputs = [ slang ncurses openssl ];
 
   meta = with stdenv.lib; {
     description = "The slrn (S-Lang read news) newsreader";
diff --git a/pkgs/applications/networking/notbit/default.nix b/pkgs/applications/networking/notbit/default.nix
deleted file mode 100644
index aa5d47730a4a..000000000000
--- a/pkgs/applications/networking/notbit/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchgit, autoconf, automake, pkgconfig, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "notbit-git-6f1ca59";
-
-  src = fetchgit {
-    url = "git://github.com/bpeel/notbit";
-    rev = "6f1ca5987c7f217c9c3dd27adf6ac995004c29a1";
-    sha256 = "0h9nzm248pw9wrdsfkr580ghiqvh6mk6vx7r2r752awrc13wvgis";
-  };
-
-  buildInputs = [ autoconf automake pkgconfig openssl ];
-
-  preConfigure = "autoreconf -vfi";
-
-  meta = with stdenv.lib; { 
-    homepage = http://busydoingnothing.co.uk/notbit/;
-    description = "A minimal bitmessage client";
-    license = licenses.mit;
-
-    # This is planned to change when the project officially supports other platforms
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
new file mode 100644
index 000000000000..1d5986dbfa64
--- /dev/null
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchgit, fetchurl, writeText
+, qt4, protobuf, libpcap
+, wireshark, gzip, diffutils, gawk
+}:
+
+stdenv.mkDerivation rec {
+  name = "ostinato-2015-12-24";
+  src = fetchgit {
+    url = "https://github.com/pstavirs/ostinato.git";
+    rev = "414d89860de0987843295d149bcabeac7c6fd9e5";
+    sha256 = "0hb78bq51r93p0yr4l1z5xlf1i666v5pa3zkdj7jmpb879kj05dx";
+  };
+
+  ostinato_png = fetchurl {
+    url = "http://ostinato.org/images/site-logo.png";
+    sha256 = "f5c067823f2934e4d358d76f65a343efd69ad783a7aeabd7ab4ce3cd03490d70";
+  };
+
+  buildInputs = [ qt4 protobuf libpcap ];
+
+  patches = [ ./drone_ini.patch ];
+
+  configurePhase = "qmake PREFIX=$out"
+    + stdenv.lib.optionalString stdenv.isDarwin " -spec macx-g++";
+
+  postInstall = ''
+    cat > $out/bin/ostinato.ini <<EOF
+    WiresharkPath=${wireshark}/bin/wireshark
+    TsharkPath=${wireshark}/bin/tshark
+    GzipPath=${gzip}/bin/gzip
+    DiffPath=${diffutils}/bin/diff
+    AwkPath=${gawk}/bin/awk
+    EOF
+
+    mkdir -p $out/share/pixmaps
+    cp ${ostinato_png} $out/share/pixmaps/ostinato.png
+
+    # Create a desktop item.
+    mkdir -p $out/share/applications
+    cat > $out/share/applications/ostinato.desktop <<EOF
+    [Desktop Entry]
+    Type=Application
+    Encoding=UTF-8
+    Name=Ostinato
+    GenericName=Packet/Traffic Generator and Analyzer
+    GenericName[it]=Generatore ed Analizzatore di pacchetti di rete
+    Comment=Network packet and traffic generator and analyzer with a friendly GUI
+    Comment[it]=Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole
+    Icon=$out/share/pixmaps/ostinato.png
+    Exec=$out/bin/ostinato
+    Terminal=false
+    Categories=Network;
+    StartupNotify=true
+    EOF
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A packet traffic generator and analyzer";
+    homepage = http://ostinato.org;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rick68 ];
+    platforms = platforms.linux;  # also OS X and cygwin
+  };
+}
diff --git a/pkgs/applications/networking/ostinato/drone_ini.patch b/pkgs/applications/networking/ostinato/drone_ini.patch
new file mode 100644
index 000000000000..5818f4e94c30
--- /dev/null
+++ b/pkgs/applications/networking/ostinato/drone_ini.patch
@@ -0,0 +1,14 @@
+diff -Nru ostinato-414d89860de0987843295d149bcabeac7c6fd9e5/server/drone_main.cpp ostinato-414d89860de0987843295d149bcabeac7c6fd9e5.new/server/drone_main.cpp
+--- ostinato-414d89860de0987843295d149bcabeac7c6fd9e5/server/drone_main.cpp	2015-12-24 16:46:35.000000000 +0800
++++ ostinato-414d89860de0987843295d149bcabeac7c6fd9e5.new/server/drone_main.cpp	2015-12-30 20:59:04.319199699 +0800
+@@ -62,8 +62,8 @@
+     /* (Portable Mode) If we have a .ini file in the same directory as the 
+        executable, we use that instead of the platform specific location
+        and format for the settings */
+-    QString portableIni = QCoreApplication::applicationDirPath() 
+-            + "/drone.ini";
++    QString portableIni = argc > 2 ? argv[2] :
++            QCoreApplication::applicationDirPath() + "/drone.ini";
+     if (QFile::exists(portableIni))
+         appSettings = new QSettings(portableIni, QSettings::IniFormat);
+     else
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index 80f8eb840f13..51d7a49cac79 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchgit, ant, jdk, makeWrapper }:
+{ stdenv, fetchurl, fetchgit, ant, jdk, bash, coreutils, substituteAll }:
 
 let
   freenet_ext = fetchurl {
@@ -15,46 +15,56 @@ let
     sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";
   };
   version = "build01470";
-in
-stdenv.mkDerivation {
-  name = "freenet-${version}";
 
+  freenet-jars = stdenv.mkDerivation {
+    name = "freenet-jars-${version}";
 
-  src = fetchgit {
-    url = https://github.com/freenet/fred;
-    rev = "refs/tags/${version}";
-    sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
-  };
+    src = fetchgit {
+      url = https://github.com/freenet/fred;
+      rev = "refs/tags/${version}";
+      sha256 = "1b6e6fec2b9a729d4a25605fa142df9ea42e59b379ff665f580e32c6178c9746";
+    };
 
-  patchPhase = ''
-    cp ${freenet_ext} lib/freenet/freenet-ext.jar
-    cp ${bcprov} lib/bcprov-jdk15on-152.jar
+    patchPhase = ''
+      cp ${freenet_ext} lib/freenet/freenet-ext.jar
+      cp ${bcprov} lib/bcprov-jdk15on-152.jar
 
-    sed '/antcall.*-ext/d' -i build.xml
-    sed 's/@unknown@/${version}/g' -i build-clean.xml
-  '';
+      sed '/antcall.*-ext/d' -i build.xml
+      sed 's/@unknown@/${version}/g' -i build-clean.xml
+    '';
 
-  buildInputs = [ ant jdk makeWrapper ];
+    buildInputs = [ ant jdk ];
 
-  buildPhase = "ant package-only";
+    buildPhase = "ant package-only";
 
-  freenetWrapper = ./freenetWrapper;
+    installPhase = ''
+      mkdir -p $out/share/freenet
+      cp lib/bcprov-jdk15on-152.jar $out/share/freenet
+      cp lib/freenet/freenet-ext.jar $out/share/freenet
+      cp dist/freenet.jar $out/share/freenet
+    '';
+  };
 
-  installPhase = ''
-    mkdir -p $out/share/freenet $out/bin
-    cp lib/bcprov-jdk15on-152.jar $out/share/freenet
-    cp lib/freenet/freenet-ext.jar $out/share/freenet
-    cp dist/freenet.jar $out/share/freenet
+in stdenv.mkDerivation {
+  name = "freenet-${version}";
+  inherit version;
 
-    cat <<EOF > $out/bin/freenet.wrapped
-    #!${stdenv.shell}
-    ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov-jdk15on-152.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
-      -Xmx1024M freenet.node.NodeStarter
-    EOF
-    chmod +x $out/bin/freenet.wrapped
-    makeWrapper $freenetWrapper $out/bin/freenet \
-      --set FREENET_ROOT "$out" \
-      --set FREENET_SEEDNODES "${seednodes}"
+  src = substituteAll {
+    src = ./freenetWrapper;
+    inherit bash coreutils seednodes;
+    freenet = freenet-jars;
+    jre = jdk.jre;
+  };
+
+  jars = freenet-jars;
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src $out/bin/freenet
+    chmod +x $out/bin/freenet
+    ln -s ${freenet-jars}/share $out/share
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
index c1667f158b97..6df7f4924587 100755
--- a/pkgs/applications/networking/p2p/freenet/freenetWrapper
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -1,4 +1,6 @@
-#! /usr/bin/env bash
+#! @bash@/bin/bash
+
+PATH=@coreutils@/bin:$PATH
 
 export FREENET_HOME="$HOME/.local/share/freenet"
 if [ -n "$XDG_DATA_HOME" ]
@@ -9,8 +11,8 @@ if [ ! -d $FREENET_HOME ]; then
   mkdir -p $FREENET_HOME
 fi
 
-cp -u $FREENET_SEEDNODES $FREENET_HOME/seednodes.fref
+cp -u @seednodes@ $FREENET_HOME/seednodes.fref
 chmod u+rw $FREENET_HOME/seednodes.fref
 
 cd $FREENET_HOME
-exec $FREENET_ROOT/bin/freenet.wrapped "$@"
+@jre@/bin/java -cp @freenet@/share/freenet/bcprov-jdk15on-152.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index f8c025ba2418..bc5289f80935 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qt4
+, boost, libtorrentRasterbar, qt5
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -10,16 +10,16 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.2.3";
+  version = "3.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "05590ak4nnqkah8dy71cxf7mqv6phw0ih1719dm761mxf8vrz9w6";
+    sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
 
-  buildInputs = [ boost libtorrentRasterbar qt4 ]
+  buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
     ++ optional guiSupport dbus_libs;
 
   configureFlags = [
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
     (if webuiSupport then "" else "--disable-webui")
   ] ++ optional debugSupport "--enable-debug";
 
+  # The lrelease binary is named lrelease instead of lrelease-qt4
+  patches = [ ./fix-lrelease.patch];
+
   # https://github.com/qbittorrent/qBittorrent/issues/1992 
   enableParallelBuilding = false;
 
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
new file mode 100644
index 000000000000..9e3e484667fe
--- /dev/null
+++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
@@ -0,0 +1,13 @@
+diff --git a/qm_gen.pri b/qm_gen.pri
+index ed29b76..2d5990c 100644
+--- a/qm_gen.pri
++++ b/qm_gen.pri
+@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
+     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+     unix {
+-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
++        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+     } else {
+         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
+     }
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 2c70d44570cf..dd947d86daf8 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchurl, xdg_utils, pkgs, pkgsi686Linux }:
 
 let
-  version = "11.0.52520";
+  version = "11.0.53191";
 
   ld32 =
     if stdenv.system == "i686-linux" then "${stdenv.cc}/nix-support/dynamic-linker"
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     # There is a 64-bit package, but it has no differences apart from Debian dependencies.
     # Generic versioned packages (teamviewer_${version}_i386.tar.xz) are not available for some reason.
     url = "http://download.teamviewer.com/download/teamviewer_${version}_i386.deb";
-    sha256 = "1430dimcv69plpj0ad0wsn10k15x9fwlk6fiq7yz51qbcr5l9wk6";
+    sha256 = "1yr4c7d6hymw7kvca2jqxzaz6rw5xr66iby77aknd0v4afh4yzz3";
   };
 
   unpackPhase = ''
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index b49c309f5ba6..58be839d737a 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares
 , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib
-, withGtk ? false, gtk ? null
+, zlib
+, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null
 , withQt ? false, qt4 ? null
 }:
 
@@ -24,9 +25,9 @@ stdenv.mkDerivation {
 
   buildInputs = [
     bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls
-    geoip libnl c-ares python libcap glib
+    geoip libnl c-ares python libcap glib zlib
   ] ++ optional withQt qt4
-    ++ optional withGtk gtk;
+    ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]);
 
   patches = [ ./wireshark-lookup-dumpcap-in-path.patch ];
 
@@ -52,8 +53,6 @@ stdenv.mkDerivation {
     mkdir -p "$out"/share/icons/
     cp "$desktopItem/share/applications/"* "$out/share/applications/"
     cp image/wsicon.svg "$out"/share/icons/wireshark.svg
-  '' + optionalString withQt ''
-    mv "$out/bin/wireshark-qt" "$out/bin/wireshark"
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index cddde10f9163..ae7ee63519fb 100644
--- a/pkgs/applications/office/gnumeric/default.nix
+++ b/pkgs/applications/office/gnumeric/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gnumeric-1.12.24";
+  name = "gnumeric-1.12.26";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "0lcm8k0jb8rd5y4ii803f21nv8rx6gc3mmdlrj5h0rkkn9qm57f5";
+    sha256 = "48250718133e998f7b2e73f71be970542e46c9096afb936dbcb152cf5394ee14";
   };
 
   configureFlags = "--disable-component";
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix
index 87e3bfd53126..8884c78e883d 100644
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@@ -1,17 +1,21 @@
 { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
 , shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
-, doxygen }:
+, doxygen, aqbanking, gwenhywfar }:
 
 stdenv.mkDerivation rec {
-  name = "kmymoney-4.6.4";
+  name = "kmymoney-4.7.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
-    sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
+    sha256 = "0g9rakjx7zmw4bf7m5516rrx0n3bl2by3nn24iiz9209yfgw5cmz";
   };
 
+  cmakeFlags = [
+    "-DENABLE_KBANKING='true'"
+  ];
+
   buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
-                  doxygen ];
+                  doxygen aqbanking gwenhywfar ];
   nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
 
   KDEDIRS = libalkimia;
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 55bdd8eceb06..30a4a47896ab 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -7,12 +7,12 @@
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
 , libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
-, unixODBC, mdds, saneBackends, mythes, libexttextcat, libvisio
+, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
 , gdb, commonsLogging
-, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
 }:
 
@@ -20,7 +20,7 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
   minor = "0";
-  patch = "2";
+  patch = "4";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -47,14 +47,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "06w1gz78136bs6fbwslxz5zsg538yqfarkq1am7zn8rzczz2qplh";
+      sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "157hypz093vhqbysygx5q4fbb81785m2b7slccfkp8x87dcsahj3";
+      sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x";
     };
 
   };
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0xn1pg72vfdajmhak6chajvd51h74jqvq2565xv3j823143niw01";
+    sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
@@ -220,7 +220,7 @@ in stdenv.mkDerivation rec {
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
-      python3 sablotron saneBackends tcsh unzip vigra which zip zlib
+      python3 sablotron sane-backends tcsh unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
new file mode 100755
index 000000000000..d77b41a0480e
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -0,0 +1,54 @@
+#!/run/current-system/sw/bin/bash
+
+# Take the list of files from the main package, ooo.lst.in
+
+cat <<EOF
+[
+EOF
+
+write_entry(){
+  echo '{'
+  echo "  name = \"${name}\";"
+  echo "  md5 = \"${md5}\";"
+  echo "  brief = ${brief};"
+  echo '}'
+}
+
+while read line; do
+  case "$line" in
+    \#*)
+      echo Skipping comment: "$line" >&2;
+      ;;
+    *_MD5SUM\ :=*)
+      read tbline;
+      line=${line##* };
+      if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then
+         verline=${tbline##* };
+         read tbline;
+         tbline=${tbline##* };
+         md5=$line
+         name=$tbline;
+         name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}"
+      else
+         tbline=${tbline##* };
+         md5=$line
+         name=$tbline;
+      fi
+      brief=true;
+      write_entry;
+      ;;
+    *_TARBALL\ :=*)
+      line=${line##* };
+      line="${line#,}"
+      md5=${line:0:32};
+      name=${line:33};
+      brief=false;
+      write_entry;
+      ;;
+    *)
+      echo Skipping: "$line" >&2;
+      ;;
+  esac
+done
+
+echo ']'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 22cf1857ae48..0e7525782c6b 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -1,13 +1,12 @@
-# DEPRECATED: these dependencies sould be system libraries
 [
 {
-  name = "commons-codec-1.6-src.tar.gz";
-  md5 = "2e482c7567908d334785ce7d69ddfff7";
-  brief = false;
+  name = "libabw-0.1.1.tar.bz2";
+  md5 = "7a3815b506d064313ba309617b6f5a0b";
+  brief = true;
 }
 {
-  name = "commons-codec-1.9-src.zip";
-  md5 = "048751f3271906db5126ab76870444c4";
+  name = "commons-codec-1.6-src.tar.gz";
+  md5 = "2e482c7567908d334785ce7d69ddfff7";
   brief = false;
 }
 {
@@ -21,11 +20,6 @@
   brief = false;
 }
 {
-  name = "commons-lang3-3.3.1-src.tar.gz";
-  md5 = "8ab049135b2d15313da5d9f0656894a1";
-  brief = false;
-}
-{
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
   brief = true;
@@ -41,21 +35,61 @@
   brief = true;
 }
 {
+  name = "boost_1_55_0.tar.bz2";
+  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
+  brief = false;
+}
+{
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
+  brief = false;
+}
+{
+  name = "cairo-1.10.2.tar.gz";
+  md5 = "f101a9e88b783337b20b2e26dfd26d5f";
+  brief = false;
+}
+{
+  name = "libcdr-0.1.1.tar.bz2";
+  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  brief = true;
+}
+{
   name = "clucene-core-2.3.3.4.tar.gz";
   md5 = "48d647fbd8ef8889e5a7f422c1bfda94";
   brief = false;
 }
 {
+  name = "libcmis-0.5.0.tar.gz";
+  md5 = "5821b806a98e6c38370970e682ce76e8";
+  brief = false;
+}
+{
+  name = "CoinMP-1.7.6.tgz";
+  md5 = "1cce53bf4b40ae29790d2c5c9f8b1129";
+  brief = true;
+}
+{
   name = "collada2gltf-master-cb1d97788a.tar.bz2";
   md5 = "4b87018f7fff1d054939d19920b751a0";
   brief = false;
 }
 {
-  name = "ConvertTextToNumber-1.3.2.oxt";
-  md5 = "451ccf439a36a568653b024534669971";
+  name = "cppunit-1.13.2.tar.gz";
+  md5 = "d1c6bdd5a76c66d2c38331e2d287bc01";
+  brief = true;
+}
+{
+  name = "converttexttonumber-1-5-0.oxt";
+  md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a";
   brief = false;
 }
 {
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
+  brief = true;
+}
+{
   name = "libe-book-0.1.2.tar.bz2";
   md5 = "6b48eda57914e6343efebc9381027b78";
   brief = true;
@@ -76,6 +110,16 @@
   brief = false;
 }
 {
+  name = "Firebird-2.5.2.26540-0.tar.bz2";
+  md5 = "21154d2004e025c8a3666625b0357bb5";
+  brief = true;
+}
+{
+  name = "fontconfig-2.8.0.tar.gz";
+  md5 = "77e15a92006ddc2adbb06f840d591c0e";
+  brief = false;
+}
+{
   name = "crosextrafonts-20130214.tar.gz";
   md5 = "368f114c078f94214a308a74c7e991bc";
   brief = false;
@@ -141,6 +185,16 @@
   brief = false;
 }
 {
+  name = "glew-1.10.0.zip";
+  md5 = "594eb47b4b1210e25438d51825404d5a";
+  brief = false;
+}
+{
+  name = "glm-0.9.4.6-libreoffice.zip";
+  md5 = "bae83fa5dc7f081768daace6e199adc3";
+  brief = false;
+}
+{
   name = "graphite2-1.2.4.tgz";
   md5 = "2ef839348fe28e3b923bf8cced440227";
   brief = true;
@@ -226,8 +280,18 @@
   brief = false;
 }
 {
-  name = "language-subtag-registry-2015-06-08.tar.bz2";
-  md5 = "d431bd8a70455be1fa8523fa633c005b";
+  name = "jpegsrc.v9a.tar.gz";
+  md5 = "3353992aecaee1805ef4109aadd433e7";
+  brief = true;
+}
+{
+  name = "libjpeg-turbo-1.3.1.tar.gz";
+  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  brief = true;
+}
+{
+  name = "language-subtag-registry-2015-08-04.tar.bz2";
+  md5 = "bf5986dbfa1c9a0f26cf1b00ed369484";
   brief = true;
 }
 {
@@ -259,7 +323,6 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
-  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";
@@ -272,11 +335,26 @@
   brief = false;
 }
 {
+  name = "libxml2-2.9.3.tar.gz";
+  md5 = "daece17e045f1c107610e137ab50c179";
+  brief = false;
+}
+{
+  name = "libxslt-1.1.28.tar.gz";
+  md5 = "9667bf6f9310b957254fdcf6596600b7";
+  brief = false;
+}
+{
   name = "lp_solve_5.5.tar.gz";
   md5 = "26b3e95ddf3d9c077c480ea45874b3b8";
   brief = false;
 }
 {
+  name = "mariadb_client-2.0.0-src.tar.gz";
+  md5 = "a233181e03d3c307668b4c722d881661";
+  brief = false;
+}
+{
   name = "mdds_0.12.1.tar.bz2";
   md5 = "ef2560ed5416652a7fe195305b14cebe";
   brief = true;
@@ -307,8 +385,8 @@
   brief = false;
 }
 {
-  name = "nss-3.19.2-with-nspr-4.10.8.tar.gz";
-  md5 = "2100bc5a7ea9685928ff68cda2e60569";
+  name = "nss-3.19.4-with-nspr-4.10.10.tar.gz";
+  md5 = "478e0e90ebc4a90159549e77021021fd";
   brief = false;
 }
 {
@@ -322,6 +400,16 @@
   brief = true;
 }
 {
+  name = "openldap-2.4.31.tgz";
+  md5 = "804c6cb5698db30b75ad0ff1c25baefd";
+  brief = false;
+}
+{
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
+  brief = true;
+}
+{
   name = "liborcus-0.7.0.tar.bz2";
   md5 = "7681383be6ce489d84c1c74f4e7f9643";
   brief = false;
@@ -337,8 +425,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.5.18.tar.gz";
-  md5 = "5266905cef49d1224437465ad4d67fd9";
+  name = "libpng-1.5.24.tar.gz";
+  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
   brief = true;
 }
 {
@@ -347,6 +435,16 @@
   brief = true;
 }
 {
+  name = "postgresql-9.2.1.tar.bz2";
+  md5 = "c0b4799ea9850eae3ead14f0a60e9418";
+  brief = false;
+}
+{
+  name = "Python-3.3.5.tgz";
+  md5 = "803a75927f8f241ca78633890c798021";
+  brief = true;
+}
+{
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
   brief = false;
@@ -387,8 +485,38 @@
   brief = false;
 }
 {
+  name = "vigra1.6.0.tar.gz";
+  md5 = "d62650a6f908e85643e557a236ea989c";
+  brief = false;
+}
+{
+  name = "libvisio-0.1.1.tar.bz2";
+  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  brief = true;
+}
+{
+  name = "libwpd-0.10.0.tar.bz2";
+  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  brief = true;
+}
+{
+  name = "libwpg-0.3.0.tar.bz2";
+  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  brief = true;
+}
+{
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  brief = true;
+}
+{
   name = "xsltml_2.1.2.zip";
   md5 = "a7983f859eafb2677d7ff386a023bc40";
   brief = false;
 }
+{
+  name = "zlib-1.2.8.tar.gz";
+  md5 = "44d667c142d7cda120332623eab69f40";
+  brief = true;
+}
 ]
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index 712725f52753..b0d7f1399376 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -2,11 +2,11 @@
 , libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }:
 
 stdenv.mkDerivation rec {
-  name = "skrooge-1.10.0";
+  name = "skrooge-1.12.5";
 
   src = fetchurl {
-    url = "http://download.kde.org/stable/skrooge/${name}.tar.bz2";
-    sha256 = "0rsw2xdgws5bvnf3h4hg16liahigcxgaxls7f8hzr9wipxx5xqda";
+    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
+    sha256 = "1mnkm0367knh0a65gifr20p42ql9zndw7d6kmbvfshvpfsmghl40";
   };
 
   buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ];
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index be1729b57c91..d74e1ac4b7c8 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -4,10 +4,10 @@ let
 
   xpi = fetchurl {
     url = "https://download.zotero.org/extension/zotero-${version}.xpi";
-    sha256 = "15wdbwnaxs748psjnxw40wld45npjjmvwx70c0jx2p63y6ks2gcx";
+    sha256 = "02h2ja08v8as4fawj683rh5rmxsjf5d0qmvqa77i176nm20y5s7s";
   };
 
-  version = "4.0.26";
+  version = "4.0.28";
 
 in
 stdenv.mkDerivation {
@@ -15,8 +15,8 @@ stdenv.mkDerivation {
   inherit version;
 
   src = fetchurl {
-    url = "https://github.com/zotero/zotero-standalone-build/archive/${version}.tar.gz";
-    sha256 = "11gbislxkhfycnii05v6d8h9qdp5rk5xag7kdnsih67gicnn467g";
+    url = "https://github.com/zotero/zotero-standalone-build/archive/4.0.28.8.tar.gz";
+    sha256 = "ab1fd5dde9bd2a6b6d31cc9a53183a04de3698f1273a943ef31ecc4c42808a68";
   };
 
   nativeBuildInputs = [ perl unzipNLS ];
diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix
deleted file mode 100644
index edf56c3eb4db..000000000000
--- a/pkgs/applications/office/zotero/firefox-bin/default.nix
+++ /dev/null
@@ -1,162 +0,0 @@
-{ stdenv, fetchurl, config
-, alsaLib
-, atk
-, cairo
-, cups
-, dbus_glib
-, dbus_libs
-, fontconfig
-, freetype
-, gconf
-, gdk_pixbuf
-, glib
-, glibc
-, gst_plugins_base
-, gstreamer
-, gtk
-, libX11
-, libXScrnSaver
-, libXcomposite
-, libXdamage
-, libXext
-, libXfixes
-, libXinerama
-, libXrender
-, libXt
-, libcanberra
-, libgnome
-, libgnomeui
-, mesa
-, nspr
-, nss
-, pango
-, libheimdal
-, libpulseaudio
-, systemd
-}:
-
-assert stdenv.isLinux;
-
-# imports `version` and `sources`
-with (import ./sources.nix);
-
-let
-  arch = if stdenv.system == "i686-linux"
-    then "linux-i686"
-    else "linux-x86_64";
-
-  isPrefixOf = prefix: string:
-    builtins.substring 0 (builtins.stringLength prefix) string == prefix;
-
-  sourceMatches = locale: source:
-      (isPrefixOf source.locale locale) && source.arch == arch;
-
-  systemLocale = config.i18n.defaultLocale or "en-US";
-
-  defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources;
-
-  source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources;
-
-in
-
-stdenv.mkDerivation {
-  name = "firefox-bin-${version}";
-
-  src = fetchurl {
-    url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
-    inherit (source) sha1;
-  };
-
-  phases = "unpackPhase installPhase";
-
-  libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.cc
-      alsaLib
-      atk
-      cairo
-      cups
-      dbus_glib
-      dbus_libs
-      fontconfig
-      freetype
-      gconf
-      gdk_pixbuf
-      glib
-      glibc
-      gst_plugins_base
-      gstreamer
-      gtk
-      libX11
-      libXScrnSaver
-      libXcomposite
-      libXdamage
-      libXext
-      libXfixes
-      libXinerama
-      libXrender
-      libXt
-      libcanberra
-      libgnome
-      libgnomeui
-      mesa
-      nspr
-      nss
-      pango
-      libheimdal
-      libpulseaudio
-      systemd
-    ] + ":" + stdenv.lib.makeSearchPath "lib64" [
-      stdenv.cc.cc
-    ];
-
-  # "strip" after "patchelf" may break binaries.
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase =
-    ''
-      mkdir -p "$prefix/usr/lib/firefox-bin-${version}"
-      cp -r * "$prefix/usr/lib/firefox-bin-${version}"
-
-      mkdir -p "$out/bin"
-      ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/"
-
-      for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
-        updater crashreporter webapprt-stub
-      do
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          "$out/usr/lib/firefox-bin-${version}/$executable"
-      done
-
-      for executable in \
-        firefox mozilla-xremote-client firefox-bin plugin-container \
-        updater crashreporter webapprt-stub libxul.so
-      do
-        patchelf --set-rpath "$libPath" \
-          "$out/usr/lib/firefox-bin-${version}/$executable"
-      done
-
-      # Create a desktop item.
-      mkdir -p $out/share/applications
-      cat > $out/share/applications/firefox.desktop <<EOF
-      [Desktop Entry]
-      Type=Application
-      Exec=$out/bin/firefox
-      Icon=$out/lib/firefox-bin-${version}/chrome/icons/default/default256.png
-      Name=Firefox
-      GenericName=Web Browser
-      Categories=Application;Network;
-      EOF
-    '';
-
-  meta = with stdenv.lib; {
-    description = "Mozilla Firefox, free web browser (binary package)";
-    homepage = http://www.mozilla.org/firefox/;
-    license = {
-      free = false;
-      url = http://www.mozilla.org/en-US/foundation/trademarks/policy/;
-    };
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb b/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb
deleted file mode 100644
index eabff067f750..000000000000
--- a/pkgs/applications/office/zotero/firefox-bin/generate_sources.rb
+++ /dev/null
@@ -1,48 +0,0 @@
-# TODO share code with thunderbird-bin/generate_sources.rb
-
-require "open-uri"
-
-version = if ARGV.empty?
-            "latest"
-          else
-            ARGV[0]
-          end
-
-base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases"
-
-Source = Struct.new(:hash, :arch, :locale, :filename)
-
-sources = open("#{base_path}/#{version}/SHA1SUMS") do |input|
-  input.readlines
-end.select do |line|
-  /\/firefox-.*\.tar\.bz2$/ === line && !(/source/ === line)
-end.map do |line|
-  hash, name = line.chomp.split(/ +/)
-  Source.new(hash, *(name.split("/")))
-end.sort_by do |source|
-  [source.locale, source.arch]
-end
-
-real_version = sources[0].filename.match(/firefox-([0-9.]*)\.tar\.bz2/)[1]
-
-arches = ["linux-i686", "linux-x86_64"]
-
-puts(<<"EOH")
-# This file is generated from generate_nix.rb. DO NOT EDIT.
-# Execute the following command in a temporary directory to update the file.
-#
-# ruby generate_source.rb > source.nix
-
-{
-  version = "#{real_version}";
-  sources = [
-EOH
-
-sources.each do |source|
-  puts(%Q|    { locale = "#{source.locale}"; arch = "#{source.arch}"; sha1 = "#{source.hash}"; }|)
-end
-
-puts(<<'EOF')
-  ];
-}
-EOF
diff --git a/pkgs/applications/office/zotero/firefox-bin/sources.nix b/pkgs/applications/office/zotero/firefox-bin/sources.nix
deleted file mode 100644
index c052a007beb4..000000000000
--- a/pkgs/applications/office/zotero/firefox-bin/sources.nix
+++ /dev/null
@@ -1,192 +0,0 @@
-# This file is generated from generate_nix.rb. DO NOT EDIT.
-# Execute the following command in a temporary directory to update the file.
-#
-# ruby generate_source.rb > source.nix
-
-{
-  version = "33.1";
-  sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "f6ecc5e1d1470a4d79d0f680f3a194857674c5a1"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "d28450930e53f168c11e7e0c4e7df46c20d50882"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "2865493140bd8838e7981749f9fe7a734fa59745"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "8f94c2be8ba8e496ff917f78206ab9a9294e4de1"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "3f6ecaab216f91759a39e255571edaf9b48d4733"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "ae0fce83ae2aa416dc3acda327dec98f2c7c0b98"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "aeaed8574b13046d1afb129ad9d3cc0ee22b2bff"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "997495abb13611591ce9ab5ea81cc65dd7ee579a"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "84193f01192c8341905a0f8d2e7b3d198c39e113"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "f7e9278e9d4b0d3b45f453a16b5840bb84598ccc"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "e52fb5a1e813e1d91ec7562bd7e94632f661c5a4"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "89f13d927c9d8596899ed09f8c9f7d97c26d78f5"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "bc0972e18db99f9d6fdbe100dd09d62bb2c3afbd"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "4552aa92a799086b7f79178eb8d846a84e77e094"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "4c2577170f9df45a313c6728076cc35504f7ad80"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "dea774633ab5c1ab5c74380984253b0597d53d2c"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "5f770c719895ddec1a8c27bda298361341b2e924"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "5581f70176eb35cf01d5ebb368741130420b505e"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "f0853164e4d1497be6dcffd6dd365eaf56b6582b"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0ccb11141eb9c339cfe652aee6e902ed0cd700e4"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "36448e2198e3650f0e5a107af3ae10dbdc8273ce"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "804668a7692b378f6686ea56dae3b9e047bce4a1"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "396a845931ee25c79baaa2147c94b7eea6c8505f"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "87d9567073d22f09abe6c45a044fd3b4ee4d925b"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "e3263e2215862dad2268686242a2374e460d1868"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "714597790f46b03289a4a91e20f797c82672f849"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "0dfc5d9abcac90e5ab254bb72ae20d987ff206f3"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "2eac6e7cb6eae8ca0714dd219eb08b3f7d846191"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "505764e55d673a282d38c3bca7db4ac29325ead1"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "bd32e999d5c61b20bb3a5983032227ff2a7d6d84"; }
-    { locale = "csb"; arch = "linux-i686"; sha1 = "ae5065363647da475901fb7cc156a4ecdecc528b"; }
-    { locale = "csb"; arch = "linux-x86_64"; sha1 = "df0de3d7e5b2aa84e37097b5f65168d732bfd3de"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "3e1e7991983277f4c07486d1f2896e2a192d5f85"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "20232e85c69830eb08b4387f69e3d26637b3d06c"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "1a3a3913876fe8eea20b4b6d33b939b9e531fd34"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "f89864c28eb750655fb212d77569fcfdfbd38ee9"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "da97ff54467b5d0cad8142158e01514a1e75f457"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "988c4cd52388368d21cfb1e6002c28f3e8fb57b1"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "0997a81282c73a8faf8a784a296bbe9102c823bd"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6573147c354d29f0ba928888916882aafb92268"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "df53cedb977f9f1cff6b43351fa19801c51e53d9"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "e124b8586af6fb23371c006be0fbe3525dafc8a9"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "738a7335b42e4d324bb3c8411666c3d64e481f85"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "788abe682ac80e08739edf0fabfd4f160eee44da"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "9aeaab7265640c4dfdde57b0ef7eebac26c1d1ec"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e4bdb638b0a4c90ecb664a9b64351a31ad237ee5"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "381749003d0755cec8dbf29cd1d4ebfa806576f8"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "518c307bb0b23592ff711943594ea76ffdf0d0c3"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "f570024c9c665b36bd8646f44b2b27ff7021f590"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "fb777076f2a2a7d911a381a0561c02701dd54878"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "20cac134a4312d5cee8ad1f144b2c44108e96b8e"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d4757bfb61d84d6d3e4b484377f1037b1ff2728c"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "0416114a667fbc9144186d9a74ce2cf3e09944cc"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "73eeff57047143e8d4217bb22a3831555f87341f"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "66d8288cb4af4d4e8584dcebefc14d9aaf46f4bc"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d0830ffc8634ab47033b932dcac51e7d042c4f19"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "592df3f8ee6e6a6fc56991a7b1e9f55a1ea1b8e8"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cf0d2afac587dbb4f640ea672ea01190f2425905"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "441a5dbb69fe61e28e06ec3ed29f34d067ec2ade"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "633b25f83507b61829a934385766628c8764544e"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "f8f6ddf346afb5bb0420ab092463d61e5e6abfe7"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "cc7cfc43d8e6db5ac08f846e81a416e5a75b37b6"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "796ee1d052e97372a870f113390ef25f26047203"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "3810bd3727a7de7474070e329ddeabfb98f4aeee"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "436b6732f58bb6a128c6e3027358089bca0d753e"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "ed7e3e1a90d31e40cd47645474246adba30eaa1d"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "1d7909cbfe55f6234b6789addae5c9a2dbcf1e49"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "d7734ee040a5ff56aa6d7149d6d5a78541f533fb"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "a8614ef406ed6d4ce7f64f14335b5c4a13fd1ee2"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "98d5e3476784ee4d759b7995e2ff936910a1b213"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "3c7a1c5e1fb9e0f2320a33771bde1cbd774eb6bf"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "10178c5fc56dd8f510f80748767e7e5961bac6ff"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "235c5016eb77c9369ee10e51514961a6986f3c78"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "023c3aafa794faa30cc25576e411f2482cc83131"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "e86c734f2afb872f407f78e867735ecda7ceb622"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "29b695a5c8291f23b22871dcec4d6e66f918e21c"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "c13ac4e21e70e5d3bcf0b2149bfc3e6090c383ce"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "70116ba4463b6937382dc9c7c8da465f5aa78c07"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "7b687b19b72543d411c9eeb4055015c4e4ebaa4b"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "d2cc38aafa2311808d92f1c927b6b6fd86c35d59"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "24027663a19be1d27379167585936591ffe01650"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "0ab9ec52df1e0debad953b2c658c16396a7c336d"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d72b91be0e392a853d3b894f2809bb16d4ed77f5"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "560a3562b66a46f7b5c235e5f0c9a37518dc60f4"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "319c19a36f1d9f087f59470cb14ad0b9429cb751"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "2c98ac830fb0eff611cb82690d068dc61fa6fb21"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "f8b2f8a85b7e5d8d4c551f0e64340cfe491695c4"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "5b6533ac4222a3e18c3d4ba74e0aa459bfa413d1"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "93308746df2c99182d2919fece807b47db688b3d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "9fd5cd46a04bed5b8fb079aeb59050664c5d93e0"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d889d18ccef0c7c25dc2e1fc71b9eaa6aaeb4229"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2ef01a1c2f01825d80d6a0846d59ff6ad77e90e1"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "1c5cb9d1d4b20b2060a8fd07d2851067a4b71d6a"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "82c871d7554fe8411d8f6fccf5e3c7f0d7798885"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "1e697fa5802915b826e29ea73805b7101a32312c"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "44b0d19bc285462f305abf8137aefd9477715e8f"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "16e00713bd355373c676e05a032933d9c210ba87"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "c32e8d9e9dde6c61092e4b72a3192f50e70bcfa9"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "d2d4d0a2c32769ae9fb6d27dfb71e52f146824c3"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "271d50bcf97440e61bf7b952a48fe3992c40faf0"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "bc1e2c28b01b7bffde01d88e6aa6aec1a8868f3d"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "94a66d608cec6de58fb8d72b116395c77198494d"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "99fdf2ae88c34db6fe9234d236caffeb50cbb843"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "78645872859dc627c5d12e6aa86aef6e3528b3d9"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "ef5dcee189c685ee5b71a76cb19138e65f22a0be"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "87b064a5ce23ffd1397b8a480e6a158b1de4cd67"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "95e6290a38025af724c34272f8e2a4d531e4f06a"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "e989184dfda401f19a895275519f729597a27e97"; }
-    { locale = "ku"; arch = "linux-i686"; sha1 = "c1004b96937b848d9e1e53f9fe4a8507d218572d"; }
-    { locale = "ku"; arch = "linux-x86_64"; sha1 = "a4e61d630ab6ce54a06ff1a90c7df3b76b235181"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "be5da1e0d17c7b51da616c082932d8190a33a74e"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "35e29b7825124dd5c68d02e7c1a15e9cdefaec22"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "c09c5cf5f25eac88f90f4aeb48495f688d78d80d"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "7f4f6511d9cf4b70e34b37c823c12bd13409a7e8"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "7fc81c00badbbd877a67d5e1998f16560dd41f3e"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "5edb8fac36c755db3e3270a0cf4320970696ff4c"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "4d49ecb2e195c9c65382155128ff02d857937703"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "96d0dac8116f20972469e527757d17cf7c22792b"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "b72b07ab4d69430d62fb9c497c047f2987636ea1"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "441918ac58ff166851921bf1566e7dda24ce2377"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "b7947f50a0618ba9b8fb5fa9f1adff13dbfc0147"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "3c98db55a6b9c707957786cc40a03d69e9b4e619"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "f1e5109a2fe72d1c7d8a32f83918064d607efa1a"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "820f056eb3413fc0e1979f192e9542db0c9e0e79"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "6a9f01f286fbe0b63f6c171f0171f2883fa5b474"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "f8cccf1c87845947693c631fd60300d1a5ec7436"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "2dbe61442b310777b427d27159ee767d82a4b254"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b7a437552fc540966478832bf89a85dc81b16766"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "36f65d56954e59bd758b4a1c09abec85872eb140"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "0c1ed8b52afdd3d15f163fc8899e14caeb0a4497"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "729144a52c95cbcb2665da00e953cbdb269c0665"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "5298026198b8d6c7eb0b816ca29bbd26f0f65907"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "33aaf77833a3c3a504559c399a270061a582ffbb"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "a2dca791375b174d0f888ce56555fe21e5b2eaf4"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "3670a8492dde8b19e1f5fba10d54eabd003183e1"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "376576536d6a7d373ec5c453e107f63261819cf1"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "53af2036a170d77f828e80d455edf6cddf826cfb"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "01e04cf2530c1b51bd9e8ee5114ac9ba5317e0e4"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0fec2a4ea90ecb6d7e09041d45a4b0647c37ebe0"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f7f1dd1f7d78b3647cb77f282b87a3d7224ec567"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "cf46849b5fbd06b51c468f2dc6dab3eb9e8ffde1"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e6bae39233b0c3735fb122b9e56ac4e82d435749"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "41ed6d9c3816647069b0416d1b7edda97fe1abff"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "36a83ca4594ba79a3b01ee21a5cfde45b13b323e"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "d70284aea6297688eb25835a482d9ca349eac313"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "78079d94b0ad83e6cd687433c335b7e0012c8cb8"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "354fb775dbddfe9f87e78982e7456f20d01476bb"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "30a29bb1cbf967fb24e5bbc6abefcdf074b316cc"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "b20089f3f2ef670426a29e409426a9cd3569090a"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "bee5b374f0ca41a858e9b61fe0b43a56bf303180"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "6c9d83b2cef140bdf513c7226854fc991d087785"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "57595905385b6b7e77eee34f54a40562d041169d"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "63b3edf9aec8a6beabdf1a4b4a9fb0fb835345fc"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "3afafa985ee73cfe378e39881665d2242a6943c9"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "e6b6b56ebee586bb10511d197b11d93aefae6316"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "f95cb4b571fa389df4e182632b12216699cc9f0a"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "18dfa5b40bd31a0d23884f6e9af357b0be01c4b2"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "f9d026e9d5a85eaad008d65b736ae8c63cb5064d"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "a5ed16491244d9ab6237546e241335005572c1c0"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "2ed29dec3a28949b93f82d0652a38a5539fb2304"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "594eae45b36645a47b12d9579826789e3255b275"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "0cec1133910c8ae87878ca56fd63b610651f99ca"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "86da5bfa06e670359b831226822db6a40a7ec7c3"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "86b3749d396a7be3628face4bf7ed7278b98c5ab"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "7020a27e9173b52a54c8e442e8e2ffc60a888e2c"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "417ea3e749a9f7309b11d50f99bd5c1b916a0c77"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "539293f4f6183ec2941fa83705f7c91bf5e65776"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "362d3c39936725437d63576f2c8ee6deaf9429ea"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "eb0d205cf6eac45a8405d072b89856293d4cb63e"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "84c19d6ec3446ecbe03f0751822501d3628699a8"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "5ef72696a4180c91483f406627ea040bede2f30c"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "9de7bcc3ff254234e1844860c3bc907317c02ae6"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "3338130b87e4dd9ee7b8e7120dd158065a772290"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "53ebf9890f9b4ccdc786fa65dcae739fae7b8f7c"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "83ae4b1f84c64733d196b9bec58ab1468b126577"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "da5b9dca0277dd2be1027251c96f7524e0204f2f"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "bc3e12000156a886e00a64bf536c5b2c35bb727d"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1ac45fd506eb1d5bb92a86ee3a9686e8c93b5c9e"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "5377236c138066df6f67083ae8ed348c6d611a81"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "8733a47e10d1bd025507c09a443acf80dd614643"; }
-    { locale = "zu"; arch = "linux-i686"; sha1 = "a653e724fe28431b2b5ca5f2553654da4ffa526f"; }
-    { locale = "zu"; arch = "linux-x86_64"; sha1 = "81c967fc251d77a38de24519dba0f4465326fcd8"; }
-  ];
-}
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index 0213348a593c..f2407e1a8333 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
-, lua, mesa, pkgconfig, perl, automake, autoconf, libtool, gettext, glib, cairo
+, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo
 , pango, gdk_pixbuf, atk
 }:
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa pkgconfig lua
-    perl automake autoconf libtool gettext ];
+    perl autoreconfHook ];
 
   patchPhase = ''
     patch -Np0 -i "${gcc46Patch}"
@@ -53,18 +53,15 @@ stdenv.mkDerivation {
     patch -Np2 -i "${libpng16Patch}"
     patch -Np1 -i "${linkingPatch}"
     patch -Np1 -i "${gcc47Patch}"
-    autoreconf
-    configureFlagsArray=(
-      --with-gtk
-      --with-lua=${lua}
-      CPPFLAGS="-DNDEBUG"
-      CFLAGS="-O2 -fsigned-char"
-      CXXFLAGS="-O2 -fsigned-char"
-      GTK_CFLAGS="-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"
-      GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"
-    )
   '';
 
+  configureFlags = "--with-gtk --with-lua=${lua}";
+  CPPFLAGS = "-DNDEBUG";
+  CFLAGS = "-O2 -fsigned-char";
+  CXXFLAGS = "-O2 -fsigned-char";
+  GTK_CFLAGS = "-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include";
+  GTK_LIBS = "-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0";
+
   installPhase = ''make MKDIR_P="mkdir -p" install'';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix
deleted file mode 100644
index 166047a98413..000000000000
--- a/pkgs/applications/science/electronics/tkgate/2.x.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, tcl, tk, libX11, glibc }:
-
-let
-  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
-  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib";
-in
-stdenv.mkDerivation rec {
-  name = "tkgate-2.0-b10";
-
-  src = fetchurl {
-    url = "http://www.tkgate.org/downloads/${name}.tgz";
-    sha256 = "0mr061xcwjmd8nhyjjcw2dzxqi53hv9xym9xsp0cw98knz2skxjf";
-  };
-
-  buildInputs = [ tcl tk libX11 ];
-
-  dontStrip = true;
-
-  patchPhase = ''
-    sed -i configure \
-      -e 's|TKGATE_INCDIRS=.*|TKGATE_INCDIRS="${tcl}/include ${tk}/include ${libiconvInc}"|' \
-      -e 's|TKGATE_LIBDIRS=.*|TKGATE_LIBDIRS="${tcl}/lib ${tk}/lib ${libiconvLib}"|'
-    sed -i options.h \
-      -e 's|.* #define TCL_LIBRARY .*|#define TCL_LIBRARY "${tcl}/${tcl.libdir}"|' \
-      -e 's|.* #define TK_LIBRARY .*|#define TK_LIBRARY "${tk}/lib/${tk.libPrefix}"|'
-  '';
-
-  meta = {
-    description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor";
-    homepage = "http://www.tkgate.org/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix
index 3bbcda9de110..45e6674439e7 100644
--- a/pkgs/applications/science/logic/alt-ergo/default.nix
+++ b/pkgs/applications/science/logic/alt-ergo/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, ocaml, ocamlPackages }:
+{ fetchurl, stdenv, ocamlPackages }:
 
 stdenv.mkDerivation rec {
   name = "alt-ergo-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "High-performance theorem prover and SMT solver";
     homepage    = "http://alt-ergo.ocamlpro.com/";
     license     = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }
diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index 5a4e2cbbc055..92c306c40827 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchFromGitHub, cmake, gmp, mpfr, luajit, boost, python
-, gperftools, ninja }:
+, gperftools, ninja, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "20150821";
+  version = "20160117";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
-    rev    = "453bd2341dac51e50d9bff07d5ff6c9c3fb3ba0b";
-    sha256 = "1hmga5my123sra873iyqc7drj4skny4hnhsasaxjkmmdhmj1zpka";
+    rev    = "b2554dcb8f45899ccce84f226cd67b6460442930";
+    sha256 = "1gr024bly92kdjky5qvcm96gn86ijakziiyrsz91h643n1iyxhms";
   };
 
-  buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja ];
+  buildInputs = [ gmp mpfr luajit boost cmake python gperftools ninja makeWrapper ];
   enableParallelBuilding = true;
 
   preConfigure = ''
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
 
+  postInstall = ''
+    wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin
+  '';
+
   meta = {
     description = "Automatic and interactive theorem prover";
     homepage    = "http://leanprover.github.io";
diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 0aa3d6e51c37..308ca79eab28 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metis-prover-${version}";
-  version = "2.3";
+  version = "2.3.20160101";
 
   src = fetchurl {
     url = "http://www.gilith.com/software/metis/metis.tar.gz";
-    sha256 = "07wqhic66i5ip2j194x6pswwrxyxrimpc4vg0haa5aqv9pfpmxad";
+    sha256 = "0wkh506ggwmfacwl19n84n1xi6ak4xhrc96d9pdkpk8zdwh5w58l";
   };
 
   nativeBuildInputs = [ perl ];
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.gilith.com/research/metis/;
     license = licenses.mit;
     maintainers = with maintainers; [ gebner ];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 6fac7dc969dc..2ca2cab3afd8 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt
-, libjpeg, libpng, libtiff, ncurses, pango, pcre, perl, readline, tcl
-, texLive, tk, xz, zlib, less, texinfo, graphviz, icu, pkgconfig, bison
-, imake, which, jdk, openblas, curl
+{ stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng
+, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib
+, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas
+, curl, Cocoa, Foundation, cf-private, libobjc, tzdata
 , withRecommendedPackages ? true
+, enableStrictBarrier ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -14,10 +15,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ bzip2 gfortran libX11 libXmu libXt
-    libXt libjpeg libpng libtiff ncurses pango pcre perl readline tcl
-    texLive tk xz zlib less texinfo graphviz icu pkgconfig bison imake
-    which jdk openblas curl
-  ];
+    libXt libjpeg libpng libtiff ncurses pango pcre perl readline
+    texLive xz zlib less texinfo graphviz icu pkgconfig bison imake
+    which jdk openblas curl ]
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ tcl tk ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation cf-private libobjc ];
 
   patches = [ ./no-usr-local-search-paths.patch ];
 
@@ -38,6 +40,7 @@ stdenv.mkDerivation rec {
       --with-system-pcre
       --with-system-xz
       --with-ICU
+      ${stdenv.lib.optionalString enableStrictBarrier "--enable-strict-barrier"}
       --enable-R-shlib
       AR=$(type -p ar)
       AWK=$(type -p gawk)
@@ -47,10 +50,23 @@ stdenv.mkDerivation rec {
       JAVA_HOME="${jdk}"
       RANLIB=$(type -p ranlib)
       R_SHELL="${stdenv.shell}"
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+      --without-tcltk
+      --without-aqua
+      --disable-R-framework
+      CC="clang"
+      CXX="clang++"
+      OBJC="clang"
+  '' + ''
     )
     echo "TCLLIBPATH=${tk}/lib" >>etc/Renviron.in
   '';
 
+  postConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i 's|/usr/share/zoneinfo|${tzdata}/share/zoneinfo|g' src/library/base/R/datetime.R
+    sed -i 's|getenv("R_SHARE_DIR")|"${tzdata}/share"|g' src/extra/tzone/localtime.c
+  '';
+
   installTargets = [ "install" "install-info" "install-pdf" ];
 
   doCheck = true;
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 5719ccb69097..be273bca0e2c 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, gmp, readline }:
 
 stdenv.mkDerivation rec {
-  version = "2.7.4";
+  version = "2.7.5";
   name = "pari-${version}";
 
   src = fetchurl {
     url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz";
-    sha256 = "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8";
+    sha256 = "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11";
   };
 
   buildInputs = [gmp readline];
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 4d3c31b4f914..1bf58195f5eb 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -26,11 +26,7 @@ in
 rec {
 
   # support for bugzilla
-  gitBz = import ./git-bz {
-    inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
-      ;
-    inherit (pythonPackages) pysqlite;
-  };
+  git-bz = callPackage ./git-bz { };
 
   git = appendToName "minimal" gitBase;
 
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index 4015867b0eb5..d43a49ac7514 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -1,38 +1,39 @@
-{ stdenv, fetchgit, python, asciidoc, xmlto, pysqlite, makeWrapper }:
+{ stdenv, fetchgit
+, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
+, pythonPackages }:
 
-let
-  version = "3.20110902";
-in
+let version = "3.2015-09-08"; in
 stdenv.mkDerivation {
-  name = "git-bz";
+  name = "git-bz-${version}";
 
   src = fetchgit {
+    sha256 = "19d9c81d4eeabe87079d8f60e4cfa7303f776f5a7c9874642cf2bd188851d029";
+    rev = "e17bbae7a2ce454d9f69c32fc40066995d44913d";
     url = "git://git.fishsoup.net/git-bz";
-    rev = "refs/heads/master";
   };
 
-  buildInputs = [
-    makeWrapper python pysqlite # asciidoc xmlto
+
+  nativeBuildInputs = [
+    asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
   ];
+  buildInputs = []
+    ++ (with pythonPackages; [ python pysqlite ]);
+
+  postPatch = ''
+    patchShebangs configure
 
-  buildPhase = ''
-    true
-    # make git-bz.1
+    # Don't create a .html copy of the man page that isn't installed anyway:
+    substituteInPlace Makefile --replace "git-bz.html" ""
   '';
 
-  installPhase = ''
-    mkdir -p $out
-    mkdir -p $out/bin
-    cp git-bz $out/bin
+  postInstall = ''
     wrapProgram $out/bin/git-bz \
-      --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $pysqlite)"
+      --prefix PYTHONPATH : "$(toPythonPath "${pythonPackages.pysqlite}")"
   '';
 
-  meta = {
-    homepage = "http://git.fishsoup.net/cgit/git-bz/";
-    description = "integration of git with Bugzilla";
-    license = stdenv.lib.licenses.gpl2;
-
+  meta = with stdenv.lib; {
+    inherit version;
+    description = "Bugzilla integration for git";
     longDescription = ''
       git-bz is a tool for integrating the Git command line with the
       Bugzilla bug-tracking system. Operations such as attaching patches to
@@ -46,9 +47,10 @@ stdenv.mkDerivation {
       currently is able to do this for Firefox, Epiphany, Galeon and
       Chromium on Linux.
     '';
+    license = licenses.gpl2Plus;
+    homepage = http://git.fishsoup.net/cgit/git-bz/;
 
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.pierron ];
-    broken = true;
+    maintainers = with maintainers; [ nckx ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 84b033f981fc..49ecce0456b2 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.6.4";
+  version = "2.7.0";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "0rnlbp7l4ggq3lk96v24rzw7qqawp6477i3b4m0b5q3346ap008w";
+    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
   };
 
   patches = [
@@ -34,7 +34,8 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optionals guiSupport [tcl tk];
 
   # required to support pthread_cancel()
-  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s"
+              + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr";
 
   # without this, git fails when trying to check for /etc/gitconfig existence
   propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc";
@@ -143,7 +144,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://git-scm.com/;
     description = "Distributed version control system";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = stdenv.lib.licenses.gpl2;
 
     longDescription = ''
       Git, a popular distributed version control system designed to
diff --git a/pkgs/applications/version-management/veracity/default.nix b/pkgs/applications/version-management/veracity/default.nix
deleted file mode 100644
index 4c69f41106b8..000000000000
--- a/pkgs/applications/version-management/veracity/default.nix
+++ /dev/null
@@ -1,108 +0,0 @@
-x@{builderDefsPackage
-  , cmake, curl, patch, zlib, icu, sqlite, libuuid
-  , readline, openssl, spidermonkey_1_8_0rc1
-  , nspr, nss
-  , unzip, glibcLocales
-  , runTests ? false
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  s = import ./src-for-default.nix;
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["runTests"];
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-    
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-
-  phaseNames = ["prepare_sgneeds" "dump0" "prepareMakefiles" "fixPaths" "doMake" "doTest" "doDeploy"];
-
-  dump0 = (a.doDump "0");
-
-  runTests = a.stdenv.lib.attrByPath ["runTests"] false a;
-
-  doTest = a.fullDepEntry (if runTests then ''
-    mkdir pseudo-home
-    export HOME=$PWD/pseudo-home
-    export LC_ALL=en_US.UTF-8
-    export LANG=en_US.UTF-8
-    ${if a.stdenv.isLinux then "export LOCALE_ARCHIVE=${a.glibcLocales}/lib/locale/locale-archive;" else ""}
-    make test || true
-  '' else "") ["doMake" "minInit"];
-
-  prepare_sgneeds = a.fullDepEntry (''
-    mkdir -p "$out/sgneeds/include/spidermonkey"
-    for d in bin include lib; do 
-      mkdir -p "$out/sgneeds/$d"
-      mkdir -p "$out/sgneeds/$d"
-      for p in "${spidermonkey_1_8_0rc1}"; do
-        for f in "$p"/"$d"/*; do
-	  ln -sf "$f" "$out"/sgneeds/"$d"
-	done
-      done
-    done
-      for p in  "${spidermonkey_1_8_0rc1}/include" "${spidermonkey_1_8_0rc1}/include/js"; do
-        for f in "$p"/*; do
-	  ln -sf "$f" "$out"/sgneeds/include/spidermonkey/
-	done
-      done
-
-    mkdir -p "$out/sgneeds/include/sgbrings"
-    ln -s "$out/sgneeds/include/js" "$out/sgneeds/include/sgbrings/js"
-    for f in "$out/sgneeds/lib/"libjs*; do
-      bn="$(basename "$f")"
-      ln -s "$f" "$out/sgneeds/lib/''${bn/libjs/libsgbrings_js}"
-    done
-
-    export SGNEEDS_DIR="$out"/sgneeds/
-    export VVTHIRDPARTY="$out"/sgneeds/
-
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I"$out/sgneeds/include" -Wno-error"
-  '') ["minInit" "defEnsureDir"];
-
-  prepareMakefiles = a.fullDepEntry ''
-    sed -e 's@ /bin/uname @ uname @g' -i CMakeLists.txt
-    sed -e 's@ /bin/uname @ uname @g' -i common-CMakeLists.txt
-    cd ..
-    mkdir build
-    cd build
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lssl"
-    cmake -G "Unix Makefiles" -D SGNEEDS_DIR="$SGNEEDS_DIR" -D VVTHIRDPARTY="$VVTHIRDPARTY" -D SPIDERMONKEY_INCDIR="${a.spidermonkey_1_8_0rc1}/include" -D SPIDERMONKEY_LIB="${a.spidermonkey_1_8_0rc1}/lib/libjs.so" ../veracity*
-  '' ["minInit" "addInputs" "doUnpack"];
-
-  fixPaths = a.fullDepEntry ''
-    sed -e "s@/bin/bash@${a.stdenv.shell}@" -i $(find .. -type f)
-    sed -e 's@/bin/ln@#{a.coreutils}/bin/ln@g' -i ../veracity/src/js_tests/*.js
-    sed -e 's@/usr/bin/gdb@#{a.gdb}/bin/gdb@g' -i ../veracity/testsuite/c_test.sh
-    sed -e 's@"/bin/@"@g' -i ../veracity/testsuite/u*.c
-  '' ["minInit"];
-
-  doDeploy = a.fullDepEntry ''
-    mkdir -p "$out/bin" "$out/share/veracity/"
-    cp -r .. "$out/share/veracity/build-dir"
-    ln -s "$out/share/veracity/build-dir/build/src/cmd/vv" "$out/bin"
-    ln -s "$out/share/veracity/build-dir/build/src/script/vscript" "$out/bin"
-    ${if runTests then "" else '' 
-      rm -rf  "$out/share/veracity/build-dir/veracity/testsuite" 
-      rm -rf  "$out/share/veracity/build-dir/build/testsuite" 
-    ''}
-  '' ["doMake" "minInit" "defEnsureDir"];
-
-  meta = {
-    description = "A distributed version control system with template-based merging";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux ;
-    broken = true;
-  };
-}) x
-
diff --git a/pkgs/applications/version-management/veracity/src-for-default.nix b/pkgs/applications/version-management/veracity/src-for-default.nix
deleted file mode 100644
index 5a514e8728d4..000000000000
--- a/pkgs/applications/version-management/veracity/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="2.1.0.10979";
-   name="veracity-2.1.0.10979";
-   hash="15x3cwwjv9b0cbjx6insqk190wpnhwcm1z4b570hvw3lix3xnxhl";
-   url="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-${version}.tar.gz";
-   advertisedUrl="http://download.sourcegear.com/Veracity/release/2.1.0.10979/veracity-source-2.1.0.10979.tar.gz";
-  
-  
-}
diff --git a/pkgs/applications/version-management/veracity/src-info-for-default.nix b/pkgs/applications/version-management/veracity/src-info-for-default.nix
deleted file mode 100644
index cf4936ffc554..000000000000
--- a/pkgs/applications/version-management/veracity/src-info-for-default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  downloadPage = "http://veracity-scm.org/downloads.html";
-  #downloadPage = "http://download-us.sourcegear.com/Veracity/nightly/index.html";
-  baseName = "veracity";
-}
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index e2aaf30d0c32..3b48a447f6ff 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -7,11 +7,11 @@ assert stdenv ? glibc;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation {
-  name = "avidemux-2.6.9";
+  name = "avidemux-2.5.6";
 
   src = fetchurl {
-    url = mirror://sourceforge/avidemux/avidemux_2.6.9.tar.gz;
-    sha256 = "01jhgricd7m9hdhr22yrdjfrnl41zccm2yxw7gfb02mwcswvswy0";
+    url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz;
+    sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn";
   };
 
   buildInputs = [ cmake pkgconfig libxml2 qt4 gtk gettext SDL libXv
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://fixounet.free.fr/avidemux/;
     description = "Free video editor designed for simple video editing tasks";
-    maintainers = with stdenv.lib.maintainers; [ viric jagajaga ];
+    maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 36da9d320721..f1a999e5554e 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
                   libvdpau
                   libva
                   libbluray
+                  qtquickcontrols
                 ]
                 ++ optional jackSupport jack
                 ++ optional portaudioSupport portaudio
diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix
deleted file mode 100644
index 1040f8e009a3..000000000000
--- a/pkgs/applications/video/cc1394/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, libraw1394, libdc1394avt, qt4, SDL }:
-
-stdenv.mkDerivation rec {
-  name = "cc1394-3.0";
-
-  src = fetchurl {
-    url = http://www.alliedvisiontec.com/fileadmin/content/PDF/Software/AVT_software/zip_files/AVTFire4Linux3v0.src.tar;
-    sha256 = "13fz3apxcv2rkb34hxd48lbhss6vagp9h96f55148l4mlf5iyyfv";
-  };
-
-  unpackPhase = ''
-    tar xf $src
-    BIGTAR=`echo *`
-    tar xf */cc1394*.tar.gz
-    rm -R $BIGTAR
-    cd cc*
-  '';
-
-  NIX_LDFLAGS = "-lX11";
-
-  enableParalellBuilding = true;
-
-  preConfigure = ''
-    sed -i -e s,/usr,$out, cc1394.pro
-    qmake PREFIX=$out
-  '';
-
-  buildInputs = [ libraw1394 libdc1394avt qt4 SDL ];
-
-  meta = {
-    homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html;
-    description = "AVT Viewer application for AVT cameras";
-    license = stdenv.lib.licenses.bsd3;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = []; # because libdc1394avt is broken
-  };
-}
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index b02ab0eb8a96..9e0f4cd2b68d 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, kodi, steam, libcec_platform, tinyxml }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml }:
 
 let
 
@@ -92,17 +92,70 @@ in
 
   };
 
+  urlresolver = (mkKodiPlugin rec {
+
+    plugin = "urlresolver";
+    namespace = "script.module.urlresolver";
+    version = "2.10.0";
+
+    src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
+      owner = "Eldorados";
+      repo = namespace;
+      rev = "72b9d978d90d54bb7a0224a1fd2407143e592984";
+      sha256 = "0r5glfvgy9ri3ar9zdkvix8lalr1kfp22fap2pqp739b6k2iqir6";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/Eldorados/urlresolver";
+      description = "Resolve common video host URL's to be playable in XBMC/Kodi";
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  }).override {
+    patches = [ (fetchpatch {
+      url = https://github.com/Eldorados/script.module.urlresolver/pull/355.patch;
+      sha256 = "0q1n2sqdjqq32202s6ifh81c9a1l5a7yfkkf170dbkiajvxglz1m";
+    }) ];
+  };
+
+  salts = (mkKodiPlugin rec {
+
+    plugin = "salts";
+    namespace = "plugin.video.salts";
+    version = "1.0.98";
+
+    src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
+      owner = "tknorris";
+      repo = plugin;
+      rev = "02cb63360ac1f60c01ec29d1da94902542f9a47a";
+      sha256 = "10cy633g383m1xy6yap46aqzyz96dh62y7c5rn5nvyw8ms18089z";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/tknorris/salts";
+      description = "Stream All The Sources";
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  }).override {
+    patches = [ (fetchpatch {
+      url = https://github.com/tknorris/salts/pull/115.patch;
+      sha256 = "157dhp049mw8lna6cg3x549jv2b9zq1vj6v94mil65q2hlw09sjd";
+    }) ];
+  };
+
   svtplay = mkKodiPlugin rec {
 
     plugin = "svtplay";
     namespace = "plugin.video.svtplay";
-    version = "4.0.18";
+    version = "4.0.21";
 
     src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
       owner = "nilzen";
       repo = "xbmc-" + plugin;
-      rev = "b60cc1164d0077451be935d0d1a26f2d29b0f589";
-      sha256 = "0rdmrgjlzhnrpmhgqvf2947i98s51r0pjbnwrhw67nnqkylss5dj";
+      rev = "1fb099dcddc65e58ca8691d19de657321b1b1fc2";
+      sha256 = "178krh8kzll7cprqwyhydb41b1jh961av875bm5yfdlplzaiynm0";
     };
 
     meta = with stdenv.lib; {
@@ -121,7 +174,7 @@ in
   };
 
   steam-launcher = (mkKodiPlugin rec {
-  
+
     plugin = "steam-launcher";
     namespace = "script.steam.launcher";
     version = "3.1.1";
@@ -149,6 +202,27 @@ in
     propagatedBuildinputs = [ steam ];
   };
 
+  t0mm0-common = mkKodiPlugin rec {
+
+    plugin = "t0mm0-common";
+    namespace = "script.module.t0mm0.common";
+    version = "0.0.1";
+
+    src = fetchFromGitHub {
+      name = plugin + "-" + version + ".tar.gz";
+      owner = "t0mm0";
+      repo = "xbmc-urlresolver";
+      rev = "ab16933a996a9e77b572953c45e70900c723d6e1";
+      sha256 = "1yd00md8iirizzaiqy6fv1n2snydcpqvp2f9irzfzxxi3i9asb93";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "https://github.com/t0mm0/xbmc-urlresolver/";
+      description = "t0mm0's common stuff";
+      maintainers = with maintainers; [ edwtjo ];
+    };
+  };
+
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index ed02850730c8..cda861497e12 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -18,11 +18,11 @@ assert legacyGUI -> wxGTK != null;
 
 stdenv.mkDerivation rec {
   name = "mkvtoolnix-${version}";
-  version = "8.3.0";
+  version = "8.4.0";
 
   src = fetchurl {
     url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz";
-    sha256 = "0dzwmwa76y4nhb5brp5a1kxgxjr71czd8vj218qmrlwm54i85gc7";
+    sha256 = "0y7qm8q9vpvjiw7b69k9140pw9nhvs6ggmk56yxnmcd02inm19gn";
   };
 
   patchPhase = ''
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 96f0c2f38f95..38efe61a7df5 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz";
-    sha256 = "1i3cinyjg1k7rp93cgf641zi8j98hl6qd6al9ws51n29qx22096z";
+    sha256 = "0cqjwl0xyg0sv1jflipfkvqjg32y0kqfh4gc3lyhqgv0hgs3fa84";
   };
 
   patchPhase = ''
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "0.12.0";
+    version = "0.14.0";
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index bc55f943a889..dd988f79cab0 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtscript }:
+{ stdenv, fetchurl, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
   version = "15.11.0";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  buildInputs = [ qtscript ];
+  buildInputs = [ qtscript qtwebkit ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";
diff --git a/pkgs/applications/video/tvtime/default.nix b/pkgs/applications/video/tvtime/default.nix
deleted file mode 100644
index 459ea533dba7..000000000000
--- a/pkgs/applications/video/tvtime/default.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{stdenv, fetchurl, xorg, libX11, libXtst, libSM, libXext, libXv, libXxf86vm, libXau, 
-   libXdmcp, zlib, libpng, libxml2, freetype, libICE, intltool, libXinerama, gettext, 
-   pkgconfig, kernel, file, libXi}:
-
-stdenv.mkDerivation rec {
-  name = "tvtime-1.0.2";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/tvtime/${name}.tar.gz";
-    sha256 = "aef2a4bab084df252428d66cabec61b4c63fab32cdfc0cc6599d82efd77f0523";
-  };
-
-  # many of these patches were copied from gentoo's portage team (maybe all?!)
-  patchPhase = ''
-    # to avoid this error message:
-    # ...-glibc-2.12.2/include/xlocale.h:43:20: note: previous declaration of 'locale_t' was here
-    patch -p1 < ${ ./tvtime-1.0.2-glibc-2.10.patch}
-
-    # to avoid this error message:
-    #  videodev2.h:19:46: fatal error: linux/compiler.h: No such file or directory
-    sed -i -e "s/videodev.h/linux\/videodev.h/" src/videoinput.c
-    sed -i -e "s/videodev2.h/linux\/videodev2.h/" src/videoinput.c
-
-    # to avoid this error message:
-    # 1 out of 2 hunks FAILED -- saving rejects to file src/Makefile.am.rej
-    patch -p1 < ${ ./tvtime-1.0.2-libsupc++.patch }
-
-    # to avoid this error message:
-    # ../plugins/greedyh.asm:21:6: error: extra qualification 'DScalerFilterGreedyH::' on member 'filterDScaler_SSE'
-    patch -p1 < ${ ./tvtime-1.0.2-gcc41.patch }
-
-    # compiles without this patch
-    patch -p1 < ${ ./tvtime-pic.patch }
-
-    # compiles without this patch
-    patch -p1 < ${ ./tvtime-1.0.2-autotools.patch }
-
-    # compiles without this patch
-    patch -p1 < ${ ./tvtime-1.0.2-xinerama.patch }
-
-    # libpng 1.5 patch (gentoo)
-    patch -p1 < ${ ./tvtime-libpng-1.5.patch }
-
-    # /usr/bin/file - ltmain.sh configure aclocal.m4
-    sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bi/file%g" ltmain.sh
-    sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bin/file%g" configure
-    sed -i -e "s%/usr/bin/file%/nix/store/f92pyxmbi274q7fzrfnlc2xiy6d3cyi1-file-5.04/bin/file%g" aclocal.m4
-  '';
-
-  configureFlags = '' 
-    --x-includes=${xorg.libX11}/include 
-    --x-libraries=${xorg.libX11}/lib
-  '';
-
-  buildInputs = [ libX11 libXtst libSM libXext libXv libXxf86vm libXau libXdmcp zlib libpng libxml2 freetype libICE intltool libXinerama gettext pkgconfig file libXi ];
-
-  meta = {
-    description = "High quality television application for use with video capture cards";
-    homepage = lhttp://tvtime.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [qknight];
-    platforms = with stdenv.lib.platforms; linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch
deleted file mode 100644
index bf02ebefa529..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-autotools.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: tvtime-1.0.2/src/Makefile.am
-===================================================================
---- tvtime-1.0.2.orig/src/Makefile.am
-+++ tvtime-1.0.2/src/Makefile.am
-@@ -19,9 +19,6 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
- tmpdir = /tmp
- localedir = $(datadir)/locale
- 
--TTF_CFLAGS = `$(FREETYPE_CONFIG) --cflags`
--TTF_LIBS = `$(FREETYPE_CONFIG) --libs`
--
- # Set the following if you want to specify an additional font directory
- # FONT_CFLAGS = -DFONTDIR='/usr/share/fonts/truetype/freefont/'
- 
-@@ -76,20 +73,20 @@ tvtime_SOURCES = $(COMMON_SRCS) $(OUTPUT
- tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLAGS) $(OPT_CFLAGS) \
- 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
- 	$(FONT_CFLAGS) $(AM_CFLAGS)
--tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
-+tvtime_LDADD  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
- 	$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
- 
- tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-command.c
- tvtime_command_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_command_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_command_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
- tvtime_configure_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-configure.c
- tvtime_configure_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_configure_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_configure_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
- tvtime_scanner_SOURCES = utils.h utils.c videoinput.h videoinput.c \
- 	tvtimeconf.h tvtimeconf.c station.h station.c tvtime-scanner.c \
- 	mixer.h mixer.c
- tvtime_scanner_CFLAGS = $(OPT_CFLAGS) $(XML2_FLAG) $(AM_CFLAGS)
--tvtime_scanner_LDFLAGS  = $(ZLIB_LIBS) $(XML2_LIBS)
-+tvtime_scanner_LDADD  = $(ZLIB_LIBS) $(XML2_LIBS)
- 
-Index: tvtime-1.0.2/configure.ac
-===================================================================
---- tvtime-1.0.2.orig/configure.ac
-+++ tvtime-1.0.2/configure.ac
-@@ -10,6 +10,7 @@ if test x"$host_alias" = x""; then host_
- 
- # Check for compilers.
- AC_PROG_CC
-+AM_PROG_CC_C_O
- AC_CHECK_PROG(found_cc, "$CC", yes, no)
- test "x$found_cc" = "xyes" || exit 1
- 
-@@ -17,9 +18,6 @@ AC_PROG_CXX
- AC_CHECK_PROG(found_cxx, "$CXX", yes, no)
- test "x$found_cxx" = "xyes" || exit 1
- 
--# Check for libtool.
--AC_PROG_LIBTOOL
--
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([ctype.h dirent.h errno.h fcntl.h getopt.h langinfo.h math.h netinet/in.h pwd.h signal.h stdint.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/resource.h sys/stat.h sys/time.h sys/wait.h sys/types.h unistd.h wordexp.h locale.h])
-@@ -65,10 +63,7 @@ dnl ------------------------------------
- dnl freetype
- dnl ---------------------------------------------
- dnl Test for freetype
--AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
--if test "$FREETYPE_CONFIG" = "no" ; then
--  AC_MSG_ERROR(freetype2 needed and freetype-config not found)
--fi
-+PKG_CHECK_MODULES([TTF], [freetype2])
- 
- dnl ---------------------------------------------
- dnl libxml2
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch
deleted file mode 100644
index 58e9bb204e10..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-gcc41.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm
---- tvtime-1.0.1/plugins/greedyh.asm	2005-08-14 18:16:43.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm	2005-11-28 17:53:09.210774544 +0100
-@@ -18,7 +18,7 @@
- 
- #include "x86-64_macros.inc"
- 
--void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo)
-+void FUNCT_NAME(TDeinterlaceInfo* pInfo)
- {
-     int64_t i;
-     bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0;
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc
---- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc	2004-10-20 17:31:05.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc	2005-11-28 17:53:33.251119856 +0100
-@@ -5,9 +5,9 @@
- #endif
- 
- #ifdef USE_STRANGE_BOB
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB)
- #else
--#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n)
-+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n)
- #endif
- 
- int SEARCH_EFFORT_FUNC(0)		// we don't try at all ;-)
-diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp
---- tvtime-1.0.1/plugins/tomsmocomp.cpp	2004-10-20 19:38:04.000000000 +0200
-+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp	2005-11-28 17:52:53.862107896 +0100
-@@ -31,7 +31,7 @@
- 
- #define IS_MMX
- #define SSE_TYPE MMX
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX
-+#define FUNCT_NAME filterDScaler_MMX
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_MMX
- #undef  SSE_TYPE
-@@ -39,7 +39,7 @@
- 
- #define IS_3DNOW
- #define SSE_TYPE 3DNOW
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW
-+#define FUNCT_NAME filterDScaler_3DNOW
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_3DNOW
- #undef  SSE_TYPE
-@@ -47,7 +47,7 @@
- 
- #define IS_SSE
- #define SSE_TYPE SSE
--#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE
-+#define FUNCT_NAME filterDScaler_SSE
- #include "tomsmocomp/TomsMoCompAll.inc"
- #undef  IS_SSE
- #undef  SSE_TYPE
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch
deleted file mode 100644
index c3d8ad87d733..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-glibc-2.10.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur tvtime-1.0.2.org/src/xmltv.c tvtime-1.0.2/src/xmltv.c
---- tvtime-1.0.2.org/src/xmltv.c	2009-07-02 21:48:49.426191088 +0200
-+++ tvtime-1.0.2/src/xmltv.c	2009-07-02 21:50:20.842066085 +0200
-@@ -118,9 +118,9 @@
- typedef struct {
-     const char *code;
-     const char *name;
--} locale_t;
-+} tvtime_locale_t;
- 
--static locale_t locale_table[] = {
-+static tvtime_locale_t locale_table[] = {
-     {"AA", "Afar"},           {"AB", "Abkhazian"},      {"AF", "Afrikaans"},
-     {"AM", "Amharic"},        {"AR", "Arabic"},         {"AS", "Assamese"},
-     {"AY", "Aymara"},         {"AZ", "Azerbaijani"},    {"BA", "Bashkir"},
-@@ -168,7 +168,7 @@
-     {"XH", "Xhosa"},          {"YO", "Yoruba"},         {"ZH", "Chinese"},
-     {"ZU", "Zulu"} };
- 
--const int num_locales = sizeof( locale_table ) / sizeof( locale_t );
-+const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t );
- 
- /**
-  * Timezone parsing code based loosely on the algorithm in
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch
deleted file mode 100644
index cc76d2decc62..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-libsupc++.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Link to libsupc++ instead of bringing in libstdc++ just because tomsocomp
-is written in C++. It does not use STL so it needs not the whole standard
-library.
-Index: tvtime-1.0.2/src/Makefile.am
-===================================================================
---- tvtime-1.0.2.orig/src/Makefile.am
-+++ tvtime-1.0.2/src/Makefile.am
-@@ -77,7 +77,7 @@ tvtime_CFLAGS = $(TTF_CFLAGS) $(PNG_CFLA
- 	$(PLUGIN_CFLAGS) $(X11_CFLAGS) $(XML2_FLAG) \
- 	$(FONT_CFLAGS) $(AM_CFLAGS)
- tvtime_LDFLAGS  = $(TTF_LIBS) $(ZLIB_LIBS) $(PNG_LIBS) \
--	$(X11_LIBS) $(XML2_LIBS) -lm -lstdc++
-+	$(X11_LIBS) $(XML2_LIBS) -lm -lsupc++
- 
- tvtime_command_SOURCES = utils.h utils.c tvtimeconf.h tvtimeconf.c \
- 	tvtime-command.c
diff --git a/pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch b/pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch
deleted file mode 100644
index 0964d055768d..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-1.0.2-xinerama.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: tvtime-1.0.2/configure.ac
-===================================================================
---- tvtime-1.0.2.orig/configure.ac
-+++ tvtime-1.0.2/configure.ac
-@@ -99,6 +99,8 @@ dnl ------------------------------------
- dnl check for X11, Xv and XF86VidModeExtension
- dnl ---------------------------------------------
- AC_PATH_XTRA
-+AC_ARG_WITH([xinerama],
-+    [AS_HELP_STRING([--without-xinerama], [Disable Xinerama extension support (default: check)])])
- if test x"$no_x" != x"yes"; then
-     dnl check for Xshm
-     AC_CHECK_LIB([Xext],[XShmCreateImage],
-@@ -112,11 +114,13 @@ if test x"$no_x" != x"yes"; then
- 	    X11_LIBS="$X11_LIBS -lXv"],,
- 	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
- 
--	dnl check for Xinerama
--	AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
--	    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
--	    X11_LIBS="$X11_LIBS -lXinerama"],,
--	    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
-+	if test "x$with_xinerama" != "xno"; then
-+		dnl check for Xinerama
-+		AC_CHECK_LIB([Xinerama],[XineramaQueryScreens],
-+		    [AC_DEFINE([HAVE_XINERAMA],,[Xinerama support])
-+		    X11_LIBS="$X11_LIBS -lXinerama"],,
-+		    [$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS -lXext])
-+	fi
- 
- 	dnl check for XTest
-         AC_CHECK_LIB([Xtst],[XTestFakeKeyEvent],
diff --git a/pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch b/pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch
deleted file mode 100644
index bfa22ed98d02..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-libpng-1.5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Include zlib.h which is no longer implicitly included with libpng-1.5
-Bug 369663
-
-diff -ru tvtime-111b28cca42d.orig/src/pngoutput.c tvtime-111b28cca42d/src/pngoutput.c
---- tvtime-111b28cca42d.orig/src/pngoutput.c	2011-02-01 02:35:26.000000000 +0100
-+++ tvtime-111b28cca42d/src/pngoutput.c	2011-06-02 13:36:55.965999463 +0200
-@@ -18,6 +18,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <zlib.h>
- #include <png.h>
- #include "pngoutput.h"
- 
diff --git a/pkgs/applications/video/tvtime/tvtime-pic.patch b/pkgs/applications/video/tvtime/tvtime-pic.patch
deleted file mode 100644
index 00b040e60af9..000000000000
--- a/pkgs/applications/video/tvtime/tvtime-pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- tvtime/src/cpu_accel.c
-+++ tvtime/src/cpu_accel.c
-@@ -35,7 +35,7 @@
-     int AMD;
-     uint32_t caps;
- 
--#ifndef PIC
-+#if !defined(__PIC__) || defined(__x86_64__)
- #define cpuid(op,eax,ebx,ecx,edx)	\
-     __asm__ ("cpuid"			\
- 	     : "=a" (eax),		\
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 410e25353d27..2af39cd33deb 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, makeWrapper
 , go, sqlite, iproute, bridge-utils, devicemapper
-, btrfsProgs, iptables, e2fsprogs, xz, utillinux
+, btrfs-progs, iptables, e2fsprogs, xz, utillinux
+, systemd, pkgconfig
 , enableLxc ? false, lxc
 }:
 
@@ -20,12 +21,14 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    makeWrapper go sqlite iproute bridge-utils devicemapper btrfsProgs
-    iptables e2fsprogs stdenv.glibc stdenv.glibc.static
+    makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs
+    iptables e2fsprogs systemd pkgconfig stdenv.glibc stdenv.glibc.static
   ];
 
   dontStrip = true;
 
+  DOCKER_BUILDTAGS = [ "journald" ];
+
   buildPhase = ''
     patchShebangs .
     export AUTO_GOPATH=1
diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix
index e8c6b39f4933..1cd33e8b97a5 100644
--- a/pkgs/applications/virtualization/open-vm-tools/default.nix
+++ b/pkgs/applications/virtualization/open-vm-tools/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, lib, fetchurl, makeWrapper, autoconf, automake,
-  libmspack, openssl, pam, xercesc, icu, libdnet, procps, 
+{ stdenv, lib, fetchurl, makeWrapper, autoreconfHook,
+  libmspack, openssl, pam, xercesc, icu, libdnet, procps,
   xlibsWrapper, libXinerama, libXi, libXrender, libXrandr, libXtst,
   pkgconfig, glib, gtk, gtkmm }:
 
@@ -16,8 +16,8 @@ in stdenv.mkDerivation {
     sha256 = "15lwayrz9bpx4z12fj616hsn25m997y72licwwz7kms4sx9ssip1";
   };
 
-  buildInputs = 
-    [ autoconf automake makeWrapper libmspack openssl pam xercesc icu libdnet procps
+  buildInputs =
+    [ autoreconfHook makeWrapper libmspack openssl pam xercesc icu libdnet procps
       pkgconfig glib gtk gtkmm xlibsWrapper libXinerama libXi libXrender libXrandr libXtst ];
 
   patchPhase = ''
@@ -28,7 +28,6 @@ in stdenv.mkDerivation {
 
   patches = [ ./recognize_nixos.patch ];
 
-  preConfigure = "autoreconf";
   configureFlags = "--without-kernel-modules --without-xmlsecurity";
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index eb2a5d737a3e..abdbb46bc5b1 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,11 +2,11 @@
 , fetchurl, fetchFromGitHub }:
 
 let
-  coreosImageRelease = "835.9.0";
-  coreosImageSystemdVersion = "225";
+  coreosImageRelease = "794.1.0";
+  coreosImageSystemdVersion = "222";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-  stage1Flavours = [ "coreos" ];
+  stage1Flavours = [ "coreos" "fly" ];
 
 in stdenv.mkDerivation rec {
   version = "0.14.0";
@@ -21,8 +21,8 @@ in stdenv.mkDerivation rec {
   };
 
   stage1BaseImage = fetchurl {
-    url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "51dc10b4269b9c1801c233de49da817d29ca8d858bb0881df94dc90f7e86ce70";
+    url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
+    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
deleted file mode 100644
index 964390d3b59b..000000000000
--- a/pkgs/applications/window-managers/bar/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, perl, libxcb }:
-
-let
-  version = "1.1";
-in
-  stdenv.mkDerivation rec {
-    name = "bar-${version}";
-  
-    src = fetchurl {
-      url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
-      sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
-    };
-  
-    buildInputs = [ libxcb perl ];
-  
-    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
-  
-    meta = {
-      description = "A lightweight xcb based bar";
-      homepage = https://github.com/LemonBoy/bar;
-      maintainers = [ stdenv.lib.maintainers.meisternu ];
-      license = "Custom";   
-      platforms = stdenv.lib.platforms.linux;
-    };
-}
diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix
index 977409d0ef1e..39eb0586f7b2 100644
--- a/pkgs/applications/window-managers/compiz/default.nix
+++ b/pkgs/applications/window-managers/compiz/default.nix
@@ -15,11 +15,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="compiz";
-    version="0.9.12.1";
+    version="0.9.12.2";
     name="${baseName}-${version}";
-    hash="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb";
-    url="https://launchpad.net/compiz/0.9.12/0.9.12.1/+download/compiz-0.9.12.1.tar.bz2";
-    sha256="0kl5im3zq0rjlxbgz5cyk38qzssahrljc67z1n16pjc1qmr6m7cb";
+    hash="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
+    url="https://launchpad.net/compiz/0.9.12/0.9.12.2/+download/compiz-0.9.12.2.tar.bz2";
+    sha256="107cv8jm7nl0lbkj2y7878lmv1pd6blra68fg10cgb7xdngaq5w9";
   };
   buildInputs = [cmake pkgconfig
     libXrender renderproto gtk libwnck pango cairo
diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix
new file mode 100644
index 000000000000..042abf09dad2
--- /dev/null
+++ b/pkgs/applications/window-managers/lemonbar/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl, libxcb }:
+
+let
+  version = "1.2pre";
+in
+  stdenv.mkDerivation rec {
+    name = "lemonbar-${version}";
+  
+    src = fetchFromGitHub {
+      owner = "LemonBoy";
+      repo = "bar";
+      rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0";
+      sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay";
+    };
+  
+    buildInputs = [ libxcb perl ];
+  
+    prePatch = ''sed -i "s@/usr@$out@" Makefile'';
+  
+    meta = with stdenv.lib; {
+      description = "A lightweight xcb based bar";
+      homepage = https://github.com/LemonBoy/bar;
+      maintainers = [ maintainers.meisternu ];
+      license = "Custom";   
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/applications/window-managers/bar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix
index c671f1a4e037..c671f1a4e037 100644
--- a/pkgs/applications/window-managers/bar/xft.nix
+++ b/pkgs/applications/window-managers/lemonbar/xft.nix
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 82ff3900cc41..19434da71176 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -7,13 +7,13 @@ in
 
 buildPythonPackage rec {
   name = "qtile-${version}";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "0dhdwjr4pdlzli68fa8glrnsjzxp6agdab9cnmpsqlwiwh97x9a6";
+    sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6";
   };
 
   patches = [
diff --git a/pkgs/applications/window-managers/windowlab/default.nix b/pkgs/applications/window-managers/windowlab/default.nix
new file mode 100644
index 000000000000..39865c4b3e7d
--- /dev/null
+++ b/pkgs/applications/window-managers/windowlab/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig
+, libX11, libXext, libXft }:
+
+let version = "1.40"; in
+stdenv.mkDerivation {
+  name = "windowlab-${version}";
+
+  src = fetchurl {
+    url = "http://nickgravgaard.com/windowlab/windowlab-${version}.tar";
+    sha256 = "1fx4jwq4s98p2wpvawsiww7d6568bpjgcjpks61dzfj8p2j32s4d";
+  };
+
+  buildInputs = [ pkgconfig libX11 libXext libXft ];
+
+  postPatch =
+    ''
+      mv Makefile Makefile.orig
+      echo \
+         "
+          DEFINES += -DXFT
+          EXTRA_INC += $(pkg-config --cflags xft)
+          EXTRA_LIBS += $(pkg-config --libs xft)
+         " > Makefile
+      sed "s|/usr/local|$out|g" Makefile.orig >> Makefile
+    '';
+
+  meta = with stdenv.lib;
+    { description = "Small and simple stacking window manager";
+      homepage    = "http://nickgravgaard.com/windowlab/";
+      license     = licenses.gpl2;
+      maintainers = with maintainers; [ ehmry ];
+      platforms   = platforms.linux;
+    };
+}
\ No newline at end of file