summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-11-20 14:32:58 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-11-20 14:32:58 +0100
commit333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb (patch)
tree0f4757ddd2bb3d73b438eea85828d8e01c049583 /pkgs/applications
parentbdbbfa0d4247e203ffe3171621b614374da05f70 (diff)
parentb809f886c0bdbd4665fc65a4c308d38a30c368d8 (diff)
downloadnixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar
nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.gz
nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.bz2
nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.lz
nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.xz
nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.tar.zst
nixpkgs-333d69a5f0e7ccfe7b8c0bdb14ebd3934b3f77fb.zip
Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/altcoins/darkcoin.nix40
-rw-r--r--pkgs/applications/altcoins/dashpay.nix33
-rw-r--r--pkgs/applications/altcoins/default.nix3
-rw-r--r--pkgs/applications/audio/ardour/default.nix11
-rw-r--r--pkgs/applications/audio/audio-recorder/default.nix55
-rw-r--r--pkgs/applications/audio/baudline/default.nix70
-rw-r--r--pkgs/applications/audio/cantata/default.nix6
-rw-r--r--pkgs/applications/audio/cd-discid/default.nix46
-rw-r--r--pkgs/applications/audio/cd-discid/install.patch14
-rw-r--r--pkgs/applications/audio/csound/default.nix6
-rw-r--r--pkgs/applications/audio/dfasma/default.nix4
-rw-r--r--pkgs/applications/audio/kid3/default.nix9
-rw-r--r--pkgs/applications/audio/lash/default.nix3
-rw-r--r--pkgs/applications/audio/meterbridge/buf_rect.patch12
-rw-r--r--pkgs/applications/audio/meterbridge/default.nix26
-rw-r--r--pkgs/applications/audio/mp3val/default.nix35
-rw-r--r--pkgs/applications/audio/musescore/default.nix14
-rw-r--r--pkgs/applications/audio/non/default.nix29
-rw-r--r--pkgs/applications/audio/qjackctl/default.nix11
-rw-r--r--pkgs/applications/audio/renoise/default.nix4
-rw-r--r--pkgs/applications/audio/rosegarden/default.nix4
-rw-r--r--pkgs/applications/audio/sonic-visualiser/default.nix4
-rw-r--r--pkgs/applications/audio/yoshimi/default.nix4
-rw-r--r--pkgs/applications/audio/zam-plugins/default.nix15
-rw-r--r--pkgs/applications/backup/crashplan/default.nix1
-rw-r--r--pkgs/applications/display-managers/lightdm/default.nix4
-rw-r--r--pkgs/applications/display-managers/sddm/cmake_paths.patch55
-rw-r--r--pkgs/applications/display-managers/sddm/default.nix32
-rw-r--r--pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch16
-rw-r--r--pkgs/applications/display-managers/slim/themes.nix4
-rw-r--r--pkgs/applications/editors/atom/default.nix11
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix20
-rw-r--r--pkgs/applications/editors/emacs-24/default.nix8
-rw-r--r--pkgs/applications/editors/emacs-24/macport-24.5.nix22
-rw-r--r--pkgs/applications/editors/emacs-modes/dash/default.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/magit/default.nix11
-rw-r--r--pkgs/applications/editors/emacs-modes/markdown-mode/default.nix28
-rw-r--r--pkgs/applications/editors/emacs-modes/org/default.nix4
-rw-r--r--pkgs/applications/editors/emacs-modes/slime/default.nix22
-rw-r--r--pkgs/applications/editors/geany/default.nix4
-rw-r--r--pkgs/applications/editors/geany/with-vte.nix6
-rw-r--r--pkgs/applications/editors/idea/default.nix30
-rw-r--r--pkgs/applications/editors/neovim/default.nix19
-rw-r--r--pkgs/applications/editors/neovim/qt.nix48
-rw-r--r--pkgs/applications/editors/rstudio/default.nix8
-rw-r--r--pkgs/applications/editors/sublime3/default.nix16
-rw-r--r--pkgs/applications/editors/textadept/default.nix15
-rw-r--r--pkgs/applications/editors/vim/configurable.nix16
-rw-r--r--pkgs/applications/editors/vim/default.nix10
-rw-r--r--pkgs/applications/gis/grass/default.nix73
-rw-r--r--pkgs/applications/gis/qgis/default.nix9
-rw-r--r--pkgs/applications/gis/saga/default.nix6
-rw-r--r--pkgs/applications/graphics/feh/default.nix7
-rw-r--r--pkgs/applications/graphics/imv/default.nix28
-rw-r--r--pkgs/applications/graphics/pencil/default.nix4
-rw-r--r--pkgs/applications/graphics/pinta/default.nix97
-rw-r--r--pkgs/applications/graphics/simple-scan/default.nix12
-rw-r--r--pkgs/applications/graphics/viewnior/default.nix18
-rw-r--r--pkgs/applications/graphics/yed/default.nix4
-rw-r--r--pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch28
-rw-r--r--pkgs/applications/kde-apps-15.04/default.nix540
-rw-r--r--pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch36
-rw-r--r--pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch12
-rw-r--r--pkgs/applications/kde-apps-15.04/kf5-renames.json70
-rw-r--r--pkgs/applications/kde-apps-15.04/packages.json5693
-rwxr-xr-xpkgs/applications/kde-apps-15.04/packages.sh22
-rw-r--r--pkgs/applications/kde-apps-15.04/plasma5-renames.json20
-rw-r--r--pkgs/applications/kde-apps-15.04/renames.json31
-rw-r--r--pkgs/applications/kde-apps-15.04/setup-hook.sh12
-rw-r--r--pkgs/applications/kde-apps-15.08/ark.nix21
-rw-r--r--pkgs/applications/kde-apps-15.08/baloo-widgets.nix8
-rw-r--r--pkgs/applications/kde-apps-15.08/default.nix28
-rw-r--r--pkgs/applications/kde-apps-15.08/dolphin-plugins.nix6
-rw-r--r--pkgs/applications/kde-apps-15.08/dolphin.nix21
-rwxr-xr-xpkgs/applications/kde-apps-15.08/fetchsrcs.sh45
-rw-r--r--pkgs/applications/kde-apps-15.08/gwenview.nix15
-rw-r--r--pkgs/applications/kde-apps-15.08/kate.nix18
-rw-r--r--pkgs/applications/kde-apps-15.08/kde-app.nix23
-rw-r--r--pkgs/applications/kde-apps-15.08/kde-locale-4.nix20
-rw-r--r--pkgs/applications/kde-apps-15.08/kde-locale-5.nix17
-rw-r--r--pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch47
-rw-r--r--pkgs/applications/kde-apps-15.08/kdelibs/default.nix1
-rw-r--r--pkgs/applications/kde-apps-15.08/kgpg.nix7
-rw-r--r--pkgs/applications/kde-apps-15.08/konsole.nix13
-rw-r--r--pkgs/applications/kde-apps-15.08/l10n.nix231
-rw-r--r--pkgs/applications/kde-apps-15.08/oxygen-icons.nix13
-rw-r--r--pkgs/applications/kde-apps-15.08/print-manager.nix12
-rw-r--r--pkgs/applications/kde-apps-15.08/srcs.nix2470
-rw-r--r--pkgs/applications/misc/blender/default.nix10
-rw-r--r--pkgs/applications/misc/calibre/default.nix10
-rw-r--r--pkgs/applications/misc/cool-retro-term/default.nix5
-rw-r--r--pkgs/applications/misc/dmenu/default.nix31
-rw-r--r--pkgs/applications/misc/eaglemode/default.nix1
-rw-r--r--pkgs/applications/misc/electrum/default.nix4
-rw-r--r--pkgs/applications/misc/gnuradio-nacl/default.nix36
-rw-r--r--pkgs/applications/misc/gnuradio/default.nix4
-rw-r--r--pkgs/applications/misc/gphoto2/default.nix4
-rw-r--r--pkgs/applications/misc/gpsbabel/default.nix29
-rw-r--r--pkgs/applications/misc/grass/default.nix190
-rw-r--r--pkgs/applications/misc/hackrf/default.nix2
-rw-r--r--pkgs/applications/misc/hamster-time-tracker/default.nix5
-rw-r--r--pkgs/applications/misc/jp2a/default.nix21
-rw-r--r--pkgs/applications/misc/keybase/default.nix4
-rw-r--r--pkgs/applications/misc/khard/default.nix4
-rw-r--r--pkgs/applications/misc/librecad/2.0.nix40
-rw-r--r--pkgs/applications/misc/librecad/default.nix25
-rw-r--r--pkgs/applications/misc/mediainfo-gui/default.nix4
-rw-r--r--pkgs/applications/misc/mediainfo/default.nix4
-rw-r--r--pkgs/applications/misc/merkaartor/default.nix4
-rw-r--r--pkgs/applications/misc/printrun/default.nix24
-rw-r--r--pkgs/applications/misc/qtpass/default.nix4
-rw-r--r--pkgs/applications/misc/rofi/default.nix9
-rw-r--r--pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix16
-rw-r--r--pkgs/applications/misc/slic3r/default.nix4
-rw-r--r--pkgs/applications/misc/synapse/default.nix4
-rw-r--r--pkgs/applications/misc/taskwarrior/default.nix4
-rw-r--r--pkgs/applications/misc/tilda/default.nix4
-rw-r--r--pkgs/applications/misc/vue/default.nix6
-rw-r--r--pkgs/applications/misc/wcalc/default.nix20
-rw-r--r--pkgs/applications/misc/zscroll/default.nix27
-rw-r--r--pkgs/applications/networking/browsers/chromium/browser.nix2
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix1
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/default.nix9
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/sources.nix8
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/widevine.patch12
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/sources.nix358
-rw-r--r--pkgs/applications/networking/browsers/firefox/default.nix18
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix2
-rw-r--r--pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix7
-rw-r--r--pkgs/applications/networking/browsers/opera/default.nix3
-rw-r--r--pkgs/applications/networking/browsers/qutebrowser/default.nix6
-rw-r--r--pkgs/applications/networking/dropbox/default.nix6
-rw-r--r--pkgs/applications/networking/feedreaders/rsstail/default.nix8
-rw-r--r--pkgs/applications/networking/ftp/filezilla/default.nix4
-rw-r--r--pkgs/applications/networking/google-drive-ocamlfuse/default.nix21
-rw-r--r--pkgs/applications/networking/ids/bro/default.nix4
-rw-r--r--pkgs/applications/networking/ids/daq/default.nix2
-rw-r--r--pkgs/applications/networking/ids/snort/default.nix6
-rw-r--r--pkgs/applications/networking/instant-messengers/baresip/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix27
-rw-r--r--pkgs/applications/networking/instant-messengers/gajim/default.nix14
-rw-r--r--pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix36
-rw-r--r--pkgs/applications/networking/instant-messengers/teamspeak/client.nix23
-rw-r--r--pkgs/applications/networking/mailreaders/claws-mail/default.nix14
-rw-r--r--pkgs/applications/networking/mailreaders/claws-mail/mime.patch7
-rw-r--r--pkgs/applications/networking/mailreaders/notmuch/default.nix4
-rw-r--r--pkgs/applications/networking/mumble/default.nix196
-rw-r--r--pkgs/applications/networking/mumble/murmur.nix42
-rw-r--r--pkgs/applications/networking/nload/default.nix27
-rw-r--r--pkgs/applications/networking/p2p/freenet/default.nix45
-rwxr-xr-xpkgs/applications/networking/p2p/freenet/freenetWrapper16
-rw-r--r--pkgs/applications/networking/p2p/twister/default.nix9
-rw-r--r--pkgs/applications/networking/remote/citrix-receiver/default.nix157
-rw-r--r--pkgs/applications/networking/remote/teamviewer/10.nix22
-rw-r--r--pkgs/applications/networking/seafile-client/default.nix4
-rw-r--r--pkgs/applications/networking/spideroak/default.nix24
-rw-r--r--pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch18
-rw-r--r--pkgs/applications/networking/sync/lsyncd/default.nix40
-rw-r--r--pkgs/applications/networking/vnstat/default.nix1
-rw-r--r--pkgs/applications/networking/yafc/default.nix10
-rw-r--r--pkgs/applications/office/calligra/default.nix44
-rw-r--r--pkgs/applications/office/calligra/librevenge.patch882
-rw-r--r--pkgs/applications/office/gnumeric/default.nix4
-rw-r--r--pkgs/applications/office/homebank/default.nix9
-rw-r--r--pkgs/applications/office/libreoffice/default.nix8
-rw-r--r--pkgs/applications/office/mendeley/default.nix6
-rw-r--r--pkgs/applications/science/logic/hol_light/default.nix16
-rw-r--r--pkgs/applications/science/math/R/default.nix7
-rw-r--r--pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch24
-rw-r--r--pkgs/applications/search/recoll/default.nix7
-rw-r--r--pkgs/applications/taxes/aangifte-2013-wa/default.nix41
-rw-r--r--pkgs/applications/taxes/aangifte-2014-wa/default.nix41
-rw-r--r--pkgs/applications/taxes/aangifte-2014/default.nix41
-rw-r--r--pkgs/applications/version-management/git-and-tools/default.nix2
-rw-r--r--pkgs/applications/version-management/git-and-tools/git-crypt/default.nix6
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix4
-rw-r--r--pkgs/applications/version-management/git-and-tools/tig/default.nix5
-rw-r--r--pkgs/applications/version-management/git-and-tools/transcrypt/default.nix35
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix5
-rw-r--r--pkgs/applications/version-management/pijul/default.nix27
-rw-r--r--pkgs/applications/video/avidemux/default.nix8
-rw-r--r--pkgs/applications/video/clipgrab/default.nix6
-rw-r--r--pkgs/applications/video/kodi/default.nix5
-rw-r--r--pkgs/applications/video/kodi/plugins.nix14
-rw-r--r--pkgs/applications/video/makemkv/default.nix6
-rw-r--r--pkgs/applications/video/mkcast/default.nix37
-rw-r--r--pkgs/applications/video/mkvtoolnix/default.nix6
-rw-r--r--pkgs/applications/video/mpv/default.nix22
-rw-r--r--pkgs/applications/video/obs-studio/default.nix4
-rw-r--r--pkgs/applications/video/popcorntime/default.nix1
-rw-r--r--pkgs/applications/video/qarte/default.nix6
-rw-r--r--pkgs/applications/video/vlc/default.nix6
-rw-r--r--pkgs/applications/virtualization/nova/client.nix21
-rw-r--r--pkgs/applications/virtualization/nova/convert.patch12
-rw-r--r--pkgs/applications/virtualization/nova/default.nix95
-rw-r--r--pkgs/applications/virtualization/openstack/glance.nix69
-rw-r--r--pkgs/applications/virtualization/openstack/keystone.nix55
-rw-r--r--pkgs/applications/virtualization/openstack/neutron.nix65
-rw-r--r--pkgs/applications/virtualization/openstack/nova.nix68
-rw-r--r--pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch61
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix4
-rw-r--r--pkgs/applications/virtualization/rkt/default.nix30
-rw-r--r--pkgs/applications/virtualization/tini/default.nix24
-rw-r--r--pkgs/applications/virtualization/virt-manager/default.nix9
-rw-r--r--pkgs/applications/virtualization/virtinst/default.nix6
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix8
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix2
-rw-r--r--pkgs/applications/window-managers/clfswm/default.nix44
-rw-r--r--pkgs/applications/window-managers/clfswm/require-clx.patch13
-rw-r--r--pkgs/applications/window-managers/dwm/default.nix8
-rw-r--r--pkgs/applications/window-managers/i3/default.nix4
-rw-r--r--pkgs/applications/window-managers/kbdd/default.nix21
-rw-r--r--pkgs/applications/window-managers/qtile/default.nix4
213 files changed, 4357 insertions, 9987 deletions
diff --git a/pkgs/applications/altcoins/darkcoin.nix b/pkgs/applications/altcoins/darkcoin.nix
deleted file mode 100644
index 89ff12f8f74..00000000000
--- a/pkgs/applications/altcoins/darkcoin.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ fetchzip, stdenv, pkgconfig
-, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf
-, utillinux
-, withGui }:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-
-  name = "darkcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  version = "0.10.99.99";
-
-  src = fetchzip {
-    url = "https://github.com/darkcoin/darkcoin/archive/v${version}.tar.gz";
-    sha256 = "0sigvimqwc1mvaq43a8c2aq7fjla2ncafrals08qfq3jd6in8b4f";
-  };
-
-  buildInputs = [ pkgconfig glib openssl db48 boost zlib miniupnpc ]
-                  ++ optionals withGui [ qt4 qrencode ];
-
-  configurePhase = optional withGui "qmake";
-
-  preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
-
-  installPhase =
-    if withGui
-    then "install -D darkcoin-qt $out/bin/darkcoin-qt"
-    else "install -D darkcoind $out/bin/darkcoind";
-
-  meta = with stdenv.lib; {
-    description = "A decentralized key/value registration and transfer system";
-    longDescription = ''
-      Darkcoin (DRK) is an open sourced, privacy-centric digital
-      currency. It allows you keep your finances private as you make
-      transactions, similar to cash.
-    '';
-    homepage = http://darkcoin.io;
-    maintainers = with maintainers; [ AndersonTorres ];
-    platforms = with platforms; unix;
-  };
-}
diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix
new file mode 100644
index 00000000000..68a0926c466
--- /dev/null
+++ b/pkgs/applications/altcoins/dashpay.nix
@@ -0,0 +1,33 @@
+{ fetchzip, stdenv, pkgconfig, autoreconfHook
+, openssl, db48, boost, zlib, miniupnpc
+, qt4, qrencode, glib, protobuf, yasm
+, utillinux }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "dashpay-${meta.version}";
+
+  src = fetchzip {
+    url = "https://github.com/dashpay/dash/archive/v${meta.version}.tar.gz";
+    sha256 = "19bk7cviy3n2dpj4kr3i6i0i3ac2l5ri8ln1a51nd3n90k016wnx";
+  };
+
+  buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm
+                  boost zlib miniupnpc protobuf qt4 qrencode utillinux ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+
+  meta = with stdenv.lib; {
+    version = "0.12.0.55";
+    description = "A decentralized key/value registration and transfer system";
+    longDescription = ''
+      Dash (DASH) is an open sourced, privacy-centric digital currency
+      with instant transactions.  It allows you to keep your finances
+      private as you make transactions without waits, similar to cash.
+    '';
+    homepage = http://dashpay.io;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = with platforms; unix;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index 762ef804f83..a7daaf3a9ea 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -8,8 +8,7 @@ rec {
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
 
-  darkcoin  = callPackage ./darkcoin.nix { withGui = true; };
-  darkcoind = callPackage ./darkcoin.nix { withGui = false; };
+  dashpay = callPackage ./dashpay.nix { };
 
   dogecoin  = callPackage ./dogecoin.nix { withGui = true; };
   dogecoind = callPackage ./dogecoin.nix { withGui = false; };
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 1ba5a7f09f4..c10a0d8a4ce 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -15,7 +15,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "4.2";
+  tag = "4.4";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ardour";
     repo = "ardour";
-    rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7";
-    sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f";
+    rev = "b00d75adf63db155ef2873bd9d259dc8ca256be6";
+    sha256 = "1gnrcnq2ksnh7fsa301v1c4p5dqrbqpjylf02rg3za3ab58wxi7l";
   };
 
   buildInputs =
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
       makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK
     ];
 
+  # ardour's wscript has a "tarball" target but that required the git revision
+  # be available. Since this is an unzipped tarball fetched from github we 
+  # have to do that ourself.
   patchPhase = ''
     printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc
     sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
@@ -80,6 +83,6 @@ stdenv.mkDerivation rec {
     homepage = http://ardour.org/;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+    maintainers = [ maintainers.goibhniu maintainers.fps ];
   };
 }
diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix
new file mode 100644
index 00000000000..2a611da45f8
--- /dev/null
+++ b/pkgs/applications/audio/audio-recorder/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, lib
+, pkgconfig, intltool, autoconf, makeWrapper
+, glib, dbus, gtk3, libdbusmenu-gtk3, libappindicator-gtk3, gst_all_1
+, pulseaudioSupport ? true, libpulseaudio ? null }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "audio-recorder-${version}";
+  version = "1.7-5";
+
+  src = fetchurl {
+    name = "${name}-wily.tar.gz";
+    url = "${meta.homepage}/+archive/ubuntu/ppa/+files/audio-recorder_${version}%7Ewily.tar.gz";
+    sha256 = "1cdlqhfqw2mg51f068j2lhn8mzxggzsbl560l4pl4fxgmpjywpkj";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool autoconf makeWrapper ];
+
+  buildInputs = with gst_all_1; [
+    glib dbus gtk3 libdbusmenu-gtk3 libappindicator-gtk3
+    gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav
+  ] ++ optional pulseaudioSupport libpulseaudio;
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace 'PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED)' \
+                'PKG_CHECK_MODULES(GIO, gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0)'
+    autoconf
+    intltoolize
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/audio-recorder \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Audio recorder for GNOME and Unity Desktops";
+    longDescription = ''
+      This program allows you to record your favourite music or audio to a file.
+      It can record audio from your system soundcard, microphones, browsers and
+      webcams. Put simply; if it plays out of your loudspeakers you can record it.
+      This program has a timer that can start, stop or pause recording on certain
+      conditions such as audio level, file size and clock time. This recorder can
+      automatically record your Skype calls. It supports several audio (output)
+      formats such as OGG audio, Flac, MP3 and WAV.
+    '';
+    homepage = https://launchpad.net/~audio-recorder;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.msteen ];
+  };
+}
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
new file mode 100644
index 00000000000..543329ef679
--- /dev/null
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchurl, libXmu, libXt, libX11, libXext, libXxf86vm, jack
+, makeWrapper
+}:
+
+let
+  rpath = stdenv.lib.makeLibraryPath
+    [ libXmu libXt libX11 libXext libXxf86vm jack ];
+in
+stdenv.mkDerivation rec {
+  name = "baudline-${version}";
+  version = "1.08";
+
+  src =
+    if stdenv.system == "x86_64-linux" then
+      fetchurl {
+        url = "http://www.baudline.com/baudline_${version}_linux_x86_64.tar.gz";
+        sha256 = "09fn0046i69in1jpizkzbaq5ggij0mpflcsparyskm3wh71mbzvr";
+      }
+    else if stdenv.system == "i686-linux" then
+      fetchurl {
+        url = "http://www.baudline.com/baudline_${version}_linux_i686.tar.gz";
+        sha256 = "1waip5pmcf5ffcfvn8lf1rvsaq2ab66imrbfqs777scz7k8fhhjb";
+      }
+    else
+      throw "baudline isn't supported (yet?) on ${stdenv.system}";
+
+  buildInputs = [ makeWrapper ];
+
+  # Prebuilt binary distribution.
+  # "patchelf --set-rpath" seems to break the application (cannot start), using
+  # LD_LIBRARY_PATH wrapper script instead.
+  buildPhase = "true";
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mkdir -p "$out/libexec/baudline"
+
+    cp -r . "$out/libexec/baudline/"
+
+    interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
+    for prog in "$out"/libexec/baudline/baudline*; do
+        patchelf --interpreter "$interpreter" "$prog"
+        ln -sr "$prog" "$out/bin/"
+    done
+    for prog in "$out"/bin/*; do
+        wrapProgram "$prog" --prefix LD_LIBRARY_PATH : ${rpath}
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Scientific signal analysis application";
+    longDescription = ''
+      Baudline is a time-frequency browser designed for scientific
+      visualization of the spectral domain.  Signal analysis is performed by
+      Fourier, correlation, and raster transforms that create colorful
+      spectrograms with vibrant detail.  Conduct test and measurement
+      experiments with the built in function generator, or play back audio
+      files with a multitude of effects and filters.  The baudline signal
+      analyzer combines fast digital signal processing, versatile high speed
+      displays, and continuous capture tools for hunting down and studying
+      elusive signal characteristics.
+    '';
+    homepage = http://www.baudline.com/;
+    # See http://www.baudline.com/faq.html#licensing_terms.
+    # (Do NOT (re)distribute on hydra.)
+    license = licenses.unfree;
+    platforms = [ "x86_64-linux" "i686-linux" ];
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index fa0fe73ebae..2d399ba44da 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake
 , withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools
+, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
 
 # I'm unable to make KDE work here, crashes at runtime so I simply
 # make Qt4 the default until someone who wants KDE can figure it out.
@@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
     ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
 
+  nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
+
   unpackPhase = "tar -xvf $src";
   sourceRoot = "${name}";
 
@@ -91,7 +93,7 @@ stdenv.mkDerivation rec {
     "-DENABLE_UDISKS2=ON"
   ];
 
-  postInstall = ''
+  postInstall = stdenv.lib.optionalString withQt5 ''
     wrapQtProgram "$out/bin/cantata"
   '';
 
diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix
index 1646f944a83..7e0c245d357 100644
--- a/pkgs/applications/audio/cd-discid/default.nix
+++ b/pkgs/applications/audio/cd-discid/default.nix
@@ -1,31 +1,27 @@
 { fetchurl, stdenv }:
 
-let version = "0.9";
-in
-  stdenv.mkDerivation {
-    name = "cd-discid-${version}";
-    src = fetchurl {
-      url = "mirror://debian/pool/main/c/cd-discid/cd-discid_${version}.orig.tar.gz";
-      sha256 = "1fx2ky1pb07l1r0bldpw16wdsfzw7a0093ib9v66kmilwy2sq5s9";
-    };
+stdenv.mkDerivation rec {
+  name = "cd-discid-${version}";
+  version = "1.4";
 
-    patches = [ ./install.patch ];
+  src = fetchurl {
+    url = "http://linukz.org/download/${name}.tar.gz";
+    sha256 = "0qrcvn7227qaayjcd5rm7z0k5q89qfy5qkdgwr5pd7ih0va8rmpz";
+  };
 
-    configurePhase = ''
-      sed -i "s|^[[:blank:]]*prefix *=.*$|prefix = $out|g ;
-	      s|^[[:blank:]]*INSTALL *=.*$|INSTALL = install -c|g"  \
-	  "Makefile";
-    '';
+  installFlags = "PREFIX=$(out) INSTALL=install";
 
-    meta = {
-      homepage = http://lly.org/~rcw/cd-discid/;
-      license = stdenv.lib.licenses.gpl2Plus;
-      description = "cd-discid, a command-line utility to retrieve a disc's CDDB ID";
+  meta = with stdenv.lib; {
+    homepage = http://linukz.org/cd-discid.shtml;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.unix;
+    description = "command-line utility to get CDDB discid information from a CD-ROM disc";
 
-      longDescription = ''
-        cd-discid is a backend utility to get CDDB discid information
-        from a CD-ROM disc.  It was originally designed for cdgrab (now
-        abcde), but can be used for any purpose requiring CDDB data.
-      '';
-    };
-  }
+    longDescription = ''
+      cd-discid is a backend utility to get CDDB discid information
+      from a CD-ROM disc.  It was originally designed for cdgrab (now
+      abcde), but can be used for any purpose requiring CDDB data.
+    '';
+  };
+}
diff --git a/pkgs/applications/audio/cd-discid/install.patch b/pkgs/applications/audio/cd-discid/install.patch
deleted file mode 100644
index 4f0256813ff..00000000000
--- a/pkgs/applications/audio/cd-discid/install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- cd-discid-0.9/Makefile	2003-01-05 21:18:07.000000000 +0100
-+++ cd-discid-0.9/Makefile	2008-05-26 22:14:56.000000000 +0200
-@@ -32,9 +32,9 @@ clean:
- 
- install: cd-discid
- 	$(INSTALL) -d -m 755 $(bindir)
--	$(INSTALL) -s -m 755 -o 0 cd-discid $(bindir)
-+	$(INSTALL) -s -m 755 cd-discid $(bindir)
- 	$(INSTALL) -d -m 755 $(mandir)
--	$(INSTALL) -m 644 -o 0 cd-discid.1 $(mandir)
-+	$(INSTALL) -m 644 cd-discid.1 $(mandir)
- 
- tarball:
- 	@cd .. && tar czvf cd-discid_$(VERSION).orig.tar.gz \
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 693d8e2a6e5..afca63a2a8a 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -12,13 +12,13 @@
 }:
 
 stdenv.mkDerivation {
-  name = "csound-6.03.2";
+  name = "csound-6.04";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = mirror://sourceforge/csound/Csound6.03.2.tar.gz;
-    sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m";
+    url = mirror://sourceforge/csound/Csound6.04.tar.gz;
+    sha256 = "1030w38lxdwjz1irr32m9cl0paqmgr02lab2m7f7j1yihwxj1w0g";
   };
 
   buildInputs = [ cmake libsndfile flex bison alsaLib libpulseaudio tcltk ];
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index d439f344f5b..9be3fff6ecb 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, makeQtWrapper }:
 
 let
 
@@ -41,6 +41,8 @@ in stdenv.mkDerivation {
 
   buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
 
+  nativeBuildInputs = [ makeQtWrapper ];
+
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
     cp -Rv "${reaperFork.src}"/* external/REAPER
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 58a64758c35..0b2e4e7977b 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -9,12 +9,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "kid3-${version}";
-  version = "3.1.2";
+  name = "kid3-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/kid3/kid3/${version}/${name}.tar.gz";
-    sha256 = "0ik2bxg2im7nwcgi85g2dj148n80mfhks20rsxnzazl7afk9fl08";
+    url = "http://downloads.sourceforge.net/project/kid3/kid3/${meta.version}/${name}.tar.gz";
+    sha256 = "12sa54mg1b3wkagmh5yi20ski8km9d199lk0a1yfxy0ffjfld7js";
   };
 
   buildInputs = with stdenv.lib;
@@ -34,6 +33,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "3.3.0";
     description = "A simple and powerful audio tag editor";
     longDescription = ''
       If you want to easily tag multiple MP3, Ogg/Vorbis, FLAC, MPC,
@@ -70,5 +70,4 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.AndersonTorres ];
   };
 }
-
 # TODO: Qt5 support
diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix
index 8d1b561cb87..cfe29949e4f 100644
--- a/pkgs/applications/audio/lash/default.nix
+++ b/pkgs/applications/audio/lash/default.nix
@@ -15,8 +15,9 @@ stdenv.mkDerivation  rec {
   # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346
   patches = [ ./socket.patch ./gcc-47.patch ];
 
-  buildInputs = [ alsaLib gtk libjack2 libuuid libxml2 makeWrapper
+  buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper
     pkgconfig readline ];
+  propagatedBuildInputs = [ libuuid ];
 
   postInstall = ''
     for i in lash_control lash_panel
diff --git a/pkgs/applications/audio/meterbridge/buf_rect.patch b/pkgs/applications/audio/meterbridge/buf_rect.patch
new file mode 100644
index 00000000000..f108b80c101
--- /dev/null
+++ b/pkgs/applications/audio/meterbridge/buf_rect.patch
@@ -0,0 +1,12 @@
+--- ../tmp-orig/meterbridge-0.9.2/src/main.h	2003-06-05 11:42:41.000000000 +0200
++++ ./src/main.h	2004-12-29 10:27:24.160912488 +0100
+@@ -8,7 +8,7 @@
+ 
+ extern SDL_Surface *screen;
+ extern SDL_Surface *image, *meter, *meter_buf;
+-extern SDL_Rect win, buf_rect[MAX_METERS], dest[MAX_METERS];
++extern SDL_Rect win, dest[MAX_METERS];
+ 
+ extern jack_port_t *input_ports[MAX_METERS];
+ extern jack_port_t *output_ports[MAX_METERS];
+
diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix
new file mode 100644
index 00000000000..e15febda231
--- /dev/null
+++ b/pkgs/applications/audio/meterbridge/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, SDL, SDL_image, libjack2
+}:
+
+stdenv.mkDerivation rec {
+  version = "0.9.2";
+  name = "meterbridge-${version}";
+
+  src = fetchurl {
+    url = "http://plugin.org.uk/meterbridge/${name}.tar.gz";
+    sha256 = "0jb6g3kbfyr5yf8mvblnciva2bmc01ijpr51m21r27rqmgi8gj5k";
+  };
+
+  patches = [ ./buf_rect.patch ];
+
+  buildInputs =
+    [ pkgconfig SDL SDL_image libjack2
+    ];
+
+  meta = with stdenv.lib; {
+    description = "Various meters (VU, PPM, DPM, JF, SCO) for Jack Audio Connection Kit";
+    homepage = http://plugin.org.uk/meterbridge/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix
new file mode 100644
index 00000000000..0957420b658
--- /dev/null
+++ b/pkgs/applications/audio/mp3val/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "mp3val-${version}";
+  version = "0.1.8";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/mp3val/${name}-src.tar.gz";
+    sha256 = "17y3646ghr38r620vkrxin3dksxqig5yb3nn4cfv6arm7kz6x8cm";
+  };
+
+  makefile = "Makefile.linux";
+
+  installPhase = ''
+    install -Dv mp3val "$out/bin/mp3val"
+  '';
+
+  meta = {
+    description = "A tool for validating and repairing MPEG audio streams";
+    longDescription = ''
+      MP3val is a small, high-speed, free software tool for checking MPEG audio
+      files' integrity. It can be useful for finding corrupted files (e.g.
+      incompletely downloaded, truncated, containing garbage). MP3val is
+      also able to fix most of the problems. Being a multiplatform application,
+      MP3val can be runned both under Windows and under Linux (or BSD). The most
+      common MPEG audio file type is MPEG 1 Layer III (mp3), but MP3val supports
+      also other MPEG versions and layers. The tool is also aware of the most
+      common types of tags (ID3v1, ID3v2, APEv2).
+    '';
+    homepage = http://mp3val.sourceforge.net/index.shtml;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 9dbfc96d571..e1f0472ce9e 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, pkgconfig
+{ stdenv, fetchzip, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
 , portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools
 , qtwebkit, qtxmlpatterns
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.0.1";
+  version = "2.0.2";
 
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "0n4xk35jggdq2dcizqjq1kdpclih4scpl93ymmxahvfa1vvwn5iw";
+    sha256 = "12a83v4i830gj76z5744034y1vvwzgy27mjbjp508yh9bd328yqw";
   };
 
   makeFlags = [
@@ -33,8 +33,14 @@ stdenv.mkDerivation rec {
     make lrelease
   '';
 
+  postBuild = ''
+    make manpages
+  '';
+
   nativeBuildInputs = [ cmake pkgconfig ];
 
+  enableParallelBuilding = true;
+
   buildInputs = [
     alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
     portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools
diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
new file mode 100644
index 00000000000..6c9e7eb708a
--- /dev/null
+++ b/pkgs/applications/audio/non/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2, libsndfile,
+ladspaH, liblrdf, liblo, libsigcxx
+}:
+
+stdenv.mkDerivation rec {
+  name = "non-${version}";
+  version = "2015-10-6";
+  src = fetchFromGitHub {
+    owner = "original-male";
+    repo = "non";
+    rev = "88fe7e7b97c97b8733506685f043cbc71b196646";
+    sha256 = "15cffp6c14rlssc8g3mrw8zvb88wffb8k8g1vhd299qlcgv7di2h";
+  };
+
+    buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
+    ladspaH liblrdf liblo libsigcxx
+    ];
+    configurePhase = ''python waf configure --prefix=$out'';
+    buildPhase = ''python waf build'';
+    installPhase = ''python waf install'';
+
+  meta = {
+    description = "Lightweight and lightning fast modular Digital Audio Workstation";
+    homepage = http://non.tuxfamily.org;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix
index c200e39887a..90129d6404b 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/applications/audio/qjackctl/default.nix
@@ -1,24 +1,25 @@
 { stdenv, fetchurl, qt4, alsaLib, libjack2, dbus }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.12";
+  version = "0.4.0";
   name = "qjackctl-${version}";
 
   # some dependencies such as killall have to be installed additionally
 
   src = fetchurl {
     url = "mirror://sourceforge/qjackctl/${name}.tar.gz";
-    sha256 = "14yvnc4k3hwsjflg8b2d04bc63pdl0gyqjc7vl6rdn29nbr23zwc";
+    sha256 = "0nj8c8vy00524hbjqwsqkliblcf9j7h46adk6v5np645pp2iqrav";
   };
 
   buildInputs = [ qt4 alsaLib libjack2 dbus ];
 
   configureFlags = "--enable-jack-version";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A Qt application to control the JACK sound server daemon";
     homepage = http://qjackctl.sourceforge.net/;
-    license = "GPL";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index 704f3f01c00..f98f7862475 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
         else
         requireFile {
             url = "http://backstage.renoise.com/frontend/app/index.html#/login";
-            name = "rns_3_0_1_reg_x86_64.tar.gz";
-            sha256 = "1swax2jz0gswdpzz8alwjfd8rhigc2yfspj7p8wvdvylqrf7n8q7";
+            name = "rns_3_0_1_linux_x86_64.tar.gz";
+            sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
         }
     else if builtins.currentSystem == "i686-linux" then
         if demo then
diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix
index 5ee15a92582..00d7559cd58 100644
--- a/pkgs/applications/audio/rosegarden/default.nix
+++ b/pkgs/applications/audio/rosegarden/default.nix
@@ -4,11 +4,11 @@
   withLirc ? false, lirc ? null } :
 
 stdenv.mkDerivation (rec {
-  version = "14.12";
+  version = "15.08";
   name = "rosegarden-${version}";
   src = fetchurl {
     url  = "mirror://sourceforge/rosegarden/${name}.tar.bz2";
-    sha256 = "0zhlxr1njyy6837f09l6p75js0j5mxmls6m02bqafv9j32wgnxpq";
+    sha256 = "1pk24bhpsmvn6rkqgll31na44w03banra1y7kiqd0gajlnw7wlls";
   };
 
   QTDIR=qt4;
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index bef2006d60b..ae7a39240a5 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
+, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
 , rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
+  nativeBuildInputs = [ makeQtWrapper ];
+
   buildPhase = ''
     for i in sonic-visualiser svapp svcore svgui;
       do cd $i && qmake -makefile PREFIX=$out && cd ..;
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 3233456a7ab..f26434f6f20 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -6,11 +6,11 @@ assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.3.5.2";
+  version = "1.3.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "001xvwknsm1sv5lvwz7f6dgf57b8djbpwbyk2gfxjy9rzl5q53qr";
+    sha256 = "0c2y59m945rrspnwdxmixk92z9nfiayxdxh582gf15nj8bvkh1l6";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix
index 1ac7921119a..7492e8e0a37 100644
--- a/pkgs/applications/audio/zam-plugins/default.nix
+++ b/pkgs/applications/audio/zam-plugins/default.nix
@@ -1,18 +1,21 @@
-{ stdenv, fetchurl, boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
+{ stdenv, fetchgit , boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile }:
 
 stdenv.mkDerivation rec {
   name = "zam-plugins-${version}";
-  version = "3.5";
+  version = "3.6";
 
-  src = fetchurl {
-    url = "https://github.com/zamaudio/zam-plugins/archive/${version}.tar.gz";
-    sha256 = "0icdrs4vaaj8gqi76jkkx5yk9h3agipa11cyb5h52y814q6mx6vm";
+  src = fetchgit {
+    url = "https://github.com/zamaudio/zam-plugins.git";
+    deepClone = true;
+    rev = "91fe56931a3e57b80f18c740d2dde6b44f962aee";
+    sha256 = "17slpywjs04xbcylyqjg6kqbpqwqbigf843y437yfvj1ar6ir1jp";
   };
 
   buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 pkgconfig rubberband libsndfile ];
 
   patchPhase = ''
-    patchShebangs ./libs/generate-ttl.sh
+    patchShebangs ./dpf/utils/generate-ttl.sh
+    substituteInPlace Makefile --replace "ZaMaximX2" "ZaMaximX2 ZamPiano ZamChild670"
   '';
 
   makeFlags = [
diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index 5a0e8c7cfbd..f86ab91344f 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -16,6 +16,7 @@ in stdenv.mkDerivation rec {
     description = "An online/offline backup solution";
     homepage = "http://www.crashplan.org";
     license = licenses.unfree;
+    broken = true;  # outdated and new client has trouble starting (nullpointer exception)
     maintainers = with maintainers; [ sztupi iElectric ];
   };
 
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index dc50ced1a60..968dd7ab991 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -6,14 +6,14 @@
 
 let
   ver_branch = "1.16";
-  version = "1.16.2";
+  version = "1.16.5";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "062jj21bjrl29mk66lpihwhrff038h2wny3p6b5asacf2mklf0hq";
+    sha256 = "1qb3gvwdm2rymwn8rb1qc4gyam226xmvy2fq5rvmrcmgxblmi34c";
   };
 
   patches = [ ./fix-paths.patch ];
diff --git a/pkgs/applications/display-managers/sddm/cmake_paths.patch b/pkgs/applications/display-managers/sddm/cmake_paths.patch
deleted file mode 100644
index 7deb3e2e1bd..00000000000
--- a/pkgs/applications/display-managers/sddm/cmake_paths.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4d6e0a9..df4ad28 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -77,7 +77,9 @@ find_package(Qt5LinguistTools REQUIRED)
- 
- # find qt5 imports dir
- get_target_property(QMAKE_EXECUTABLE Qt5::qmake LOCATION)
--exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
-+if(NOT QT_IMPORTS_DIR)
-+    exec_program(${QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_QML" RETURN_VALUE return_code OUTPUT_VARIABLE QT_IMPORTS_DIR)
-+endif()
- 
- # Set components version
- set(COMPONENTS_VERSION 2.0)
-diff --git a/data/man/sddm.conf.rst.in b/data/man/sddm.conf.rst.in
-index 6a28224..798bc5c 100644
---- a/data/man/sddm.conf.rst.in
-+++ b/data/man/sddm.conf.rst.in
-@@ -65,6 +65,10 @@ OPTIONS
- 	Path of the X server.
- 	Default value is "/usr/bin/X".
- 
-+`XephyrPath=`
-+	Path of the Xephyr.
-+	Default value is "/usr/bin/Xephyr".
-+
- `XauthPath=`
- 	Path of the Xauth.
- 	Default value is "/usr/bin/xauth".
-diff --git a/src/common/Configuration.h b/src/common/Configuration.h
-index 72aa6f4..854cc22 100644
---- a/src/common/Configuration.h
-+++ b/src/common/Configuration.h
-@@ -54,6 +54,7 @@ namespace SDDM {
-         // TODO: Not absolutely sure if everything belongs here. Xsessions, VT and probably some more seem universal
-         Section(XDisplay,
-             Entry(ServerPath,          QString,     _S("/usr/bin/X"),                           _S("X server path"));
-+            Entry(XephyrPath,          QString,     _S("/usr/bin/Xephyr"),                      _S("Xephyr path"));
-             Entry(XauthPath,           QString,     _S("/usr/bin/xauth"),                       _S("Xauth path"));
-             Entry(SessionDir,          QString,     _S("/usr/share/xsessions"),                 _S("Session description directory"));
-             Entry(SessionCommand,      QString,     _S(SESSION_COMMAND),                        _S("Xsession script path\n"
-diff --git a/src/daemon/XorgDisplayServer.cpp b/src/daemon/XorgDisplayServer.cpp
-index f10ad82..cb9de3f 100644
---- a/src/daemon/XorgDisplayServer.cpp
-+++ b/src/daemon/XorgDisplayServer.cpp
-@@ -136,7 +136,7 @@ namespace SDDM {
-         if (daemonApp->testing()) {
-             QStringList args;
-             args << m_display << "-ac" << "-br" << "-noreset" << "-screen" << "800x600";
--            process->start("/usr/bin/Xephyr", args);
-+            process->start(mainConfig.XDisplay.XephyrPath.get(), args);
-         } else {
-             // set process environment
-             QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 82cd8bd3091..5851f1af639 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,10 +1,8 @@
-{ stdenv, fetchpatch, fetchFromGitHub, cmake, pkgconfig, libxcb
-, libpthreadstubs, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam
-, systemd
-}:
+{ stdenv, fetchpatch, makeQtWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
+, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
 
 let
-  version = "0.11.0";
+  version = "0.13.0";
 in
 stdenv.mkDerivation rec {
   name = "sddm-${version}";
@@ -13,21 +11,25 @@ stdenv.mkDerivation rec {
     owner = "sddm";
     repo = "sddm";
     rev = "v${version}";
-    sha256 = "1s1gm0xvgwzrpxgni3ngdj8phzg21gkk1jyiv2l2i5ayl0jdm7ig";
+    sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig qttools ];
+  patches = [ ./sddm-ignore-config-mtime.patch ];
 
-  buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
+  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig qttools ];
 
-  patches = [ (fetchpatch {
-                url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch";
-                sha256 = "1pda0wf4xljdadja7iyh5c48h0347imadg9ya1dw5slgb7w1d94l";
-              })
-              ./cmake_paths.patch
-            ];
+  buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
 
-  cmakeFlags = [ "-DCONFIG_FILE=/etc/sddm.conf" ];
+  cmakeFlags = [
+    "-DCONFIG_FILE=/etc/sddm.conf"
+    # Set UID_MIN and UID_MAX so that the build script won't try
+    # to read them from /etc/login.defs (fails in chroot).
+    # The values come from NixOS; they may not be appropriate
+    # for running SDDM outside NixOS, but that configuration is
+    # not supported anyway.
+    "-DUID_MIN=1000"
+    "-DUID_MAX=29999"
+  ];
 
   preConfigure = ''
     export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
new file mode 100644
index 00000000000..9edd9a7b538
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
@@ -0,0 +1,16 @@
+diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp
+index 6618455..5356e76 100644
+--- a/src/common/ConfigReader.cpp
++++ b/src/common/ConfigReader.cpp
+@@ -136,11 +136,6 @@ namespace SDDM {
+         QString currentSection = QStringLiteral(IMPLICIT_SECTION);
+ 
+         QFile in(m_path);
+-        QDateTime modificationTime = QFileInfo(in).lastModified();
+-        if (modificationTime <= m_fileModificationTime) {
+-            return;
+-        }
+-        m_fileModificationTime = modificationTime;
+ 
+         in.open(QIODevice::ReadOnly);
+         while (!in.atEnd()) {
diff --git a/pkgs/applications/display-managers/slim/themes.nix b/pkgs/applications/display-managers/slim/themes.nix
index 0c69f101885..b1be24f3e1d 100644
--- a/pkgs/applications/display-managers/slim/themes.nix
+++ b/pkgs/applications/display-managers/slim/themes.nix
@@ -176,8 +176,8 @@ in {
   nixosSlim = buildTheme {
     fullName = "nixos-slim";
     src = fetchurl {
-      url = "https://github.com/jagajaga/nixos-slim-theme/archive/1.1.tar.gz";
-      sha256 = "66c3020a6716130a20c3898567339b990fbd7888a3b7bbcb688f6544d1c05c31";
+      url = "https://github.com/jagajaga/nixos-slim-theme/archive/2.0.tar.gz";
+      sha256 = "0lldizhigx7bjhxkipii87y432hlf5wdvamnfxrryf9z7zkfypc8";
     };
   };
 }
diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 9bcad5b7649..bd1597b02ba 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd
+, gvfs, cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, systemd
 }:
 
 let
@@ -16,15 +16,15 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0jki2ca12mazvszy05xc7zy8nfpavl0rnzcyksvvic32l3w2yxj7";
+    sha256 = "1rbwwwryhcasqgn2y1d9hvi3n4dag50dh1fd9hmkx4h9nmm3mbi0";
     name = "${name}.deb";
   };
 
-  buildInputs = [ atomEnv makeWrapper ];
+  buildInputs = [ atomEnv gvfs makeWrapper ];
 
   phases = [ "installPhase" "fixupPhase" ];
 
@@ -41,7 +41,8 @@ in stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $out/share/atom/resources/app/apm/bin/node
     wrapProgram $out/bin/atom \
-      --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
+      --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" \
+      --prefix "PATH" : "${gvfs}/bin"
     wrapProgram $out/bin/apm \
       --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
   '';
diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index b80d63f69d3..0d0c9d14814 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -106,16 +106,16 @@ rec {
 
   anyedittools = buildEclipsePlugin rec {
     name = "anyedit-${version}";
-    version = "2.4.15.201504172030";
+    version = "2.5.0.201510241327";
 
     srcFeature = fetchurl {
       url = "http://andrei.gmxhome.de/eclipse/features/AnyEditTools_${version}.jar";
-      sha256 = "19hbwgqn02ghflbcp5cw3qy203mym5kwgzq4xrn0xcl8ckl5s2pp";
+      sha256 = "01qaxg1b4n7y7g1xdkx1bnmpwqydln270mk14l4pl35q3c88s5nc";
     };
 
     srcPlugin = fetchurl {
-      url = "http://dl.bintray.com/iloveeclipse/plugins/de.loskutov.anyedit.AnyEditTools_${version}.jar";
-      sha256 = "1i3ghf2mhdfhify30hlyxqmyqcp40pkd5zhsiyg6finn4w81sxv2";
+      url = "https://github.com/iloveeclipse/anyedittools/releases/download/2.5.0/de.loskutov.anyedit.AnyEditTools_${version}.jar";
+      sha256 = "0m4qxkscl5xih8x1znbrih4jh28wky4l62spfif9zw0s7mgl117c";
     };
 
     meta = with stdenv.lib; {
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.9.0.201508291549";
+    version = "6.11.1.201510102004";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.9.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
-      sha256 = "0r6lfbyhqcwa628i6wjp9d6mfp4jnc46bmwp9j7v02m79f8wx74g";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.11.1/net.sf.eclipsecs-updatesite_${version}-bin.zip";
+      sha256 = "0l9nfx7a3qdx1pvjgc6ck4rxh7yrvqsskr190yrxxwmpnyj9cjs4";
     };
 
     meta = with stdenv.lib; {
@@ -335,16 +335,16 @@ rec {
 
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
-    version = "6.9.5.201508210528";
+    version = "6.9.8.201510130443";
 
     srcFeature = fetchurl {
       url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar";
-      sha256 = "0xalm7pvj0vx61isgkjkgj073b4hlqlzx6xnkrnnnyi0r212a26j";
+      sha256 = "0g0dva1zpqk0rz0vgr025g2cfc47snr857fsqcrssmp9qmy8x0i0";
     };
 
     srcPlugin = fetchurl {
       url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar";
-      sha256 = "07wmivfvfsq6cjw5zwciajdxkfa7drk108jsr44gf4i1bv9fj055";
+      sha256 = "16mnvqkakixqp3bcnyx6x2iwkhnv3k4q561c97kssz98xsrr8f54";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 60078b65901..5dd477f2981 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
-, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc
+, alsaLib, cairo, acl, gpm, AppKit
 , withX ? !stdenv.isDarwin
 , withGTK3 ? false, gtk3 ? null
 , withGTK2 ? true, gtk2
@@ -49,11 +49,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (withX && withGTK3) gtk3
     ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
-  ];
-
-  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin AppKit;
 
   configureFlags =
     if stdenv.isDarwin
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 879c0f55137..6b377abdda1 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, Carbon, Foundation,
-libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit
+{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls
+, Carbon, Cocoa, ImageCaptureCore, OSAKit, Quartz, WebKit
 }:
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.10";
+  name = "${emacsName}-mac-5.13";
 
   #builder = ./builder.sh;
 
@@ -15,18 +15,17 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf";
+    sha256 = "0p8xpsnsdpwpfq4mz0fazm785d0my0pq4ifbw533g959jh17b36h";
   };
 
-  NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
-  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
-
   enableParallelBuilding = true;
 
   buildInputs = [
-    ncurses pkgconfig texinfo libxml2 gnutls Carbon Cocoa Foundation libobjc WebKit Quartz
-    ImageCaptureCore OSAKit
+    ncurses pkgconfig texinfo libxml2 gnutls
+  ];
+
+  propagatedBuildInputs = [
+    Carbon Cocoa ImageCaptureCore OSAKit Quartz WebKit
   ];
 
   postUnpack = ''
@@ -36,6 +35,7 @@ stdenv.mkDerivation rec {
   '';
 
   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"
 
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
       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
+      GUI support for Mac OS X 10.4 - 10.11. 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-modes/dash/default.nix b/pkgs/applications/editors/emacs-modes/dash/default.nix
index c71860992da..09b03ccdba6 100644
--- a/pkgs/applications/editors/emacs-modes/dash/default.nix
+++ b/pkgs/applications/editors/emacs-modes/dash/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl, emacs}:
 
 let
-  version = "2.11.0";
+  version = "2.12.1";
 in
 stdenv.mkDerivation {
   name = "emacs-dash-${version}";
 
   src = fetchurl {
     url = "https://github.com/magnars/dash.el/archive/${version}.tar.gz";
-    sha256 = "1piwcwilkxcbjxx832mhb7q3pz1fgwp203r581bpqcw6kd5x726q";
+    sha256 = "082jl7mp4x063bpj5ad2pc5125k0d6p7rb89gcj7ny3lma9h2ij1";
   };
 
   buildInputs = [ emacs ];
diff --git a/pkgs/applications/editors/emacs-modes/magit/default.nix b/pkgs/applications/editors/emacs-modes/magit/default.nix
index 8d71ca58202..b5f4ac506cc 100644
--- a/pkgs/applications/editors/emacs-modes/magit/default.nix
+++ b/pkgs/applications/editors/emacs-modes/magit/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, emacs, texinfo, gitModes, git, dash }:
 
 let
-  version = "2.2.1";
+  version = "2.3.0";
 in
 stdenv.mkDerivation {
   name = "magit-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     owner = "magit";
     repo = "magit";
     rev = version;
-    sha256 = "1bq26wrgm4wgif0hj16mkmiz0p1iilxs7dmdd1vq5df8nivmakjz";
+    sha256 = "1zbx1ky1481lkvfjr4k23q7jdrk9ji9v5ghj88qib36vbmzfwww8";
   };
 
   buildInputs = [ emacs texinfo git ];
@@ -28,15 +28,10 @@ stdenv.mkDerivation {
     cp lisp/magit-version.el .
   '';
 
-  doCheck = false;  # one out of 5 tests fails, not sure why
+  doCheck = false;  # 2 out of 15 tests fails, not sure why
   checkTarget = "test";
   preCheck = "export EMAIL='Joe Doe <joe.doe@example.org>'";
 
-  # postInstall = ''
-  #   mkdir -p $out/bin
-  #   mv "bin/"* $out/bin/
-  # '';
-
   meta = {
     homepage = "https://github.com/magit/magit";
     description = "Magit, an Emacs interface to Git";
diff --git a/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
new file mode 100644
index 00000000000..7176b289b8b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/markdown-mode/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, emacs }:
+
+let
+  version = "2.0-82-gfe30ef7";
+in
+stdenv.mkDerivation {
+  name = "markdown-mode-${version}";
+
+  src = fetchFromGitHub {
+    owner  = "defunkt";
+    repo   = "markdown-mode";
+    rev    = "v${version}";
+    sha256 = "14a6r05j0g2ppq2q4kd14qyxwr6yv5jwndavbwzkmp6qhmm9k8nz";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+
+  meta.license = stdenv.lib.licenses.gpl3Plus;
+}
diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
index 1276e4754eb..f7289a3b400 100644
--- a/pkgs/applications/editors/emacs-modes/org/default.nix
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -2,11 +2,11 @@
 , texLiveAggregationFun }:
 
 stdenv.mkDerivation rec {
-  name = "org-8.3.1";
+  name = "org-8.3.2";
 
   src = fetchurl {
     url = "http://orgmode.org/${name}.tar.gz";
-    sha256 = "0cn3k02b2dhp489rrlaz4g91h0ph99a7721gm8x7axicqhpv04rx";
+    sha256 = "1f3mi1g4s8psfzq8mfbq3sccj7hsxvcfww0gf4337xs6jp8i3s4a";
   };
 
   buildInputs = [ emacs ];
diff --git a/pkgs/applications/editors/emacs-modes/slime/default.nix b/pkgs/applications/editors/emacs-modes/slime/default.nix
new file mode 100644
index 00000000000..4c632642536
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/slime/default.nix
@@ -0,0 +1,22 @@
+{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/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 8d4002c9ef8..5dd839d5651 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk2, which, pkgconfig, intltool, file }:
 
 let
-  version = "1.24.1";
+  version = "1.25";
 in
 
 stdenv.mkDerivation rec {
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.geany.org/${name}.tar.bz2";
-    sha256 = "0cwci8876dpgcn60dfvjlciqr8x68iv86psjj148grhzn3chbdbz";
+    sha256 = "8ee41da28cead8c94d433e616d7ababa81727c63e9196ca6758ade3af14a49ef";
   };
 
   buildInputs = [ gtk2 which pkgconfig intltool file ];
diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix
new file mode 100644
index 00000000000..ffffed1b853
--- /dev/null
+++ b/pkgs/applications/editors/geany/with-vte.nix
@@ -0,0 +1,6 @@
+{ runCommand, makeWrapper, geany, gnome }:
+let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name;
+in
+runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } "
+   makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib
+"
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 5aa8c7d1553..0323baabe49 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -212,14 +212,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.2.2.0";
-    build = "141.1980579";
+    version = "1.4.0.10";
+    build = "141.2288178";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "08bayp2kxxg0zdmd1rcfg89g80wmwxf56fzmk5xkz1qg6s9b98a6";
+      sha256 = "04zzzk6xlvzip6klxvs4zz2wyfyn3w9b5jwilzbqjidiz2d3va57";
     };
   };
 
@@ -237,25 +237,25 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "14.1.5";
-    build = "IC-141.2735.5";
+    version = "15.0";
+    build = "IC-143.381";
     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 = "196rijl2k24ysjihdsisfy8hjl21wcn98fn8wagvxsvjf7anyg9k";
+      sha256 = "0d39ipwji76gkc7w5bcl7a94kdz5cwmcnwmvq1lzm06v43jjq51s";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "14.1.5";
-    build = "IU-141.2735.5";
+    version = "15.0";
+    build = "IU-143.381";
     description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/idea/ideaIU-${version}.tar.gz";
-      sha256 = "0wxb7m0k3kbjnr42rwzsk4g09qxqsmnpsdj769azamvsr4p904k9";
+      sha256 = "1hw8hqpzkdlp0ilax6anzjybhmjb40s16jblyplqpah065pc8rja";
     };
   };
 
@@ -273,25 +273,25 @@ in
 
   pycharm-community = buildPycharm rec {
     name = "pycharm-community-${version}";
-    version = "4.5.4";
-    build = "141.2569";
+    version = "5.0";
+    build = "143.589";
     description = "PyCharm Community Edition";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "0a2208rjcvcm9dww317clwiil3ddza3qq9wqkvr0rrcfp1739pbb";
+      sha256 = "01q51m6rpyw296imiglbadzfr0r91wvyrxdid683yl7f5v73wzwh";
     };
   };
 
   pycharm-professional = buildPycharm rec {
     name = "pycharm-professional-${version}";
-    version = "4.5.4";
-    build = "141.2569";
+    version = "5.0";
+    build = "143.589";
     description = "PyCharm Professional Edition";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download-cf.jetbrains.com/python/${name}.tar.gz";
-      sha256 = "1dy64myih92kxmi6h9y142dbmmwwphs2n3vswyg53881g5i0lfhd";
+      sha256 = "16lwg00dl03gwj4dqihdrn15p1fy8513srw2dslna1w1glfajv06";
     };
   };
 
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index c55d4b0e76a..344293d3367 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -6,6 +6,7 @@
 , withPython3 ? true, python3Packages, extraPython3Packages ? []
 , withJemalloc ? true, jemalloc
 
+, withPyGUI ? false
 , vimAlias ? false
 , configure ? null
 }:
@@ -14,7 +15,7 @@ with stdenv.lib;
 
 let
 
-  version = "2015-06-09";
+  version = "0.1.0";
 
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation {
@@ -45,7 +46,11 @@ let
   };
 
   pythonEnv = pythonPackages.python.buildEnv.override {
-    extraLibs = [ pythonPackages.neovim ] ++ extraPythonPackages;
+    extraLibs = (
+        if withPyGUI
+          then [ pythonPackages.neovim_gui ]
+          else [ pythonPackages.neovim ]
+      ) ++ extraPythonPackages;
     ignoreCollisions = true;
   };
 
@@ -58,8 +63,8 @@ let
     name = "neovim-${version}";
 
     src = fetchFromGitHub {
-      sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
-      rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
+      sha256 = "1704f3dqf5p6hicpzf0pi21n6ymylra9prsm4azvqp86allmvnfx";
+      rev = "v${version}";
       repo = "neovim";
       owner = "neovim";
     };
@@ -93,6 +98,7 @@ let
 
     preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       export DYLD_LIBRARY_PATH=${jemalloc}/lib
+      substituteInPlace src/nvim/CMakeLists.txt --replace "    util" ""
     '';
 
     postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -102,8 +108,11 @@ let
                 $out/bin/nvim
     '' + optionalString withPython ''
       ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
+    '' + optionalString withPyGUI ''
+      makeWrapper "${pythonEnv}/bin/pynvim" "$out/bin/pynvim" \
+        --prefix PATH : "$out/bin"
     '' + optionalString withPython3 ''
-      ln -s ${python3Env}/bin/python $out/bin/nvim-python3
+      ln -s ${python3Env}/bin/python3 $out/bin/nvim-python3
     '' + optionalString (withPython || withPython3) ''
         wrapProgram $out/bin/nvim --add-flags "${
           (optionalString withPython
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
new file mode 100644
index 00000000000..949be3875d8
--- /dev/null
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, cmake, qt5, pythonPackages, libmsgpack
+, makeWrapper, neovim
+}:
+
+let # not very usable ATM
+  version = "0pre-2015-10-18";
+in
+stdenv.mkDerivation {
+  name = "neovim-qt-${version}";
+
+  src = fetchFromGitHub {
+    repo = "neovim-qt";
+    owner = "equalsraf";
+    rev = "03236e2";
+    sha256 = "0hhwpnj7yfqdk7yiwrq0x6n4xx30brj9clxmxx796421rlcrxypq";
+  };
+
+  # It tries to download libmsgpack; let's use ours.
+  postPatch = let use-msgpack = ''
+    cmake_minimum_required(VERSION 2.8.11)
+    project(neovim-qt-deps)
+
+    # Similar enough to FindMsgpack
+    set(MSGPACK_INCLUDE_DIRS ${libmsgpack}/include PARENT_SCOPE)
+    set(MSGPACK_LIBRARIES msgpack PARENT_SCOPE)
+  '';
+    in "echo '${use-msgpack}' > third-party/CMakeLists.txt";
+
+  buildInputs = with pythonPackages; [
+    cmake qt5.qtbase
+    python msgpack jinja2 libmsgpack
+    makeWrapper
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mv ./bin/nvim-qt "$out/bin/"
+    wrapProgram "$out/bin/nvim-qt" --prefix PATH : "${neovim}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A prototype Qt5 GUI for neovim";
+    license = licenses.isc;
+    inherit (neovim.meta) platforms;
+  };
+}
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index fda51dc2401..8f0c560f47d 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }:
+{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }:
 
 let
   version = "0.98.110";
@@ -8,7 +8,7 @@ in
 stdenv.mkDerivation {
   name = "RStudio-${version}";
 
-  buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ];
+  buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
@@ -61,6 +61,10 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ];
 
+  postInstall = ''
+      wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
+  '';
+
   meta = with stdenv.lib;
     { description = "Set of integrated tools for the R language";
       homepage = http://www.rstudio.com/;
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index b26d27a8bc5..49c30a1f6d6 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -1,10 +1,15 @@
-{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2 }:
+{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2,
+  pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect,
+  gksuSupport ? false, gksu}:
 
 assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert gksuSupport -> gksu != null;
 
 let
   build = "3083";
   libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
+  redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
+    ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
 in let
   # package with just the binaries
   sublime = stdenv.mkDerivation {
@@ -35,6 +40,9 @@ in let
           --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
           $i
       done
+
+      # Rewrite pkexec|gksudo argument. Note that we can't delete bytes in binary.
+      sed -i -e 's,/bin/cp\x00,cp\x00\x00\x00\x00\x00\x00,g' sublime_text
     '';
 
     installPhase = ''
@@ -44,6 +52,10 @@ in let
       mkdir -p $out
       cp -prvd * $out/
 
+      wrapProgram $out/sublime_text \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+        --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
+
       # Without this, plugin_host crashes, even though it has the rpath
       wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so
     '';
@@ -64,7 +76,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     description = "Sophisticated text editor for code, markup and prose";
     homepage = https://www.sublimetext.com/;
-    maintainers = with maintainers; [ wmertens ];
+    maintainers = with maintainers; [ wmertens demin-dmitriy ];
     license = licenses.unfree;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 9eb1bdc7e43..a8f12bd4ece 100644
--- a/pkgs/applications/editors/textadept/default.nix
+++ b/pkgs/applications/editors/textadept/default.nix
@@ -20,14 +20,14 @@ let
   '';
 in
 stdenv.mkDerivation rec{
-  version = "8.0";
-  scintillua_version = "3.5.5-1";
+  version = "8.2";
+  scintillua_version = "3.6.0-1";
   name = "textadept-${version}";
   inherit buildInputs;
   src = fetchhg {
     url = http://foicica.com/hg/textadept;
     rev = "textadept_${version}";
-    sha256 = "18kcphqkn0l77dbcyvywy3wh13ib280bb0qsffaqy439gk5zr7ql";
+    sha256 = "1vb6a15fyk7ixcv5fy0g400lxbj6dp5ndbmyx53d28idbdkz9ap1";
   };
   preConfigure = ''
     cd src
@@ -35,16 +35,17 @@ stdenv.mkDerivation rec{
     echo '#! ${stdenv.shell}' > wget/wget
     chmod a+x wget/wget
     export PATH="$PATH:$PWD/wget"
-    ${get_url http://prdownloads.sourceforge.net/scintilla/scintilla355.tgz "11n49h58xh35vj1j85cxasl93rjiv699c5cs5lpv19skfsgs3sb4"}
+    ${get_url http://prdownloads.sourceforge.net/scintilla/scintilla360.tgz "07ib4w3n9kqfaia2yngj2q7ab5r55zn0hccfzph6vas9hl8vk9zf"}
     ${get_url http://foicica.com/scinterm/download/scinterm_1.6.zip "0ixwj9il6ri1xl4nvb6f108z4qhrahysza6frbbaqmbdz21hnmcl"}
-    ${get_url http://foicica.com/scintillua/download/scintillua_3.5.5-1.zip "0bpz5rmgaisbimhm6rpn961mbv30cwqid7kh9lad94v3y9ppvf35"}
-    ${get_url http://www.lua.org/ftp/lua-5.3.0.tar.gz "00fv1p6dv4701pyjrlvkrr6ykzxqy9hy1qxzj6qmwlb0ssr5wjmf"}
+    ${get_url http://foicica.com/scintillua/download/scintillua_3.6.0-1.zip "0zk1ciyyi0d3dz4dzzq5fa74505pvqf0w5yszl7l29c1l4hkk561"}
+    ${get_url http://www.lua.org/ftp/lua-5.3.1.tar.gz "05xczy5ws6d7ic3f9h9djwg983bpa4pmds3698264bncssm6f9q7"}
     ${get_url http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-0.12.2.tar.gz "01002avq90yc8rgxa5z9a1768jm054iid3pnfpywdcfij45jgbba"}
     ${get_url_zip http://github.com/keplerproject/luafilesystem/archive/v_1_6_3.zip "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"}
     ${get_url http://foicica.com/lspawn/download/lspawn_1.2.zip "1fhfi274bxlsdvva5q5j0wv8hx68cmf3vnv9spllzad4jdvz82xv"}
     ${get_url http://luajit.org/download/LuaJIT-2.0.3.tar.gz "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"}
     ${get_url http://foicica.com/gtdialog/download/gtdialog_1.2.zip "0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"}
-    ${get_url http://invisible-island.net/datafiles/release/cdk.tar.gz "00s87kq5x10x22azr6q17b663syk169y3dk3kaj8z6dlk2b8vknp"}
+    ${get_url ftp://invisible-island.net/cdk/cdk-5.0-20150928.tgz "028da75d5f777a1c4184f88e34918bd273bd83bbe3c959bc11710c4f0ea2e448"}
+    mv cdk-*.tgz cdk.tar.gz
     ${get_url_zip http://foicica.com/hg/bombay/archive/d704272c3629.zip "19dg3ky87rfy0a3319vmv18hgn9spplpznvlqnk3djh239ddpplw"}
     mv d704*.zip bombay.zip
     ${get_url http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.17.tar.gz "12gkrv1ldwk945qbpprnyawh0jz7rmqh18fyndbxiajyxmj97538"}
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index fd4f13ab650..3d6c9ffa859 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -3,7 +3,12 @@
 args@{pkgs, source ? "default", fetchurl, fetchhg, stdenv, ncurses, pkgconfig, gettext
 , composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby
 , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu
-, libICE, ... }: with args;
+, libICE
+
+# apple frameworks
+, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private
+
+, ... }: with args;
 
 
 let inherit (args.composableDerivation) composableDerivation edf;
@@ -88,7 +93,14 @@ composableDerivation {
           '';
         };
       }
-      // edf { name = "darwin"; } #Disable Darwin (Mac OS X) support.
+      // edf {
+        name = "darwin";
+        enable = {
+          nativeBuildInputs = [ CoreServices CoreData Cocoa Foundation libobjc cf-private ];
+          NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
+            "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+        };
+      } #Disable Darwin (Mac OS X) support.
       // edf { name = "xsmp"; } #Disable XSMP session management
       // edf { name = "xsmp_interact"; } #Disable XSMP interaction
       // edf { name = "mzscheme"; feat = "mzschemeinterp";} #Include MzScheme interpreter.
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index 3bdd44529dd..ab7b08d8186 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig
 
 # apple frameworks
-, CoreServices, CoreData, Cocoa, Foundation, libobjc }:
+, Carbon, Cocoa }:
 
 stdenv.mkDerivation rec {
   name = "vim-${version}";
@@ -14,16 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "1m34s2hsc5lcish6gmvn2iwaz0k7jc3kg9q4nf30fj9inl7gaybs";
   };
 
-  # this makes maintainers very sad
-  # open source CF doesn't have anything NSArray-related, causing linking errors. the
-  # missing symbol is in system CoreFoundation.
-  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
-
   enableParallelBuilding = true;
 
   buildInputs = [ ncurses pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
   nativeBuildInputs = [ gettext ];
 
   configureFlags = [
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
new file mode 100644
index 00000000000..13f9fe6bd77
--- /dev/null
+++ b/pkgs/applications/gis/grass/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
+, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas
+, proj, gdal, geos, sqlite, postgresql, mysql, pythonPackages
+}:
+
+stdenv.mkDerivation {
+  name = "grass-7.0.1";
+  src = fetchurl {
+    url = http://grass.osgeo.org/grass70/source/grass-7.0.1.tar.gz;
+    sha256 = "0ps0xfsgls1hai8fx8x74ajh3560p1yjql2sg02lpqpx30bdv1q9";
+  };
+
+  buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite pkgconfig cairo
+  readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql mysql.lib blas ]
+    ++ (with pythonPackages; [ python dateutil wxPython30 numpy sqlite3 ]);
+
+  configureFlags = [
+    "--with-proj-share=${proj}/share/proj"
+    "--without-opengl"
+    "--with-readline"
+    "--with-wxwidgets"
+    "--with-netcdf"
+    "--with-geos"
+    "--with-postgres"
+    "--with-mysql" "--with-mysql-includes=${mysql.lib}/include/mysql"
+    "--with-blas"
+  ];
+
+  /* Ensures that the python script run at build time are actually executable;
+   * otherwise, patchShebangs ignores them.  */
+  postConfigure = ''
+    chmod +x scripts/d.out.file/d.out.file.py \
+      scripts/d.to.rast/d.to.rast.py \
+      scripts/d.what.rast/d.what.rast.py \
+      scripts/d.what.vect/d.what.vect.py \
+      scripts/g.extension/g.extension.py \
+      scripts/g.extension.all/g.extension.all.py \
+      scripts/r.pack/r.pack.py \
+      scripts/r.tileset/r.tileset.py \
+      scripts/r.unpack/r.unpack.py \
+      scripts/v.krige/v.krige.py \
+      scripts/v.rast.stats/v.rast.stats.py \
+      scripts/v.to.lines/v.to.lines.py \
+      scripts/v.what.strds/v.what.strds.py \
+      scripts/v.unpack/v.unpack.py \
+      scripts/wxpyimgview/*.py \
+      gui/wxpython/animation/g.gui.animation.py \
+      gui/wxpython/rlisetup/g.gui.rlisetup.py \
+      gui/wxpython/vdigit/g.gui.vdigit.py \
+      temporal/t.rast.accumulate/t.rast.accumulate.py \
+      temporal/t.rast.accdetect/t.rast.accdetect.py \
+      temporal/t.select/t.select.py
+    for d in gui lib scripts temporal tools; do
+      patchShebangs $d
+    done
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/grass70 \
+    --set PYTHONPATH $PYTHONPATH \
+    --set GRASS_PYTHON ${pythonPackages.python}/bin/${pythonPackages.python.executable}
+    ln -s $out/grass-*/lib $out/lib
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = {
+    homepage = http://grass.osgeo.org/;
+    description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix
index 8d9771c9134..b771d2552d8 100644
--- a/pkgs/applications/gis/qgis/default.nix
+++ b/pkgs/applications/gis/qgis/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl,
-  qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
+{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
+, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
+, withGrass ? false, grass
+}:
 
 stdenv.mkDerivation rec {
   name = "qgis-2.10.1";
 
   buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
     fcgi libspatialindex libspatialite postgresql ] ++
+    (stdenv.lib.optional withGrass grass) ++
     (with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];
 
   nativeBuildInputs = [ cmake makeWrapper ];
@@ -24,6 +27,8 @@ stdenv.mkDerivation rec {
     sha256 = "79119b54642edaffe3cda513531eb7b81913e013954a49c6d3b21c8b00143307";
   };
 
+  cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
+
   postInstall = ''
     wrapProgram $out/bin/qgis \
       --prefix PYTHONPATH : $PYTHONPATH
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 7ba523d3a60..46fefc9fd7b 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -2,15 +2,15 @@
   libharu, opencv, vigra, postgresql }:
 
 stdenv.mkDerivation rec {
-  name = "saga-2.2.0";
+  name = "saga-2.2.1";
 
   buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma jasper ];
 
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.2/SAGA%202.2.0/saga_2.2.0.tar.gz";
-    sha256 = "50b2e642331c817606bc954302e53757c4ffa6f6d6f468e12caeaaa7a182edaf";
+    url = "http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.2/SAGA%202.2.1/saga_2.2.1.tar.gz";
+    sha256 = "325e0890c28dc19c4ec727f58672be67480b2a4dd6604252c0cc4cc08aad34d0";
   };
 
   meta = {
diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index ef43e87ea9a..39132bb9b6f 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,16 +2,17 @@
 , libXinerama, curl, libexif }:
 
 stdenv.mkDerivation rec {
-  name = "feh-2.13.1";
+  name = "feh-2.14";
 
   src = fetchurl {
     url = "http://feh.finalrewind.org/${name}.tar.bz2";
-    sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";
+    sha256 = "0j5wxpqccnd0hl74z2vwv25n7qnik1n2mcm2jn0c0z7cjn4wsa9q";
   };
 
   outputs = [ "out" "doc" ];
 
-  buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];
 
   preBuild = ''
     makeFlags="PREFIX=$out exif=1"
diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
new file mode 100644
index 00000000000..b5d44eb4cce
--- /dev/null
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub,
+  SDL2, freeimage
+}:
+
+stdenv.mkDerivation rec {
+  name = "imv";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "eXeC64";
+    repo  = "imv";
+    rev = "f2ce793d628e88825eff3364b293104cb0bdb582";
+    sha256 = "1xqaqbfjgksbjmy1yy7q4sv5bak7w8va60xa426jzscy9cib2sgh";
+  };
+
+  buildInputs = [ SDL2 freeimage ];
+
+  configurePhase = "substituteInPlace Makefile --replace /usr $out";
+
+  meta = with stdenv.lib; {
+    description = "A command line image viewer for tiling window managers";
+    homepage    = https://github.com/eXeC64/imv; 
+    license     = licenses.mit;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.unix;
+  };
+}
+
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 94ab1b76cda..a067efe82ea 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, xulrunner }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.13";
+  version = "2.0.14";
   name = "pencil-${version}";
 
   src = fetchurl {
     url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "150jsaq27n01l0vf10jiyrlfm0canqhphdxi42di96b9zsfkphpk";
+    sha256 = "59f46db863e6d95ee6987e600d658ad4b58b03b0744c5c6d17ce04f5ae92d260";
 
   };
 
diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix
index 6958c94f7e1..2fd98b5033e 100644
--- a/pkgs/applications/graphics/pinta/default.nix
+++ b/pkgs/applications/graphics/pinta/default.nix
@@ -1,44 +1,83 @@
-{stdenv, fetchurl, mono, gtksharp, pkgconfig}:
+{ stdenv, fetchFromGitHub, buildDotnetPackage, dotnetPackages, gtksharp,
+  gettext }:
 
-stdenv.mkDerivation {
-  name = "pinta-1.4";
+let
+  mono-addins = dotnetPackages.MonoAddins;
+in
+buildDotnetPackage rec {
+  name = "pinta-1.6";
 
-  src = fetchurl {
-    url = "https://github.com/PintaProject/Pinta/tarball/3f7ccfa93d";
-    name = "pinta-1.4.tar.gz";
-    sha256 = "1kgb4gy5l6bd0akniwhiqqkvqayr5jgdsvn2pgg1038q9raafnpn";
+  baseName = "Pinta";
+  version = "1.6";
+  outputFiles = [ "bin/*" ];
+  buildInputs = [ gtksharp mono-addins gettext ];
+  xBuildFiles = [ "Pinta.sln" ];
+
+  src = fetchFromGitHub {
+    owner = "PintaProject";
+    repo = "Pinta";
+    rev = version;
+    sha256 = "0vgswy981c7ys4q7js5k85sky7bz8v32wsfq3br4j41vg92pw97d";
   };
 
-  buildInputs = [mono gtksharp pkgconfig];
+  # Remove version information from nodes <Reference Include="... Version=... ">
+  postPatch = with stdenv.lib; let
+    csprojFiles = [
+      "Pinta/Pinta.csproj"
+      "Pinta.Core/Pinta.Core.csproj"
+      "Pinta.Effects/Pinta.Effects.csproj"
+      "Pinta.Gui.Widgets/Pinta.Gui.Widgets.csproj"
+      "Pinta.Resources/Pinta.Resources.csproj"
+      "Pinta.Tools/Pinta.Tools.csproj"
+    ];
+    versionedNames = [
+      "Mono\\.Addins"
+      "Mono\\.Posix"
+      "Mono\\.Addins\\.Gui"
+      "Mono\\.Addins\\.Setup"
+    ];
 
-  buildPhase = ''
-    # xbuild understands pkgconfig, but gtksharp does not give .pc for gdk-sharp
-    # So we have to go the GAC-way
-    export MONO_GAC_PREFIX=${gtksharp}
-    xbuild Pinta.sln
-  '';
+    stripVersion = name: file: let
+        match = ''<Reference Include="${name}([ ,][^"]*)?"'';
+        replace = ''<Reference Include="${name}"'';
+      in "sed -i -re 's/${match}/${replace}/g' ${file}\n";
 
-  # Very ugly - I don't know enough Mono to improve this. Isn't there any rpath in binaries?
-  installPhase = ''
-    mkdir -p $out/lib/pinta $out/bin
-    cp bin/*.{dll,exe} $out/lib/pinta
-    cat > $out/bin/pinta << EOF
-    #!/bin/sh
-    export MONO_GAC_PREFIX=${gtksharp}:\$MONO_GAC_PREFIX
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gtksharp}/lib:${gtksharp.gtk}/lib:${mono}/lib
-    exec ${mono}/bin/mono $out/lib/pinta/Pinta.exe
-    EOF
-    chmod +x $out/bin/pinta
-  '';
+    # Map all possible pairs of two lists
+    map2 = f: listA: listB: concatMap (a: map (f a) listB) listA;
+    concatMap2Strings = f: listA: listB: concatStrings (map2 f listA listB);
+  in
+    concatMap2Strings stripVersion versionedNames csprojFiles
+    + ''
+      # For some reason there is no Microsoft.Common.tasks file
+      # in ''${mono}/lib/mono/3.5 .
+      substituteInPlace Pinta.Install.proj \
+        --replace 'ToolsVersion="3.5"' 'ToolsVersion="4.0"' \
+        --replace "/usr/local" "$out"
+    '';
 
-  # Always needed on Mono, otherwise nothing runs
-  dontStrip = true; 
+  makeWrapperArgs = [
+    ''--prefix MONO_GAC_PREFIX ':' "${gtksharp}"''
+    ''--prefix LD_LIBRARY_PATH ':' "${gtksharp}/lib"''
+    ''--prefix LD_LIBRARY_PATH ':' "${gtksharp.gtk}/lib"''
+  ];
+
+  postInstall = ''
+    # Do automake's job manually
+    substitute xdg/pinta.desktop.in xdg/pinta.desktop \
+      --replace _Name Name \
+      --replace _Comment Comment \
+      --replace _GenericName GenericName \
+      --replace _X-GNOME-FullName X-GNOME-FullName
+
+    xbuild /target:CompileTranslations Pinta.Install.proj
+    xbuild /target:Install Pinta.Install.proj
+  '';
 
   meta = {
     homepage = http://www.pinta-project.com/;
     description = "Drawing/editing program modeled after Paint.NET";
     license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index c5d1b936233..7c68e94100f 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
-, libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
+, libxml2, makeWrapper, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.18.0"; in
+let version = "3.19.1"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl";
-    url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz";
+    sha256 = "1d2a8cncq36ly60jpz0fzdw1lgxynl6lyrlw0q66yijlxqn81ynr";
+    url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 
-  buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 packagekit
-    saneBackends systemd vala ];
+  buildInputs = [ cairo colord glib gusb gtk3 libusb libxml2 saneBackends
+    systemd vala ];
   nativeBuildInputs = [ intltool itstool makeWrapper pkgconfig ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 478553d2c00..d01b1a14018 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -1,14 +1,18 @@
-{ stdenv, fetchurl, pkgconfig, gtk2, libpng, exiv2, lcms
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
 , intltool, gettext, shared_mime_info, glib, gdk_pixbuf, perl}:
 
 stdenv.mkDerivation rec {
-  name = "viewnior-1.4";
-
-  src = fetchurl {
-    url = "https://www.dropbox.com/s/zytq0suabesv933/${name}.tar.gz";
-    sha256 = "0vv1133phgfzm92md6bbccmcvfiqb4kz28z1572c0qj971yz457a";
+  name = "viewnior-${version}";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = "xsisqox";
+    repo = "Viewnior";
+    rev = name;
+    sha256 = "0y352hkkwmzb13a87vqgj1dpdn81qk94acby1a93xkqr1qs626lw";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
     [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
       shared_mime_info glib gdk_pixbuf perl
@@ -30,7 +34,7 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3;
 
-    homepage = http://xsisqox.github.com/Viewnior;
+    homepage = http://siyanpanayotov.com/project/viewnior/;
 
     maintainers = [ stdenv.lib.maintainers.smironov ];
 
diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix
index e3b7d001174..51c41e01bf9 100644
--- a/pkgs/applications/graphics/yed/default.nix
+++ b/pkgs/applications/graphics/yed/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, requireFile, makeWrapper, unzip, jre }:
 
 stdenv.mkDerivation rec {
-  name = "yEd-3.14.3";
+  name = "yEd-3.14.4";
 
   src = requireFile {
     name = "${name}.zip";
     url = "https://www.yworks.com/en/products/yfiles/yed/";
-    sha256 = "0xgazknbz82sgk65hxmvbycl1vd25z80a7jgwjgw7syicrgmplcl";
+    sha256 = "0pm271ss6cq2s6cv9ww92haaq2abkjxd9dvc8d72h6af5awv8xy6";
   };
 
   nativeBuildInputs = [ unzip makeWrapper ];
diff --git a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch b/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch
deleted file mode 100644
index b2679b95a86..00000000000
--- a/pkgs/applications/kde-apps-15.04/cantor/0001-qalculate-filename-string-type.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1a526e40ffc1d6cb050334e8641d8b90d9858a54 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 30 Aug 2015 07:05:03 -0500
-Subject: [PATCH] qalculate filename string type
-
----
- src/backends/qalculate/qalculateexpression.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/backends/qalculate/qalculateexpression.cpp b/src/backends/qalculate/qalculateexpression.cpp
-index 1891baa..b2a1984 100644
---- a/src/backends/qalculate/qalculateexpression.cpp
-+++ b/src/backends/qalculate/qalculateexpression.cpp
-@@ -771,9 +771,9 @@ void QalculateExpression::evaluatePlotCommand()
- 	if (plotParameters.filetype == PLOT_FILETYPE_EPS ||
- 	    plotParameters.filetype == PLOT_FILETYPE_PS  ||
- 	    (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 4 &&
--	     plotParameters.filename.substr(p-4,4) == QLatin1String(".eps")) ||
-+	     plotParameters.filename.substr(p-4,4) == basic_string<char>(".eps")) ||
- 	    (plotParameters.filetype == PLOT_FILETYPE_AUTO && p >= 3 &&
--	     plotParameters.filename.substr(p-3,3) == QLatin1String(".ps")))
-+	     plotParameters.filename.substr(p-3,3) == basic_string<char>(".ps")))
- 	    setResult(new Cantor::EpsResult(KUrl(plotParameters.filename.c_str())));
- 	else
- 	    setResult(new Cantor::ImageResult(KUrl(plotParameters.filename.c_str())));
--- 
-2.5.0
-
diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
deleted file mode 100644
index 41dc641e899..00000000000
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ /dev/null
@@ -1,540 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ pkgs, newScope, kf5 ? null, plasma5 ? null, qt5 ? null, debug ? false }:
-
-let inherit (pkgs) autonix kde4 stdenv symlinkJoin; in
-
-with autonix; let inherit (stdenv) lib; in
-
-let
-  kf5_ = if kf5 != null then kf5 else pkgs.kf510;
-  plasma5_ = if plasma5 != null then plasma5 else pkgs.plasma53;
-  qt5_ = if qt5 != null then qt5 else pkgs.qt54;
-in
-
-let
-
-  kf5 = kf5_.override { inherit debug qt5; };
-  plasma5 = plasma5_.override { inherit debug kf5 qt5; };
-  qt5 = qt5_;
-
-  kdeOrL10nPackage = name: pkg:
-    assert (builtins.isAttrs pkg);
-    if lib.hasPrefix "kde-l10n" pkg.name
-      then l10nPackage name pkg
-    else kdePackage name pkg;
-
-  kdePackage = name: pkg:
-    let defaultOverride = drv: drv // {
-          setupHook = ./setup-hook.sh;
-          cmakeFlags =
-            (drv.cmakeFlags or [])
-            ++ [ "-DBUILD_TESTING=OFF" ]
-            ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-          meta = {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-          };
-        };
-        callPackage = newScope {
-          inherit (stdenv) mkDerivation;
-          inherit (pkgs) fetchurl;
-          inherit scope;
-        };
-    in mkPackage callPackage defaultOverride name pkg;
-
-  l10nPackage = name: pkg:
-    let nameVersion = builtins.parseDrvName pkg.name;
-
-        pkgQt4 = pkg // {
-          name = "${nameVersion.name}-qt4-${nameVersion.version}";
-          buildInputs = [ "kdelibs" "qt4" ];
-          nativeBuildInputs = [ "cmake" "gettext" "perl" ];
-          propagatedBuildInputs = [];
-          propagatedNativeBuildInputs = [];
-          propagatedUserEnvPkgs = [];
-        };
-        drvQt4 = overrideDerivation (kdePackage name pkgQt4) (drv: {
-          preConfigure = (drv.preConfigure or "") + ''
-            cd 4/
-          '';
-        });
-
-        pkgQt5 = pkg // {
-          name = "${nameVersion.name}-qt5-${nameVersion.version}";
-          buildInputs = [ "kdoctools" "ki18n" ];
-          nativeBuildInputs = [ "cmake" "extra-cmake-modules" "gettext" "perl" ];
-          propagatedBuildInputs = [];
-          propagatedNativeBuildInputs = [];
-          propagatedUserEnvPkgs = [];
-        };
-        drvQt5 = overrideDerivation (kdePackage name pkgQt5) (drv: {
-          preConfigure = (drv.preConfigure or "") + ''
-            cd 5/
-          '';
-        });
-    in symlinkJoin pkg.name [ drvQt4 drvQt5 ];
-
-  super =
-    let json = builtins.fromJSON (builtins.readFile ./packages.json);
-        mirrorUrl = n: pkg: pkg // {
-          src = pkg.src // { url = "mirror://kde/${pkg.src.url}"; };
-        };
-        renames =
-          (builtins.fromJSON (builtins.readFile ./kf5-renames.json))
-          // (builtins.fromJSON (builtins.readFile ./plasma5-renames.json))
-          // (builtins.fromJSON (builtins.readFile ./renames.json));
-        propagated = [ "extra-cmake-modules" ];
-        native = [
-          "bison"
-          "extra-cmake-modules"
-          "flex"
-          "kdoctools"
-          "ki18n"
-          "libxslt"
-          "perl"
-          "pythoninterp"
-        ];
-        user = [
-          "qt5"
-          "qt5core"
-          "qt5dbus"
-          "qt5gui"
-          "qt5qml"
-          "qt5quick"
-          "qt5svg"
-          "qt5webkitwidgets"
-          "qt5widgets"
-          "qt5x11extras"
-          "shareddesktopontologies"
-          "sharedmimeinfo"
-        ];
-    in lib.fold (f: attrs: f attrs) json [
-      (lib.mapAttrs kdeOrL10nPackage)
-      (userEnvDeps user)
-      (nativeDeps native)
-      (propagateDeps propagated)
-      (renameDeps renames)
-      (lib.mapAttrs mirrorUrl)
-    ];
-
-  kde4Package = pkg: overrideScope pkg (with kde4; {
-    inherit akonadi baloo kactivities libkdegames libkmahjongg;
-    kde4 = self.kdelibs;
-  });
-
-  scope =
-    # KDE Frameworks 5
-    kf5 //
-    # packages in this collection
-    self //
-    {
-      kf5baloo = plasma5.baloo;
-      kf5kdcraw = self.libkdcraw;
-      kf5kdegames = self.libkdegames;
-      kf5kipi = self.libkipi;
-      libkonq = self.kde-baseapps;
-    } //
-    # packages requiring same Qt 5
-    (with pkgs; {
-      accountsqt5 = accounts-qt.override { inherit qt5; };
-      dbusmenuqt = libdbusmenu_qt;
-      grantlee5 = grantlee5.override { inherit qt5; };
-      mlt = pkgs.mlt-qt5.override { inherit qt5; };
-      phonon4qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      qca-qt5 = qca-qt5.override { inherit qt5; };
-      qt5script = qt5.script;
-      qt5x11extras = qt5.x11extras;
-      signonqt5 = signon.override { inherit qt5; };
-      telepathyqt5 = telepathy_qt5.override { inherit qt5; };
-    }) //
-    # packages from nixpkgs
-    (with pkgs; {
-      inherit acl attr automoc4 avahi bison cdparanoia cfitsio cmake cups
-              djvulibre docbook_xml_dtd_42 docbook_xsl enchant eigen2
-              exiv2 fam ffmpeg flac flex freetype gmp gettext gpgme
-              grantlee gsl hunspell ilmbase intltool jasper lcms2
-              libaccounts-glib libgcrypt libotr libraw libssh libspectre
-              libvncserver libical networkmanager openal opencv
-              openexr perl phonon pkgconfig polkit_qt4 prison python qca2
-              qimageblitz qjson qt4 samba saneBackends soprano speechd
-              strigi taglib udev xorg xplanet xscreensaver xz pcre;
-      alsa = alsaLib;
-      assuan = libassuan;
-      boost = boost155;
-      canberra = libcanberra;
-      eigen3 = eigen;
-      epub = ebook_tools;
-      gif = giflib;
-      gphoto2 = libgphoto2;
-      hupnp = herqq;
-      indi = indilib;
-      jpeg = libjpeg;
-      ldap = openldap;
-      libattica = attica;
-      musicbrainz3 = libmusicbrainz;
-      oggvorbis = libvorbis;
-      poppler = poppler_qt4;
-      pulseaudio = libpulseaudio;
-      qalculate = libqalculate;
-      sasl2 = cyrus_sasl;
-      shareddesktopontologies = shared_desktop_ontologies;
-      sharedmimeinfo = shared_mime_info;
-      sndfile = libsndfile;
-      tiff = libtiff;
-      telepathyqt4 = telepathy_qt;
-      tunepimp = libtunepimp;
-      usb = libusb;
-      xsltproc = libxslt;
-    });
-
-  self =
-    (builtins.removeAttrs super [
-      "artikulate" # build failure; wrong boost?
-      "kde-dev-scripts" "kde-dev-utils" # docbook errors
-      "kdewebdev" # unknown build failure
-      "kde-l10n-sr" # missing CMake command
-    ]) // {
-      audiocd-kio = kde4Package super.audiocd-kio;
-
-      amor = kde4Package super.amor;
-
-      ark = extendDerivation (kde4Package super.ark) {
-        buildInputs = [ pkgs.makeWrapper ];
-        # runtime dependency
-        postInstall = ''
-          wrapProgram $out/bin/ark --prefix PATH : "${pkgs.unzipNLS}/bin"
-        '';
-      };
-
-      cantor = extendDerivation (kde4Package super.cantor) {
-        patches = [ ./cantor/0001-qalculate-filename-string-type.patch ];
-      };
-
-      cervisia = kde4Package super.cervisia;
-
-      dolphin-plugins = kde4Package super.dolphin-plugins;
-
-      dragon = kde4Package super.dragon;
-
-      ffmpegthumbs = extendDerivation (kde4Package super.ffmpegthumbs) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      juk = kde4Package super.juk;
-
-      jovie = kde4Package super.jovie;
-
-      kaccessible = kde4Package super.kaccessible;
-
-      kaccounts-providers = extendDerivation super.kaccounts-providers {
-        buildInputs = [ pkgs.libaccounts-glib ];
-        # hard-coded install path
-        preConfigure = ''
-          substituteInPlace webkit-options/CMakeLists.txt \
-            --replace "/etc/signon-ui/webkit-options.d/" \
-                      "$out/etc/signon-ui/webkit-options.d/"
-        '';
-      };
-
-      kajongg = kde4Package super.kajongg;
-
-      kalzium = extendDerivation (kde4Package super.kalzium) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      kamera = kde4Package super.kamera;
-
-      kate = extendDerivation super.kate {
-        buildInputs = with scope; [
-          kconfig kguiaddons kiconthemes ki18n kinit kjobwidgets kio
-          kparts ktexteditor kwindowsystem kxmlgui
-        ];
-        nativeBuildInputs = [ scope.kdoctools ];
-      };
-
-      kcachegrind = kde4Package super.kcachegrind;
-
-      kcolorchooser = kde4Package super.kcolorchooser;
-
-      kde-base-artwork = kde4Package super.kde-base-artwork;
-
-      kde-baseapps = kde4Package super.kde-baseapps;
-
-      kde-runtime = extendDerivation (kde4Package super.kde-runtime) {
-        buildInputs = [ scope.canberra ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-        # cmake does not detect path to `ilmbase`
-        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
-        # some components of this package have been replaced in other packages
-        meta = { priority = 10; };
-      };
-
-      kde-wallpapers = kde4Package super.kde-wallpapers;
-
-      kde-workspace = extendDerivation (kde4Package super.kde-workspace) {
-        patches = [ ./kde-workspace/ksysguard-0001-disable-signalplottertest.patch ];
-        buildInputs = with scope.xorg; [
-            libxkbfile libXcomposite xcbutilimage xcbutilkeysyms xcbutilrenderutil
-        ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-        # some components of this package have been replaced in other packages
-        meta = { priority = 10; };
-      };
-
-      kdeartwork = kde4Package super.kdeartwork;
-
-      kdegraphics-mobipocket = kde4Package super.kdegraphics-mobipocket;
-
-      kdegraphics-strigi-analyzer = kde4Package super.kdegraphics-strigi-analyzer;
-
-      kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
-
-      kdelibs = extendDerivation super.kdelibs {
-        buildInputs = with scope; [ attr polkit_qt4 xsltproc xz pcre ];
-        propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-        propagatedNativeBuildInputs = with scope; [
-          automoc4 cmake perl sharedmimeinfo
-        ];
-
-        patches = [ ./kdelibs/polkit-install.patch ];
-
-        # cmake does not detect path to `ilmbase`
-        NIX_CFLAGS_COMPILE = "-I${scope.ilmbase}/include/OpenEXR";
-
-        cmakeFlags = [
-          "-DDOCBOOKXML_CURRENTDTD_DIR=${scope.docbook_xml_dtd_42}/xml/dtd/docbook"
-          "-DDOCBOOKXSL_DIR=${scope.docbook_xsl}/xml/xsl/docbook"
-          "-DHUPNP_ENABLED=ON"
-          "-DWITH_SOLID_UDISKS2=ON"
-          "-DKDE_DEFAULT_HOME=.kde"
-        ];
-      };
-
-      kdenetwork-filesharing = kde4Package super.kdenetwork-filesharing;
-
-      kdenetwork-strigi-analyzers = kde4Package super.kdenetwork-strigi-analyzers;
-
-      kdenlive = extendDerivation super.kdenlive { buildInputs = [ scope.mlt ]; };
-
-      kdepim = extendDerivation (kde4Package super.kdepim) {
-        buildInputs = with scope; [ gpgme assuan ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      kdepim-runtime = kde4Package super.kdepim-runtime;
-
-      kdepimlibs = extendDerivation (kde4Package super.kdepimlibs) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      kdesdk-kioslaves = kde4Package super.kdesdk-kioslaves;
-
-      kdesdk-strigi-analyzers = kde4Package super.kdesdk-strigi-analyzers;
-
-      kdesdk-thumbnailers =
-        extendDerivation (kde4Package super.kdesdk-thumbnailers) {
-          nativeBuildInputs = [ scope.gettext ];
-        };
-
-      kdf = kde4Package super.kdf;
-
-      kfloppy = kde4Package super.kfloppy;
-
-      kgamma = kde4Package super.kgamma;
-
-      kget = kde4Package super.kget;
-
-      kgoldrunner = kde4Package super.kgoldrunner;
-
-      kgpg = extendDerivation (kde4Package super.kgpg) {
-        buildInputs = [ scope.boost ];
-      };
-
-      khangman = extendDerivation super.khangman { buildInputs = [ scope.kio ]; };
-
-      kigo = kde4Package super.kigo;
-
-      kiriki = kde4Package super.kiriki;
-
-      klickety = kde4Package super.klickety;
-
-      kmag = kde4Package super.kmag;
-
-      kmahjongg = kde4Package super.kmahjongg;
-
-      kmix = extendDerivation super.kmix {
-        nativeBuildInputs = [ scope.pkgconfig ];
-        cmakeFlags = [ "-DKMIX_KF5_BUILD=ON" ];
-      };
-
-      kmousetool = extendDerivation (kde4Package super.kmousetool) {
-        buildInputs = with scope.xorg; [ libXtst libXt ];
-      };
-
-      kmouth = kde4Package super.kmouth;
-
-      knavalbattle = kde4Package super.knavalbattle;
-
-      kolf = kde4Package super.kolf;
-
-      kolourpaint = kde4Package super.kolourpaint;
-
-      konquest = kde4Package super.konquest;
-
-      kopete = kde4Package super.kopete;
-
-      kppp = kde4Package super.kppp;
-
-      kqtquickcharts = kde4Package super.kqtquickcharts;
-
-      krdc = kde4Package super.krdc;
-
-      kremotecontrol = extendDerivation (kde4Package super.kremotecontrol) {
-        buildInputs = [ scope.xorg.libXtst ];
-      };
-
-      kreversi = kde4Package super.kreversi;
-
-      krfb = extendDerivation (kde4Package super.krfb) {
-        buildInputs = with scope; [ xorg.libXtst ktp-common-internals ];
-      };
-
-      ksaneplugin = kde4Package super.ksaneplugin;
-
-      kscd = kde4Package super.kscd;
-
-      ksirk = kde4Package super.ksirk;
-
-      ksnakeduel = kde4Package super.ksnakeduel;
-
-      ksnapshot = kde4Package super.ksnapshot;
-
-      kspaceduel = kde4Package super.kspaceduel;
-
-      kstars = extendDerivation super.kstars {
-        buildInputs = with scope; [ kparts cfitsio ];
-      };
-
-      ksudoku = kde4Package super.ksudoku;
-
-      ksystemlog = kde4Package super.ksystemlog;
-
-      ktp-accounts-kcm = extendDerivation super.ktp-accounts-kcm {
-        buildInputs = [ scope.libaccounts-glib ];
-      };
-
-      ktp-common-internals = extendDerivation super.ktp-common-internals {
-        buildInputs = with scope; [ kdelibs4support kparts libotr ];
-      };
-
-      ktp-text-ui = extendDerivation super.ktp-text-ui {
-        buildInputs = [ scope.kdbusaddons ];
-      };
-
-      ktuberling = kde4Package super.ktuberling;
-
-      ktux = kde4Package super.ktux;
-
-      kubrick = kde4Package super.kubrick;
-
-      kuser = kde4Package super.kuser;
-
-      kwalletmanager = kde4Package super.kwalletmanager;
-
-      lokalize = extendDerivation super.lokalize {
-        buildInputs = [ scope.kdbusaddons ];
-      };
-
-      libkcddb = kde4Package super.libkcddb;
-
-      libkcompactdisc = kde4Package super.libkcompactdisc;
-
-      libkdcraw = extendDerivation super.libkdcraw {
-        buildInputs = with scope; [ kdelibs libraw ];
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      libkdeedu = kde4Package super.libkdeedu;
-
-      libkexiv2 = extendDerivation super.libkexiv2 {
-        buildInputs = with scope; [ exiv2 kdelibs ];
-      };
-
-      libkface = extendDerivation super.libkface {
-        buildInputs = with scope; [ kdelibs opencv ];
-      };
-
-      libkgeomap = extendDerivation (kde4Package super.libkgeomap) {
-        cmakeFlags =
-          [ "-DCMAKE_MODULE_PATH=${scope.marble}/share/apps/cmake/modules" ];
-      };
-
-      libkipi = extendDerivation super.libkipi {
-        buildInputs = [ scope.kdelibs ];
-      };
-
-      libksane = extendDerivation super.libksane {
-        buildInputs = with scope; [ kdelibs saneBackends];
-      };
-
-      lskat = kde4Package super.lskat;
-
-      marble = kde4Package super.marble;
-
-      mplayerthumbs = kde4Package super.mplayerthumbs;
-
-      okular = extendDerivation (kde4Package super.okular) {
-        nativeBuildInputs = [ scope.pkgconfig ];
-      };
-
-      pairs = kde4Package super.pairs;
-
-      palapeli = kde4Package super.palapeli;
-
-      picmi = kde4Package super.picmi;
-
-      poxml = kde4Package super.poxml;
-
-      rocs = extendDerivation super.rocs {
-        buildInputs = [ scope.kdelibs4support ];
-      };
-
-      signon-kwallet-extension = extendDerivation super.signon-kwallet-extension {
-        buildInputs = [ scope.signonqt5 ];
-        preConfigure = ''
-          sed -i src/CMakeLists.txt \
-              -e "s,\''${SIGNONEXTENSION_PLUGINDIR},$out/lib/signon/extensions,"
-        '';
-      };
-
-      superkaramba = kde4Package super.superkaramba;
-
-      svgpart = kde4Package super.svgpart;
-
-      sweeper = kde4Package super.sweeper;
-
-      umbrello = kde4Package super.umbrello;
-
-      zeroconf-ioslave = kde4Package super.zeroconf-ioslave;
-
-    };
-
-in self
diff --git a/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch b/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch
deleted file mode 100644
index cd19b7e2d72..00000000000
--- a/pkgs/applications/kde-apps-15.04/kde-workspace/ksysguard-0001-disable-signalplottertest.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 18:55:44 -0500
-Subject: [PATCH] ksysguard disable signalplottertest
-
----
- libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
-index d472fd7..f178b71 100644
---- a/libs/ksysguard/tests/CMakeLists.txt
-+++ b/libs/ksysguard/tests/CMakeLists.txt
-@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
- set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
- kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
- target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KGraphicsSignalPlotter benchmark
--set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
--kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
--target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KSignalPlotter unit test
--set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
--kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
--target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
--
--
--
--
--- 
-2.5.0
-
diff --git a/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/applications/kde-apps-15.04/kdelibs/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/applications/kde-apps-15.04/kf5-renames.json b/pkgs/applications/kde-apps-15.04/kf5-renames.json
deleted file mode 100644
index 4da5f8272ee..00000000000
--- a/pkgs/applications/kde-apps-15.04/kf5-renames.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "kf5widgetsaddons": "kwidgetsaddons",
-    "kf5texteditor": "ktexteditor",
-    "kf5designerplugin": "kdesignerplugin",
-    "kf5bookmarks": "kbookmarks",
-    "kf5frameworkintegration": "frameworkintegration",
-    "kf5package": "kpackage",
-    "kf5archive": "karchive",
-    "kf5plasma": "plasma-framework",
-    "kf5kcmutils": "kcmutils",
-    "kf5configwidgets": "kconfigwidgets",
-    "ctest": "attica",
-    "kf5kio": "kio",
-    "kf5networkmanagerqt": "networkmanager-qt",
-    "kf5coreaddons": "kcoreaddons",
-    "kf5guiaddons": "kguiaddons",
-    "kf5jobwidgets": "kjobwidgets",
-    "kf5modemmanagerqt": "modemmanager-qt",
-    "kf5runner": "krunner",
-    "kf5globalaccel": "kglobalaccel",
-    "kf5dbusaddons": "kdbusaddons",
-    "kf5crash": "kcrash",
-    "kf5itemviews": "kitemviews",
-    "kf5doctools": "kdoctools",
-    "kf5i18n": "ki18n",
-    "kf5webkit": "kdewebkit",
-    "kf5newstuff": "knewstuff",
-    "kded": "kded",
-    "kf5notifications": "knotifications",
-    "kf5activitiesexperimentalstats": "kactivities",
-    "kf5dnssd": "kdnssd",
-    "kf5notifyconfig": "knotifyconfig",
-    "kf5iconthemes": "kiconthemes",
-    "kf5js": "kjs",
-    "kf5kde4support": "kdelibs4support",
-    "kf5parts": "kparts",
-    "backend": "plasma-framework",
-    "kf5completion": "kcompletion",
-    "kf5threadweaver": "threadweaver",
-    "kf5mediaplayer": "kmediaplayer",
-    "kf5plasmaquick": "plasma-framework",
-    "kf5wallet": "kwallet",
-    "kf5xmlgui": "kxmlgui",
-    "kf5attica": "attica",
-    "kf5declarative": "kdeclarative",
-    "kf5config": "kconfig",
-    "kf5init": "kinit",
-    "kf5textwidgets": "ktextwidgets",
-    "kf5jsembed": "kjsembed",
-    "kf5codecs": "kcodecs",
-    "kf5service": "kservice",
-    "kf5sonnet": "sonnet",
-    "kf5kdelibs4support": "kdelibs4support",
-    "kf5pty": "kpty",
-    "kf5solid": "solid",
-    "kf5auth": "kauth",
-    "ecm": "extra-cmake-modules",
-    "kf5activities": "kactivities",
-    "kf5plotting": "kplotting",
-    "kf5people": "kpeople",
-    "kf5emoticons": "kemoticons",
-    "kf5kross": "kross",
-    "kf5su": "kdesu",
-    "kf5khtml": "khtml",
-    "kf5unitconversion": "kunitconversion",
-    "kf5idletime": "kidletime",
-    "kf5windowsystem": "kwindowsystem",
-    "kf5xmlrpcclient": "kxmlrpcclient",
-    "kf5itemmodels": "kitemmodels"
-}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/packages.json b/pkgs/applications/kde-apps-15.04/packages.json
deleted file mode 100644
index fef1a4610bf..00000000000
--- a/pkgs/applications/kde-apps-15.04/packages.json
+++ /dev/null
@@ -1,5693 +0,0 @@
-{
-    "libkexiv2": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkexiv2-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkexiv2-15.04.3.tar.xz",
-            "name": "libkexiv2-15.04.3.tar.xz",
-            "sha256": "0f5cfkdlqmngpj0sr9i6w2n57jgnhj6j6gvr8cc26n11zrdv9w04"
-        },
-        "buildInputs": [
-            "exiv2",
-            "kde4"
-        ]
-    },
-    "kde-l10n-bg": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-bg-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-bg-15.04.3.tar.xz",
-            "name": "kde-l10n-bg-15.04.3.tar.xz",
-            "sha256": "1s2qm9dlih7yfs83pywkn1q5mk9xik70rmzqvp1fj0zj66gxhf9i"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kqtquickcharts": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kqtquickcharts-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kqtquickcharts-15.04.3.tar.xz",
-            "name": "kqtquickcharts-15.04.3.tar.xz",
-            "sha256": "1fmyyiy2ahxxbf9cy5aqpb5zvcqk0yrig9h586hzhw028mdblj5a"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "palapeli": {
-        "nativeBuildInputs": [
-            "cmake",
-            "qvoronoi_executable"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "palapeli-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/palapeli-15.04.3.tar.xz",
-            "name": "palapeli-15.04.3.tar.xz",
-            "sha256": "04l94nwwzqgsf54hg0yrbmv5fc2lljcgpxg4fcfbp8j58ypqv6kq"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames",
-            "sharedmimeinfo"
-        ]
-    },
-    "kmahjongg": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmahjongg-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmahjongg-15.04.3.tar.xz",
-            "name": "kmahjongg-15.04.3.tar.xz",
-            "sha256": "1066qmvkxzi83mnd736ldfqm6qmdwwj7bw1daixfarkr2mws7i51"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames",
-            "libkmahjongg"
-        ]
-    },
-    "analitza": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [
-            "qt5core"
-        ],
-        "name": "analitza-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/analitza-15.04.3.tar.xz",
-            "name": "analitza-15.04.3.tar.xz",
-            "sha256": "0ljydfchs0928damms87k5v049w9g021k42y1a000z3z09154rm2"
-        },
-        "buildInputs": [
-            "ecm",
-            "eigen3",
-            "glew",
-            "opengl",
-            "qt5",
-            "qt5opengl",
-            "qt5qml",
-            "qt5quick",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets",
-            "qt5xml"
-        ]
-    },
-    "kfourinline": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kfourinline-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kfourinline-15.04.3.tar.xz",
-            "name": "kfourinline-15.04.3.tar.xz",
-            "sha256": "07rxjp7i9nhgy57zrh21qmc8352b915ykny6jsds80jrc2fl8hbs"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5declarative",
-            "kf5dnssd",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemmodels",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5xmlgui",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "juk": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "juk-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/juk-15.04.3.tar.xz",
-            "name": "juk-15.04.3.tar.xz",
-            "sha256": "1zdax89bzpmxs6yi196ybd805y9k6p7cgnnn9c7kba35zn96wj91"
-        },
-        "buildInputs": [
-            "kde4",
-            "taglib",
-            "tunepimp"
-        ]
-    },
-    "kde-l10n-id": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-id-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-id-15.04.3.tar.xz",
-            "name": "kde-l10n-id-15.04.3.tar.xz",
-            "sha256": "1rhn68s7zxaifm92i33ik99hc51p242hpqr4d0pdsgwnjbp2n76w"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-wallpapers": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-wallpapers-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-wallpapers-15.04.3.tar.xz",
-            "name": "kde-wallpapers-15.04.3.tar.xz",
-            "sha256": "1s2kgxx97jvl2xsnpz7cqzpg22j1mvybbvv793gpa8awsfsvhddw"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "libkipi": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkipi-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkipi-15.04.3.tar.xz",
-            "name": "libkipi-15.04.3.tar.xz",
-            "sha256": "05ryh1lkghlkn7877k5nspmrny1ijx0vgwimv4bmlc6faifpgfjx"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "artikulate": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "artikulate-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/artikulate-15.04.3.tar.xz",
-            "name": "artikulate-15.04.3.tar.xz",
-            "sha256": "17nmlh58vxlidgw2g060kvpscch14813zcpzhdykq0mr3293a05z"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdeclarative",
-            "qtgstreamer"
-        ]
-    },
-    "kde-l10n-it": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-it-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-it-15.04.3.tar.xz",
-            "name": "kde-l10n-it-15.04.3.tar.xz",
-            "sha256": "1azijn9zz650r899d1ybvlj0qmiwgsyg9m5qd7iln0hxa01fw89i"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-da": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-da-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-da-15.04.3.tar.xz",
-            "name": "kde-l10n-da-15.04.3.tar.xz",
-            "sha256": "182dyyx7knny4rs19aiwxd19c355z2fm93psck0ja4rgwhs1qxr3"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-km": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-km-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-km-15.04.3.tar.xz",
-            "name": "kde-l10n-km-15.04.3.tar.xz",
-            "sha256": "0f9wkks5mrh9ap8810d9k46dbhqvhn6g8wwfb777iss18jx6g8jd"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-ca_valencia": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ca_valencia-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ca@valencia-15.04.3.tar.xz",
-            "name": "kde-l10n-ca_valencia-15.04.3.tar.xz",
-            "sha256": "0h21x45hbm0iahf3c8qjfc9cdx5z36js40bqr5klzm7xvwpc596p"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-wa": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-wa-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-wa-15.04.3.tar.xz",
-            "name": "kde-l10n-wa-15.04.3.tar.xz",
-            "sha256": "10lidmp54db9f8f3xzf2samvi6s0mck0azhyyiz17amcrfj28nkp"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "libkomparediff2": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkomparediff2-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkomparediff2-15.04.3.tar.xz",
-            "name": "libkomparediff2-15.04.3.tar.xz",
-            "sha256": "1i9y5qjxcg5yl5q8ldczy3cssn3rw9p04wcjqx347faqv3dy4nxf"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5codecs",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5i18n",
-            "kf5kio",
-            "kf5parts",
-            "kf5xmlgui",
-            "qt5core",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kwalletmanager": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kwalletmanager-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kwalletmanager-15.04.3.tar.xz",
-            "name": "kwalletmanager-15.04.3.tar.xz",
-            "sha256": "1h5c4vjspzw29j0xqlwaxpdk7k3n0zlkjram25hy3c3vs40hihil"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "ktp-auth-handler": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-auth-handler-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-auth-handler-15.04.3.tar.xz",
-            "name": "ktp-auth-handler-15.04.3.tar.xz",
-            "sha256": "0782lzh3ykk50cpdrh5djvxlgsp88hirbhivdpnwp8bcck3iiha9"
-        },
-        "buildInputs": [
-            "accountsqt5",
-            "ecm",
-            "kaccounts",
-            "kf5",
-            "kf5i18n",
-            "kf5kio",
-            "kf5wallet",
-            "kf5webkit",
-            "kf5widgetsaddons",
-            "ktp",
-            "qca-qt5",
-            "qca-qt5-ossl",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5gui",
-            "qt5network",
-            "signonqt5",
-            "telepathyqt5"
-        ]
-    },
-    "kde-l10n-ga": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ga-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ga-15.04.3.tar.xz",
-            "name": "kde-l10n-ga-15.04.3.tar.xz",
-            "sha256": "1h83illxc04i0m116rxy8x23s22fksmxb9kaimn3bglbcd5jgi95"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ksnapshot": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksnapshot-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksnapshot-15.04.3.tar.xz",
-            "name": "ksnapshot-15.04.3.tar.xz",
-            "sha256": "00mj98bdbldw9klfw7qd332migh0gfzdy7pq89am8n2rbp84a0jw"
-        },
-        "buildInputs": [
-            "kde4",
-            "kipi"
-        ]
-    },
-    "kreversi": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kreversi-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kreversi-15.04.3.tar.xz",
-            "name": "kreversi-15.04.3.tar.xz",
-            "sha256": "0nhg2jz0y79yhq68ax10l06sh1dkwn1mjh2qmkhsc6ks80wfq0lp"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdeclarative",
-            "kdegames"
-        ]
-    },
-    "kmix": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmix-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmix-15.04.3.tar.xz",
-            "name": "kmix-15.04.3.tar.xz",
-            "sha256": "1sjh9a4xp981h91ydlxbsxhz0sxdd5ajwn5zn39r3hnfnxh8vx9l"
-        },
-        "buildInputs": [
-            "alsa",
-            "canberra",
-            "ecm",
-            "glib2",
-            "kde4",
-            "kf5",
-            "kf5configwidgets",
-            "kf5dbusaddons",
-            "kf5globalaccel",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kcmutils",
-            "kf5kdelibs4support",
-            "kf5xmlgui",
-            "phonon",
-            "pulseaudio"
-        ]
-    },
-    "signon-kwallet-extension": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "signon-kwallet-extension-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/signon-kwallet-extension-15.04.3.tar.xz",
-            "name": "signon-kwallet-extension-15.04.3.tar.xz",
-            "sha256": "07waf72xwgpdska42ydi9pifs2d2l7idaf0jwamrqrwf5s19vdf0"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5wallet",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5test",
-            "signonextension"
-        ]
-    },
-    "kde-l10n-es": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-es-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-es-15.04.3.tar.xz",
-            "name": "kde-l10n-es-15.04.3.tar.xz",
-            "sha256": "0nqz9lal9f2s0ryydyy0xxh53q2pxjmpbhkad1l9107shjsy9ry7"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kompare": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kompare-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kompare-15.04.3.tar.xz",
-            "name": "kompare-15.04.3.tar.xz",
-            "sha256": "1dl0sddskmxm2h6qshgmv06glk740ih0ldw6d9vvlk9a4mnpk3yw"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5codecs",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5iconthemes",
-            "kf5jobwidgets",
-            "kf5parts",
-            "kf5texteditor",
-            "kf5widgetsaddons",
-            "libkomparediff2",
-            "qt5",
-            "qt5core",
-            "qt5printsupport",
-            "qt5widgets"
-        ]
-    },
-    "kdiamond": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdiamond-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdiamond-15.04.3.tar.xz",
-            "name": "kdiamond-15.04.3.tar.xz",
-            "sha256": "066bf4vjcfnidj7yw04g0wdz09wqskvbjskljwndgx178bwb1zn1"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kdegames",
-            "kf5notifyconfig",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5widgets"
-        ]
-    },
-    "kaccounts-integration": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [
-            "accountsqt5",
-            "kf5coreaddons",
-            "qt5widgets",
-            "signonqt5"
-        ],
-        "name": "kaccounts-integration-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kaccounts-integration-15.04.3.tar.xz",
-            "name": "kaccounts-integration-15.04.3.tar.xz",
-            "sha256": "1rx957mbx8fjy0i9al3axpwsqkydgzp2ksqa0lisjcp59sw93zsf"
-        },
-        "buildInputs": [
-            "accountsqt5",
-            "ecm",
-            "kf5",
-            "kf5akonadi",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5wallet",
-            "kf5widgetsaddons",
-            "qt5",
-            "qt5core",
-            "qt5test",
-            "qt5widgets",
-            "signonqt5"
-        ]
-    },
-    "kde-l10n-gl": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-gl-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-gl-15.04.3.tar.xz",
-            "name": "kde-l10n-gl-15.04.3.tar.xz",
-            "sha256": "09j27a65nbk4l96yjhfpk409va7vk5cq7s77h6wpy8pa1vdgl944"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kwordquiz": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kwordquiz-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kwordquiz-15.04.3.tar.xz",
-            "name": "kwordquiz-15.04.3.tar.xz",
-            "sha256": "00r977c2pi7v512j1h7lr3vs4mxqz6cvfz94a5nicp7khnqy9ysq"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5crash",
-            "kf5declarative",
-            "kf5doctools",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5sonnet",
-            "kf5xmlgui",
-            "libkeduvocdocument",
-            "phonon4qt5",
-            "qt5",
-            "qt5core",
-            "qt5printsupport",
-            "qt5widgets"
-        ]
-    },
-    "kigo": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kigo-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kigo-15.04.3.tar.xz",
-            "name": "kigo-15.04.3.tar.xz",
-            "sha256": "0zhs5lhmd44kzr50ccb9f0dbdpnb2g2cgc7fwr4jsccfd5yz6974"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "ktp-desktop-applets": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-desktop-applets-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-desktop-applets-15.04.3.tar.xz",
-            "name": "ktp-desktop-applets-15.04.3.tar.xz",
-            "sha256": "038d7wlgrzwyyldxb1iq2yha8plkmxwvmi7wf6gs8q1nwy7dfwvw"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5plasma",
-            "kf5windowsystem",
-            "qt5",
-            "qt5qml"
-        ]
-    },
-    "kolourpaint": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kolourpaint-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kolourpaint-15.04.3.tar.xz",
-            "name": "kolourpaint-15.04.3.tar.xz",
-            "sha256": "0lyik49wpa9wngj7y2yraklkl2fl1g7jnbyjzcircczaq9s644fk"
-        },
-        "buildInputs": [
-            "kde4",
-            "qimageblitz"
-        ]
-    },
-    "kapptemplate": {
-        "nativeBuildInputs": [
-            "cmake",
-            "rbkconfig_compiler4",
-            "rbuic4",
-            "xsltproc_executable"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kapptemplate-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kapptemplate-15.04.3.tar.xz",
-            "name": "kapptemplate-15.04.3.tar.xz",
-            "sha256": "0hs063g2khrghrglwy7r1amrj46xr39dlh1gnbbfpadc5fmk2x6s"
-        },
-        "buildInputs": [
-            "ecm",
-            "kde4",
-            "kdepimlibs",
-            "kf5",
-            "kf5archive",
-            "kf5completion",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kio",
-            "kf5plasma",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5gui",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kdegraphics-thumbnailers": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdegraphics-thumbnailers-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdegraphics-thumbnailers-15.04.3.tar.xz",
-            "name": "kdegraphics-thumbnailers-15.04.3.tar.xz",
-            "sha256": "07cc7mp1c59hccn30670yzvmbr14f78whyxz5dwcwxpbcgaklq1a"
-        },
-        "buildInputs": [
-            "kdcraw",
-            "kde4",
-            "kexiv2"
-        ]
-    },
-    "kde-l10n-pt_BR": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-pt_BR-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pt_BR-15.04.3.tar.xz",
-            "name": "kde-l10n-pt_BR-15.04.3.tar.xz",
-            "sha256": "0yyfk4whymblp4gy0zxvyri254x898lmg78n07amzddxz22dml5f"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ksystemlog": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksystemlog-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksystemlog-15.04.3.tar.xz",
-            "name": "ksystemlog-15.04.3.tar.xz",
-            "sha256": "117xkjgqrivyjyzh4jz3z5xvcj2l1f3x665kgc3rrw4y4zpwwcnm"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kuser": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kuser-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kuser-15.04.3.tar.xz",
-            "name": "kuser-15.04.3.tar.xz",
-            "sha256": "1q1f9l3lwcszpfiyfjaf7cjbw325cfjpbkc6rfvl3jp157w5nr4m"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdepimlibs"
-        ]
-    },
-    "libksane": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libksane-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libksane-15.04.3.tar.xz",
-            "name": "libksane-15.04.3.tar.xz",
-            "sha256": "0i5ynf3g2i6vlhzl5cga8imprblmdz418cfkznwkw1yj35g236c3"
-        },
-        "buildInputs": []
-    },
-    "knavalbattle": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "knavalbattle-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/knavalbattle-15.04.3.tar.xz",
-            "name": "knavalbattle-15.04.3.tar.xz",
-            "sha256": "10nri1fvi057cvb6qwlhqyv9x1rjavsdhhipgrdhqpzmm0y84sd1"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kaccessible": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kaccessible-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kaccessible-15.04.3.tar.xz",
-            "name": "kaccessible-15.04.3.tar.xz",
-            "sha256": "1a413cv32xsqx9aalkrqh3ybw6phvh4ckgzr15kxca3lc78zw00s"
-        },
-        "buildInputs": [
-            "kde4",
-            "qt4",
-            "speechd",
-            "x11"
-        ]
-    },
-    "knetwalk": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "knetwalk-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/knetwalk-15.04.3.tar.xz",
-            "name": "knetwalk-15.04.3.tar.xz",
-            "sha256": "1bmn1avq2xpvrvaryzl25izdh7xn1c5pdxll51kj7l017590pa43"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kdewebdev": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdewebdev-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdewebdev-15.04.3.tar.xz",
-            "name": "kdewebdev-15.04.3.tar.xz",
-            "sha256": "05wxb6swr3dpjw8vvsz9ylznx2rcjg2glzj9blnckkd7wl35r3q1"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdepimlibs",
-            "libtidy",
-            "ruby",
-            "zlib"
-        ]
-    },
-    "kget": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kget-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kget-15.04.3.tar.xz",
-            "name": "kget-15.04.3.tar.xz",
-            "sha256": "17wlqx55r3yrnl149rydmmdksll9wg40dnqqq45knv2gx9mdxlwg"
-        },
-        "buildInputs": [
-            "boost",
-            "kde4",
-            "kde4workspace",
-            "ktorrent",
-            "libmms",
-            "nepomukcore",
-            "nepomukwidgets",
-            "qca2",
-            "qgpgme",
-            "shareddesktopontologies",
-            "soprano",
-            "sqlite"
-        ]
-    },
-    "kalzium": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kalzium-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kalzium-15.04.3.tar.xz",
-            "name": "kalzium-15.04.3.tar.xz",
-            "sha256": "0hdffpyhg8dk4hhnkg0isizrdz65wbgndr6zja733p7n3gsrias6"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdewin32"
-        ]
-    },
-    "marble": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "marble-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/marble-15.04.3.tar.xz",
-            "name": "marble-15.04.3.tar.xz",
-            "sha256": "1fjbfarf8zp1d7ailvx017qb28sjk318r2jdb7pz5x8x4yl6b82s"
-        },
-        "buildInputs": [
-            "kde4",
-            "libgps",
-            "liblocation",
-            "libshp",
-            "libwlocate",
-            "perl",
-            "phonon",
-            "protobuf",
-            "pyqt4",
-            "pythonlibrary",
-            "qextserialport",
-            "qt4",
-            "qt5concurrent",
-            "qt5core",
-            "qt5designer",
-            "qt5network",
-            "qt5printsupport",
-            "qt5quick",
-            "qt5script",
-            "qt5sql",
-            "qt5svg",
-            "qt5test",
-            "qt5webkitwidgets",
-            "qt5widgets",
-            "qt5xml",
-            "qtlocation",
-            "quazip",
-            "sharedmimeinfo",
-            "sip",
-            "zlib"
-        ]
-    },
-    "kig": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kig-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kig-15.04.3.tar.xz",
-            "name": "kig-15.04.3.tar.xz",
-            "sha256": "1k19pfp8b4k3spfcs70fgjhk78jkhbb7bfilyzf0ahzrjcpgp8c8"
-        },
-        "buildInputs": [
-            "boostpython",
-            "ecm",
-            "kf5archive",
-            "kf5configwidgets",
-            "kf5doctools",
-            "kf5emoticons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemmodels",
-            "kf5kdelibs4support",
-            "kf5parts",
-            "kf5texteditor",
-            "kf5xmlgui",
-            "qt5printsupport",
-            "qt5svg",
-            "qt5test"
-        ]
-    },
-    "kiten": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kiten-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kiten-15.04.3.tar.xz",
-            "name": "kiten-15.04.3.tar.xz",
-            "sha256": "0f4kmm01ikn54dy2z2lnv0kdqx7rn77mnfrwv25470h6ar4w89w1"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5archive",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5khtml",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets"
-        ]
-    },
-    "ktp-contact-list": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-contact-list-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-contact-list-15.04.3.tar.xz",
-            "name": "ktp-contact-list-15.04.3.tar.xz",
-            "sha256": "02vvp0i2bi3j7gk037pqzfhn44khln0wddwbql3kq49v4q2i5s7d"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5people",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "ktp",
-            "qt5",
-            "qt5widgets",
-            "qt5xml",
-            "telepathyqt5"
-        ]
-    },
-    "kde-l10n-pt": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-pt-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pt-15.04.3.tar.xz",
-            "name": "kde-l10n-pt-15.04.3.tar.xz",
-            "sha256": "0gy7y8xns0kxl7n8wa073xypnyvdyq56gz1ahj0k8mpadfak6vk0"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-fr": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-fr-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fr-15.04.3.tar.xz",
-            "name": "kde-l10n-fr-15.04.3.tar.xz",
-            "sha256": "0z1ga48y5zih85cdmb165kyxm9z7ydhxykj4ci40ckdqiwzjhkag"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kmouth": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmouth-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmouth-15.04.3.tar.xz",
-            "name": "kmouth-15.04.3.tar.xz",
-            "sha256": "1ak1nvc0y0yi1gd9kdhhjw64j6fkf7bw11nnxxhpq9gvgmyyfm7r"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "filelight": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "filelight-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/filelight-15.04.3.tar.xz",
-            "name": "filelight-15.04.3.tar.xz",
-            "sha256": "05ak727bkij70zc5lr458snq346ndc32r5icjz6jgmyxqxsdk17d"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kio",
-            "kf5parts",
-            "kf5solid",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5script",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kdesdk-kioslaves": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdesdk-kioslaves-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdesdk-kioslaves-15.04.3.tar.xz",
-            "name": "kdesdk-kioslaves-15.04.3.tar.xz",
-            "sha256": "0f5cjlssylgr42bnrsdaw64xl17zr0sl989digqg47hrd7np1zf7"
-        },
-        "buildInputs": [
-            "kde4",
-            "perl",
-            "svn"
-        ]
-    },
-    "kde-baseapps": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-baseapps-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-baseapps-15.04.3.tar.xz",
-            "name": "kde-baseapps-15.04.3.tar.xz",
-            "sha256": "1inkzj984qy0ab4ks5m002phs6a00cjfn25gri9jglcqn3jzy85a"
-        },
-        "buildInputs": [
-            "baloo",
-            "baloowidgets",
-            "glib2",
-            "kactivities",
-            "kde4",
-            "kfilemetadata",
-            "libtidy",
-            "x11",
-            "zlib"
-        ]
-    },
-    "ksirk": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksirk-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksirk-15.04.3.tar.xz",
-            "name": "ksirk-15.04.3.tar.xz",
-            "sha256": "1km9423k6hdkb58and8sqz0wwyab8k6k4jg534xppjph7x8a3rm0"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames",
-            "qca2"
-        ]
-    },
-    "killbots": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "killbots-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/killbots-15.04.3.tar.xz",
-            "name": "killbots-15.04.3.tar.xz",
-            "sha256": "10pvgwmc2s8cz6cz7lr3gracia654qzwjh3b01z3sha7gjfd5ly2"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kjumpingcube": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kjumpingcube-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kjumpingcube-15.04.3.tar.xz",
-            "name": "kjumpingcube-15.04.3.tar.xz",
-            "sha256": "0ls4v7ip4vh5h9jn9966bwr00aic64psmwnp96j6zmvrlkmz5saf"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5itemmodels",
-            "kf5kdegames",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-sr": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-sr-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sr-15.04.3.tar.xz",
-            "name": "kde-l10n-sr-15.04.3.tar.xz",
-            "sha256": "03mpd7cf4zh144jwl0lzv68jbl2805idx68a2zfy50jifbx9k8qa"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-et": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-et-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-et-15.04.3.tar.xz",
-            "name": "kde-l10n-et-15.04.3.tar.xz",
-            "sha256": "10jqj02dz1bklabrda8h0hd6gvfxhfxa7mfl7zdn142xz6qs1194"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kmag": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmag-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmag-15.04.3.tar.xz",
-            "name": "kmag-15.04.3.tar.xz",
-            "sha256": "1k2jnqjm1ky6mgqlyz47c4n6ivqlnyva25siyrx466anzbjn5ffp"
-        },
-        "buildInputs": [
-            "kde4",
-            "qaccessibilityclient"
-        ]
-    },
-    "kdenetwork-strigi-analyzers": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdenetwork-strigi-analyzers-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdenetwork-strigi-analyzers-15.04.3.tar.xz",
-            "name": "kdenetwork-strigi-analyzers-15.04.3.tar.xz",
-            "sha256": "04xikfhzdl56vkz9zsk1whcikwdwqbs72y9mam40wd9qr0pzfxcw"
-        },
-        "buildInputs": [
-            "boost",
-            "kde4",
-            "strigi"
-        ]
-    },
-    "kcharselect": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kcharselect-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kcharselect-15.04.3.tar.xz",
-            "name": "kcharselect-15.04.3.tar.xz",
-            "sha256": "12p85b7yplmm4v8v9znq0r4p8y3m2f088brdvlxgmb04x5158m9s"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets"
-        ]
-    },
-    "kdegraphics-strigi-analyzer": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdegraphics-strigi-analyzer-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdegraphics-strigi-analyzer-15.04.3.tar.xz",
-            "name": "kdegraphics-strigi-analyzer-15.04.3.tar.xz",
-            "sha256": "1mya983vbkxa1q0lwn7gz0fc52y8cdkpadkvfnzal5kpbwvbh96r"
-        },
-        "buildInputs": [
-            "kde4",
-            "openexr",
-            "strigi",
-            "tiff"
-        ]
-    },
-    "libkmahjongg": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [
-            "kf5configwidgets",
-            "qt5gui"
-        ],
-        "name": "libkmahjongg-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkmahjongg-15.04.3.tar.xz",
-            "name": "libkmahjongg-15.04.3.tar.xz",
-            "sha256": "0b0zrb3bbkphqq96gc8y5xn28g19l5c60pr0s1h5rmm70021ixk6"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5i18n",
-            "kf5widgetsaddons",
-            "qt5",
-            "qt5core",
-            "qt5gui",
-            "qt5svg",
-            "qt5test"
-        ]
-    },
-    "ktp-kded-module": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-kded-module-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-kded-module-15.04.3.tar.xz",
-            "name": "ktp-kded-module-15.04.3.tar.xz",
-            "sha256": "1zr0h1yzn9m4b4xld8lp5dx4xx6phw6fnp0z3i27mjbr0a1n6qa1"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5idletime",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5notifications",
-            "kf5widgetsaddons",
-            "ktp",
-            "qt5",
-            "qt5concurrent",
-            "qt5network",
-            "qt5sql",
-            "qt5widgets"
-        ]
-    },
-    "ktuberling": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktuberling-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktuberling-15.04.3.tar.xz",
-            "name": "ktuberling-15.04.3.tar.xz",
-            "sha256": "0alxdrjzalngg2y1fyzcsgglsqjk4gcihkndmr25s0c663fzdrrn"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kcron": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kcron-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kcron-15.04.3.tar.xz",
-            "name": "kcron-15.04.3.tar.xz",
-            "sha256": "0kwhzfmlgcj3fbi9kj08lnikz37z3gpywfcx940d4gw4n9hg26av"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kio",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5printsupport",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-nl": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-nl-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nl-15.04.3.tar.xz",
-            "name": "kde-l10n-nl-15.04.3.tar.xz",
-            "sha256": "0id9rl05jp3ff6jd22qnfzs40dlnijsr2mkfwzvnf08h3nk6c8id"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "parley": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "parley-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/parley-15.04.3.tar.xz",
-            "name": "parley-15.04.3.tar.xz",
-            "sha256": "1lvqih1vav234jvf18z00kdd6hn8vq7pm9659bchn02j5ic110d3"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5crash",
-            "kf5docbook",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kcmutils",
-            "kf5khtml",
-            "kf5kio",
-            "kf5kross",
-            "kf5module",
-            "kf5newstuff",
-            "kf5notifications",
-            "kf5produce",
-            "kf5sonnet",
-            "kf5the",
-            "kf5xmlgui",
-            "libattica",
-            "libkeduvocdocument",
-            "libxml2",
-            "libxslt",
-            "qt5",
-            "qt5concurrent",
-            "qt5core",
-            "qt5multimedia",
-            "qt5svg",
-            "qt5test"
-        ]
-    },
-    "kgoldrunner": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kgoldrunner-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kgoldrunner-15.04.3.tar.xz",
-            "name": "kgoldrunner-15.04.3.tar.xz",
-            "sha256": "171q6v3nivr64vq2wn25hfv1zhrrmlf97rd128nxscb4qzk0zcnm"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kiriki": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kiriki-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kiriki-15.04.3.tar.xz",
-            "name": "kiriki-15.04.3.tar.xz",
-            "sha256": "14s37qs7f0qgpms1syakjj9amkwa0d1va8yrbmlwfbk5dvx953ls"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "sweeper": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "sweeper-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/sweeper-15.04.3.tar.xz",
-            "name": "sweeper-15.04.3.tar.xz",
-            "sha256": "156vmxapddlbdhwpdal2s2jr8i4zbn1yccpafqnn8qf0k0384v0l"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "lokalize": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "lokalize-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/lokalize-15.04.3.tar.xz",
-            "name": "lokalize-15.04.3.tar.xz",
-            "sha256": "1dpbzcgx32n27v2k39w944dzl0i2pph84a02ck4c8864w31d0vf5"
-        },
-        "buildInputs": [
-            "ecm",
-            "hunspell",
-            "kf5",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kio",
-            "kf5kross",
-            "kf5notifications",
-            "kf5sonnet",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5script",
-            "qt5sql",
-            "qt5widgets"
-        ]
-    },
-    "kbounce": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kbounce-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kbounce-15.04.3.tar.xz",
-            "name": "kbounce-15.04.3.tar.xz",
-            "sha256": "1i0hyc3hb9qibqynkvi9n98a1gcvanw8k6rg0vngifzc3nv4750g"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-eo": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-eo-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-eo-15.04.3.tar.xz",
-            "name": "kde-l10n-eo-15.04.3.tar.xz",
-            "sha256": "0ac3mmflgnfy3qgsbl8938cf2j0961xh5vvhxwk7wp5j0y1g7nd0"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-is": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-is-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-is-15.04.3.tar.xz",
-            "name": "kde-l10n-is-15.04.3.tar.xz",
-            "sha256": "0lv7hcq6qp422y0byv8sak7wf62ws1ssmyggm6izsxaw01z6di9m"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-sl": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-sl-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sl-15.04.3.tar.xz",
-            "name": "kde-l10n-sl-15.04.3.tar.xz",
-            "sha256": "12zg0wbdrvx61qqdv11mx99ncxsnbs6ywf2qa2s5pv9ccj81zl0y"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "libkcompactdisc": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkcompactdisc-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkcompactdisc-15.04.3.tar.xz",
-            "name": "libkcompactdisc-15.04.3.tar.xz",
-            "sha256": "0xfb10zvrmvp9hxzh05mk75wd2q8c17kd28kxzy6vzsys1ml23fy"
-        },
-        "buildInputs": [
-            "alsa",
-            "kde4"
-        ]
-    },
-    "picmi": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "picmi-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/picmi-15.04.3.tar.xz",
-            "name": "picmi-15.04.3.tar.xz",
-            "sha256": "08r5k1hs4ja724d3hgq17cwjr96xqhi09l1fr1ls6hrij6vw2qaj"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames",
-            "qt4"
-        ]
-    },
-    "superkaramba": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "superkaramba-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/superkaramba-15.04.3.tar.xz",
-            "name": "superkaramba-15.04.3.tar.xz",
-            "sha256": "1qd2gi0jllqr2f3wmv5n3smljfgirray8hba5k062ka3fjl6ssqx"
-        },
-        "buildInputs": [
-            "kde4",
-            "pythonlibs",
-            "qimageblitz"
-        ]
-    },
-    "gwenview": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "gwenview-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/gwenview-15.04.3.tar.xz",
-            "name": "gwenview-15.04.3.tar.xz",
-            "sha256": "16p6dz8z63h5d6l5cjz61shpd30bawxgcasn55g6v7gk6rxdrvn2"
-        },
-        "buildInputs": [
-            "ecm",
-            "exiv2",
-            "jpeg",
-            "kf5",
-            "kf5activities",
-            "kf5baloo",
-            "kf5kdcraw",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5kipi",
-            "lcms2",
-            "phonon4qt5",
-            "png",
-            "qt5",
-            "qt5concurrent",
-            "qt5core",
-            "qt5dbus",
-            "qt5opengl",
-            "qt5script",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets",
-            "qt5x11extras",
-            "x11"
-        ]
-    },
-    "kde-l10n-fa": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-fa-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fa-15.04.3.tar.xz",
-            "name": "kde-l10n-fa-15.04.3.tar.xz",
-            "sha256": "0fslss3bz1kzjca3zy923sq8p54jyl1bvqk1qsmv3lmws2881djl"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kpat": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kpat-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kpat-15.04.3.tar.xz",
-            "name": "kpat-15.04.3.tar.xz",
-            "sha256": "08zb9r291wig1iwh3j7h493ncjfj55255f3pf5ag9nrq44ykvk11"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5declarative",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets",
-            "sharedmimeinfo"
-        ]
-    },
-    "klettres": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "klettres-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/klettres-15.04.3.tar.xz",
-            "name": "klettres-15.04.3.tar.xz",
-            "sha256": "0pqdjm5ixkfrxbp20ypgqx18wxyk0mnrmv2bqf6nk3ybwrdfb5y5"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5emoticons",
-            "kf5i18n",
-            "kf5itemmodels",
-            "kf5kdelibs4support",
-            "kf5newstuff",
-            "kf5widgetsaddons",
-            "phonon4qt5",
-            "qt5",
-            "qt5core",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kdelibs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdelibs-4.14.10",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdelibs-4.14.10.tar.xz",
-            "name": "kdelibs-4.14.10.tar.xz",
-            "sha256": "156ajl4al6s2vqyl920yxd2rrs7b77348233xa3bgg5jn2ysgx80"
-        },
-        "buildInputs": [
-            "acl",
-            "agg",
-            "aspell",
-            "automoc4",
-            "avahi",
-            "bison",
-            "blitz",
-            "bluez",
-            "bzip2",
-            "carbon",
-            "dbusmenuqt",
-            "dnssd",
-            "docbookxml",
-            "docbookxsl",
-            "eigen2",
-            "enchant",
-            "fam",
-            "ffmpeg",
-            "flac",
-            "flex",
-            "gif",
-            "gobject",
-            "grantlee",
-            "gssapi",
-            "gstreamer",
-            "hspell",
-            "hunspell",
-            "hupnp",
-            "iokit",
-            "jasper",
-            "jpeg",
-            "kde4",
-            "kde4internal",
-            "lcms",
-            "libart",
-            "libattica",
-            "libintl",
-            "libxml2",
-            "libxslt",
-            "openexr",
-            "openssl",
-            "pcre",
-            "perl",
-            "png",
-            "qca2",
-            "qimageblitz",
-            "qt4",
-            "shareddesktopontologies",
-            "sharedmimeinfo",
-            "soprano",
-            "sqlite",
-            "strigi",
-            "udev",
-            "usb",
-            "xine",
-            "xmms",
-            "zlib"
-        ]
-    },
-    "katomic": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "katomic-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/katomic-15.04.3.tar.xz",
-            "name": "katomic-15.04.3.tar.xz",
-            "sha256": "0j3khd1yiyq2y9c4rm36cf79frml7xhzb1jgxab6hshyzcr10lc3"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifyconfig",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5widgets"
-        ]
-    },
-    "kollision": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kollision-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kollision-15.04.3.tar.xz",
-            "name": "kollision-15.04.3.tar.xz",
-            "sha256": "0x45mjm6irhgrv0jmpaxa55d38h1m3c4jry5hmv8r8x4c7l7z565"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "klines": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "klines-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/klines-15.04.3.tar.xz",
-            "name": "klines-15.04.3.tar.xz",
-            "sha256": "0v5r720i996qq8hrlz8x9avrdh0dnqxbxz7h1wr4mhmz5iqj2s9c"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5service",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-ru": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ru-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ru-15.04.3.tar.xz",
-            "name": "kde-l10n-ru-15.04.3.tar.xz",
-            "sha256": "0blm1fmvx7i0dzvf46qngq7cb9p16pw93v3j4bf63r24671w40xj"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kcalc": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kcalc-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kcalc-15.04.3.tar.xz",
-            "name": "kcalc-15.04.3.tar.xz",
-            "sha256": "0hxva8l2x5v6k2ry25zzzral6cdia1ypk1iz37qfnb20myfv7x6q"
-        },
-        "buildInputs": [
-            "ecm",
-            "gmp",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5doctools",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5init",
-            "kf5notifications",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-mr": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-mr-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-mr-15.04.3.tar.xz",
-            "name": "kde-l10n-mr-15.04.3.tar.xz",
-            "sha256": "1yvjwcdsnf5pf8izb8fifsd2rsrvmkw704iw5m6yzh7fzdy6qyhg"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "lskat": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "lskat-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/lskat-15.04.3.tar.xz",
-            "name": "lskat-15.04.3.tar.xz",
-            "sha256": "188pq09afxyapwnx7bc4v5hc5224049q2nkywgnl161sl8jhb40v"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kcolorchooser": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kcolorchooser-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kcolorchooser-15.04.3.tar.xz",
-            "name": "kcolorchooser-15.04.3.tar.xz",
-            "sha256": "1rq4r3sn3rhd6whqhchzy2cvpqik43naikh8sdzinwpp968sbz0l"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kde-l10n-kk": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-kk-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-kk-15.04.3.tar.xz",
-            "name": "kde-l10n-kk-15.04.3.tar.xz",
-            "sha256": "0ywz646pv3dfbhbsijrk7l47l96hw3n7mds2zplmw5624wlfz7dn"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kblocks": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kblocks-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kblocks-15.04.3.tar.xz",
-            "name": "kblocks-15.04.3.tar.xz",
-            "sha256": "1iizgcj75ayr4ckpw85igcy8r6ia594sshgy1x5yir4i2jiaxr1m"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5itemmodels",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-lt": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-lt-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-lt-15.04.3.tar.xz",
-            "name": "kde-l10n-lt-15.04.3.tar.xz",
-            "sha256": "1y8a7py2r3b35kvjmzpw4vgzjjmfhl44bjd0qjsyh4323q6mc4lw"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-cs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-cs-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-cs-15.04.3.tar.xz",
-            "name": "kde-l10n-cs-15.04.3.tar.xz",
-            "sha256": "0pjvyhg2x85l2ns5zhhyn4ij26l3kaq7yf4nb3qh67radqm4kd3w"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kblackbox": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kblackbox-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kblackbox-15.04.3.tar.xz",
-            "name": "kblackbox-15.04.3.tar.xz",
-            "sha256": "1al2qzfy9773zqs6f98zqi110dmzlaa60a45pzfmmamjlh0nf5ay"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kdegames",
-            "kf5xmlgui",
-            "qt5",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "libkdeedu": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkdeedu-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkdeedu-15.04.3.tar.xz",
-            "name": "libkdeedu-15.04.3.tar.xz",
-            "sha256": "0sm3aqchxmv6nap003mpklk6yrkqlqrp5zlyvc6hn764mjm80mxr"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "amor": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "amor-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/amor-15.04.3.tar.xz",
-            "name": "amor-15.04.3.tar.xz",
-            "sha256": "197vvdw6zsn19j5xnddaz60xsmk6hv4846hxvqsybi3k0sldnb8f"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kde-l10n-eu": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-eu-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-eu-15.04.3.tar.xz",
-            "name": "kde-l10n-eu-15.04.3.tar.xz",
-            "sha256": "0cq453v58yw4nkj3a3zmk0994779f6ay1vvgmk8fz6ychy1sx4mw"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kamera": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kamera-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kamera-15.04.3.tar.xz",
-            "name": "kamera-15.04.3.tar.xz",
-            "sha256": "1xngcscz2cj3x292gf1fn6yigbq7nafwf4k3f2dgghb8yxnxzqrz"
-        },
-        "buildInputs": [
-            "gphoto2",
-            "kde4"
-        ]
-    },
-    "pairs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "pairs-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/pairs-15.04.3.tar.xz",
-            "name": "pairs-15.04.3.tar.xz",
-            "sha256": "1pzmxahr82rwahvcn8573qnw843nfyrqpmffngz02lj7fhxc7n9v"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "dragon": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "dragon-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/dragon-15.04.3.tar.xz",
-            "name": "dragon-15.04.3.tar.xz",
-            "sha256": "0i1zl23hsf9rykd415xjh5p2v1cmkifwljxhvqyhn1x4bv729mk1"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kmplot": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmplot-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmplot-15.04.3.tar.xz",
-            "name": "kmplot-15.04.3.tar.xz",
-            "sha256": "1ymhw5iwdksbh6il0ivcagmhv0qchxmh17bawkd20bn2yh8w9njd"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5kdelibs4support",
-            "kf5parts",
-            "kf5widgetsaddons",
-            "qt5",
-            "qt5core",
-            "qt5gui",
-            "qt5printsupport",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "kde-base-artwork": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-base-artwork-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-base-artwork-15.04.3.tar.xz",
-            "name": "kde-base-artwork-15.04.3.tar.xz",
-            "sha256": "10g3335ghz4pkyqqym8ay7lm6aw85gkk1y8bykpskyzpgv9kpc7r"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "blinken": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "blinken-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/blinken-15.04.3.tar.xz",
-            "name": "blinken-15.04.3.tar.xz",
-            "sha256": "0ngg0l75vshcw288kd1141038dq1ayggid6g9r1c6djm7is17fn0"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5dbusaddons",
-            "kf5doctools",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5core",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "konquest": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "konquest-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/konquest-15.04.3.tar.xz",
-            "name": "konquest-15.04.3.tar.xz",
-            "sha256": "092z41v548yns87n677ic3jqcjs11lya7znakw1wg8il2iq4p8ad"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kde-l10n-he": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-he-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-he-15.04.3.tar.xz",
-            "name": "kde-l10n-he-15.04.3.tar.xz",
-            "sha256": "083c5gxxgvibg5xryyh919h4sli3z129cwqi8x9bjzmqdjd1b3a7"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "bovo": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "bovo-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/bovo-15.04.3.tar.xz",
-            "name": "bovo-15.04.3.tar.xz",
-            "sha256": "0fjvxvz8f3vr8sv8grpkwyhfvbcv7hayvsvmw7f1gpiamq7m7aab"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5coreaddons",
-            "kf5declarative",
-            "kf5kdegames",
-            "kf5newstuff",
-            "kf5xmlgui",
-            "qt5",
-            "qt5concurrent",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "ktimer": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktimer-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktimer-15.04.3.tar.xz",
-            "name": "ktimer-15.04.3.tar.xz",
-            "sha256": "1pixq0nh6n4rm4pvpabrly2wxsq58a719k7fj70w6a541chsmy77"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5dbusaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kio",
-            "kf5notifications",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets"
-        ]
-    },
-    "kde-l10n-hu": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-hu-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hu-15.04.3.tar.xz",
-            "name": "kde-l10n-hu-15.04.3.tar.xz",
-            "sha256": "0ql1yh5hmzdxmr6dnzsl08rxmvgrb4zcs6rk1r0jqkcfnwlhdf53"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-ro": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ro-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ro-15.04.3.tar.xz",
-            "name": "kde-l10n-ro-15.04.3.tar.xz",
-            "sha256": "0ix4p8alq6xrsgbwv23xijcnwpd8gcf96zsd59bfpmvykxqmwpdq"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-sv": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-sv-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sv-15.04.3.tar.xz",
-            "name": "kde-l10n-sv-15.04.3.tar.xz",
-            "sha256": "0qpkl0dqw6jwb0xy1adjibhabga32hzk0rhwl75dw7bw257aka6f"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kgamma": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kgamma-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kgamma-15.04.3.tar.xz",
-            "name": "kgamma-15.04.3.tar.xz",
-            "sha256": "0wdx2xv2jkhdlbcy46ylg6c2aib4rj1gfbwc7zxwfcm52amra6a8"
-        },
-        "buildInputs": [
-            "kde4",
-            "x11"
-        ]
-    },
-    "kanagram": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kanagram-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kanagram-15.04.3.tar.xz",
-            "name": "kanagram-15.04.3.tar.xz",
-            "sha256": "18aix8r0ziprk2i8hdp6jis2i5b23q2r46x3y4lncgxs1ldgv74b"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5crash",
-            "kf5declarative",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5sonnet",
-            "libkeduvocdocument",
-            "qt5",
-            "qt5core",
-            "qt5opengl",
-            "qt5optional_components",
-            "qt5qml",
-            "qt5quick",
-            "qt5texttospeech"
-        ]
-    },
-    "kstars": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kstars-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kstars-15.04.3.tar.xz",
-            "name": "kstars-15.04.3.tar.xz",
-            "sha256": "1lnspbgg037id7jq2fjf3p7rr819jd0h4hs21hxqifcsx2qm90qp"
-        },
-        "buildInputs": [
-            "astrometrynet",
-            "cfitsio",
-            "ecm",
-            "eigen3",
-            "indi",
-            "kf5",
-            "kf5config",
-            "kf5dbusaddons",
-            "kf5doctools",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5init",
-            "kf5jobwidgets",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5plotting",
-            "kf5texteditor",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "opengl",
-            "qt5",
-            "qt5gui",
-            "qt5multimedia",
-            "qt5opengl",
-            "qt5printsupport",
-            "qt5qml",
-            "qt5quick",
-            "qt5sql",
-            "qt5svg",
-            "qt5test",
-            "qt5xml",
-            "wcslib",
-            "xplanet"
-        ]
-    },
-    "kdeartwork": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdeartwork-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdeartwork-15.04.3.tar.xz",
-            "name": "kdeartwork-15.04.3.tar.xz",
-            "sha256": "1ay8xwnniy9gd4vfnnd9h5i1yybv4w5fjpycn58xdkhwf0zi229p"
-        },
-        "buildInputs": [
-            "eigen3",
-            "kde4",
-            "kde4workspace",
-            "kexiv2",
-            "opengl",
-            "xscreensaver"
-        ]
-    },
-    "kfloppy": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kfloppy-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kfloppy-15.04.3.tar.xz",
-            "name": "kfloppy-15.04.3.tar.xz",
-            "sha256": "0jzvcm1kkb0zzvmb96zl2xv0ya4a3ilirqq8zwjgzh36s06y1h7j"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "jovie": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "jovie-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/jovie-15.04.3.tar.xz",
-            "name": "jovie-15.04.3.tar.xz",
-            "sha256": "02bfx985wggmb8bbca6yz5hgfjxg0zniqsbxap3h4baiba5n2rpn"
-        },
-        "buildInputs": [
-            "kde4",
-            "qt4",
-            "speechd"
-        ]
-    },
-    "kde-l10n-zh_TW": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-zh_TW-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-zh_TW-15.04.3.tar.xz",
-            "name": "kde-l10n-zh_TW-15.04.3.tar.xz",
-            "sha256": "1p19mzpa0cm7x5afc6x9j7xr83850hrz9fvn27h4gdc8s0gbmc9m"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kscd": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kscd-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kscd-15.04.3.tar.xz",
-            "name": "kscd-15.04.3.tar.xz",
-            "sha256": "0dy41w2vc53qks0z19azrwmf6p1y4jrh7bycj81prh2dinnpkra1"
-        },
-        "buildInputs": [
-            "alsa",
-            "kde4",
-            "musicbrainz3",
-            "qt4"
-        ]
-    },
-    "kde-l10n-uk": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-uk-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-uk-15.04.3.tar.xz",
-            "name": "kde-l10n-uk-15.04.3.tar.xz",
-            "sha256": "19xwxm3bjwjxzr7axr5my6n6pm12jn9gz6xrxxjpdnf1b8386y48"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "konsole": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "konsole-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/konsole-15.04.3.tar.xz",
-            "name": "konsole-15.04.3.tar.xz",
-            "sha256": "147cx1ana0z5hg0vx0zgqavizk65s17a2pmyxd3fhdy3ad3c2ld0"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5bookmarks",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5init",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5parts",
-            "kf5pty",
-            "kf5service",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5script",
-            "qt5test",
-            "qt5widgets",
-            "x11"
-        ]
-    },
-    "kruler": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kruler-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kruler-15.04.3.tar.xz",
-            "name": "kruler-15.04.3.tar.xz",
-            "sha256": "0ljssj6fqbpzsc7rvm8vyy6mpzll443w1xxbrima0dgvdc656lx0"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5notifications",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets",
-            "qt5x11extras",
-            "x11",
-            "xcb"
-        ]
-    },
-    "kubrick": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kubrick-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kubrick-15.04.3.tar.xz",
-            "name": "kubrick-15.04.3.tar.xz",
-            "sha256": "1gvamla9pxd0dj0yc8108pr31f1yf79x6ng87gmbi10nriw4dz27"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames",
-            "opengl"
-        ]
-    },
-    "kdenetwork-filesharing": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdenetwork-filesharing-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdenetwork-filesharing-15.04.3.tar.xz",
-            "name": "kdenetwork-filesharing-15.04.3.tar.xz",
-            "sha256": "083j6159sjcq0d8j2n6id6fyha5a4wk4ii7sl177md63xsl4xax1"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "dolphin-plugins": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "dolphin-plugins-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/dolphin-plugins-15.04.3.tar.xz",
-            "name": "dolphin-plugins-15.04.3.tar.xz",
-            "sha256": "0pfrydfb7qn3r5zjs6x83i05fqvzizrw0idh1faqv5br4hra9pzp"
-        },
-        "buildInputs": [
-            "kde4",
-            "libkonq"
-        ]
-    },
-    "kmines": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmines-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmines-15.04.3.tar.xz",
-            "name": "kmines-15.04.3.tar.xz",
-            "sha256": "0p8bfk8brh9y32qk9rpqcvpxk8if3y2m9mzh5mmg6d5bqv4r8v5a"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5qml",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kspaceduel": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kspaceduel-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kspaceduel-15.04.3.tar.xz",
-            "name": "kspaceduel-15.04.3.tar.xz",
-            "sha256": "1w4b1vd6p16fg7j08sbmhd3cqd8n1y6xm761yziz20mkkgr1yvjm"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kde-l10n-tr": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-tr-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-tr-15.04.3.tar.xz",
-            "name": "kde-l10n-tr-15.04.3.tar.xz",
-            "sha256": "0p201cjaf67ixcfdmqvxmigz5frly3w036ry15hmkqq3l2hz6q4l"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "libkdcraw": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkdcraw-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkdcraw-15.04.3.tar.xz",
-            "name": "libkdcraw-15.04.3.tar.xz",
-            "sha256": "0hi5i07qzvw8mbk1yrv8w8l5zhbzgnfvvpv44ym56pcz4a9fmjfg"
-        },
-        "buildInputs": [
-            "kde4",
-            "libraw"
-        ]
-    },
-    "ktp-approver": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-approver-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-approver-15.04.3.tar.xz",
-            "name": "ktp-approver-15.04.3.tar.xz",
-            "sha256": "051398wxm9cfnid2dvi4sycb61iygj8smg8f5xdfm31mfxdva3hn"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5notifications",
-            "kf5service",
-            "qt5",
-            "qt5network",
-            "qt5widgets",
-            "telepathyqt5"
-        ]
-    },
-    "ktp-contact-runner": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-contact-runner-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-contact-runner-15.04.3.tar.xz",
-            "name": "ktp-contact-runner-15.04.3.tar.xz",
-            "sha256": "0bv83if7mwqwsblpnmdf87k6fvvjb21i6kwa7i1q9vnr7avka0yg"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5i18n",
-            "kf5runner",
-            "kf5service",
-            "ktp",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5network",
-            "qt5widgets"
-        ]
-    },
-    "kdepim-runtime": {
-        "nativeBuildInputs": [
-            "_testrunner",
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdepim-runtime-4.14.10",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdepim-runtime-4.14.10.tar.xz",
-            "name": "kdepim-runtime-4.14.10.tar.xz",
-            "sha256": "0lndmza6x4969g9dgyl3p5zqh371nm1x8gciqy13wv34g0r1x3fn"
-        },
-        "buildInputs": [
-            "accountsqt",
-            "akonadi",
-            "boost",
-            "kde4",
-            "kdepimlibs",
-            "libkfbapi",
-            "libkgapi2",
-            "libkolab",
-            "libkolabxml",
-            "qjson",
-            "qt4",
-            "sasl2",
-            "sharedmimeinfo",
-            "signonqt",
-            "xsltproc"
-        ]
-    },
-    "print-manager": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "print-manager-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/print-manager-15.04.3.tar.xz",
-            "name": "print-manager-15.04.3.tar.xz",
-            "sha256": "15mmypcxmgrypapss3nzi3vjrbmw7f547jbpbmsprcpij1klip6q"
-        },
-        "buildInputs": [
-            "cups",
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5notifications",
-            "kf5plasma",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5network",
-            "qt5qml",
-            "qt5quick",
-            "qt5widgets"
-        ]
-    },
-    "oxygen-icons": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "oxygen-icons-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz",
-            "name": "oxygen-icons-15.04.3.tar.xz",
-            "sha256": "07npzyrbw2fn1qd04imnv7cz0sisk7yllrwr2y21yr2i1gbncfqk"
-        },
-        "buildInputs": []
-    },
-    "umbrello": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "umbrello-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/umbrello-15.04.3.tar.xz",
-            "name": "umbrello-15.04.3.tar.xz",
-            "sha256": "0qil8814zc3pa11xqf0lz3lwkvp57j3iahhjzaw7famn8vfzjpmh"
-        },
-        "buildInputs": [
-            "kde4",
-            "libxml2",
-            "libxslt"
-        ]
-    },
-    "kde-l10n-ar": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ar-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ar-15.04.3.tar.xz",
-            "name": "kde-l10n-ar-15.04.3.tar.xz",
-            "sha256": "19kzdyjcrbjp5hwccvzyi2fd3gy3pm8yay64jpg9iln28ahzbx3b"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ktp-filetransfer-handler": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-filetransfer-handler-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-filetransfer-handler-15.04.3.tar.xz",
-            "name": "ktp-filetransfer-handler-15.04.3.tar.xz",
-            "sha256": "12z8zcrj2nhlhh1kyx565aaacczh7884hnid6rzrb2fmm58sx39h"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5i18n",
-            "kf5kio",
-            "ktp",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5widgets"
-        ]
-    },
-    "kdepimlibs": {
-        "nativeBuildInputs": [
-            "_testrunner",
-            "cmake",
-            "perl_executable"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdepimlibs-4.14.10",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz",
-            "name": "kdepimlibs-4.14.10.tar.xz",
-            "sha256": "1hl4wmdsp3lswvzvspy8h9x31n38z9gj6l50plhz3v6nmna9dk68"
-        },
-        "buildInputs": [
-            "akonadi",
-            "boost",
-            "gpgme",
-            "kde4",
-            "ldap",
-            "libical",
-            "libxml2",
-            "libxslt",
-            "prison",
-            "qjson",
-            "sasl2",
-            "sharedmimeinfo",
-            "xsltproc"
-        ]
-    },
-    "step": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "step-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/step-15.04.3.tar.xz",
-            "name": "step-15.04.3.tar.xz",
-            "sha256": "1nnjyw4jrqwdx0n34xw897kwq543vzyia8csyiadiqdq9hyzmlpg"
-        },
-        "buildInputs": [
-            "ecm",
-            "eigen3",
-            "gsl",
-            "kf5",
-            "kf5config",
-            "kf5doctools",
-            "kf5kdelibs4support",
-            "kf5khtml",
-            "kf5newstuff",
-            "kf5plotting",
-            "pythoninterp",
-            "qalculate",
-            "qt5",
-            "qt5opengl",
-            "qt5printsupport",
-            "qt5qml",
-            "qt5quick",
-            "qt5svg",
-            "qt5test",
-            "qt5xml"
-        ]
-    },
-    "kmousetool": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kmousetool-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kmousetool-15.04.3.tar.xz",
-            "name": "kmousetool-15.04.3.tar.xz",
-            "sha256": "1allf52fw55fcwxzg43cqjhfan060xyv4avmqjf43bn23h25fmjs"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kde-l10n-ja": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ja-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ja-15.04.3.tar.xz",
-            "name": "kde-l10n-ja-15.04.3.tar.xz",
-            "sha256": "1423jd7lkldnqslvww1ypvmdgzbydlibjy19gmrazlsnmfrp6zzs"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kdenlive": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdenlive-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdenlive-15.04.3.tar.xz",
-            "name": "kdenlive-15.04.3.tar.xz",
-            "sha256": "17v5r0fcb0j52a89v6ygsbap03cg4ah5v5jqy2lpck8y57vslvgv"
-        },
-        "buildInputs": [
-            "ecm",
-            "git",
-            "kf5",
-            "kf5archive",
-            "kf5bookmarks",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5doctools",
-            "kf5guiaddons",
-            "kf5iconthemes",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5plotting",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "libv4l2",
-            "mlt",
-            "opengl",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5opengl",
-            "qt5script",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets",
-            "sdl",
-            "sharedmimeinfo"
-        ]
-    },
-    "kbreakout": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kbreakout-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kbreakout-15.04.3.tar.xz",
-            "name": "kbreakout-15.04.3.tar.xz",
-            "sha256": "1wpc1r8xgz985514iiym49268rn4qa6msbslmc55r6bgyawjm1g1"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5jobwidgets",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5service",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "kde-workspace": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-workspace-4.11.21",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-workspace-4.11.21.tar.xz",
-            "name": "kde-workspace-4.11.21.tar.xz",
-            "sha256": "13vwgzz838nlqryh8nhlx70c5msyl5alrqdqlcamncxg0a4cd5ki"
-        },
-        "buildInputs": [
-            "akonadi",
-            "boost",
-            "dbusmenuqt",
-            "fontconfig",
-            "freetype",
-            "glib2",
-            "jpeg",
-            "kactivities",
-            "kde4",
-            "kdeclarative",
-            "kdepimlibs",
-            "libgps",
-            "nepomukcore",
-            "opengl",
-            "opengles",
-            "pciutils",
-            "png",
-            "prison",
-            "pythonlibrary",
-            "qalculate",
-            "qimageblitz",
-            "qjson",
-            "qt4",
-            "raw1394",
-            "sensors",
-            "soprano",
-            "strigi",
-            "udev",
-            "usb",
-            "wayland",
-            "x11",
-            "x11_xcb",
-            "xcb",
-            "xmms",
-            "zlib"
-        ]
-    },
-    "ffmpegthumbs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ffmpegthumbs-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ffmpegthumbs-15.04.3.tar.xz",
-            "name": "ffmpegthumbs-15.04.3.tar.xz",
-            "sha256": "1di5v6bpf8zvw243dc7rdrzynvvwgnk6pnckg9zafhwsds6br5wc"
-        },
-        "buildInputs": [
-            "ffmpeg",
-            "kde4"
-        ]
-    },
-    "ktux": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktux-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktux-15.04.3.tar.xz",
-            "name": "ktux-15.04.3.tar.xz",
-            "sha256": "00b6fl056pcxdsgqzv81by10l8xpbijk8589nd0dmj74kca31qrn"
-        },
-        "buildInputs": [
-            "kde4",
-            "kde4workspace"
-        ]
-    },
-    "kde-dev-utils": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-dev-utils-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-dev-utils-15.04.3.tar.xz",
-            "name": "kde-dev-utils-15.04.3.tar.xz",
-            "sha256": "0mykd3w2l0yfi18b8jpzdvhy2dzm9avwzfpbsscb8s19vsarqf2x"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "libkeduvocdocument": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkeduvocdocument-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkeduvocdocument-15.04.3.tar.xz",
-            "name": "libkeduvocdocument-15.04.3.tar.xz",
-            "sha256": "1lx72m98x60ddzhqlf5jmnw64jh5pzh02hs4gv9vsgsvbjiizmix"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5archive",
-            "kf5i18n",
-            "kf5kio",
-            "qt5",
-            "qt5test",
-            "qt5xml"
-        ]
-    },
-    "kde-l10n-pl": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-pl-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pl-15.04.3.tar.xz",
-            "name": "kde-l10n-pl-15.04.3.tar.xz",
-            "sha256": "1kzhwhf2jxmvkr3070qfhn51d7i44ni62dacghssdiisxkcvw0xi"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ktp-send-file": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-send-file-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-send-file-15.04.3.tar.xz",
-            "name": "ktp-send-file-15.04.3.tar.xz",
-            "sha256": "1yv4gmgcgi4rlxkispmlrlzi8jp3v1mfansh6w21lafallf3k8kf"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kcmutils",
-            "kf5kio",
-            "ktp",
-            "qt5",
-            "qt5widgets"
-        ]
-    },
-    "cantor": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "cantor-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/cantor-15.04.3.tar.xz",
-            "name": "cantor-15.04.3.tar.xz",
-            "sha256": "02n2pavs8wqngjm9lnw0g1ipdyv42d2pzii57p3nwplfhr8n0ia4"
-        },
-        "buildInputs": [
-            "analitza5",
-            "ecm",
-            "kde4",
-            "kf5",
-            "kf5archive",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5kdelibs4support",
-            "kf5newstuff",
-            "kf5parts",
-            "kf5pty",
-            "kf5texteditor",
-            "libspectre",
-            "luajit",
-            "pythonlibs",
-            "pythonlibs3",
-            "qalculate",
-            "qt5",
-            "qt5core",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets",
-            "qt5xml",
-            "qt5xmlpatterns",
-            "r"
-        ]
-    },
-    "libkcddb": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkcddb-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkcddb-15.04.3.tar.xz",
-            "name": "libkcddb-15.04.3.tar.xz",
-            "sha256": "0050h4g99wxggiqibfgrmc9zyqkv1l49x0h2k1r32gxl9lf6iid8"
-        },
-        "buildInputs": [
-            "kde4",
-            "musicbrainz5"
-        ]
-    },
-    "bomber": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "bomber-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/bomber-15.04.3.tar.xz",
-            "name": "bomber-15.04.3.tar.xz",
-            "sha256": "15b79l3m280miaf32w9m48w5rysrizv7kqpc4dg8pwp7i4zbjigc"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5i18n",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5widgets"
-        ]
-    },
-    "libkface": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkface-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkface-15.04.3.tar.xz",
-            "name": "libkface-15.04.3.tar.xz",
-            "sha256": "1k3m8qhqw7xlqg0biidp5ckc1z73m0syxw20shjbmzhhwag5qlql"
-        },
-        "buildInputs": [
-            "kde4",
-            "qt4"
-        ]
-    },
-    "kde-l10n-nb": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-nb-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nb-15.04.3.tar.xz",
-            "name": "kde-l10n-nb-15.04.3.tar.xz",
-            "sha256": "0p07mwcdk2anazcx2f86dxywmkpgxb5qnwlaah9zfqzlv915v4mp"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kturtle": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kturtle-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kturtle-15.04.3.tar.xz",
-            "name": "kturtle-15.04.3.tar.xz",
-            "sha256": "0qxymwmd7fdqqzbkj7jjziddmgr01vhnfhfy891m6mzrmhak6dcb"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5i18n",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5newstuff",
-            "qt5",
-            "qt5core",
-            "qt5gui",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "svgpart": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "svgpart-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/svgpart-15.04.3.tar.xz",
-            "name": "svgpart-15.04.3.tar.xz",
-            "sha256": "1b6apnppn2qal1jc0z1mfss71dscvfx2i8wr25wq6mzy8y1ajwzr"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kdegraphics-mobipocket": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdegraphics-mobipocket-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdegraphics-mobipocket-15.04.3.tar.xz",
-            "name": "kdegraphics-mobipocket-15.04.3.tar.xz",
-            "sha256": "123fa5x6zdnm2c18i02azp9ingr2vkrxsrhfafa38v5b4y3jki6g"
-        },
-        "buildInputs": [
-            "kde4",
-            "strigi"
-        ]
-    },
-    "krfb": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "krfb-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/krfb-15.04.3.tar.xz",
-            "name": "krfb-15.04.3.tar.xz",
-            "sha256": "0pa2xnbgg6rlb3my92kc4kr0sgifrjf8r0j594sdsyfz960hzd2l"
-        },
-        "buildInputs": [
-            "kde4",
-            "ktp",
-            "libvncserver",
-            "telepathyqt4"
-        ]
-    },
-    "kde-l10n-ko": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ko-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ko-15.04.3.tar.xz",
-            "name": "kde-l10n-ko-15.04.3.tar.xz",
-            "sha256": "0qs4mcds85rs4kqhck7n450makj295bnfrjlx2hgx1bzk8jpgl19"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "libkgeomap": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "libkgeomap-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkgeomap-15.04.3.tar.xz",
-            "name": "libkgeomap-15.04.3.tar.xz",
-            "sha256": "1h0w1vdnxawgibp479vh1rsqz17gps459wxcixwxmcgb4xxrf1dk"
-        },
-        "buildInputs": [
-            "kde4",
-            "marble",
-            "marblewidget",
-            "qt4"
-        ]
-    },
-    "kalgebra": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kalgebra-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kalgebra-15.04.3.tar.xz",
-            "name": "kalgebra-15.04.3.tar.xz",
-            "sha256": "1h67lcxsvsccqk66k6xs1ah2nb1p05p1mcdkcbqjfs0bpw8mby5z"
-        },
-        "buildInputs": [
-            "analitza5",
-            "curses",
-            "ecm",
-            "kf5configwidgets",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kio",
-            "kf5widgetsaddons",
-            "opengl",
-            "qt5",
-            "qt5opengl",
-            "qt5printsupport",
-            "qt5qml",
-            "qt5quick",
-            "qt5svg",
-            "qt5test",
-            "qt5webkitwidgets",
-            "qt5xml",
-            "readline"
-        ]
-    },
-    "rocs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "rocs-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/rocs-15.04.3.tar.xz",
-            "name": "rocs-15.04.3.tar.xz",
-            "sha256": "123kj345nh1pq1d3w04k2ssf26q2hp6w8mnvlpza4fgav9lrw57m"
-        },
-        "buildInputs": [
-            "boost",
-            "ecm",
-            "grantlee5",
-            "kf5",
-            "kf5archive",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5declarative",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5itemviews",
-            "kf5texteditor",
-            "kf5xmlgui",
-            "qt5",
-            "qt5concurrent",
-            "qt5core",
-            "qt5gui",
-            "qt5quickwidgets",
-            "qt5script",
-            "qt5scripttools",
-            "qt5svg",
-            "qt5test",
-            "qt5webkit",
-            "qt5webkitwidgets",
-            "qt5widgets",
-            "qt5xmlpatterns"
-        ]
-    },
-    "kbruch": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kbruch-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kbruch-15.04.3.tar.xz",
-            "name": "kbruch-15.04.3.tar.xz",
-            "sha256": "0fivkpa5cr5ahhh1h1z90vl1sr35ks0kmw2mnpk42wgpgipdfbfx"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5crash",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets"
-        ]
-    },
-    "ksudoku": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksudoku-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksudoku-15.04.3.tar.xz",
-            "name": "ksudoku-15.04.3.tar.xz",
-            "sha256": "130v3fhhcxf2fkrhkgb7lqjdv4h7kwzn6z133hmqd617s53pnmfw"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames",
-            "opengl"
-        ]
-    },
-    "kde-l10n-el": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-el-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-el-15.04.3.tar.xz",
-            "name": "kde-l10n-el-15.04.3.tar.xz",
-            "sha256": "1h5hj8li66h5p309rcyk4f6sahdgs25ihdfy673bd7hjz51hk3da"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kopete": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kopete-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kopete-15.04.3.tar.xz",
-            "name": "kopete-15.04.3.tar.xz",
-            "sha256": "07d51in5h6f07gf12pr2fb2w7gkwyca04ra8vy7m373lrkv71i35"
-        },
-        "buildInputs": [
-            "alsa",
-            "boost",
-            "expat",
-            "gif",
-            "glib2",
-            "idn",
-            "jasper",
-            "jsoncpp",
-            "kde4",
-            "kdepimlibs",
-            "kleopatra",
-            "libgadu",
-            "libmeanwhile",
-            "libmsn",
-            "libortp",
-            "libotr",
-            "libv4l2",
-            "libxml2",
-            "libxslt",
-            "mediastreamer",
-            "openssl",
-            "qca2",
-            "qgpgme",
-            "qimageblitz",
-            "qt4",
-            "qt5core",
-            "qt5network",
-            "speex",
-            "sqlite",
-            "srtp",
-            "xmms",
-            "zlib"
-        ]
-    },
-    "kde-l10n-de": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-de-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-de-15.04.3.tar.xz",
-            "name": "kde-l10n-de-15.04.3.tar.xz",
-            "sha256": "1yvc9z5fzhpv6xvc2r69fvfxhr6p6fp2b7hpfs7l0v2p1vlw59fl"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-nds": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-nds-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nds-15.04.3.tar.xz",
-            "name": "kde-l10n-nds-15.04.3.tar.xz",
-            "sha256": "135ibbcddyqw65v0gvb1cvd6d736wwdvqy2q819808z44ylah8ha"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-pa": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-pa-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-pa-15.04.3.tar.xz",
-            "name": "kde-l10n-pa-15.04.3.tar.xz",
-            "sha256": "0dksyld8jn3qngnb7r4g0ir2zy6c7dm2gx8ws5zz3k7ism61fqby"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "okteta": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [
-            "kastencore",
-            "kastengui",
-            "kf5kio",
-            "oktetacore",
-            "oktetagui",
-            "oktetakastencore",
-            "oktetakastengui",
-            "qt5core",
-            "qt5gui",
-            "qt5widgets"
-        ],
-        "name": "okteta-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/okteta-15.04.3.tar.xz",
-            "name": "okteta-15.04.3.tar.xz",
-            "sha256": "1z52n88kjkzjdsvyr0sksh0kmjya5gwjra6gnjaqfd25nbralgnc"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5bookmarks",
-            "kf5codecs",
-            "kf5completion",
-            "kf5configwidgets",
-            "kf5dbusaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5parts",
-            "kf5service",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qca-qt5",
-            "qt5",
-            "qt5core",
-            "qt5designer",
-            "qt5network",
-            "qt5printsupport",
-            "qt5script",
-            "qt5scripttools",
-            "qt5test",
-            "qt5widgets",
-            "qt5xml",
-            "sharedmimeinfo"
-        ]
-    },
-    "ktp-accounts-kcm": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-accounts-kcm-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-accounts-kcm-15.04.3.tar.xz",
-            "name": "ktp-accounts-kcm-15.04.3.tar.xz",
-            "sha256": "00gvcps8h5bi612fwyy5xgb855avv7ad4gfhbbpqz2bykgsjfgj7"
-        },
-        "buildInputs": [
-            "accountsfiledir",
-            "accountsqt5",
-            "ecm",
-            "intltool",
-            "kaccounts",
-            "kf5",
-            "kf5codecs",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5widgetsaddons",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5widgets",
-            "signonqt5",
-            "telepathyqt5"
-        ]
-    },
-    "zeroconf-ioslave": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "zeroconf-ioslave-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/zeroconf-ioslave-15.04.3.tar.xz",
-            "name": "zeroconf-ioslave-15.04.3.tar.xz",
-            "sha256": "141hfbcikpwsr9il3ysjslprcqp1687ncrrhjw3h1qq5pdm8z96p"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kremotecontrol": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kremotecontrol-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kremotecontrol-15.04.3.tar.xz",
-            "name": "kremotecontrol-15.04.3.tar.xz",
-            "sha256": "0zia5j0svgprglckfkf9vb7d5dkgggil7a2qc55yhpr2ihnvryvl"
-        },
-        "buildInputs": [
-            "kde4",
-            "qt4"
-        ]
-    },
-    "kde-l10n-bs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-bs-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-bs-15.04.3.tar.xz",
-            "name": "kde-l10n-bs-15.04.3.tar.xz",
-            "sha256": "0lf1nxf068fyl7vck3vqdzaj8f5mpq3lzs10rg5qkm3a3qli0drc"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ark": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ark-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ark-15.04.3.tar.xz",
-            "name": "ark-15.04.3.tar.xz",
-            "sha256": "1065i6vs1cswjd0lb7b01b7fl6k5p73pfbp5nfzjxi9a1sl4sql5"
-        },
-        "buildInputs": [
-            "bzip2",
-            "kde4",
-            "libarchive",
-            "libkonq",
-            "liblzma",
-            "qjson",
-            "zlib"
-        ]
-    },
-    "libkdegames": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5i18n",
-            "kf5kdelibs4support",
-            "kf5widgetsaddons",
-            "qt5network",
-            "qt5qml",
-            "qt5quickwidgets",
-            "qt5widgets",
-            "qt5xml"
-        ],
-        "name": "libkdegames-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/libkdegames-15.04.3.tar.xz",
-            "name": "libkdegames-15.04.3.tar.xz",
-            "sha256": "051bn6f3f1blzxkm16lqnplwba9c6q0ig6ah819vadw7qbmls44n"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5archive",
-            "kf5bookmarks",
-            "kf5codecs",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5crash",
-            "kf5dbusaddons",
-            "kf5declarative",
-            "kf5dnssd",
-            "kf5globalaccel",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5jobwidgets",
-            "kf5kdelibs4support",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5service",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "openal",
-            "qt5",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg",
-            "qt5test",
-            "qt5widgets",
-            "sndfile"
-        ]
-    },
-    "kde-l10n-hi": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-hi-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hi-15.04.3.tar.xz",
-            "name": "kde-l10n-hi-15.04.3.tar.xz",
-            "sha256": "1xjicw98r69jlby116xy3g5z6kbblry1h0wfrsyp1m8s8fm4f2gm"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "cervisia": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "cervisia-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/cervisia-15.04.3.tar.xz",
-            "name": "cervisia-15.04.3.tar.xz",
-            "sha256": "18fl0krby18y94xqc8g78rplgsidqwzxwvv4j3xypsjvhaalrw7q"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kde-l10n-en_GB": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-en_GB-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-en_GB-15.04.3.tar.xz",
-            "name": "kde-l10n-en_GB-15.04.3.tar.xz",
-            "sha256": "0wlca0rp01x8z4ff26db8nsiafly2frk4fvxsw86rc7cwb15ck7q"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kapman": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kapman-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kapman-15.04.3.tar.xz",
-            "name": "kapman-15.04.3.tar.xz",
-            "sha256": "0avlvf4nw89xa224g5h53rf4xmmb32z25ia4ilpiaglsm5lavkf8"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5i18n",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "kdeedu-data": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdeedu-data-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdeedu-data-15.04.3.tar.xz",
-            "name": "kdeedu-data-15.04.3.tar.xz",
-            "sha256": "14k0dcbhxkfpb7rwrp08lzd3m201v3gahv1cd9hy1wzga513kbm2"
-        },
-        "buildInputs": [
-            "ecm"
-        ]
-    },
-    "kgeography": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kgeography-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kgeography-15.04.3.tar.xz",
-            "name": "kgeography-15.04.3.tar.xz",
-            "sha256": "1qra3j6zrwihm5c896adh0acy7lgbkpcw8ja22dv519926slbi84"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5service",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5widgets"
-        ]
-    },
-    "kdesdk-thumbnailers": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdesdk-thumbnailers-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdesdk-thumbnailers-15.04.3.tar.xz",
-            "name": "kdesdk-thumbnailers-15.04.3.tar.xz",
-            "sha256": "06vznwg9fhrky5bf46hfaxw4dyh9nfr0v0slh77ys0szn18cns7c"
-        },
-        "buildInputs": [
-            "gettextpo",
-            "kde4"
-        ]
-    },
-    "kppp": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kppp-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kppp-15.04.3.tar.xz",
-            "name": "kppp-15.04.3.tar.xz",
-            "sha256": "0ibmc0axcxg4x4dcwdjhq4mgvfrcm18n2g12qd2b27czhiffbq7b"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kde-l10n-ug": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ug-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ug-15.04.3.tar.xz",
-            "name": "kde-l10n-ug-15.04.3.tar.xz",
-            "sha256": "1mrgcx242jnh32kz522jnc3wihn7a72231pibw6sh2hmykcv5yjl"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kgpg": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kgpg-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kgpg-15.04.3.tar.xz",
-            "name": "kgpg-15.04.3.tar.xz",
-            "sha256": "13hswfxfs4h58aizydl4v8i8zlac0k7qp5br7aqa5p9fpaj8496b"
-        },
-        "buildInputs": [
-            "gpgme",
-            "kde4",
-            "kdepimlibs"
-        ]
-    },
-    "kde-l10n-lv": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-lv-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-lv-15.04.3.tar.xz",
-            "name": "kde-l10n-lv-15.04.3.tar.xz",
-            "sha256": "1ac377lba57wjmnqr9jqjmq8qn9a15hvydbnbj35akqchppcvpk2"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-hr": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-hr-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-hr-15.04.3.tar.xz",
-            "name": "kde-l10n-hr-15.04.3.tar.xz",
-            "sha256": "12n0s8a8iy1bldnjzhg9jiy896c9vyj5zj23mxlbmzchz5gz9bby"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kde-l10n-ca": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ca-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ca-15.04.3.tar.xz",
-            "name": "kde-l10n-ca-15.04.3.tar.xz",
-            "sha256": "1yag38xhairw08zm0q5qrwzria3hzs75cipgf4xrwii946rx3g44"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "mplayerthumbs": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "mplayerthumbs-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/mplayerthumbs-15.04.3.tar.xz",
-            "name": "mplayerthumbs-15.04.3.tar.xz",
-            "sha256": "0ah79wl2qi15y874ds39f53pz2qsc0iwy7h33jzrqmy85sx92g71"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kate": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kate-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kate-15.04.3.tar.xz",
-            "name": "kate-15.04.3.tar.xz",
-            "sha256": "0lr0f23ylv6rlm3yqzkrklnj9c0rsfnsmn0gnkd7bw7hwcgb0wfz"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5dbusaddons",
-            "libgit2",
-            "pykde4",
-            "pyqt4",
-            "pythonlibrary",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5script",
-            "qt5sql",
-            "qt5test",
-            "qt5widgets",
-            "sip"
-        ]
-    },
-    "ksaneplugin": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksaneplugin-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksaneplugin-15.04.3.tar.xz",
-            "name": "ksaneplugin-15.04.3.tar.xz",
-            "sha256": "1zy2ybdgihji4blz9vwfmnw0k1b8s60qfhpjcmrgzlbc4kp0wag7"
-        },
-        "buildInputs": [
-            "kde4",
-            "ksane"
-        ]
-    },
-    "kde-runtime": {
-        "nativeBuildInputs": [
-            "cmake",
-            "md5sum_executable",
-            "windres_executable"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-runtime-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-runtime-15.04.3.tar.xz",
-            "name": "kde-runtime-15.04.3.tar.xz",
-            "sha256": "0fyd9wksb7lxqsbq24q2vhy35a7pfr9mqa1xgpx5rjcml3n1vlpq"
-        },
-        "buildInputs": [
-            "alsa",
-            "bzip2",
-            "exiv2",
-            "glib2",
-            "gpgme",
-            "jpeg",
-            "kactivities",
-            "kde4",
-            "kdeclarative",
-            "kdepimlibs",
-            "libattica",
-            "libgcrypt",
-            "liblzma",
-            "libssh",
-            "nepomukcore",
-            "networkmanager",
-            "openexr",
-            "pulseaudio",
-            "qca2",
-            "qgpgme",
-            "qntrack",
-            "samba",
-            "sharedmimeinfo",
-            "slp",
-            "soprano"
-        ]
-    },
-    "ktp-text-ui": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktp-text-ui-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-text-ui-15.04.3.tar.xz",
-            "name": "ktp-text-ui-15.04.3.tar.xz",
-            "sha256": "0my4gxw73pmpi45xa2s3ny933kmbfal733iq235vpsqqmdyz7mah"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5archive",
-            "kf5dbusaddons",
-            "kf5emoticons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5people",
-            "kf5service",
-            "kf5sonnet",
-            "kf5textwidgets",
-            "kf5webkit",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "kf5xmlgui",
-            "ktp",
-            "qt5",
-            "qt5webkitwidgets"
-        ]
-    },
-    "kaccounts-providers": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kaccounts-providers-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kaccounts-providers-15.04.3.tar.xz",
-            "name": "kaccounts-providers-15.04.3.tar.xz",
-            "sha256": "0lpdcjqqrl3c9l6asfqjbas79g145i6a8ix6dhzc8s77vp1wqxil"
-        },
-        "buildInputs": [
-            "accountsfiledir",
-            "ecm",
-            "intltool"
-        ]
-    },
-    "kteatime": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kteatime-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kteatime-15.04.3.tar.xz",
-            "name": "kteatime-15.04.3.tar.xz",
-            "sha256": "1359y527nlwzb6jhid5wl3y93ajxawbjd1hf0pmfg5pxpy7aykzg"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5crash",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5textwidgets",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5core",
-            "qt5dbus",
-            "qt5widgets"
-        ]
-    },
-    "krdc": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "krdc-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/krdc-15.04.3.tar.xz",
-            "name": "krdc-15.04.3.tar.xz",
-            "sha256": "0ylq0dpn45cp1s3y3gb7mrvkjx798knpfmb50lhl3397z1niw4zv"
-        },
-        "buildInputs": [
-            "kde4",
-            "libnxcl",
-            "libvncserver",
-            "telepathyqt4"
-        ]
-    },
-    "klickety": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "klickety-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/klickety-15.04.3.tar.xz",
-            "name": "klickety-15.04.3.tar.xz",
-            "sha256": "0zxnclm74l77f6lwz74wkk831sidwcsd6lc94p853gngmrra5a0c"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kolf": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kolf-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kolf-15.04.3.tar.xz",
-            "name": "kolf-15.04.3.tar.xz",
-            "sha256": "1vhhy3pffp4f92zm1k1ksx18gvv404jfa6p28ybsp23fb22z8f90"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "ktouch": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ktouch-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktouch-15.04.3.tar.xz",
-            "name": "ktouch-15.04.3.tar.xz",
-            "sha256": "03xvj2rpamw5b6bpbiqkk01jhnkhcqi3c4rxhd0dxqi3da0r1211"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdeclarative",
-            "x11"
-        ]
-    },
-    "kdepim": {
-        "nativeBuildInputs": [
-            "cmake",
-            "dblatex_executable"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdepim-4.14.10",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdepim-4.14.10.tar.xz",
-            "name": "kdepim-4.14.10.tar.xz",
-            "sha256": "1qmpbgwchjzfrw8nyvx5ibd6zl05w4kn341519w334r5h5dqdbgd"
-        },
-        "buildInputs": [
-            "akonadi",
-            "baloo",
-            "boost",
-            "git",
-            "grantlee",
-            "kde4",
-            "kdepimlibs",
-            "libkgapi2",
-            "prison",
-            "qgpgme",
-            "qjson",
-            "sasl2",
-            "xsltproc",
-            "zlib"
-        ]
-    },
-    "poxml": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "poxml-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/poxml-15.04.3.tar.xz",
-            "name": "poxml-15.04.3.tar.xz",
-            "sha256": "1n49q5rrhi878jwcvgzy8cri2dd2ycv24m4b0js7j1vxl3cy26n9"
-        },
-        "buildInputs": [
-            "gettext",
-            "gettextpo",
-            "kde4"
-        ]
-    },
-    "okular": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "okular-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/okular-15.04.3.tar.xz",
-            "name": "okular-15.04.3.tar.xz",
-            "sha256": "03mmdvnjbaaph4zdpddpfs55v7idn95cf1wvxv540flx3qzn9s7z"
-        },
-        "buildInputs": [
-            "activeapp",
-            "chm",
-            "djvulibre",
-            "epub",
-            "freetype",
-            "jpeg",
-            "kactivities",
-            "kde4",
-            "kexiv2",
-            "libkscreen",
-            "libspectre",
-            "poppler",
-            "qca2",
-            "qimageblitz",
-            "qmobipocket",
-            "tiff",
-            "zlib"
-        ]
-    },
-    "kde-l10n-fi": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-fi-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-fi-15.04.3.tar.xz",
-            "name": "kde-l10n-fi-15.04.3.tar.xz",
-            "sha256": "07vk6c62g1fywpqbvaa29gwgl4prcyxk4l1j15cj2zwrkl35hi20"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ktp-common-internals": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [
-            "kf5wallet",
-            "telepathyloggerqt",
-            "telepathyqt5"
-        ],
-        "name": "ktp-common-internals-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ktp-common-internals-15.04.3.tar.xz",
-            "name": "ktp-common-internals-15.04.3.tar.xz",
-            "sha256": "1i59k2063590y1nbzbpgdmnxyk4nap2sazr57pi8y4lqzzycr7qv"
-        },
-        "buildInputs": [
-            "accountsqt5",
-            "doxygen",
-            "ecm",
-            "kaccounts",
-            "kf5",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5iconthemes",
-            "kf5kcmutils",
-            "kf5kio",
-            "kf5notifications",
-            "kf5notifyconfig",
-            "kf5people",
-            "kf5texteditor",
-            "kf5wallet",
-            "kf5widgetsaddons",
-            "kf5windowsystem",
-            "libgcrypt",
-            "libotr",
-            "qt5",
-            "qt5qml",
-            "qt5sql",
-            "qt5test",
-            "telepathyloggerqt",
-            "telepathyqt5",
-            "telepathyqt5service"
-        ]
-    },
-    "kcachegrind": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kcachegrind-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kcachegrind-15.04.3.tar.xz",
-            "name": "kcachegrind-15.04.3.tar.xz",
-            "sha256": "1njlky2gsp9ac00id7kk0m19ygwfp5wpzjncmzvkcx65gdafhnwi"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kdf": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdf-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdf-15.04.3.tar.xz",
-            "name": "kdf-15.04.3.tar.xz",
-            "sha256": "1s8jhz9k4c913fzp88gxsrpxp183vk3rpj497aj0qqh5xrl4pz7a"
-        },
-        "buildInputs": [
-            "kde4"
-        ]
-    },
-    "kajongg": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kajongg-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kajongg-15.04.3.tar.xz",
-            "name": "kajongg-15.04.3.tar.xz",
-            "sha256": "0gs7h6mx9ngvk2vhn4qn3qbcyf18aw97r1j7if4hqc3lr836zpbg"
-        },
-        "buildInputs": [
-            "kde4",
-            "twisted"
-        ]
-    },
-    "ksquares": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksquares-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksquares-15.04.3.tar.xz",
-            "name": "ksquares-15.04.3.tar.xz",
-            "sha256": "0pczn92b0bbgqwqcah4dlhsj5qwqcm0v58j5schpxqvsxz7p26jx"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5notifyconfig",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5test",
-            "qt5widgets"
-        ]
-    },
-    "kshisen": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kshisen-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kshisen-15.04.3.tar.xz",
-            "name": "kshisen-15.04.3.tar.xz",
-            "sha256": "0kagbvw8kilv5908d4b20b7ayj8y44p8bm3av3rijvvz0mn7b4zx"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5coreaddons",
-            "kf5declarative",
-            "kf5dnssd",
-            "kf5doctools",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5kmahjongglib",
-            "kf5newstuff",
-            "kf5xmlgui",
-            "phonon4qt5",
-            "qt5",
-            "qt5core",
-            "qt5gui"
-        ]
-    },
-    "kde-l10n-nn": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-nn-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-nn-15.04.3.tar.xz",
-            "name": "kde-l10n-nn-15.04.3.tar.xz",
-            "sha256": "1xizqrxakgfa3hqfcdm4q97vgzj0lsx8np2jr4xvmd94bh2caw56"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "kdesdk-strigi-analyzers": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kdesdk-strigi-analyzers-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kdesdk-strigi-analyzers-15.04.3.tar.xz",
-            "name": "kdesdk-strigi-analyzers-15.04.3.tar.xz",
-            "sha256": "0n821gwvj2il1zf5s6nqaq58i5r4pn2vzcck1yl2y901shqw6vzb"
-        },
-        "buildInputs": [
-            "kde4",
-            "strigi"
-        ]
-    },
-    "kde-l10n-zh_CN": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-zh_CN-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-zh_CN-15.04.3.tar.xz",
-            "name": "kde-l10n-zh_CN-15.04.3.tar.xz",
-            "sha256": "0i3d9dqcb5222k9ys7n14lp9llv7pdcc1fwymnmzrsszr38vd24j"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "ksnakeduel": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "ksnakeduel-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/ksnakeduel-15.04.3.tar.xz",
-            "name": "ksnakeduel-15.04.3.tar.xz",
-            "sha256": "08q6r4r5d29ikiqpbx8mfw79nxjjphw2r2capkbs3bd6ly30bzpx"
-        },
-        "buildInputs": [
-            "kde4",
-            "kdegames"
-        ]
-    },
-    "kde-l10n-ia": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-ia-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-ia-15.04.3.tar.xz",
-            "name": "kde-l10n-ia-15.04.3.tar.xz",
-            "sha256": "17b42p7jw5nb97fp88lbg2f2pqy1zcsavisfp2h8wmd8sk4hfpd1"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "granatier": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "granatier-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/granatier-15.04.3.tar.xz",
-            "name": "granatier-15.04.3.tar.xz",
-            "sha256": "1bi6p2xzgxzn6wdfjmxpxfms8z2cksgkkhsa6p0ngd6ln8plmdj9"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5dbusaddons",
-            "kf5guiaddons",
-            "kf5i18n",
-            "kf5iconthemes",
-            "kf5itemviews",
-            "kf5kdegames",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifyconfig",
-            "kf5widgetsaddons",
-            "kf5xmlgui",
-            "qt5",
-            "qt5svg",
-            "qt5widgets"
-        ]
-    },
-    "kde-dev-scripts": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-dev-scripts-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-dev-scripts-15.04.3.tar.xz",
-            "name": "kde-dev-scripts-15.04.3.tar.xz",
-            "sha256": "0isa27ijgcqjcsh30cjg6hbrzpfwm1vjv1zi2blxxnfwmq2n1j0l"
-        },
-        "buildInputs": [
-            "ecm",
-            "kde4",
-            "kf5doctools"
-        ]
-    },
-    "khangman": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "khangman-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/khangman-15.04.3.tar.xz",
-            "name": "khangman-15.04.3.tar.xz",
-            "sha256": "13rbm2g29hvjia1c28r0svw5xjgvr133vqgkhp8b5vsrvz9kqjrn"
-        },
-        "buildInputs": [
-            "ecm",
-            "kf5",
-            "kf5completion",
-            "kf5config",
-            "kf5configwidgets",
-            "kf5coreaddons",
-            "kf5crash",
-            "kf5declarative",
-            "kf5doctools",
-            "kf5i18n",
-            "kf5kio",
-            "kf5newstuff",
-            "kf5notifications",
-            "kf5xmlgui",
-            "libkeduvocdocument",
-            "qt5",
-            "qt5core",
-            "qt5qml",
-            "qt5quick",
-            "qt5quickwidgets",
-            "qt5svg"
-        ]
-    },
-    "kde-l10n-sk": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "kde-l10n-sk-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/kde-l10n/kde-l10n-sk-15.04.3.tar.xz",
-            "name": "kde-l10n-sk-15.04.3.tar.xz",
-            "sha256": "05vvxphhapc4kc90a4p2f7j447varc4jz69n6y0fkh0xg2rpk12j"
-        },
-        "buildInputs": [
-            "ecm",
-            "gettext",
-            "kde4",
-            "kf5doctools",
-            "kf5i18n"
-        ]
-    },
-    "audiocd-kio": {
-        "nativeBuildInputs": [
-            "cmake"
-        ],
-        "propagatedNativeBuildInputs": [],
-        "propagatedUserEnvPkgs": [],
-        "propagatedBuildInputs": [],
-        "name": "audiocd-kio-15.04.3",
-        "src": {
-            "url": "stable/applications/15.04.3/src/audiocd-kio-15.04.3.tar.xz",
-            "name": "audiocd-kio-15.04.3.tar.xz",
-            "sha256": "0fwrjz4bkxinkzk52yv52jx2i6r9rm1nip056kddk718rqr224qi"
-        },
-        "buildInputs": [
-            "cdparanoia",
-            "flac",
-            "kde4",
-            "libkcddb",
-            "libkcompactdisc",
-            "oggvorbis"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/packages.sh b/pkgs/applications/kde-apps-15.04/packages.sh
deleted file mode 100755
index a18324e513f..00000000000
--- a/pkgs/applications/kde-apps-15.04/packages.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-set -x
-
-origin="$(pwd)"
-
-# if setting KDE_MIRROR, be sure to set --cut-dirs=N in MANIFEST_EXTRA_ARGS
-KDE_MIRROR="${KDE_MIRROR:-http://download.kde.org}"
-
-alias nix-build="nix-build --no-out-link \"$origin/../../..\""
-
-# The extra slash at the end of the URL is necessary to stop wget
-# from recursing over the whole server! (No, it's not a bug.)
-$(nix-build -A autonix.manifest) \
-    "${KDE_MIRROR}/stable/applications/15.04.3/" \
-    "$@" -A '*.tar.xz'
-
-AUTONIX_DEPS_KF5=${AUTONIX_DEPS_KF5:-"$(nix-build -A haskellPackages.autonix-deps-kf5)/bin/kf5-deps"}
-
-$AUTONIX_DEPS_KF5 manifest.json
-
-rm manifest.json
diff --git a/pkgs/applications/kde-apps-15.04/plasma5-renames.json b/pkgs/applications/kde-apps-15.04/plasma5-renames.json
deleted file mode 100644
index 98141d29cc5..00000000000
--- a/pkgs/applications/kde-apps-15.04/plasma5-renames.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "kf5sysguard": "libksysguard",
-    "kf5baloo": "baloo",
-    "krunnerappdbusinterface": "plasma-workspace",
-    "screensaverdbusinterface": "plasma-workspace",
-    "ctest": "kdeplasma-addons",
-    "kf5filemetadata": "kfilemetadata",
-    "kwindbusinterface": "kwin",
-    "kf5activitiesexperimentalstats": "plasma-desktop",
-    "khotkeysdbusinterface": "khotkeys",
-    "libkworkspace": "plasma-workspace",
-    "libtaskmanager": "plasma-workspace",
-    "backend": "powerdevil",
-    "kf5screen": "libkscreen",
-    "ksmserverdbusinterface": "plasma-workspace",
-    "kf5wayland": "kwayland",
-    "kdecoration2": "kdecoration",
-    "kf5bluezqt": "bluez-qt",
-    "oxygenfont": "oxygen-fonts"
-}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/renames.json b/pkgs/applications/kde-apps-15.04/renames.json
deleted file mode 100644
index 42b2e53df9a..00000000000
--- a/pkgs/applications/kde-apps-15.04/renames.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "libkomparediff2": "libkomparediff2",
-    "kdegames": "libkdegames",
-    "ksane": "libksane",
-    "ctest": "sweeper",
-    "kastencore": "okteta",
-    "kastengui": "okteta",
-    "gpgmepp": "kdepimlibs",
-    "oktetacore": "okteta",
-    "kf5kmahjongglib": "libkmahjongg",
-    "oktetagui": "okteta",
-    "libkcompactdisc": "libkcompactdisc",
-    "libkdeedu": "libkdeedu",
-    "kaccounts": "kaccounts-integration",
-    "kastencontrollers": "okteta",
-    "backend": "kde-workspace",
-    "ktp": "ktp-common-internals",
-    "kdepimlibs": "kdepimlibs",
-    "qjdns": "kopete",
-    "libkeduvocdocument": "libkeduvocdocument",
-    "oktetakastencore": "okteta",
-    "libkcddb": "libkcddb",
-    "oktetakastengui": "okteta",
-    "kde4workspace": "kde-workspace",
-    "jdns": "kopete",
-    "okular": "okular",
-    "qmobipocket": "kdegraphics-mobipocket",
-    "kdeclarative": "kdelibs",
-    "analitza5": "analitza",
-    "oktetakastencontrollers": "okteta"
-}
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.04/setup-hook.sh b/pkgs/applications/kde-apps-15.04/setup-hook.sh
deleted file mode 100644
index 636669d4c62..00000000000
--- a/pkgs/applications/kde-apps-15.04/setup-hook.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
-
-addQt4Plugins() {
-  if [[ -d "$1/lib/qt4/plugins" ]]; then
-      propagatedUserEnvPkgs+=" $1"
-  fi
-
-  if [[ -d "$1/lib/kde4/plugins" ]]; then
-      propagatedUserEnvPkgs+=" $1"
-  fi
-}
-envHooks+=(addQt4Plugins)
diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix
index b0bf81e0b5b..36a1ca7cfbd 100644
--- a/pkgs/applications/kde-apps-15.08/ark.nix
+++ b/pkgs/applications/kde-apps-15.08/ark.nix
@@ -14,8 +14,17 @@
 , kpty
 , kwidgetsaddons
 , libarchive
+, p7zip
+, unrar
+, unzipNLS
+, zip
 }:
 
+let PATH = lib.makeSearchPath "bin" [
+      p7zip unrar unzipNLS zip
+    ];
+in
+
 kdeApp {
   name = "ark";
   nativeBuildInputs = [
@@ -27,15 +36,21 @@ kdeApp {
     kconfig
     kcrash
     kdbusaddons
-    ki18n
     kiconthemes
-    khtml
-    kio
     kservice
     kpty
     kwidgetsaddons
     libarchive
   ];
+  propagatedBuildInputs = [
+    khtml
+    ki18n
+    kio
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/ark" \
+        --prefix PATH : "${PATH}"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 lgpl3 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
index d38eea96c59..a24928160df 100644
--- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
+++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
@@ -19,12 +19,14 @@ kdeApp {
   ];
   buildInputs = [
     kconfig
-    kio
-    ki18n
     kservice
-    kfilemetadata
+  ];
+  propagatedBuildInputs = [
     baloo
     kdelibs4support
+    kfilemetadata
+    ki18n
+    kio
   ];
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix
index 45484964ff9..8694ee0b264 100644
--- a/pkgs/applications/kde-apps-15.08/default.nix
+++ b/pkgs/applications/kde-apps-15.08/default.nix
@@ -21,25 +21,10 @@ let
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
   mirror = "mirror://kde";
 
-  kdeApp = args:
-    let
-      inherit (args) name;
-      sname = args.sname or name;
-      inherit (srcs."${sname}") src version;
-    in stdenv.mkDerivation (args // {
-      name = "${name}-${version}";
-      inherit src;
-
-      cmakeFlags =
-        (args.cmakeFlags or [])
-        ++ [ "-DBUILD_TESTING=OFF" ]
-        ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-      meta = {
-        platforms = lib.platforms.linux;
-        homepage = "http://www.kde.org";
-      } // (args.meta or {});
-    });
+  kdeApp = import ./kde-app.nix {
+    inherit stdenv lib;
+    inherit debug srcs;
+  };
 
   packages = self: with self; {
     kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
@@ -60,9 +45,12 @@ let
     libkexiv2 = callPackage ./libkexiv2.nix {};
     libkipi = callPackage ./libkipi.nix {};
     okular = callPackage ./okular.nix {};
+    oxygen-icons = callPackage ./oxygen-icons.nix {};
     print-manager = callPackage ./print-manager.nix {};
+
+    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
   };
 
-  newScope = scope: pkgs.kf513.newScope ({ inherit kdeApp; } // scope);
+  newScope = scope: pkgs.kf515.newScope ({ inherit kdeApp; } // scope);
 
 in lib.makeScope newScope packages
diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
index 4eeec1c17e5..72a08c73261 100644
--- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
+++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
@@ -17,10 +17,12 @@ kdeApp {
   ];
   buildInputs = [
     kxmlgui
+    dolphin
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support
     ki18n
     kio
-    kdelibs4support
-    dolphin
   ];
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix
index 1704e9ae272..3218146f510 100644
--- a/pkgs/applications/kde-apps-15.08/dolphin.nix
+++ b/pkgs/applications/kde-apps-15.08/dolphin.nix
@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, makeQtWrapper
 , kinit
 , kcmutils
 , kcoreaddons
@@ -31,31 +32,37 @@ kdeApp {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
     kinit
     kcmutils
     kcoreaddons
     knewstuff
-    ki18n
     kdbusaddons
     kbookmarks
     kconfig
-    kio
     kparts
     solid
     kiconthemes
     kcompletion
-    ktexteditor
-    kwindowsystem
     knotifications
-    kactivities
     phonon
-    baloo
     baloo-widgets
-    kfilemetadata
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
     kdelibs4support
+    kfilemetadata
+    ki18n
+    kio
+    ktexteditor
+    kwindowsystem
   ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/dolphin"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
index e696bb11d93..126753e3ccc 100755
--- a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
+++ b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
@@ -4,34 +4,42 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/applications/15.08.1/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
+WGET_ARGS='http://download.kde.org/stable/applications/15.08.3/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz'
 
 mkdir tmp; cd tmp
 
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+rm -f ../srcs.csv
+
+wget -nH -r -c --no-parent $WGET_ARGS
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameVersion="${filename%.tar.*}"
+        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        echo "$name,$version,$src,$filename" >>../srcs.csv
+    fi
+done
 
 cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by manifest.sh
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
 { fetchurl, mirror }:
 
 {
 EOF
 
-workdir=$(pwd)
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        url="${src:2}"
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameversion="${filename%.tar.*}"
-        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-        cat >>../srcs.nix <<EOF
+gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
+    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
+    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
+    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
+    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
+    url="${src:2}"
+    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+    cat >>../srcs.nix <<EOF
   $name = {
-    version = "$version";
+    version = "$latestVersion";
     src = fetchurl {
       url = "\${mirror}/$url";
       sha256 = "$sha256";
@@ -39,9 +47,10 @@ find . | while read src; do
     };
   };
 EOF
-    fi
 done
 
 echo "}" >>../srcs.nix
 
+rm -f ../srcs.csv
+
 cd ..
diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix
index 27d20369128..732ac11e96d 100644
--- a/pkgs/applications/kde-apps-15.08/gwenview.nix
+++ b/pkgs/applications/kde-apps-15.08/gwenview.nix
@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, makeQtWrapper
 , baloo
 , exiv2
 , kactivities
@@ -18,18 +19,24 @@ kdeApp {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
-    baloo
     exiv2
-    kactivities
-    kdelibs4support
-    kio
     lcms2
     phonon
     qtsvg
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
+    kdelibs4support
+    kio
     qtx11extras
   ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/gwenview"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix
index b24ef0b863f..91eeb2314a4 100644
--- a/pkgs/applications/kde-apps-15.08/kate.nix
+++ b/pkgs/applications/kde-apps-15.08/kate.nix
@@ -34,28 +34,34 @@ kdeApp {
   ];
   buildInputs = [
     qtscript
-    kactivities
     kconfig
     kcrash
     kguiaddons
     kiconthemes
-    ki18n
     kinit
     kjobwidgets
-    kio
     kparts
-    ktexteditor
-    kwindowsystem
     kxmlgui
     kdbusaddons
     kwallet
-    plasma-framework
     kitemmodels
     knotifications
     threadweaver
     knewstuff
     libgit2
   ];
+  propagatedBuildInputs = [
+    kactivities
+    ki18n
+    kio
+    ktexteditor
+    kwindowsystem
+    plasma-framework
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kate"
+    wrapQtProgram "$out/bin/kwrite"
+  '';
   meta = {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/kde-app.nix b/pkgs/applications/kde-apps-15.08/kde-app.nix
new file mode 100644
index 00000000000..242f3d9c793
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.08/kde-app.nix
@@ -0,0 +1,23 @@
+{ stdenv, lib, debug, srcs }:
+
+args:
+
+let
+  inherit (args) name;
+  sname = args.sname or name;
+  inherit (srcs."${sname}") src version;
+in
+stdenv.mkDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  cmakeFlags =
+    (args.cmakeFlags or [])
+    ++ [ "-DBUILD_TESTING=OFF" ]
+    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  meta = {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})
diff --git a/pkgs/applications/kde-apps-15.08/kde-locale-4.nix b/pkgs/applications/kde-apps-15.08/kde-locale-4.nix
new file mode 100644
index 00000000000..4b612ee3e3c
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.08/kde-locale-4.nix
@@ -0,0 +1,20 @@
+name: args:
+
+{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
+
+kdeApp (args // {
+  sname = "kde-l10n-${name}";
+  name = "kde-l10n-${name}-qt4";
+
+  nativeBuildInputs =
+    [ automoc4 cmake gettext perl ]
+    ++ (args.nativeBuildInputs or []);
+  buildInputs =
+    [ kdelibs ]
+    ++ (args.buildInputs or []);
+
+  preConfigure = ''
+    sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
+    ${args.preConfigure or ""}
+  '';
+})
diff --git a/pkgs/applications/kde-apps-15.08/kde-locale-5.nix b/pkgs/applications/kde-apps-15.08/kde-locale-5.nix
new file mode 100644
index 00000000000..522fc542aeb
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.08/kde-locale-5.nix
@@ -0,0 +1,17 @@
+name: args:
+
+{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
+
+kdeApp (args // {
+  sname = "kde-l10n-${name}";
+  name = "kde-l10n-${name}-qt5";
+
+  nativeBuildInputs =
+    [ cmake extra-cmake-modules gettext kdoctools ]
+    ++ (args.nativeBuildInputs or []);
+
+  preConfigure = ''
+    sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
+    ${args.preConfigure or ""}
+  '';
+})
diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch
new file mode 100644
index 00000000000..a79d7b2b7d1
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch
@@ -0,0 +1,47 @@
+diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
+index ab8f76d..2ae5089 100644
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
+@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
+     else
+     {
+         xdgdirList.clear();
+-        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
+-#ifdef Q_WS_WIN
+-        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
+-#else
+-        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
+-#endif
+     }
+ 
+     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
+@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
+         }
+     } else {
+         xdgdirList = kdedirDataDirs;
+-#ifndef Q_WS_WIN
+-        xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
+-        xdgdirList.append(QString::fromLatin1("/usr/share/"));
+-#endif
+     }
+ 
+     localXdgDir = readEnvPath("XDG_DATA_HOME");
+diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
+index 4c9cad9..6849d45 100644
+--- a/solid/solid/xdgbasedirs.cpp
++++ b/solid/solid/xdgbasedirs.cpp
+@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
+ {
+   if ( qstrncmp( "data", resource, 4 ) == 0 ) {
+     if ( instance()->mDataDirs.isEmpty() ) {
+-      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
++      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
+     }
+     return instance()->mDataDirs;
+   } else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
+     if ( instance()->mConfigDirs.isEmpty() ) {
+-      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
++      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
+     }
+     return instance()->mConfigDirs;
+   }
diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
index f87b1114c55..49a8e1a11c3 100644
--- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
+++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
@@ -21,6 +21,7 @@ kdeApp {
   patches = [
     ./0001-old-kde4-cmake-policies.patch
     ./0002-polkit-install-path.patch
+    ./0003-remove_xdg_impurities.patch
   ];
 
   # cmake does not detect path to `ilmbase`
diff --git a/pkgs/applications/kde-apps-15.08/kgpg.nix b/pkgs/applications/kde-apps-15.08/kgpg.nix
index cf3fe20d5d7..3ee92519718 100644
--- a/pkgs/applications/kde-apps-15.08/kgpg.nix
+++ b/pkgs/applications/kde-apps-15.08/kgpg.nix
@@ -2,12 +2,14 @@
 , lib
 , automoc4
 , cmake
+, makeWrapper
 , perl
 , pkgconfig
 , boost
 , gpgme
 , kdelibs
 , kdepimlibs
+, gnupg
 }:
 
 kdeApp {
@@ -15,6 +17,7 @@ kdeApp {
   nativeBuildInputs = [
     automoc4
     cmake
+    makeWrapper
     perl
     pkgconfig
   ];
@@ -24,6 +27,10 @@ kdeApp {
     kdelibs
     kdepimlibs
   ];
+  postInstall = ''
+    wrapProgram "$out/bin/kgpg" \
+        --prefix PATH : "${gnupg}/bin"
+  '';
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix
index 05cac334348..4b4cba2a377 100644
--- a/pkgs/applications/kde-apps-15.08/konsole.nix
+++ b/pkgs/applications/kde-apps-15.08/konsole.nix
@@ -2,6 +2,7 @@
 , lib
 , extra-cmake-modules
 , kdoctools
+, makeQtWrapper
 , qtscript
 , kbookmarks
 , kcompletion
@@ -30,6 +31,7 @@ kdeApp {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    makeQtWrapper
   ];
   buildInputs = [
     qtscript
@@ -39,10 +41,8 @@ kdeApp {
     kconfigwidgets
     kcoreaddons
     kguiaddons
-    ki18n
     kiconthemes
     kinit
-    kdelibs4support
     kio
     knotifications
     knotifyconfig
@@ -51,9 +51,16 @@ kdeApp {
     kservice
     ktextwidgets
     kwidgetsaddons
-    kwindowsystem
     kxmlgui
   ];
+  propagatedBuildInputs = [
+    kdelibs4support
+    ki18n
+    kwindowsystem
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/konsole"
+  '';
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/l10n.nix b/pkgs/applications/kde-apps-15.08/l10n.nix
new file mode 100644
index 00000000000..7a9f1c36cbf
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.08/l10n.nix
@@ -0,0 +1,231 @@
+{ callPackage, pkgs, lib }:
+
+let
+
+  kdeLocale4 = import ./kde-locale-4.nix;
+  kdeLocale5 = import ./kde-locale-5.nix;
+
+in
+
+lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
+  ar = {
+    qt4 = callPackage (kdeLocale4 "ar" {}) {};
+    qt5 = callPackage (kdeLocale5 "ar" {}) {};
+  };
+  bg = {
+    qt4 = callPackage (kdeLocale4 "bg" {}) {};
+    qt5 = callPackage (kdeLocale5 "bg" {}) {};
+  };
+  bs = {
+    qt4 = callPackage (kdeLocale4 "bs" {}) {};
+    qt5 = callPackage (kdeLocale5 "bs" {}) {};
+  };
+  ca = {
+    qt4 = callPackage (kdeLocale4 "ca" {}) {};
+    qt5 = callPackage (kdeLocale5 "ca" {}) {};
+  };
+  ca_valencia = {
+    qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
+    qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
+  };
+  cs = {
+    qt4 = callPackage (kdeLocale4 "cs" {}) {};
+    qt5 = callPackage (kdeLocale5 "cs" {}) {};
+  };
+  da = {
+    qt4 = callPackage (kdeLocale4 "da" {}) {};
+    qt5 = callPackage (kdeLocale5 "da" {}) {};
+  };
+  de = {
+    qt4 = callPackage (kdeLocale4 "de" {}) {};
+    qt5 = callPackage (kdeLocale5 "de" {}) {};
+  };
+  el = {
+    qt4 = callPackage (kdeLocale4 "el" {}) {};
+    qt5 = callPackage (kdeLocale5 "el" {}) {};
+  };
+  en_GB = {
+    qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
+    qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
+  };
+  eo = {
+    qt4 = callPackage (kdeLocale4 "eo" {}) {};
+    qt5 = callPackage (kdeLocale5 "eo" {}) {};
+  };
+  es = {
+    qt4 = callPackage (kdeLocale4 "es" {}) {};
+    qt5 = callPackage (kdeLocale5 "es" {}) {};
+  };
+  et = {
+    qt4 = callPackage (kdeLocale4 "et" {}) {};
+    qt5 = callPackage (kdeLocale5 "et" {}) {};
+  };
+  eu = {
+    qt4 = callPackage (kdeLocale4 "eu" {}) {};
+    qt5 = callPackage (kdeLocale5 "eu" {}) {};
+  };
+  fa = {
+    qt4 = callPackage (kdeLocale4 "fa" {}) {};
+    qt5 = callPackage (kdeLocale5 "fa" {}) {};
+  };
+  fi = {
+    qt4 = callPackage (kdeLocale4 "fi" {}) {};
+    qt5 = callPackage (kdeLocale5 "fi" {}) {};
+  };
+  fr = {
+    qt4 = callPackage (kdeLocale4 "fr" {}) {};
+    qt5 = callPackage (kdeLocale5 "fr" {}) {};
+  };
+  ga = {
+    qt4 = callPackage (kdeLocale4 "ga" {}) {};
+    qt5 = callPackage (kdeLocale5 "ga" {}) {};
+  };
+  gl = {
+    qt4 = callPackage (kdeLocale4 "gl" {}) {};
+    qt5 = callPackage (kdeLocale5 "gl" {}) {};
+  };
+  he = {
+    qt4 = callPackage (kdeLocale4 "he" {}) {};
+    qt5 = callPackage (kdeLocale5 "he" {}) {};
+  };
+  hi = {
+    qt4 = callPackage (kdeLocale4 "hi" {}) {};
+    qt5 = callPackage (kdeLocale5 "hi" {}) {};
+  };
+  hr = {
+    qt4 = callPackage (kdeLocale4 "hr" {}) {};
+    qt5 = callPackage (kdeLocale5 "hr" {}) {};
+  };
+  hu = {
+    qt4 = callPackage (kdeLocale4 "hu" {}) {};
+    qt5 = callPackage (kdeLocale5 "hu" {}) {};
+  };
+  ia = {
+    qt4 = callPackage (kdeLocale4 "ia" {}) {};
+    qt5 = callPackage (kdeLocale5 "ia" {}) {};
+  };
+  id = {
+    qt4 = callPackage (kdeLocale4 "id" {}) {};
+    qt5 = callPackage (kdeLocale5 "id" {}) {};
+  };
+  is = {
+    qt4 = callPackage (kdeLocale4 "is" {}) {};
+    qt5 = callPackage (kdeLocale5 "is" {}) {};
+  };
+  it = {
+    qt4 = callPackage (kdeLocale4 "it" {}) {};
+    qt5 = callPackage (kdeLocale5 "it" {}) {};
+  };
+  ja = {
+    qt4 = callPackage (kdeLocale4 "ja" {}) {};
+    qt5 = callPackage (kdeLocale5 "ja" {}) {};
+  };
+  kk = {
+    qt4 = callPackage (kdeLocale4 "kk" {}) {};
+    qt5 = callPackage (kdeLocale5 "kk" {}) {};
+  };
+  km = {
+    qt4 = callPackage (kdeLocale4 "km" {}) {};
+    qt5 = callPackage (kdeLocale5 "km" {}) {};
+  };
+  ko = {
+    qt4 = callPackage (kdeLocale4 "ko" {}) {};
+    qt5 = callPackage (kdeLocale5 "ko" {}) {};
+  };
+  lt = {
+    qt4 = callPackage (kdeLocale4 "lt" {}) {};
+    qt5 = callPackage (kdeLocale5 "lt" {}) {};
+  };
+  lv = {
+    qt4 = callPackage (kdeLocale4 "lv" {}) {};
+    qt5 = callPackage (kdeLocale5 "lv" {}) {};
+  };
+  mr = {
+    qt4 = callPackage (kdeLocale4 "mr" {}) {};
+    qt5 = callPackage (kdeLocale5 "mr" {}) {};
+  };
+  nb = {
+    qt4 = callPackage (kdeLocale4 "nb" {}) {};
+    qt5 = callPackage (kdeLocale5 "nb" {}) {};
+  };
+  nds = {
+    qt4 = callPackage (kdeLocale4 "nds" {}) {};
+    qt5 = callPackage (kdeLocale5 "nds" {}) {};
+  };
+  nl = {
+    qt4 = callPackage (kdeLocale4 "nl" {}) {};
+    qt5 = callPackage (kdeLocale5 "nl" {}) {};
+  };
+  nn = {
+    qt4 = callPackage (kdeLocale4 "nn" {}) {};
+    qt5 = callPackage (kdeLocale5 "nn" {}) {};
+  };
+  pa = {
+    qt4 = callPackage (kdeLocale4 "pa" {}) {};
+    qt5 = callPackage (kdeLocale5 "pa" {}) {};
+  };
+  pl = {
+    qt4 = callPackage (kdeLocale4 "pl" {}) {};
+    qt5 = callPackage (kdeLocale5 "pl" {}) {};
+  };
+  pt = {
+    qt4 = callPackage (kdeLocale4 "pt" {}) {};
+    qt5 = callPackage (kdeLocale5 "pt" {}) {};
+  };
+  pt_BR = {
+    qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
+    qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
+  };
+  ro = {
+    qt4 = callPackage (kdeLocale4 "ro" {}) {};
+    qt5 = callPackage (kdeLocale5 "ro" {}) {};
+  };
+  ru = {
+    qt4 = callPackage (kdeLocale4 "ru" {}) {};
+    qt5 = callPackage (kdeLocale5 "ru" {}) {};
+  };
+  sk = {
+    qt4 = callPackage (kdeLocale4 "sk" {}) {};
+    qt5 = callPackage (kdeLocale5 "sk" {}) {};
+  };
+  sl = {
+    qt4 = callPackage (kdeLocale4 "sl" {}) {};
+    qt5 = callPackage (kdeLocale5 "sl" {}) {};
+  };
+  sr = {
+    qt4 = callPackage (kdeLocale4 "sr" {}) {};
+    qt5 = callPackage (kdeLocale5 "sr" {
+      preConfigure = ''
+        sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
+      '';
+    }) {};
+  };
+  sv = {
+    qt4 = callPackage (kdeLocale4 "sv" {}) {};
+    qt5 = callPackage (kdeLocale5 "sv" {}) {};
+  };
+  tr = {
+    qt4 = callPackage (kdeLocale4 "tr" {}) {};
+    qt5 = callPackage (kdeLocale5 "tr" {}) {};
+  };
+  ug = {
+    qt4 = callPackage (kdeLocale4 "ug" {}) {};
+    qt5 = callPackage (kdeLocale5 "ug" {}) {};
+  };
+  uk = {
+    qt4 = callPackage (kdeLocale4 "uk" {}) {};
+    qt5 = callPackage (kdeLocale5 "uk" {}) {};
+  };
+  wa = {
+    qt4 = callPackage (kdeLocale4 "wa" {}) {};
+    qt5 = callPackage (kdeLocale5 "wa" {}) {};
+  };
+  zh_CN = {
+    qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
+    qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
+  };
+  zh_TW = {
+    qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
+    qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
+  };
+}
diff --git a/pkgs/applications/kde-apps-15.08/oxygen-icons.nix b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix
new file mode 100644
index 00000000000..4f9a92dffdd
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.08/oxygen-icons.nix
@@ -0,0 +1,13 @@
+{ kdeApp
+, lib
+, cmake
+}:
+
+kdeApp {
+  name = "oxygen-icons";
+  nativeBuildInputs = [ cmake ];
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix
index 909aea8e716..b4eab372789 100644
--- a/pkgs/applications/kde-apps-15.08/print-manager.nix
+++ b/pkgs/applications/kde-apps-15.08/print-manager.nix
@@ -23,21 +23,23 @@ kdeApp {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtdeclarative
     cups
     kconfig
     kconfigwidgets
     kdbusaddons
     kiconthemes
-    ki18n
     kcmutils
-    kio
     knotifications
-    plasma-framework
     kwidgetsaddons
-    kwindowsystem
     kitemviews
   ];
+  propagatedBuildInputs = [
+    ki18n
+    kio
+    kwindowsystem
+    plasma-framework
+    qtdeclarative
+  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/applications/kde-apps-15.08/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix
index 97e1e774303..d0187495729 100644
--- a/pkgs/applications/kde-apps-15.08/srcs.nix
+++ b/pkgs/applications/kde-apps-15.08/srcs.nix
@@ -1,1981 +1,1981 @@
-# DO NOT EDIT! This file is generated automatically by manifest.sh
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
 { fetchurl, mirror }:
 
 {
-  libkcompactdisc = {
-    version = "15.08.1";
+  akonadi = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkcompactdisc-15.08.1.tar.xz";
-      sha256 = "19b6zjzdmjagz9d9x1bb46cc59r92qm9g0pbvim9br603crwsasd";
-      name = "libkcompactdisc-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/akonadi-15.08.3.tar.xz";
+      sha256 = "0v7zwvixfpf5fskxlamvmyaagb2vxqkw81fzsb4yiyq8493lm0mf";
+      name = "akonadi-15.08.3.tar.xz";
     };
   };
-  kollision = {
-    version = "15.08.1";
+  akonadi-calendar = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kollision-15.08.1.tar.xz";
-      sha256 = "03bm9ydrfq0kicf7j2bmrvjgcffciq7ys0fz0xpcllkwglidsnar";
-      name = "kollision-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/akonadi-calendar-15.08.3.tar.xz";
+      sha256 = "11mp32k71pa9f6gkqmm1dkia1ljcr9wdx4iyb9ys8fm580xxk5gv";
+      name = "akonadi-calendar-15.08.3.tar.xz";
     };
   };
-  libkmahjongg = {
-    version = "15.08.1";
+  akonadi-search = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkmahjongg-15.08.1.tar.xz";
-      sha256 = "1jpcj2kj9wn6988gzz4csrwy4c2pwbnyi184iq6c39fmbvrv4f2r";
-      name = "libkmahjongg-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/akonadi-search-15.08.3.tar.xz";
+      sha256 = "10iwmb76yijqpagvsjgwyksq1j3j61ihv2hmi09z44zz4w171vzb";
+      name = "akonadi-search-15.08.3.tar.xz";
     };
   };
-  superkaramba = {
-    version = "15.08.1";
+  amor = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/superkaramba-15.08.1.tar.xz";
-      sha256 = "0pk7kr2bcj2yasf9af3bdqg207pidkg5m2yafmvp83dz2anyxad9";
-      name = "superkaramba-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/amor-15.08.3.tar.xz";
+      sha256 = "0jci7yvxc1z7kcs1sw85dvsvz2c2ak2szxlf5bz09msgpxgb0xxc";
+      name = "amor-15.08.3.tar.xz";
     };
   };
-  kcharselect = {
-    version = "15.08.1";
+  analitza = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcharselect-15.08.1.tar.xz";
-      sha256 = "0g785ab5iclv1db2dwwlzf14a2l6n9yznw6pb8hx589za7yc46v2";
-      name = "kcharselect-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/analitza-15.08.3.tar.xz";
+      sha256 = "174s4qd0j6yx4r8vn7ak598d5kiyhqzy2cc4l7iynpyqs28ybpwi";
+      name = "analitza-15.08.3.tar.xz";
     };
   };
-  umbrello = {
-    version = "15.08.1";
+  ark = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/umbrello-15.08.1.tar.xz";
-      sha256 = "0pq2d4iz1dmxb7cdmcja65703qlsakp590v5yjvhjsnlasnk8anj";
-      name = "umbrello-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ark-15.08.3.tar.xz";
+      sha256 = "0w61ifdwhv6prnxryqsz4ka7508jj4w3zj4c2x34lv2g9q05fw21";
+      name = "ark-15.08.3.tar.xz";
     };
   };
-  kde-runtime = {
-    version = "15.08.1";
+  artikulate = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-runtime-15.08.1.tar.xz";
-      sha256 = "04vx2v9m5dz5jihvmqvcd6pvk312hdhgj7pkzv8q0lg3z81fqgyi";
-      name = "kde-runtime-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/artikulate-15.08.3.tar.xz";
+      sha256 = "0bsdjjr5zyl57iagxd1vb1g5zz1w6k85788pwp1rkvwwv7qmdcng";
+      name = "artikulate-15.08.3.tar.xz";
     };
   };
-  kcontacts = {
-    version = "15.08.1";
+  audiocd-kio = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcontacts-15.08.1.tar.xz";
-      sha256 = "1a9ww08m3k7sdqnkb2dpi2c0fpfihjschyzwx82kcp1z613agx1c";
-      name = "kcontacts-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/audiocd-kio-15.08.3.tar.xz";
+      sha256 = "09v5a6r8ks5zaxd1p35wqngnaprfww0wvzkjlxs0j2wf7v4in0kb";
+      name = "audiocd-kio-15.08.3.tar.xz";
     };
   };
-  kontactinterface = {
-    version = "15.08.1";
+  baloo-widgets = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kontactinterface-15.08.1.tar.xz";
-      sha256 = "1axsixl5yvawrczpgfbrcyax9d9mmc8yjvkxi0hi26mq8zzxkxnm";
-      name = "kontactinterface-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/baloo-widgets-15.08.3.tar.xz";
+      sha256 = "0lavpqv798cfnfpdxn7ypwh77550kky2ar7l3nsi5jczkk2n0kza";
+      name = "baloo-widgets-15.08.3.tar.xz";
     };
   };
-  ktp-desktop-applets = {
-    version = "15.08.1";
+  blinken = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-desktop-applets-15.08.1.tar.xz";
-      sha256 = "16nan7vb2gzpll2fnc4li23sjjxhgy7ijzfp6zcp5gc1bxn86jj4";
-      name = "ktp-desktop-applets-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/blinken-15.08.3.tar.xz";
+      sha256 = "00r2yjvj3g1lj0lzvwf0xjgras8fmqllgdy5d8ij5ihg7bb9l3rq";
+      name = "blinken-15.08.3.tar.xz";
     };
   };
-  kldap = {
-    version = "15.08.1";
+  bomber = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kldap-15.08.1.tar.xz";
-      sha256 = "13mn0zkyd8qkp2rlcd75g821k3xpvwrj6xwjwvllfn25zsng32yw";
-      name = "kldap-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/bomber-15.08.3.tar.xz";
+      sha256 = "084prrbpc5wscbh4w04r4452fs7zkklmfc1mga1ba2wp1fpf24yc";
+      name = "bomber-15.08.3.tar.xz";
     };
   };
-  kaccounts-providers = {
-    version = "15.08.1";
+  bovo = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kaccounts-providers-15.08.1.tar.xz";
-      sha256 = "15sl3rwwpshqvzjrkfiray3gg3ja84awsyk3y5n9jbf97rw47v3k";
-      name = "kaccounts-providers-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/bovo-15.08.3.tar.xz";
+      sha256 = "0fzwp9n0fn16z3r60ry9zn1acs76dyzrkrl45jv927zk4x7pk5vi";
+      name = "bovo-15.08.3.tar.xz";
     };
   };
-  signon-kwallet-extension = {
-    version = "15.08.1";
+  cantor = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/signon-kwallet-extension-15.08.1.tar.xz";
-      sha256 = "1pb73zqs34kygvaphgrvvl08hj882znsws1nzwbyyskyn6gjsw2n";
-      name = "signon-kwallet-extension-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/cantor-15.08.3.tar.xz";
+      sha256 = "0fyy7wda6cd1vnw8whnadfa4hlw5yjw3npv0wdnxql426ig33dd1";
+      name = "cantor-15.08.3.tar.xz";
     };
   };
-  klines = {
-    version = "15.08.1";
+  cervisia = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/klines-15.08.1.tar.xz";
-      sha256 = "17vnbk0qbiynyjycj5nda9w38ija5cvhlfhji1f580hq156qzsgl";
-      name = "klines-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/cervisia-15.08.3.tar.xz";
+      sha256 = "083cw5yh63lkkgv68hynnkx9b8y9myz5h92vbh17vrza07w94zmi";
+      name = "cervisia-15.08.3.tar.xz";
     };
   };
-  kompare = {
-    version = "15.08.1";
+  dolphin = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kompare-15.08.1.tar.xz";
-      sha256 = "0n474f1nvbkxj1ryyv2x0yqm9qg3crdzmr30l2fbagi2fxmjxkli";
-      name = "kompare-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/dolphin-15.08.3.tar.xz";
+      sha256 = "188a7yhk93rw8hhab852357jgygji5g45irs063hg47k1kms5vgm";
+      name = "dolphin-15.08.3.tar.xz";
     };
   };
-  analitza = {
-    version = "15.08.1";
+  dolphin-plugins = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/analitza-15.08.1.tar.xz";
-      sha256 = "0zxkpsccnp0m8r7z1p243h5vh4fz4dzq2dz932vfac8hs45lcaki";
-      name = "analitza-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/dolphin-plugins-15.08.3.tar.xz";
+      sha256 = "1jgq418p72g804kkw10n3rawdky750fpq3wbwbdckxwjybanqd7y";
+      name = "dolphin-plugins-15.08.3.tar.xz";
     };
   };
-  kalzium = {
-    version = "15.08.1";
+  dragon = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kalzium-15.08.1.tar.xz";
-      sha256 = "0jhfv5cw5vhgy13ld5km664r7ydqv52nwd4k450x2d62rvq63nfp";
-      name = "kalzium-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/dragon-15.08.3.tar.xz";
+      sha256 = "0agncn4c0dbrrnz1rjmnrz9hxlqpavb9nb6zxzcyn30ssmy553qg";
+      name = "dragon-15.08.3.tar.xz";
     };
   };
-  kcachegrind = {
-    version = "15.08.1";
+  ffmpegthumbs = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcachegrind-15.08.1.tar.xz";
-      sha256 = "1nmyw0nld1qasd2zz8dg854br8nqn3kby2xd2afr9a8frhzzmiv2";
-      name = "kcachegrind-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ffmpegthumbs-15.08.3.tar.xz";
+      sha256 = "15sbfhirys5qj25ns768agq2nanr6q1zyvmm4mbjqasl5rckxkmk";
+      name = "ffmpegthumbs-15.08.3.tar.xz";
     };
   };
-  kuser = {
-    version = "15.08.1";
+  filelight = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kuser-15.08.1.tar.xz";
-      sha256 = "0qgvjfh1r4ri227zbcb2v9dg7njg1wq3pi189y0l3jzgfa4h1aph";
-      name = "kuser-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/filelight-15.08.3.tar.xz";
+      sha256 = "0l6bvpxybcf1y2w12q8c9ixa5hgvs6sxa99hmyjxybj2icylr322";
+      name = "filelight-15.08.3.tar.xz";
     };
   };
-  libkgeomap = {
-    version = "15.08.1";
+  gpgmepp = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkgeomap-15.08.1.tar.xz";
-      sha256 = "18y3pas4bx16ykf50jlwry7fbrx34cz1s0qflirxyrx6n8kh9lgm";
-      name = "libkgeomap-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/gpgmepp-15.08.3.tar.xz";
+      sha256 = "03nl1zs9lsba0a9ba4qi5kn7l76g3135g7lbf9vfm9pvgl38bdfs";
+      name = "gpgmepp-15.08.3.tar.xz";
     };
   };
-  artikulate = {
-    version = "15.08.1";
+  granatier = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/artikulate-15.08.1.tar.xz";
-      sha256 = "0pz66hrnd89519ivk1cw8gzddjv6043x59nbkhmnlk8f5hvvkk2k";
-      name = "artikulate-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/granatier-15.08.3.tar.xz";
+      sha256 = "1k0pvvygzw5mzakpnrlwqc4rrdqkdbk5y5bw2r44m4594r5vkyfg";
+      name = "granatier-15.08.3.tar.xz";
     };
   };
-  kscd = {
-    version = "15.08.1";
+  gwenview = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kscd-15.08.1.tar.xz";
-      sha256 = "0alf1088p32spwlpjjj91wpgk48ahzqphvag8adgvh9cp8ij7m7j";
-      name = "kscd-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/gwenview-15.08.3.tar.xz";
+      sha256 = "1fdwh2ksivvliz46hzmha36kx1308ixz7zbmxiwfl0z4g49x28k6";
+      name = "gwenview-15.08.3.tar.xz";
     };
   };
-  akonadi-calendar = {
-    version = "15.08.1";
+  jovie = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/akonadi-calendar-15.08.1.tar.xz";
-      sha256 = "00iyv123s18157v46y3xdg56lyfr0w6f0zz8qsp6js7vn0fa468j";
-      name = "akonadi-calendar-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/jovie-15.08.3.tar.xz";
+      sha256 = "1cxkgxkzj8g75jwbfzfc09fb9y3100yk56951vihifgbhilclh5r";
+      name = "jovie-15.08.3.tar.xz";
     };
   };
-  kdesdk-strigi-analyzers = {
-    version = "15.08.1";
+  kaccessible = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdesdk-strigi-analyzers-15.08.1.tar.xz";
-      sha256 = "1g2c511ba42mxg955yyh8w45ga5313mvvpkdl7yvbz7ikb2z6ji5";
-      name = "kdesdk-strigi-analyzers-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kaccessible-15.08.3.tar.xz";
+      sha256 = "16a9jvziq4xlc88ypd7qaqnx4dz5cr61l5gqkl3fhlrfc98aqnsm";
+      name = "kaccessible-15.08.3.tar.xz";
     };
   };
-  killbots = {
-    version = "15.08.1";
+  kaccounts-integration = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/killbots-15.08.1.tar.xz";
-      sha256 = "1p7lxi3rh8ghashy04252wc086kxz1crdxgnisfw4dv4kr17qmb2";
-      name = "killbots-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kaccounts-integration-15.08.3.tar.xz";
+      sha256 = "146z5lgfy5gpwmyl7gx0qzv3za84g34rq5fqfj8xkw2ww65ncwgs";
+      name = "kaccounts-integration-15.08.3.tar.xz";
     };
   };
-  ksirk = {
-    version = "15.08.1";
+  kaccounts-providers = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksirk-15.08.1.tar.xz";
-      sha256 = "00zlmjyxf31hl910kickgxcc3sh5g2j9grg2mlps8qxdv9m4g1d5";
-      name = "ksirk-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kaccounts-providers-15.08.3.tar.xz";
+      sha256 = "1nmdfb630k6bs0qzmzl1cl6xsz60nsk6w5kz5qildwgk6ll36dgx";
+      name = "kaccounts-providers-15.08.3.tar.xz";
     };
   };
-  ark = {
-    version = "15.08.1";
+  kajongg = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ark-15.08.1.tar.xz";
-      sha256 = "0lmqi9qdf46v9yap6f7s5favx4y66w3sixhplby4q1cm085yg5hl";
-      name = "ark-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kajongg-15.08.3.tar.xz";
+      sha256 = "1xxqxwri5havnmdncqqpi8q0r69mnkf9qbpjzggxq4ciqc99hg8k";
+      name = "kajongg-15.08.3.tar.xz";
     };
   };
-  kde-l10n-el = {
-    version = "15.08.1";
+  kalarmcal = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-el-15.08.1.tar.xz";
-      sha256 = "0qznnbk6mgbdjz4mm7rpmr04b6i9fya1yjhnmv8hpwlicl8n9sd6";
-      name = "kde-l10n-el-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kalarmcal-15.08.3.tar.xz";
+      sha256 = "0vaz3b8wp02qbx4xjj5wqx9vsy7jibhiwr60gl8nimjnyczxnr01";
+      name = "kalarmcal-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ug = {
-    version = "15.08.1";
+  kalgebra = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ug-15.08.1.tar.xz";
-      sha256 = "1brnbjnpwqhh52g058s2hqh77a6p2c81sygdfsjgngc0griahl4q";
-      name = "kde-l10n-ug-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kalgebra-15.08.3.tar.xz";
+      sha256 = "1p1zq9lfwakawgnv99n17qxj7bx390pglk6v3j56l2p3zlsqjil1";
+      name = "kalgebra-15.08.3.tar.xz";
     };
   };
-  kde-l10n-sl = {
-    version = "15.08.1";
+  kalzium = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sl-15.08.1.tar.xz";
-      sha256 = "12gg889lhq6l1h5bv6hlcwsq2zkqdfxgicxhkjnm3i7ly5laij4f";
-      name = "kde-l10n-sl-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kalzium-15.08.3.tar.xz";
+      sha256 = "0bz8qv0nmf7ysh47zmwhvwwi7vnb3kd190ci1sg7xdm342xdzdi1";
+      name = "kalzium-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ar = {
-    version = "15.08.1";
+  kamera = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ar-15.08.1.tar.xz";
-      sha256 = "101c1316wwxl3pf38fb9ch2h5nyra8h2cf79w9l1krdcp6s4776w";
-      name = "kde-l10n-ar-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kamera-15.08.3.tar.xz";
+      sha256 = "1jlywxbsa52rqlzm0lmq2xbz18r56s0jgwylmwja5rjcm0wp58hz";
+      name = "kamera-15.08.3.tar.xz";
     };
   };
-  kde-l10n-wa = {
-    version = "15.08.1";
+  kanagram = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-wa-15.08.1.tar.xz";
-      sha256 = "0z9s118fc0wj2dg2ha7mv0rldvsa3rr8mhwjdgawkmfr9ns82w64";
-      name = "kde-l10n-wa-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kanagram-15.08.3.tar.xz";
+      sha256 = "1nlz18ih95ppc7csqzbiix4my7xin8plf5wn55x7pp8jj6q44l2d";
+      name = "kanagram-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ro = {
-    version = "15.08.1";
+  kapman = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ro-15.08.1.tar.xz";
-      sha256 = "0j3qccfwarb9azsvm2pf0ikc12dsbywzfi7hv2xd244qcnjpp289";
-      name = "kde-l10n-ro-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kapman-15.08.3.tar.xz";
+      sha256 = "1i125fkk9lj2azlhcvjxdli53lay0073f81n9vv3fkjyfkmdch2d";
+      name = "kapman-15.08.3.tar.xz";
     };
   };
-  kde-l10n-it = {
-    version = "15.08.1";
+  kapptemplate = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-it-15.08.1.tar.xz";
-      sha256 = "04blm19llvm2n885p9in4iicaj81ap9vvxsqmfnz7rwb93bsy4wl";
-      name = "kde-l10n-it-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kapptemplate-15.08.3.tar.xz";
+      sha256 = "05hh09h58s4b32njf83viplmafbg4lw8zqp0qsyacdn37cid51a8";
+      name = "kapptemplate-15.08.3.tar.xz";
     };
   };
-  kde-l10n-he = {
-    version = "15.08.1";
+  kate = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-he-15.08.1.tar.xz";
-      sha256 = "1fgxnm6l45kcjrgjg19z2fg6fnsbpdy0agllj6rw0ffbcp68l863";
-      name = "kde-l10n-he-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kate-15.08.3.tar.xz";
+      sha256 = "0d31ph43d83mn806yfpj7w630r7rwsj0js6qp9738865il5c4428";
+      name = "kate-15.08.3.tar.xz";
     };
   };
-  kde-l10n-et = {
-    version = "15.08.1";
+  katomic = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-et-15.08.1.tar.xz";
-      sha256 = "027vpybfrm6zdmglwlhmyrh6157gmv8i5x1hx5d8f57m8jnh3nfq";
-      name = "kde-l10n-et-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/katomic-15.08.3.tar.xz";
+      sha256 = "144vchhis0ngg49h1znabx2kp02jfqyh04lq9sdndaawa729d2f6";
+      name = "katomic-15.08.3.tar.xz";
     };
   };
-  kde-l10n-pa = {
-    version = "15.08.1";
+  kblackbox = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pa-15.08.1.tar.xz";
-      sha256 = "05n9kaalsdx8nvn0p29wf33barhkhb64xxr3xg8cc0d3x21kmhx1";
-      name = "kde-l10n-pa-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kblackbox-15.08.3.tar.xz";
+      sha256 = "16h4z8aagx8f161fyzzli0hdyqipsc9bl3pnicnkm9fcxlkrs1hj";
+      name = "kblackbox-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ja = {
-    version = "15.08.1";
+  kblocks = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ja-15.08.1.tar.xz";
-      sha256 = "0ir82yc2jmy7ijn02y9f2vxnv1cd5a92pjji3fzriqfg6dlgyiw9";
-      name = "kde-l10n-ja-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kblocks-15.08.3.tar.xz";
+      sha256 = "025zharfv24vvvq0jy7kzmxkif4nix7ck40if5x0hxbkn902mmjf";
+      name = "kblocks-15.08.3.tar.xz";
     };
   };
-  kde-l10n-bg = {
-    version = "15.08.1";
+  kblog = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-bg-15.08.1.tar.xz";
-      sha256 = "1r515r3c03328ivwqkm7ijj2264l21liblzllgvjy6zmg7n8ilsp";
-      name = "kde-l10n-bg-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kblog-15.08.3.tar.xz";
+      sha256 = "1bbkjg43dflqc3yxg96mphsmqzxrphp43m314cdrpka5pb39kdc9";
+      name = "kblog-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ko = {
-    version = "15.08.1";
+  kbounce = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ko-15.08.1.tar.xz";
-      sha256 = "19w7z4j7463lg0yzkf8ndfvf3664hk524qfcrdygf61f03hkp22l";
-      name = "kde-l10n-ko-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kbounce-15.08.3.tar.xz";
+      sha256 = "1rn0irm4by01k6k61iam2m27m5dc8i0fi025h4rwmyfqx9hn6f9i";
+      name = "kbounce-15.08.3.tar.xz";
     };
   };
-  kde-l10n-tr = {
-    version = "15.08.1";
+  kbreakout = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-tr-15.08.1.tar.xz";
-      sha256 = "1bca3scdg4ma6k6957pq45dmjxgp8hx3bm9jql2rqp0knqf9dwl8";
-      name = "kde-l10n-tr-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kbreakout-15.08.3.tar.xz";
+      sha256 = "069y45gyi92zm3hyil7ggm6gnimz7wj4g543lix4fx28kd7m044v";
+      name = "kbreakout-15.08.3.tar.xz";
     };
   };
-  kde-l10n-mr = {
-    version = "15.08.1";
+  kbruch = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-mr-15.08.1.tar.xz";
-      sha256 = "0ga55szsi9kbvjdcc2cjl8m15jzcfrpiryak1m78s46p056lfs7n";
-      name = "kde-l10n-mr-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kbruch-15.08.3.tar.xz";
+      sha256 = "0panrkmaid998i276wn3jsvmrhq1f7nj20yh9vva3mrc7y0bvhg3";
+      name = "kbruch-15.08.3.tar.xz";
     };
   };
-  kde-l10n-es = {
-    version = "15.08.1";
+  kcachegrind = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-es-15.08.1.tar.xz";
-      sha256 = "1bb1vp8k6f323q2rjclxpja9yykfgm2di6wn0qhr787swr6qrxjb";
-      name = "kde-l10n-es-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcachegrind-15.08.3.tar.xz";
+      sha256 = "0hjv28j5lcdxcmdihnyal03gqjfi8lfwxhdlxbzar9dr7r8azg4p";
+      name = "kcachegrind-15.08.3.tar.xz";
     };
   };
-  kde-l10n-hu = {
-    version = "15.08.1";
+  kcalc = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hu-15.08.1.tar.xz";
-      sha256 = "0jysfqb9pmhcw2kd48n6asmkci56mgk1jcsx8gxn9lcfrqnpc52g";
-      name = "kde-l10n-hu-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcalc-15.08.3.tar.xz";
+      sha256 = "1in0b2i58s6sv6fz9z3bqaxby0d33arwmq4gazvc2kzhfxylq501";
+      name = "kcalc-15.08.3.tar.xz";
     };
   };
-  kde-l10n-km = {
-    version = "15.08.1";
+  kcalcore = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-km-15.08.1.tar.xz";
-      sha256 = "1yjckfma9dj8li9whwfa6bid289z05vllxqigbsjfy12721ahrc6";
-      name = "kde-l10n-km-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcalcore-15.08.3.tar.xz";
+      sha256 = "07wpls28xw3pis9l3fmmn64af3n21nv53b9ip6ycflxn3xcqmap8";
+      name = "kcalcore-15.08.3.tar.xz";
     };
   };
-  kde-l10n-eo = {
-    version = "15.08.1";
+  kcalutils = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-eo-15.08.1.tar.xz";
-      sha256 = "07rns0a5bb2sq13hcndvq79zg451lc3rj2cldmdxdyj5axl0c955";
-      name = "kde-l10n-eo-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcalutils-15.08.3.tar.xz";
+      sha256 = "12h41bnp6vvqcfy8pm2nhqypaggaj7sgh22by8w75qvimb94ddiz";
+      name = "kcalutils-15.08.3.tar.xz";
     };
   };
-  kde-l10n-pt = {
-    version = "15.08.1";
+  kcharselect = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pt-15.08.1.tar.xz";
-      sha256 = "0z5lginm78i6wrxhcdarv660sszybjih02ra3j4wghflzhwrgrhw";
-      name = "kde-l10n-pt-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcharselect-15.08.3.tar.xz";
+      sha256 = "0iy3n8pb5xa6aj1zhbxqpk278c5k4vs9bw0i8jww3id0cwggardn";
+      name = "kcharselect-15.08.3.tar.xz";
     };
   };
-  kde-l10n-pl = {
-    version = "15.08.1";
+  kcolorchooser = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pl-15.08.1.tar.xz";
-      sha256 = "0ifjvbvzm5qks35z54i5mdz151347690zg4rn8y033lag81c7ir1";
-      name = "kde-l10n-pl-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcolorchooser-15.08.3.tar.xz";
+      sha256 = "1wyjm4d47xm5lflrd63xgwll6xjpxgnc0h8xjk4rrc6nf43w6bn1";
+      name = "kcolorchooser-15.08.3.tar.xz";
     };
   };
-  kde-l10n-lv = {
-    version = "15.08.1";
+  kcontacts = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-lv-15.08.1.tar.xz";
-      sha256 = "105lq8q97dg9y9j5p5zqf78gvk28qn4axr3ppk1j698576l1ihxl";
-      name = "kde-l10n-lv-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcontacts-15.08.3.tar.xz";
+      sha256 = "0j6ag6knz4z76md7bnizx5fwzsqavxbfz33hdpdw6606m5d66j5p";
+      name = "kcontacts-15.08.3.tar.xz";
     };
   };
-  kde-l10n-en_GB = {
-    version = "en_GB-15.08.1";
+  kcron = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-en_GB-15.08.1.tar.xz";
-      sha256 = "0rb4pjxds75x84ylc71ci2sj75l5p8vr2hmnrlddmj39j22c3mcj";
-      name = "kde-l10n-en_GB-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcron-15.08.3.tar.xz";
+      sha256 = "04z8pq5mc1kjvhnkmzgymzs9inynxdkiddq70hs7y94fbfsq2rf0";
+      name = "kcron-15.08.3.tar.xz";
     };
   };
-  kde-l10n-nn = {
-    version = "15.08.1";
+  kdeartwork = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nn-15.08.1.tar.xz";
-      sha256 = "01h9xysa8vghaghqpfp7gvps3rymiypb52ffz50srhrhjyh1zq0y";
-      name = "kde-l10n-nn-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz";
+      sha256 = "031v00f4b1jg5z7qlgycjsjiz1hyn6svm9n4mkiybrida2hf6gzv";
+      name = "kdeartwork-15.08.3.tar.xz";
     };
   };
-  kde-l10n-hr = {
-    version = "15.08.1";
+  kde-baseapps = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hr-15.08.1.tar.xz";
-      sha256 = "0jlnig5rsmdxv3ng352hd8n0vqd020bf00xnjbdihcnvdwq625lv";
-      name = "kde-l10n-hr-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-baseapps-15.08.3.tar.xz";
+      sha256 = "0n010z1b0hdj5rdw8p9y28vkai5knfwkgasrw8knvildcfifp913";
+      name = "kde-baseapps-15.08.3.tar.xz";
     };
   };
-  kde-l10n-fi = {
-    version = "15.08.1";
+  kde-base-artwork = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fi-15.08.1.tar.xz";
-      sha256 = "0ajgy01p22h1c2dsarsq7ximwp3blvmxnf9217szikkf5yky2w9m";
-      name = "kde-l10n-fi-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-base-artwork-15.08.3.tar.xz";
+      sha256 = "054rc5llv2cxkc0yss8i7rnp6dp10srl0g6sxvwm4w9hvicxp1gg";
+      name = "kde-base-artwork-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ia = {
-    version = "15.08.1";
+  kdebugsettings = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ia-15.08.1.tar.xz";
-      sha256 = "1mgzpzy1s45v6nf2wbqgsam7bdg1x0fkmggnwy8k8f7kx5yxfcw4";
-      name = "kde-l10n-ia-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdebugsettings-15.08.3.tar.xz";
+      sha256 = "0jy8gpydkis8jpb0vax6w41rj2hwwp8jvbiif438bvvfwyakx7dk";
+      name = "kdebugsettings-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ga = {
-    version = "15.08.1";
+  kde-dev-scripts = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ga-15.08.1.tar.xz";
-      sha256 = "06l39s9d6y33f4vvcxvry7cxw2m431xgvcz1wcmf6zhlpi5wwlmr";
-      name = "kde-l10n-ga-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-dev-scripts-15.08.3.tar.xz";
+      sha256 = "1zc75alr7ap8i5njfn00d7rzvzmazyxq44zi7fs1p9zcv3lz3gli";
+      name = "kde-dev-scripts-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ca = {
-    version = "15.08.1";
+  kde-dev-utils = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ca-15.08.1.tar.xz";
-      sha256 = "0ql4b550wasf31vkvha1kjyv7d0svyxk7wc77v39fbly0agxwbap";
-      name = "kde-l10n-ca-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-dev-utils-15.08.3.tar.xz";
+      sha256 = "06k6iwgaimryhm0lma5m2nmrj1gf9y0fbxnzswxl3cygsvabffyf";
+      name = "kde-dev-utils-15.08.3.tar.xz";
     };
   };
-  kde-l10n-de = {
-    version = "15.08.1";
+  kdeedu-data = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-de-15.08.1.tar.xz";
-      sha256 = "11ayw3n392qz1dyblw4gsw4pbdp3wll11z76cawhbmj2jscjd1yb";
-      name = "kde-l10n-de-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdeedu-data-15.08.3.tar.xz";
+      sha256 = "1x91cqjjxaxdvh5fl3jlhnpj344r0j1qgmyw7x1cq05r3spdk47w";
+      name = "kdeedu-data-15.08.3.tar.xz";
     };
   };
-  kde-l10n-fr = {
-    version = "15.08.1";
+  kdegraphics-mobipocket = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fr-15.08.1.tar.xz";
-      sha256 = "1mclsk410ir9y6xvy8j8dswpa3k7hmjng232annq05fzapw7bda6";
-      name = "kde-l10n-fr-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-mobipocket-15.08.3.tar.xz";
+      sha256 = "0p1i57m86r21y8zd9lz6rr28ir0jqwy7nmlxkrkpllgd4r3xalhp";
+      name = "kdegraphics-mobipocket-15.08.3.tar.xz";
     };
   };
-  kde-l10n-id = {
-    version = "15.08.1";
+  kdegraphics-strigi-analyzer = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-id-15.08.1.tar.xz";
-      sha256 = "13lls8w18c8zrfrqfaz2yjn7jcjrv6dsax09l8wda5144xhbsxw3";
-      name = "kde-l10n-id-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-strigi-analyzer-15.08.3.tar.xz";
+      sha256 = "1nsi48i2qpa3gddwy3ib7a59i8a96p49nm48xisn2sym34mi31cq";
+      name = "kdegraphics-strigi-analyzer-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ca_valencia = {
-    version = "ca_valencia-15.08.1";
+  kdegraphics-thumbnailers = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ca@valencia-15.08.1.tar.xz";
-      sha256 = "075j5zbn9fy510bf278j3184niwf8dkdpzihvjsram8xrggl4whl";
-      name = "kde-l10n-ca_valencia-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-thumbnailers-15.08.3.tar.xz";
+      sha256 = "1ffs3ck1zl4795w73gjiwc146a6f2iqqiy4grmgnmg89irbqcnv7";
+      name = "kdegraphics-thumbnailers-15.08.3.tar.xz";
     };
   };
-  kde-l10n-nds = {
-    version = "15.08.1";
+  kde-l10n-ar = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nds-15.08.1.tar.xz";
-      sha256 = "0ifndqj0d58g6k71qw9n4xhd0a90fqba3xsk2qyd6yhnmygd48xd";
-      name = "kde-l10n-nds-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ar-15.08.3.tar.xz";
+      sha256 = "0kp82s1h3rmlizm7kb4f5iyr8ljlysic7vqawzv8qnga00w0r90f";
+      name = "kde-l10n-ar-15.08.3.tar.xz";
     };
   };
-  kde-l10n-nl = {
-    version = "15.08.1";
+  kde-l10n-bg = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nl-15.08.1.tar.xz";
-      sha256 = "11jzaf5dbyl52s61031lygn8xf6qjjqaldlyqgljz1scpp13f75b";
-      name = "kde-l10n-nl-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bg-15.08.3.tar.xz";
+      sha256 = "1769sr2qh3qblz28m104a3jgc0fg4bwy4annfyr2n48sizyan3qd";
+      name = "kde-l10n-bg-15.08.3.tar.xz";
     };
   };
-  kde-l10n-fa = {
-    version = "15.08.1";
+  kde-l10n-bs = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-fa-15.08.1.tar.xz";
-      sha256 = "1bai66j03khb6f6y8v72axan6aggdlbwgv3bi91mxwlzhy8ycjxx";
-      name = "kde-l10n-fa-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bs-15.08.3.tar.xz";
+      sha256 = "16lgja0cnf8v4szyb2nhlwzpnrzxhhbvjd7w6j0ryfrnrxfd6x7n";
+      name = "kde-l10n-bs-15.08.3.tar.xz";
     };
   };
-  kde-l10n-da = {
-    version = "15.08.1";
+  kde-l10n-ca = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-da-15.08.1.tar.xz";
-      sha256 = "10sxs45bvs5qw02pj2qhykymm3ddl6ij3gvwgxj7r1kl84lfkil6";
-      name = "kde-l10n-da-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca-15.08.3.tar.xz";
+      sha256 = "03hy9qi1lnwv73vn9phrcwr8m0jcj65d18jci01pvbpaj483pmxk";
+      name = "kde-l10n-ca-15.08.3.tar.xz";
     };
   };
-  kde-l10n-uk = {
-    version = "15.08.1";
+  kde-l10n-ca_valencia = {
+    version = "ca_valencia-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-uk-15.08.1.tar.xz";
-      sha256 = "00f6mjs7nalg8q87ix7h66kqicy7xb9pgkghldbhpal0rqgzscph";
-      name = "kde-l10n-uk-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca@valencia-15.08.3.tar.xz";
+      sha256 = "0h47xlgmlk527mafs834fswplpb8mrma4li247n1lyabyz6m6vhd";
+      name = "kde-l10n-ca_valencia-15.08.3.tar.xz";
     };
   };
-  kde-l10n-eu = {
-    version = "15.08.1";
+  kde-l10n-cs = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-eu-15.08.1.tar.xz";
-      sha256 = "01jcykc8d7nzlsfjp2xcbf7bkld7skf7mmrig7dllgl0igdkx1qm";
-      name = "kde-l10n-eu-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-cs-15.08.3.tar.xz";
+      sha256 = "0w403x63nj27iv0lag691a88q15sf5jq0hqylgijcsl6djf1jd66";
+      name = "kde-l10n-cs-15.08.3.tar.xz";
     };
   };
-  kde-l10n-sk = {
-    version = "15.08.1";
+  kde-l10n-da = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sk-15.08.1.tar.xz";
-      sha256 = "13fcfrsdn0q7z0p2cxkcl54g597ix17327lyxz0ns4xn9ada198s";
-      name = "kde-l10n-sk-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-da-15.08.3.tar.xz";
+      sha256 = "0v3rqc9mzg748qj0g1qm5g2qzjwlhrspkq4dryj792nj5d81xlmx";
+      name = "kde-l10n-da-15.08.3.tar.xz";
     };
   };
-  kde-l10n-kk = {
-    version = "15.08.1";
+  kde-l10n-de = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-kk-15.08.1.tar.xz";
-      sha256 = "13zi7yh9hsxmb8v6x2jqlyh4wdb4waj653py27g91rbznsp1fjzp";
-      name = "kde-l10n-kk-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-de-15.08.3.tar.xz";
+      sha256 = "0mvdf3ixc5nfrbv5j84pb668wkckcliswcdgd2laasv3s7a57mrg";
+      name = "kde-l10n-de-15.08.3.tar.xz";
     };
   };
-  kde-l10n-zh_CN = {
-    version = "zh_CN-15.08.1";
+  kde-l10n-el = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-zh_CN-15.08.1.tar.xz";
-      sha256 = "0j88zjxihddgi4a53034i5br3jf8v61wp5mcbclci59i4p4cwrh7";
-      name = "kde-l10n-zh_CN-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-el-15.08.3.tar.xz";
+      sha256 = "0ywgk884l4kvqgaags7k87pm00241pygx630mc4ssrsw3nplv5lh";
+      name = "kde-l10n-el-15.08.3.tar.xz";
     };
   };
-  kde-l10n-lt = {
-    version = "15.08.1";
+  kde-l10n-en_GB = {
+    version = "en_GB-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-lt-15.08.1.tar.xz";
-      sha256 = "03g7l9yyw6wajjpkqss16kfyg6piv50xjrzdy8611asdfabhccjs";
-      name = "kde-l10n-lt-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-en_GB-15.08.3.tar.xz";
+      sha256 = "002apvwkmmjqk0z5zrbbrri2wndg439xiwgkdr110a0hvak5v0nl";
+      name = "kde-l10n-en_GB-15.08.3.tar.xz";
     };
   };
-  kde-l10n-sv = {
-    version = "15.08.1";
+  kde-l10n-eo = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sv-15.08.1.tar.xz";
-      sha256 = "0dvgqf39xiz1fkfxvfn9232j454377d92c72dd0h3yl7mf9nndd7";
-      name = "kde-l10n-sv-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eo-15.08.3.tar.xz";
+      sha256 = "144lrkjchx4gxzj7isfyrcmbbmpgy4a1v1v9cc4a8hf9c1kxzglk";
+      name = "kde-l10n-eo-15.08.3.tar.xz";
     };
   };
-  kde-l10n-nb = {
-    version = "15.08.1";
+  kde-l10n-es = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-nb-15.08.1.tar.xz";
-      sha256 = "1y51kdmgnirfjsc5ka75rjvbqjbxxchqj2j4430h8jncjgvjvw6d";
-      name = "kde-l10n-nb-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-es-15.08.3.tar.xz";
+      sha256 = "160zsf6gss1ngz7pj4gykba83mwdi2id406plab5xznkqyanmp1v";
+      name = "kde-l10n-es-15.08.3.tar.xz";
     };
   };
-  kde-l10n-gl = {
-    version = "15.08.1";
+  kde-l10n-et = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-gl-15.08.1.tar.xz";
-      sha256 = "0fapj4gmm4pp5bf3gj6xwnzjxw9094mal7njb0nisshvdfbpgr37";
-      name = "kde-l10n-gl-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-et-15.08.3.tar.xz";
+      sha256 = "19gaswa1l5rlbh2k0b2bvbwafp6rnq3l6h5dv8q4yqhz1wsxcssr";
+      name = "kde-l10n-et-15.08.3.tar.xz";
     };
   };
-  kde-l10n-hi = {
-    version = "15.08.1";
+  kde-l10n-eu = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-hi-15.08.1.tar.xz";
-      sha256 = "0ys05gxcj6vkx4a8xjhwfym6faz6ifh50i5si175rynb6igyydnh";
-      name = "kde-l10n-hi-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eu-15.08.3.tar.xz";
+      sha256 = "1mrq2psh5n8gp1iqz41ilqwalpcyznjjqwmv2grf4ay9ss3ljbq0";
+      name = "kde-l10n-eu-15.08.3.tar.xz";
     };
   };
-  kde-l10n-ru = {
-    version = "15.08.1";
+  kde-l10n-fa = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-ru-15.08.1.tar.xz";
-      sha256 = "1qdgh3y8q7hnkhjfbid35fxy4xjl1hj800kljhif7q4kg4ish86m";
-      name = "kde-l10n-ru-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fa-15.08.3.tar.xz";
+      sha256 = "0axhz589y8zwl45hgi6wfy7ns50d1d3837j5mbl6ghvgs2bayfrj";
+      name = "kde-l10n-fa-15.08.3.tar.xz";
     };
   };
-  kde-l10n-sr = {
-    version = "15.08.1";
+  kde-l10n-fi = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-sr-15.08.1.tar.xz";
-      sha256 = "1ag5fj3iy5kycwgwhxiwcp4xl19j1q1lbk07b6nz69jm12kpsy6i";
-      name = "kde-l10n-sr-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fi-15.08.3.tar.xz";
+      sha256 = "1xk5isp34xmv6rj2xsfjsjfwzbnc3db7jx2kp0a046n1ysv9g6q5";
+      name = "kde-l10n-fi-15.08.3.tar.xz";
     };
   };
-  kde-l10n-cs = {
-    version = "15.08.1";
+  kde-l10n-fr = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-cs-15.08.1.tar.xz";
-      sha256 = "1lmln0q9r7cvkvs0qz2ky01rj8rjbrwl7g3vkz2zyr64gxgnjilz";
-      name = "kde-l10n-cs-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fr-15.08.3.tar.xz";
+      sha256 = "1bwp3d0c9654f7m8670gasba67zrhwggvzz3rrcl2x188a10483x";
+      name = "kde-l10n-fr-15.08.3.tar.xz";
     };
   };
-  kde-l10n-bs = {
-    version = "15.08.1";
+  kde-l10n-ga = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-bs-15.08.1.tar.xz";
-      sha256 = "0wyk547g8k3j6lcl1wipw4jwd0wqi8zrnb2h59g55il9rj7782q3";
-      name = "kde-l10n-bs-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ga-15.08.3.tar.xz";
+      sha256 = "1zgk73ykybjxpl9zh7g5i86ygfvqiaimhg2nxxnb82maq2ba8p7y";
+      name = "kde-l10n-ga-15.08.3.tar.xz";
     };
   };
-  kde-l10n-is = {
-    version = "15.08.1";
+  kde-l10n-gl = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-is-15.08.1.tar.xz";
-      sha256 = "0n3ws9imns4jzvnnrkrm8dk8yzlfjcbxl7ip36m7a09lnnskc4zw";
-      name = "kde-l10n-is-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-gl-15.08.3.tar.xz";
+      sha256 = "0czfkcki0qd48rhn7nxww8961gn7lw06ydnd7d7a4isq9aw6649q";
+      name = "kde-l10n-gl-15.08.3.tar.xz";
     };
   };
-  kde-l10n-zh_TW = {
-    version = "zh_TW-15.08.1";
+  kde-l10n-he = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-zh_TW-15.08.1.tar.xz";
-      sha256 = "1w4f8wr9c132z4kmqcjknrgp1hh33s08qvyjxysns6ncj6izpaaz";
-      name = "kde-l10n-zh_TW-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-he-15.08.3.tar.xz";
+      sha256 = "0p89y331kbkkl8pbdsqjpf30qqdgpzrchnmpl3wvkv6zgq0m58i7";
+      name = "kde-l10n-he-15.08.3.tar.xz";
     };
   };
-  kde-l10n-pt_BR = {
-    version = "pt_BR-15.08.1";
+  kde-l10n-hi = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-l10n/kde-l10n-pt_BR-15.08.1.tar.xz";
-      sha256 = "0dr0h5bxw462mpirzsnvxcy3s14nlk3a2gh5h9r2wis5fii364da";
-      name = "kde-l10n-pt_BR-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hi-15.08.3.tar.xz";
+      sha256 = "0n7p1vndyfmddcgm182nmbxppjiqpq2agm8dziddxvqsmb2pmrfg";
+      name = "kde-l10n-hi-15.08.3.tar.xz";
     };
   };
-  kmix = {
-    version = "15.08.1";
+  kde-l10n-hr = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmix-15.08.1.tar.xz";
-      sha256 = "1lpzghasljw07kq9a94lw61l4qlvhif6cd7jypg0vici65lz8k7d";
-      name = "kmix-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hr-15.08.3.tar.xz";
+      sha256 = "0nz0jj90zky4r5zphcy7pyblx00xh2i90fklddz1519afzxjzvc6";
+      name = "kde-l10n-hr-15.08.3.tar.xz";
     };
   };
-  kjumpingcube = {
-    version = "15.08.1";
+  kde-l10n-hu = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kjumpingcube-15.08.1.tar.xz";
-      sha256 = "1b0mqf9rhbdz4dfd0gbps59zzjqdif30zz642v4yi6mqnc002yv9";
-      name = "kjumpingcube-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hu-15.08.3.tar.xz";
+      sha256 = "0v4273knbz9q0jqwgljhxwwryfp4y5nd791qf4nnci8zngyrkwi4";
+      name = "kde-l10n-hu-15.08.3.tar.xz";
     };
   };
-  kruler = {
-    version = "15.08.1";
+  kde-l10n-ia = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kruler-15.08.1.tar.xz";
-      sha256 = "06qlvdyd1cbw8vr2qcqs7q8jylj7kl0y218agp8b60h03nri9psj";
-      name = "kruler-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ia-15.08.3.tar.xz";
+      sha256 = "1h4y8b0pn4a19cnvbgsr6ypcy77b3wfh0jn34rnbnvzmwgbbsdgq";
+      name = "kde-l10n-ia-15.08.3.tar.xz";
     };
   };
-  poxml = {
-    version = "15.08.1";
+  kde-l10n-id = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/poxml-15.08.1.tar.xz";
-      sha256 = "076ksfa9pdjbs8xk38j5z1ysryqcq68fgk5zw157cmxjaxv4ahqm";
-      name = "poxml-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-id-15.08.3.tar.xz";
+      sha256 = "1rcrpm05lwn4caaxg9zshvn7wvyjx2a580axyxfaldqbgzr4s4nl";
+      name = "kde-l10n-id-15.08.3.tar.xz";
     };
   };
-  knavalbattle = {
-    version = "15.08.1";
+  kde-l10n-is = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/knavalbattle-15.08.1.tar.xz";
-      sha256 = "1j235kdnb0qx1dkq89gqcwk0qjj16m0iyf502d6p1mz8cskz7fkp";
-      name = "knavalbattle-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-is-15.08.3.tar.xz";
+      sha256 = "1g40y3y9v88zi2ikzldi818khh4v1sgwfxajx7g37b8f713d5mk3";
+      name = "kde-l10n-is-15.08.3.tar.xz";
     };
   };
-  libkexiv2 = {
-    version = "15.08.1";
+  kde-l10n-it = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkexiv2-15.08.1.tar.xz";
-      sha256 = "0cgbh6g5kqi8lzlnidd19yxlyzid71pncpxikmhqfmnwhdgrqq2f";
-      name = "libkexiv2-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-it-15.08.3.tar.xz";
+      sha256 = "1qb42pkj0b4nl6bf5dq5aiirm58divgz1xacrnrlgmis10rm04w6";
+      name = "kde-l10n-it-15.08.3.tar.xz";
     };
   };
-  kcalutils = {
-    version = "15.08.1";
+  kde-l10n-ja = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcalutils-15.08.1.tar.xz";
-      sha256 = "0l8kzz092wz93j58h52q4icpvhvl2djgagdbx12yl7qlwin7wnd3";
-      name = "kcalutils-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ja-15.08.3.tar.xz";
+      sha256 = "0d4yd9x6gsabfhz22vbab7m30m31c92azhkchnxf4yhwa7x50aay";
+      name = "kde-l10n-ja-15.08.3.tar.xz";
     };
   };
-  palapeli = {
-    version = "15.08.1";
+  kde-l10n-kk = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/palapeli-15.08.1.tar.xz";
-      sha256 = "09sbyw25ngvcg6inhh7ig0x5yyhsi3gw2il1p98sfdabjk2f8736";
-      name = "palapeli-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-kk-15.08.3.tar.xz";
+      sha256 = "00gwacqv00mqm262iard2jbfdwz7m5cap08k0iyw931kccdlg5k4";
+      name = "kde-l10n-kk-15.08.3.tar.xz";
     };
   };
-  ksudoku = {
-    version = "15.08.1";
+  kde-l10n-km = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksudoku-15.08.1.tar.xz";
-      sha256 = "1l6dgackab9k1rnzbwwz3rfpxlqvydp5q632ibpqs449c6pk3kww";
-      name = "ksudoku-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-km-15.08.3.tar.xz";
+      sha256 = "0mc0w39262n00q1l8qkjgfwh7w3kwpfzq1y5qsldg948lppk8i5l";
+      name = "kde-l10n-km-15.08.3.tar.xz";
     };
   };
-  kdebugsettings = {
-    version = "15.08.1";
+  kde-l10n-ko = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdebugsettings-15.08.1.tar.xz";
-      sha256 = "1h5wn6ilhkrygjacb592nmdv31791y9r0rx6m3l7xx3nbj9hy12c";
-      name = "kdebugsettings-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ko-15.08.3.tar.xz";
+      sha256 = "1bzkx74ymbwazpwm0pdjgq1pqi3x7wlq9v0h63q53wx89ald7lzj";
+      name = "kde-l10n-ko-15.08.3.tar.xz";
     };
   };
-  kdegraphics-strigi-analyzer = {
-    version = "15.08.1";
+  kde-l10n-lt = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-strigi-analyzer-15.08.1.tar.xz";
-      sha256 = "12yby24k5crsyz6mhm2r0wnl306gp7422yj1nrl6yqi16wd37rbs";
-      name = "kdegraphics-strigi-analyzer-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lt-15.08.3.tar.xz";
+      sha256 = "0xkrxp815pbssb1myfchzjyxxgswznvimxdi29kckprsfhrycss9";
+      name = "kde-l10n-lt-15.08.3.tar.xz";
     };
   };
-  kturtle = {
-    version = "15.08.1";
+  kde-l10n-lv = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kturtle-15.08.1.tar.xz";
-      sha256 = "0n6vbj2kvcby62cn8i65dq2rl5jv1zfp9xbg827s6vz681an2sqk";
-      name = "kturtle-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lv-15.08.3.tar.xz";
+      sha256 = "0rrnydq93rwg1j19vyw2g8d1zmql8yrdiqar6qsck5jljdhwzynv";
+      name = "kde-l10n-lv-15.08.3.tar.xz";
     };
   };
-  libkcddb = {
-    version = "15.08.1";
+  kde-l10n-mr = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkcddb-15.08.1.tar.xz";
-      sha256 = "1x26dpr26d6xc73203dbk3vni7hcn1w6jdk94ffs0aaf3bmifal2";
-      name = "libkcddb-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-mr-15.08.3.tar.xz";
+      sha256 = "1kwypcdd3myw53gd0cwz8v43cfdfqhnnq5qrwcfyv6myv2sf1xg4";
+      name = "kde-l10n-mr-15.08.3.tar.xz";
     };
   };
-  bomber = {
-    version = "15.08.1";
+  kde-l10n-nb = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/bomber-15.08.1.tar.xz";
-      sha256 = "08l8ksqzap8hyza7mmf1wwddj8xkl03hsrc0mwvxsvyp7h7v3rxq";
-      name = "bomber-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nb-15.08.3.tar.xz";
+      sha256 = "0blhr196gi1f3m8big82gf01qghj5f3nd8nzxx7i96lmvdc3k8na";
+      name = "kde-l10n-nb-15.08.3.tar.xz";
     };
   };
-  ksquares = {
-    version = "15.08.1";
+  kde-l10n-nds = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksquares-15.08.1.tar.xz";
-      sha256 = "17qx89q594w22nd2qhqcmb1wc291b89zs22jh62xrm62yr6h9ijj";
-      name = "ksquares-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nds-15.08.3.tar.xz";
+      sha256 = "117xh1vh3fb23v7i6n9ljn4va3jvqy55mbz3zc997df79mkq0c02";
+      name = "kde-l10n-nds-15.08.3.tar.xz";
     };
   };
-  konquest = {
-    version = "15.08.1";
+  kde-l10n-nl = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/konquest-15.08.1.tar.xz";
-      sha256 = "0ss7gvr8ihk7ip4dhxyps8h1137i5m20m6sf0rv10c2h0y9cy0zk";
-      name = "konquest-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nl-15.08.3.tar.xz";
+      sha256 = "1zjjsq8p5ipj5rn9wl9jsixx1pj0ffdnq2myhb727z5lw07nafy9";
+      name = "kde-l10n-nl-15.08.3.tar.xz";
     };
   };
-  parley = {
-    version = "15.08.1";
+  kde-l10n-nn = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/parley-15.08.1.tar.xz";
-      sha256 = "0f88ia58f9lw8rpz1mgr21hslkmwnwwf2ac0affm81b17nxx8zpc";
-      name = "parley-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nn-15.08.3.tar.xz";
+      sha256 = "198x0kdj7w7iqx43llnwb01wshfzjkv2vdazyh7ip86r8whxrika";
+      name = "kde-l10n-nn-15.08.3.tar.xz";
     };
   };
-  kate = {
-    version = "15.08.1";
+  kde-l10n-pa = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kate-15.08.1.tar.xz";
-      sha256 = "0hrbr4lnmz0hgs856kfb966k85p8ccdzva8h4f6ifvacgxppb5iz";
-      name = "kate-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pa-15.08.3.tar.xz";
+      sha256 = "0i69lf888p4sahms347r1wadni5zg7d9w9a9vv02g7lk193n3r07";
+      name = "kde-l10n-pa-15.08.3.tar.xz";
     };
   };
-  baloo-widgets = {
-    version = "15.08.1";
+  kde-l10n-pl = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/baloo-widgets-15.08.1.tar.xz";
-      sha256 = "021lgivqmahad2b5mwdg4vngyyfi6gcsk3xgn9rbzkxg67k2ivbc";
-      name = "baloo-widgets-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pl-15.08.3.tar.xz";
+      sha256 = "13b28slaqgwnqi2vw7mclyrbgrfhbpv5w4wb6l1mk6kv6ksh48a2";
+      name = "kde-l10n-pl-15.08.3.tar.xz";
     };
   };
-  kbreakout = {
-    version = "15.08.1";
+  kde-l10n-pt = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kbreakout-15.08.1.tar.xz";
-      sha256 = "1l83iy6iad6npykl4dyh45s5z8pgamdp7aqi2r5c9r4awg16iq48";
-      name = "kbreakout-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt-15.08.3.tar.xz";
+      sha256 = "046v644pqvg6nfc767mpgzn8bsrgakmqs94x55cg1y76q5v7fncs";
+      name = "kde-l10n-pt-15.08.3.tar.xz";
     };
   };
-  kshisen = {
-    version = "15.08.1";
+  kde-l10n-pt_BR = {
+    version = "pt_BR-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kshisen-15.08.1.tar.xz";
-      sha256 = "1lrn5l4jscbn0ppppshpkh62plskzwy2km9dqp1hp5czpq5zvwk8";
-      name = "kshisen-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt_BR-15.08.3.tar.xz";
+      sha256 = "0kp71wgyrvbvrrlj46fnbjc7bh04wvqdnrv8grxc7zbn037m1kax";
+      name = "kde-l10n-pt_BR-15.08.3.tar.xz";
     };
   };
-  dragon = {
-    version = "15.08.1";
+  kde-l10n-ro = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/dragon-15.08.1.tar.xz";
-      sha256 = "0ffb0jspckwp8alis70akhrv7kkjq69zba34y61axm67f65izh9l";
-      name = "dragon-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ro-15.08.3.tar.xz";
+      sha256 = "0h3l3yb72v8lg6jzsczm37zilsidihjlfpaxbmjvyka440m3rhgz";
+      name = "kde-l10n-ro-15.08.3.tar.xz";
     };
   };
-  ktp-common-internals = {
-    version = "15.08.1";
+  kde-l10n-ru = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-common-internals-15.08.1.tar.xz";
-      sha256 = "13alrk7zn3vq6khackdbyqbk209ivvcfza9mpqaxxll8sg9r3i3k";
-      name = "ktp-common-internals-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ru-15.08.3.tar.xz";
+      sha256 = "0drxf6jpd6gd7wnqz3pa2f3x9ay1bsfycyahsbqny6vkqbas18rn";
+      name = "kde-l10n-ru-15.08.3.tar.xz";
     };
   };
-  ktp-text-ui = {
-    version = "15.08.1";
+  kde-l10n-sk = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-text-ui-15.08.1.tar.xz";
-      sha256 = "1f7r47rbcciq12c5531qb9wr7xqz7nvsy04jk8gaxwdsr9a97ayf";
-      name = "ktp-text-ui-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sk-15.08.3.tar.xz";
+      sha256 = "0jv5blx2biwpvazr6cc8kmvgqjp3ixmf547q453wkyrss9sg6n7y";
+      name = "kde-l10n-sk-15.08.3.tar.xz";
     };
   };
-  kcalcore = {
-    version = "15.08.1";
+  kde-l10n-sl = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcalcore-15.08.1.tar.xz";
-      sha256 = "0dpip8hbc5fb8yw876lig19kp2wi71dkwcb1mj8k49lph09k3460";
-      name = "kcalcore-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sl-15.08.3.tar.xz";
+      sha256 = "1nnjxwhidfw5iyp1rl5sdqpkk3jn1p4csa7v05qssydplqz86plp";
+      name = "kde-l10n-sl-15.08.3.tar.xz";
     };
   };
-  kremotecontrol = {
-    version = "15.08.1";
+  kde-l10n-sr = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kremotecontrol-15.08.1.tar.xz";
-      sha256 = "01fck27b3ilni2h78lmhq27aq4sw89060bh69xhw8z80iad2bxyy";
-      name = "kremotecontrol-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sr-15.08.3.tar.xz";
+      sha256 = "0dqca94al2x68jyb7zq52vf2zirqlh6bqcgrnvd2h3gkz8yifgkf";
+      name = "kde-l10n-sr-15.08.3.tar.xz";
     };
   };
-  ktp-kded-module = {
-    version = "15.08.1";
+  kde-l10n-sv = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-kded-module-15.08.1.tar.xz";
-      sha256 = "0l2s07z87q2j92q4w6n16rbvd7xm8k4zgchlk06djb5d9gwdgvl0";
-      name = "ktp-kded-module-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sv-15.08.3.tar.xz";
+      sha256 = "1xa31mdcmlw955ybzfpas7fq38ffh9s00v1jvzpys008hhs5y4mr";
+      name = "kde-l10n-sv-15.08.3.tar.xz";
     };
   };
-  kapptemplate = {
-    version = "15.08.1";
+  kde-l10n-tr = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kapptemplate-15.08.1.tar.xz";
-      sha256 = "1pc3dq3h30lx7d51zan52mnz5zwb70g6r84cskkgc2dmws7mrl0k";
-      name = "kapptemplate-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-tr-15.08.3.tar.xz";
+      sha256 = "0hfl5jbwkfhwpv1kbbcvinzbp6vks7kfn0s8n6c989icnr4y6p18";
+      name = "kde-l10n-tr-15.08.3.tar.xz";
     };
   };
-  dolphin-plugins = {
-    version = "15.08.1";
+  kde-l10n-ug = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/dolphin-plugins-15.08.1.tar.xz";
-      sha256 = "1fpsbxcds2wzivcpc6vf6bqwi658mw4jrlpwd52w2nlsjpmgr31x";
-      name = "dolphin-plugins-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ug-15.08.3.tar.xz";
+      sha256 = "0aznwrbzvw4zh20zgrmbyvwg0f639vibsq7vf38z3bn1acw22cyh";
+      name = "kde-l10n-ug-15.08.3.tar.xz";
     };
   };
-  kpat = {
-    version = "15.08.1";
+  kde-l10n-uk = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kpat-15.08.1.tar.xz";
-      sha256 = "0cw17agpx23fsmnnvwkjn3xvq59d6hpppgydalnhrqka9321qy2d";
-      name = "kpat-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-uk-15.08.3.tar.xz";
+      sha256 = "01h65ysizlcfbn3iim3pgs17y8l8q7qnsf1skqwh6ryib3z20l7d";
+      name = "kde-l10n-uk-15.08.3.tar.xz";
     };
   };
-  akonadi = {
-    version = "15.08.1";
+  kde-l10n-wa = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/akonadi-15.08.1.tar.xz";
-      sha256 = "19222mzvi34lqdaxavcpx0d1mxfnfynvhv5562rw3d7iqmhvbms6";
-      name = "akonadi-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-wa-15.08.3.tar.xz";
+      sha256 = "0pm4fcziv3jci6vdggxk1mlhfpppm1pgk035rzg8004yhj84mds1";
+      name = "kde-l10n-wa-15.08.3.tar.xz";
     };
   };
-  kcalc = {
-    version = "15.08.1";
+  kde-l10n-zh_CN = {
+    version = "zh_CN-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcalc-15.08.1.tar.xz";
-      sha256 = "02xj9n6zv3f3m35g38gsmqnrshbswqkya930sc5nqc0mlyflli6m";
-      name = "kcalc-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_CN-15.08.3.tar.xz";
+      sha256 = "0cnahayw2nf23r7gks34y3llqsiljxv0v20v26nwarj7dcj4r7zv";
+      name = "kde-l10n-zh_CN-15.08.3.tar.xz";
     };
   };
-  sweeper = {
-    version = "15.08.1";
+  kde-l10n-zh_TW = {
+    version = "zh_TW-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/sweeper-15.08.1.tar.xz";
-      sha256 = "08vk9yq7py576irkg34d3rzkdrzi6bb6zhynbyziyx097sqj5khj";
-      name = "sweeper-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_TW-15.08.3.tar.xz";
+      sha256 = "1sbfwwvqr6arckzdhs77ar9yz66f4bv1xndw05lpj899k3vd6mp4";
+      name = "kde-l10n-zh_TW-15.08.3.tar.xz";
     };
   };
-  lokalize = {
-    version = "15.08.1";
+  kdelibs = {
+    version = "4.14.14";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/lokalize-15.08.1.tar.xz";
-      sha256 = "15xsx430a9w3kr1abvlh4h3spn063992mc76rq17c7a8n1n7zr4b";
-      name = "lokalize-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdelibs-4.14.14.tar.xz";
+      sha256 = "055nq12rgilcb3m8gwjxwpalrj7bv2hjvf2h0axba4bjjl99n6b3";
+      name = "kdelibs-4.14.14.tar.xz";
     };
   };
-  step = {
-    version = "15.08.1";
+  kdenetwork-filesharing = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/step-15.08.1.tar.xz";
-      sha256 = "15capfa297s4shrr6xwbpg62rn8pimwpmjm11p160g6lqdspwacm";
-      name = "step-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdenetwork-filesharing-15.08.3.tar.xz";
+      sha256 = "0fh11nrlmariyy1rn1ncsjzydidpfwqhr6r73mi8mqbry7vm1kp5";
+      name = "kdenetwork-filesharing-15.08.3.tar.xz";
     };
   };
-  picmi = {
-    version = "15.08.1";
+  kdenetwork-strigi-analyzers = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/picmi-15.08.1.tar.xz";
-      sha256 = "16sa0w3bhxbj8f8nl0wh5b639gzi6y45167g3mh62a7di6llw1rm";
-      name = "picmi-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdenetwork-strigi-analyzers-15.08.3.tar.xz";
+      sha256 = "0adrr6clw75rqjcw1611xwzxb2ma6c4jcawrl5k3xa46qg37g4gk";
+      name = "kdenetwork-strigi-analyzers-15.08.3.tar.xz";
     };
   };
-  kig = {
-    version = "15.08.1";
+  kdenlive = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kig-15.08.1.tar.xz";
-      sha256 = "0wyvqfsgr1101vmzmsixribvd9plys91dvrx6cj9ji7mf4k5875g";
-      name = "kig-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdenlive-15.08.3.tar.xz";
+      sha256 = "0k8x3wipndrg2d424i16bbnnjfv3b43v48jrid28r9vas4b7xghk";
+      name = "kdenlive-15.08.3.tar.xz";
     };
   };
-  ktp-contact-runner = {
-    version = "15.08.1";
+  kdepim = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-contact-runner-15.08.1.tar.xz";
-      sha256 = "1m8jc39l9d394x3hqlqvc5msy7wi1aki9q8nd4bg6nmdz8v5dxz9";
-      name = "ktp-contact-runner-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdepim-15.08.3.tar.xz";
+      sha256 = "1rpscplpawlqcya17p27gf25rqrv819xrp6vdk44c9p9jw31q4hz";
+      name = "kdepim-15.08.3.tar.xz";
     };
   };
-  kimap = {
-    version = "15.08.1";
+  kdepimlibs = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kimap-15.08.1.tar.xz";
-      sha256 = "07q4z16jfddh17khdd39dzasjfmnvd2zgdnph24s171815c2x2ps";
-      name = "kimap-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdepimlibs-15.08.3.tar.xz";
+      sha256 = "0ad20g2wngf265zflaq8h2s25p911llaknf0ni3r63nb4px4jhlw";
+      name = "kdepimlibs-15.08.3.tar.xz";
     };
   };
-  ksystemlog = {
-    version = "15.08.1";
+  kdepim-runtime = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksystemlog-15.08.1.tar.xz";
-      sha256 = "1v18f6dcirr6rayaxy8h85swj04g5giafs67h64g9flq5gacykji";
-      name = "ksystemlog-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdepim-runtime-15.08.3.tar.xz";
+      sha256 = "0lrwkkjgw8w5r5wgl5d006ainy5dnkpz8kdvbmbgb4hpvj79zba1";
+      name = "kdepim-runtime-15.08.3.tar.xz";
     };
   };
-  kio-extras = {
-    version = "15.08.1";
+  kde-runtime = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kio-extras-15.08.1.tar.xz";
-      sha256 = "06vnr10a3m4gs5bjz3dqx1bv1sqz3q69ihq1hlih4c8lyy9wd26q";
-      name = "kio-extras-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-runtime-15.08.3.tar.xz";
+      sha256 = "0n9nkbmdyf49aw1d85y8g9mx3rs3xnsy34izrbnwa35q9sjg3bsr";
+      name = "kde-runtime-15.08.3.tar.xz";
     };
   };
-  blinken = {
-    version = "15.08.1";
+  kdesdk-kioslaves = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/blinken-15.08.1.tar.xz";
-      sha256 = "0yh5ay2cpgb45y4any6sanzpwcngfxl98x3gnc5n81zl2kzb9y8m";
-      name = "blinken-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdesdk-kioslaves-15.08.3.tar.xz";
+      sha256 = "04kyfham56hzwyqydgplqkmn3888wfxsr4hl1690w61qx8m60x3a";
+      name = "kdesdk-kioslaves-15.08.3.tar.xz";
     };
   };
-  ktp-send-file = {
-    version = "15.08.1";
+  kdesdk-strigi-analyzers = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-send-file-15.08.1.tar.xz";
-      sha256 = "07pk6d1rzz0hwfsw7nk4grixvvjja219jvr56j50vpnlmlza29xs";
-      name = "ktp-send-file-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdesdk-strigi-analyzers-15.08.3.tar.xz";
+      sha256 = "0dy60s6idbhy3anxqkk8cjrsnb5p1gizhzrxlq9kv2sk3rld1pxc";
+      name = "kdesdk-strigi-analyzers-15.08.3.tar.xz";
     };
   };
-  kdiamond = {
-    version = "15.08.1";
+  kdesdk-thumbnailers = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdiamond-15.08.1.tar.xz";
-      sha256 = "1f81l6pnwrpirb5v0npcd2452dkdh0llpmzh57gfd8cik0n1agzm";
-      name = "kdiamond-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdesdk-thumbnailers-15.08.3.tar.xz";
+      sha256 = "077p0alajih4pq3g6k24a3cmsz61kb32iq1mzlkrbq8myadrkz86";
+      name = "kdesdk-thumbnailers-15.08.3.tar.xz";
     };
   };
-  kholidays = {
-    version = "15.08.1";
+  kde-wallpapers = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kholidays-15.08.1.tar.xz";
-      sha256 = "1i875c7wpp5vlzjyw78bsxgyhmhv2y9846xbv6xi5y4b211iw6lf";
-      name = "kholidays-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-wallpapers-15.08.3.tar.xz";
+      sha256 = "14wm02ywncd4n0ppwgzag467vp5h0005csnl6na2bb2qrcplpbjd";
+      name = "kde-wallpapers-15.08.3.tar.xz";
     };
   };
-  kbounce = {
-    version = "15.08.1";
+  kdewebdev = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kbounce-15.08.1.tar.xz";
-      sha256 = "127b7c4rpkz04nihqyl7d594k9vwjcvlq0758jfmkxijsgpjc334";
-      name = "kbounce-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdewebdev-15.08.3.tar.xz";
+      sha256 = "1nsfmff34wpb9cmrmlj32yqihx4aha0bkn7h0j2jvkhqqnwxr802";
+      name = "kdewebdev-15.08.3.tar.xz";
     };
   };
-  kaccounts-integration = {
-    version = "15.08.1";
+  kdf = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kaccounts-integration-15.08.1.tar.xz";
-      sha256 = "07kryp71xq2zwfdm05g8mcmkmxhlj2wb2l9fi2sxbhsr360z33mx";
-      name = "kaccounts-integration-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdf-15.08.3.tar.xz";
+      sha256 = "05lfhivnj332m7br03pm0jflsdsv2kvzxadiic8gmm05yvx6k442";
+      name = "kdf-15.08.3.tar.xz";
     };
   };
-  lskat = {
-    version = "15.08.1";
+  kdiamond = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/lskat-15.08.1.tar.xz";
-      sha256 = "13vhfpi34qcv6q56qaxwk89apss8l921a59qvlmadmw999h7ms0s";
-      name = "lskat-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdiamond-15.08.3.tar.xz";
+      sha256 = "1i2wr0fcqi8sji82m6frknvjd8dyvx9p0a8m2b75a5bl4ww95k0b";
+      name = "kdiamond-15.08.3.tar.xz";
     };
   };
-  libkdeedu = {
-    version = "15.08.1";
+  kfloppy = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkdeedu-15.08.1.tar.xz";
-      sha256 = "09fv1fbxlf6n4k0fyiy49avykpnxbmvi833i6ibm90v9csrfv6hf";
-      name = "libkdeedu-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kfloppy-15.08.3.tar.xz";
+      sha256 = "0gbagm6jkjj4gmpq0asjgngn3np5b77hry733krzglawdf4dh7jh";
+      name = "kfloppy-15.08.3.tar.xz";
     };
   };
-  libkeduvocdocument = {
-    version = "15.08.1";
+  kfourinline = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkeduvocdocument-15.08.1.tar.xz";
-      sha256 = "0fz8fkcai1zdmqhvcic689sbwm07zg69z7jw4m6wgk7yqls8mkvq";
-      name = "libkeduvocdocument-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kfourinline-15.08.3.tar.xz";
+      sha256 = "01d94irpyq3z01yvcffw3h5qm8mbcipb855wi3na2ply8jm1kj1s";
+      name = "kfourinline-15.08.3.tar.xz";
     };
   };
-  akonadi-search = {
-    version = "15.08.1";
+  kgeography = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/akonadi-search-15.08.1.tar.xz";
-      sha256 = "0mzhil4ihs2b7k6dg29d5igpwsiwiv6awzvj6b5xn76i4xax1jk1";
-      name = "akonadi-search-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kgeography-15.08.3.tar.xz";
+      sha256 = "1wfq98dhs2g1k8gw1p98slgyf3f1amwrkqf4ja4hsm4lcxqhmrh5";
+      name = "kgeography-15.08.3.tar.xz";
     };
   };
-  katomic = {
-    version = "15.08.1";
+  kget = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/katomic-15.08.1.tar.xz";
-      sha256 = "0rj6sgh8v8x57fqbjvhik9xcw563nx0dvv8rin05nr22hlid8l9y";
-      name = "katomic-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kget-15.08.3.tar.xz";
+      sha256 = "1wrpjm2hjhl7bz70ga71xmys7jnwq9xyvdr7glb3032z2w52sld5";
+      name = "kget-15.08.3.tar.xz";
     };
   };
-  kross-interpreters = {
-    version = "15.08.1";
+  kgoldrunner = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kross-interpreters-15.08.1.tar.xz";
-      sha256 = "1lqkmxxw1kz23q4pmmvrwqgi9vkxp0pw6g3zpr0x4zkzsj62q2ff";
-      name = "kross-interpreters-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kgoldrunner-15.08.3.tar.xz";
+      sha256 = "1xxgj46l3b7a8wmas7wsx8h9bg4hgcgiasx3dz27v870i01wzh7i";
+      name = "kgoldrunner-15.08.3.tar.xz";
     };
   };
-  audiocd-kio = {
-    version = "15.08.1";
+  kgpg = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/audiocd-kio-15.08.1.tar.xz";
-      sha256 = "0sqh21x12za743xqmyfyd8h4z0wz0nzd2zjp6fzga76xfcryci5j";
-      name = "audiocd-kio-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kgpg-15.08.3.tar.xz";
+      sha256 = "09am74pb3hs24z3npml98rsbsxzincn85wgvpym02f4gnc5abd42";
+      name = "kgpg-15.08.3.tar.xz";
     };
   };
-  mplayerthumbs = {
-    version = "15.08.1";
+  khangman = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/mplayerthumbs-15.08.1.tar.xz";
-      sha256 = "01l063iply1d4bfdb04agj11imha4fpnv131dcfd39ixi1icv8yb";
-      name = "mplayerthumbs-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/khangman-15.08.3.tar.xz";
+      sha256 = "0fyy37v0ljv1mvxfd4p6x6lflqfmsh703p9j0mb0bd2f6wswwa1l";
+      name = "khangman-15.08.3.tar.xz";
     };
   };
-  syndication = {
-    version = "15.08.1";
+  kholidays = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/syndication-15.08.1.tar.xz";
-      sha256 = "1kklbw77iiiqfcv8sydy9jkc8g630xw551y6r1jp1wbvrdkjwq47";
-      name = "syndication-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kholidays-15.08.3.tar.xz";
+      sha256 = "0vf7pz6i2raw94mcxfzlk9s5hxnampx5lq5b5iyfad5d5vc24215";
+      name = "kholidays-15.08.3.tar.xz";
     };
   };
-  kqtquickcharts = {
-    version = "15.08.1";
+  kidentitymanagement = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kqtquickcharts-15.08.1.tar.xz";
-      sha256 = "0jjn8nrxqjpsg9cwfazqz7v4lacl99wxhdh9mclqxk4xy54ydxqc";
-      name = "kqtquickcharts-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kidentitymanagement-15.08.3.tar.xz";
+      sha256 = "0napyckxdv4vnj7n063qgiwa7xgwjab5qnz8rl1g60kidvvz7vw0";
+      name = "kidentitymanagement-15.08.3.tar.xz";
     };
   };
-  kmouth = {
-    version = "15.08.1";
+  kig = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmouth-15.08.1.tar.xz";
-      sha256 = "1w6jgs9skis1y8g07hdzwpdsa7dmzfi5dw82wx0wnnmdm076vg41";
-      name = "kmouth-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kig-15.08.3.tar.xz";
+      sha256 = "15fws8yrdyz68qik1gf3fchrdfyk0mml9p923dzirb6faaz1sfpx";
+      name = "kig-15.08.3.tar.xz";
     };
   };
-  dolphin = {
-    version = "15.08.1";
+  kigo = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/dolphin-15.08.1.tar.xz";
-      sha256 = "09mr54zbyyq4kd3ddi054c86ji63b0k5fjd3y8x44vnd3id8jpjs";
-      name = "dolphin-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kigo-15.08.3.tar.xz";
+      sha256 = "0h48kqadfhlm2jppld9ima4bbzgxnwcfg0y6zbhsvflavi6cpckn";
+      name = "kigo-15.08.3.tar.xz";
     };
   };
-  libkdcraw = {
-    version = "15.08.1";
+  killbots = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkdcraw-15.08.1.tar.xz";
-      sha256 = "0kshhch81sqjlashbh3ww3nz9ahv99f1bsxlrly39rvfa8yg6vpv";
-      name = "libkdcraw-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/killbots-15.08.3.tar.xz";
+      sha256 = "1zp68p83adi1qggs8j3pa5rgfdjqy5c4pmc9kp0ndcpk7hi7nwvz";
+      name = "killbots-15.08.3.tar.xz";
     };
   };
-  libksane = {
-    version = "15.08.1";
+  kimap = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libksane-15.08.1.tar.xz";
-      sha256 = "0ih4axq0pcpvmgs8x12ad22bxixcccqpkqs160vxl7a29327rbdm";
-      name = "libksane-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kimap-15.08.3.tar.xz";
+      sha256 = "1wymg2s8yjckzc6zrb56fslbfbvzg41mi5fvnrf54d92lh4s90p0";
+      name = "kimap-15.08.3.tar.xz";
     };
   };
-  kmines = {
-    version = "15.08.1";
+  kio-extras = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmines-15.08.1.tar.xz";
-      sha256 = "12n4im9vqyym5jr0chs4g3wjlr2d2a3i35jhm52j8ibdx7fnpmw6";
-      name = "kmines-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kio-extras-15.08.3.tar.xz";
+      sha256 = "0psi8hj9s961l9xga92g9amv95h0im3nm12fc6vh184h2by2gddf";
+      name = "kio-extras-15.08.3.tar.xz";
     };
   };
   kiriki = {
-    version = "15.08.1";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kiriki-15.08.1.tar.xz";
-      sha256 = "1ighd4bmvgn84misb7zldjg5z75k1i7z8l7yjb0qybh1cc2bw3b3";
-      name = "kiriki-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kiriki-15.08.3.tar.xz";
+      sha256 = "1w9yb38wwi45f8dfsi7wvaq6l9crjb6v0kp74cmaljgvirs3mmjk";
+      name = "kiriki-15.08.3.tar.xz";
     };
   };
-  kaccessible = {
-    version = "15.08.1";
+  kiten = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kaccessible-15.08.1.tar.xz";
-      sha256 = "10crgqpiqkbrb0hil1660cy4dcywiljicqhnhr3nns0ncllvw2vi";
-      name = "kaccessible-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kiten-15.08.3.tar.xz";
+      sha256 = "0rj4rka4wk3zh0s04ry8r4hqhajsi53qv1ns6ra1mbl1v32bw20g";
+      name = "kiten-15.08.3.tar.xz";
     };
   };
-  ksnapshot = {
-    version = "15.08.1";
+  kjumpingcube = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksnapshot-15.08.1.tar.xz";
-      sha256 = "19z3rbvkn55waig6dm1lvan6wlndshhjbiqwwdlc9nh2wng8dcd0";
-      name = "ksnapshot-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kjumpingcube-15.08.3.tar.xz";
+      sha256 = "0ccf3zcc31n78ing87h16rjk5kylz7k36lvgp4c9w6w8ahmgzp8g";
+      name = "kjumpingcube-15.08.3.tar.xz";
     };
   };
-  kamera = {
-    version = "15.08.1";
+  kldap = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kamera-15.08.1.tar.xz";
-      sha256 = "0czpr3wb3irlbczrx0dczph6l9dwhz3wv9amrz2lvb8p9c8j4nmd";
-      name = "kamera-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kldap-15.08.3.tar.xz";
+      sha256 = "1rnl40367fxq4cgqrrm27a93k3b6gns47gxv2afvjpq7dn142dc2";
+      name = "kldap-15.08.3.tar.xz";
     };
   };
-  kdenetwork-filesharing = {
-    version = "15.08.1";
+  klettres = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdenetwork-filesharing-15.08.1.tar.xz";
-      sha256 = "03w78qf8sgwypzgwpyl5cfb5441787j6vzzhlddsbmkrl4vnhnff";
-      name = "kdenetwork-filesharing-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/klettres-15.08.3.tar.xz";
+      sha256 = "14bbjx20zn5gmxhkgarh7y75j5806rpzbbh0rj2w2lpav8ggma90";
+      name = "klettres-15.08.3.tar.xz";
     };
   };
-  kmag = {
-    version = "15.08.1";
+  klickety = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmag-15.08.1.tar.xz";
-      sha256 = "02bhjmmqb28qyacqzikrkxgh1zf4v1012kdjpdczsmnrgb1nmpgl";
-      name = "kmag-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/klickety-15.08.3.tar.xz";
+      sha256 = "1vqflsi4k21qj91z7h6hprswpzr7zpdnpkvwwiw2v2zwi4p8m967";
+      name = "klickety-15.08.3.tar.xz";
     };
   };
-  kalarmcal = {
-    version = "15.08.1";
+  klines = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kalarmcal-15.08.1.tar.xz";
-      sha256 = "02m2fd98jdacr7hm71dl6hsshil152c09p1daaa9b58yrgb9dqd9";
-      name = "kalarmcal-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/klines-15.08.3.tar.xz";
+      sha256 = "103wws54y0sal9w3ikbmksq0d2ndw34xpr972zjcmw06py4kx4kn";
+      name = "klines-15.08.3.tar.xz";
     };
   };
-  kstars = {
-    version = "15.08.1";
+  kmag = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kstars-15.08.1.tar.xz";
-      sha256 = "049pnbqn1ddmqd663vc181yh5z204klbs255w41k7p1z1vl5zszr";
-      name = "kstars-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmag-15.08.3.tar.xz";
+      sha256 = "1hmyc2n8gspd46k4g3k6jh0cfy7r0v5x17l7xrvj45nmhhhnivc0";
+      name = "kmag-15.08.3.tar.xz";
     };
   };
-  ktp-approver = {
-    version = "15.08.1";
+  kmahjongg = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-approver-15.08.1.tar.xz";
-      sha256 = "0qdax2zby93xc694s3s6s21y4bfjbfxsd292ag544cwazcjz8zp5";
-      name = "ktp-approver-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmahjongg-15.08.3.tar.xz";
+      sha256 = "07xsmd0zh9n01cy0fra2njz2qcgp1y7y5w9v4s2bkj3a4gd35ag8";
+      name = "kmahjongg-15.08.3.tar.xz";
     };
   };
-  kdesdk-kioslaves = {
-    version = "15.08.1";
+  kmailtransport = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdesdk-kioslaves-15.08.1.tar.xz";
-      sha256 = "161885bzayf804pdci5n1xh1n4zw3pddk2j53icn573gzpvczwla";
-      name = "kdesdk-kioslaves-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmailtransport-15.08.3.tar.xz";
+      sha256 = "0g8983wq7x4w19k0fxypsk69hi5nrxldvq0a49jna2g2yfxi8w5l";
+      name = "kmailtransport-15.08.3.tar.xz";
     };
   };
-  kdenetwork-strigi-analyzers = {
-    version = "15.08.1";
+  kmbox = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdenetwork-strigi-analyzers-15.08.1.tar.xz";
-      sha256 = "0w3jlg9idsxi1pwxh97s9iawjyq8m2z51kz5mm0d0irwslkwaygk";
-      name = "kdenetwork-strigi-analyzers-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmbox-15.08.3.tar.xz";
+      sha256 = "11fsvjmidb9s309wlcchgmb4viambqmw1njy6g5c2zpyfw9ryq8b";
+      name = "kmbox-15.08.3.tar.xz";
     };
   };
-  juk = {
-    version = "15.08.1";
+  kmime = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/juk-15.08.1.tar.xz";
-      sha256 = "0l6zq90jvhkhppjq0djmj1ij1c1yjjvhh5ss4czqn39bay33r2a7";
-      name = "juk-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmime-15.08.3.tar.xz";
+      sha256 = "16pfzjdiaa9z2nq564bcrb82f50zh1cd8zyx7jzwzzw6cspv5n0q";
+      name = "kmime-15.08.3.tar.xz";
     };
   };
-  kolf = {
-    version = "15.08.1";
+  kmines = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kolf-15.08.1.tar.xz";
-      sha256 = "05xldbfkbbvmq743029cksgdcsfn20xadn91sw1yp9146k0bd97h";
-      name = "kolf-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmines-15.08.3.tar.xz";
+      sha256 = "18ld9y50axz77cspm1rccm0w21h01zihbh0880gf2vjqwcv1ifxc";
+      name = "kmines-15.08.3.tar.xz";
     };
   };
-  print-manager = {
-    version = "15.08.1";
+  kmix = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/print-manager-15.08.1.tar.xz";
-      sha256 = "0cy5ga11kk11ca4nzpr6wjb4a342ziaflilc9pz6l3b7r8vhjv09";
-      name = "print-manager-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmix-15.08.3.tar.xz";
+      sha256 = "0mkh7jvn26d6i38zzinx2gh9bl50scis17maj56c9m67i4m0hlk9";
+      name = "kmix-15.08.3.tar.xz";
     };
   };
-  kppp = {
-    version = "15.08.1";
+  kmousetool = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kppp-15.08.1.tar.xz";
-      sha256 = "1v2dqb9bdi1yl4fpyn98iq8pg69r9pfy7z1wbq6b37nwlhlapva8";
-      name = "kppp-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmousetool-15.08.3.tar.xz";
+      sha256 = "07ddvl9nmigqq12mz27x0gw3lhb8a6ilfmqlx5sm810cp7b4claq";
+      name = "kmousetool-15.08.3.tar.xz";
     };
   };
-  bovo = {
-    version = "15.08.1";
+  kmouth = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/bovo-15.08.1.tar.xz";
-      sha256 = "1lj2hwjdwkn70gfgyk3v0r8wdrdlpqkx9n17fd15x0jm8xjxc7wj";
-      name = "bovo-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmouth-15.08.3.tar.xz";
+      sha256 = "1m0y8fdyh1glh27azi700zzvdpki0chjphnq5gx9339hbf97bdi4";
+      name = "kmouth-15.08.3.tar.xz";
     };
   };
-  ktimer = {
-    version = "15.08.1";
+  kmplot = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktimer-15.08.1.tar.xz";
-      sha256 = "07882zpgalf2yzqplg3mzl6sxh84zfkbk1jwlw8kwkr7pr7lmfvv";
-      name = "ktimer-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmplot-15.08.3.tar.xz";
+      sha256 = "1zk8ccl2yhxgi18qkabjzm4ffcyg6flvvh3fy3hz7l1cikb6dza1";
+      name = "kmplot-15.08.3.tar.xz";
     };
   };
-  kpimtextedit = {
-    version = "15.08.1";
+  knavalbattle = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kpimtextedit-15.08.1.tar.xz";
-      sha256 = "1djk0gyfdxsqjwhrqf4rnkjvy7hz1rysdm3idjqrnjhnlrjwsiwc";
-      name = "kpimtextedit-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/knavalbattle-15.08.3.tar.xz";
+      sha256 = "1g1dy0a0rvil31rj4s0z8gic9nb9xpx6xl7b91a36wj6cab57434";
+      name = "knavalbattle-15.08.3.tar.xz";
     };
   };
-  filelight = {
-    version = "15.08.1";
+  knetwalk = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/filelight-15.08.1.tar.xz";
-      sha256 = "085n071j5mpzh2yr4035bdxgfay782g4zx386lr2s03ywc5icsw2";
-      name = "filelight-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/knetwalk-15.08.3.tar.xz";
+      sha256 = "0iapwmdy7i9dps3jf7ski75xdjg4bkp0fhz9njng11yx1g3a64qi";
+      name = "knetwalk-15.08.3.tar.xz";
     };
   };
-  khangman = {
-    version = "15.08.1";
+  kolf = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/khangman-15.08.1.tar.xz";
-      sha256 = "1g60s028b08vd34l7n8m4sd7d9zl419kz8f1hvdgs2z9zacd5zqg";
-      name = "khangman-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kolf-15.08.3.tar.xz";
+      sha256 = "1akvicna1wzjcjdz2nz2mydmv9f39rff6jwcbj6blgdr1q56p4q7";
+      name = "kolf-15.08.3.tar.xz";
     };
   };
-  kteatime = {
-    version = "15.08.1";
+  kollision = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kteatime-15.08.1.tar.xz";
-      sha256 = "0bsy22dgfpsibkpi0nv4245mxaf0xnh8rpaia8mzrh0d72gf2syb";
-      name = "kteatime-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kollision-15.08.3.tar.xz";
+      sha256 = "1r9ijp1bgl20rv76if09695bkc5yrr99sn1s0193fjjh34fpd0w8";
+      name = "kollision-15.08.3.tar.xz";
     };
   };
-  gpgmepp = {
-    version = "15.08.1";
+  kolourpaint = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/gpgmepp-15.08.1.tar.xz";
-      sha256 = "1nr4k3k34cmmvn4mznnr4kgvbi4raan96phbiqzgh6mzkq2rc8yr";
-      name = "gpgmepp-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kolourpaint-15.08.3.tar.xz";
+      sha256 = "1miq2jvmqkgcwpzh2vzzb2dvmb8ziwr767ss5daqv540gpc8crjr";
+      name = "kolourpaint-15.08.3.tar.xz";
     };
   };
-  ktp-contact-list = {
-    version = "15.08.1";
+  kompare = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-contact-list-15.08.1.tar.xz";
-      sha256 = "0x8fvfqjjrhdnfaa9ybagf33lv1r21bywkipvkp2f81dalsd1sv0";
-      name = "ktp-contact-list-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kompare-15.08.3.tar.xz";
+      sha256 = "067m9xrnx6smscsk7wq9d8j2sv0g7ayfrdjwf4xsfa5jz8fh32s5";
+      name = "kompare-15.08.3.tar.xz";
     };
   };
-  klettres = {
-    version = "15.08.1";
+  konquest = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/klettres-15.08.1.tar.xz";
-      sha256 = "0ykb5pfawiyby2xshfdq2gy7w66dw5vhqdd4vjkix6nyb87n703z";
-      name = "klettres-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/konquest-15.08.3.tar.xz";
+      sha256 = "1v760lh6wx8kqyyrw2vb48n5x0ccl12dr3gy5dxyrs9sn0jpwz4r";
+      name = "konquest-15.08.3.tar.xz";
     };
   };
-  kidentitymanagement = {
-    version = "15.08.1";
+  konsole = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kidentitymanagement-15.08.1.tar.xz";
-      sha256 = "0aslniqzp8bgayvvrxkdfb9ihvz57n6zf3rh99dsv34z20mfyc59";
-      name = "kidentitymanagement-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/konsole-15.08.3.tar.xz";
+      sha256 = "0kpizwk3vwp25sincqnjrmvrhwv2a7vgacnw4yp2bxvdqqrb4zhr";
+      name = "konsole-15.08.3.tar.xz";
     };
   };
-  libkdegames = {
-    version = "15.08.1";
+  kontactinterface = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkdegames-15.08.1.tar.xz";
-      sha256 = "0khr3rih3yv2vh9q2dkvdc2r1lpxhky5hmh7gachhyjh0296i9nq";
-      name = "libkdegames-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kontactinterface-15.08.3.tar.xz";
+      sha256 = "1www2daa48r43dii2fb9s0x2ll3bsvhxnllypcs2fy5gzaj6wrff";
+      name = "kontactinterface-15.08.3.tar.xz";
     };
   };
-  kmailtransport = {
-    version = "15.08.1";
+  kopete = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmailtransport-15.08.1.tar.xz";
-      sha256 = "18gnhw49df0f7j0n0nzfnr5v6wvl37mf82slwbsrjqvhj60b2xsg";
-      name = "kmailtransport-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kopete-15.08.3.tar.xz";
+      sha256 = "1x05w7ls0298shwr10f0vcbxcd0rvfvgfcwz2c5jrgb1zf968k8c";
+      name = "kopete-15.08.3.tar.xz";
     };
   };
-  kbruch = {
-    version = "15.08.1";
+  kpat = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kbruch-15.08.1.tar.xz";
-      sha256 = "1mdbrfj7g92v5yzpdi0cccmhf5vdy7y5blbnk50p56qaq8w8avm2";
-      name = "kbruch-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kpat-15.08.3.tar.xz";
+      sha256 = "16lmrlxxl3kibzflw3lvcbp7xmklr4jqwh1aqqxw5lbybkz2vnah";
+      name = "kpat-15.08.3.tar.xz";
     };
   };
-  zeroconf-ioslave = {
-    version = "15.08.1";
+  kpimtextedit = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/zeroconf-ioslave-15.08.1.tar.xz";
-      sha256 = "1h8v78b6fb82brpxkhlwyphb830ndzlq4z5llgav1dy7i0v8pd7r";
-      name = "zeroconf-ioslave-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kpimtextedit-15.08.3.tar.xz";
+      sha256 = "1q1a77wnwny7j777vrhbqlz6z1z7jmil8raii4nbrwjqpdw8fc92";
+      name = "kpimtextedit-15.08.3.tar.xz";
     };
   };
-  kdegraphics-thumbnailers = {
-    version = "15.08.1";
+  kppp = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-thumbnailers-15.08.1.tar.xz";
-      sha256 = "1qavbvczjikad4kg28lq6zbb7dvllfw5nggilrs0s2qar7jqlrkw";
-      name = "kdegraphics-thumbnailers-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kppp-15.08.3.tar.xz";
+      sha256 = "0q5542f9aa98w94krib84yrjsk3ialaq43vd9bbdvf0j5wfzb276";
+      name = "kppp-15.08.3.tar.xz";
     };
   };
-  kreversi = {
-    version = "15.08.1";
+  kqtquickcharts = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kreversi-15.08.1.tar.xz";
-      sha256 = "0clxm23a0m5j8aj3cp1va5s38y0y5wr7akwmigpk37xjylzp1xdd";
-      name = "kreversi-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kqtquickcharts-15.08.3.tar.xz";
+      sha256 = "0ppifqc9bz8hljniw6h5a31k38qbij9ydpwjzpg11m0s8a4havmm";
+      name = "kqtquickcharts-15.08.3.tar.xz";
     };
   };
-  kdewebdev = {
-    version = "15.08.1";
+  krdc = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdewebdev-15.08.1.tar.xz";
-      sha256 = "00q25xp28m9sfgs7h4g89gyh34v36zwmliz1jvsq18aja45f5hpm";
-      name = "kdewebdev-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/krdc-15.08.3.tar.xz";
+      sha256 = "1vcfx703bniac9l7g6cg031nb18blypxb1i84dwfjavr4ib2im8l";
+      name = "krdc-15.08.3.tar.xz";
     };
   };
-  kgoldrunner = {
-    version = "15.08.1";
+  kremotecontrol = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kgoldrunner-15.08.1.tar.xz";
-      sha256 = "18xs36g9gmhzlwyg2gl9cc3842dzwc196dpfp0xshja2f1rlr6fp";
-      name = "kgoldrunner-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kremotecontrol-15.08.3.tar.xz";
+      sha256 = "0nxbw1zl8lcc9nvj5damz7m5q6bijm8mjx7isccf7j6mjazdxcin";
+      name = "kremotecontrol-15.08.3.tar.xz";
     };
   };
-  kde-base-artwork = {
-    version = "15.08.1";
+  kreversi = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-base-artwork-15.08.1.tar.xz";
-      sha256 = "081mrc0s2lnbzwmmy9hwqas28cl6jzdycwxx3vfn4rvsgw4cgrp2";
-      name = "kde-base-artwork-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kreversi-15.08.3.tar.xz";
+      sha256 = "1806m071wgnjg01lrjii9nh7spiwxm9cf0jl0gib7fk2cw9kw2fa";
+      name = "kreversi-15.08.3.tar.xz";
     };
   };
-  kiten = {
-    version = "15.08.1";
+  krfb = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kiten-15.08.1.tar.xz";
-      sha256 = "1pz9frvf23hi2hy7g040prcgjvjssgv3yya2kvapafpmbwnd38dv";
-      name = "kiten-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/krfb-15.08.3.tar.xz";
+      sha256 = "0dil3qpkf8m9449aqawjrilwvickb3nl3msj2g3svdnfvak7cv61";
+      name = "krfb-15.08.3.tar.xz";
     };
   };
-  kmahjongg = {
-    version = "15.08.1";
+  kross-interpreters = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmahjongg-15.08.1.tar.xz";
-      sha256 = "193ynx3da2nyaf2ixq7gc93nv8p9djslh8m666kdnqcxarlxd2qn";
-      name = "kmahjongg-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kross-interpreters-15.08.3.tar.xz";
+      sha256 = "1msy3xg5n5g2ax074g23j889dadqn4mbqa3r5mlmdaz9bnny1n9r";
+      name = "kross-interpreters-15.08.3.tar.xz";
     };
   };
-  kcolorchooser = {
-    version = "15.08.1";
+  kruler = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcolorchooser-15.08.1.tar.xz";
-      sha256 = "1ig03dg4baf29hhim1m77bzwnm6mqqyzbmyhk6g92mj5883nnfb7";
-      name = "kcolorchooser-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kruler-15.08.3.tar.xz";
+      sha256 = "1mr1pzn776a7xgq0rwqdn635s9y2bl0bh53i1c99h32jbxhn6fhb";
+      name = "kruler-15.08.3.tar.xz";
     };
   };
-  kapman = {
-    version = "15.08.1";
+  ksaneplugin = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kapman-15.08.1.tar.xz";
-      sha256 = "070zckasm7bm1g01rvp55gbilyzxqs5gsrp56zp3lyids0ycjfgz";
-      name = "kapman-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksaneplugin-15.08.3.tar.xz";
+      sha256 = "18mpjl21rmbw95zc2b8f9sgi2sh922p0qj8d3jfhs3gggjy5hjfb";
+      name = "ksaneplugin-15.08.3.tar.xz";
     };
   };
-  gwenview = {
-    version = "15.08.1";
+  kscd = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/gwenview-15.08.1.tar.xz";
-      sha256 = "0lks7chyd8bylz1m3nv3bfch5jcffkv52aawxv9r5www9wd7jq69";
-      name = "gwenview-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kscd-15.08.3.tar.xz";
+      sha256 = "0pqr342swpbwkqq7qwn7zs97kmbqpmwrlkkk0amaadgsfd9c9j40";
+      name = "kscd-15.08.3.tar.xz";
     };
   };
-  kcron = {
-    version = "15.08.1";
+  kshisen = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kcron-15.08.1.tar.xz";
-      sha256 = "1s90bmlfbhcfiq6iizp4sq0z3ds8nrqghckcx9zrbyyj852llh0f";
-      name = "kcron-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kshisen-15.08.3.tar.xz";
+      sha256 = "0xx8lwxw4zfzwzaqdi1v7g00vzy74arfbfhvkxgs6k1gvhja0ckk";
+      name = "kshisen-15.08.3.tar.xz";
     };
   };
-  kdeartwork = {
-    version = "15.08.1";
+  ksirk = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdeartwork-15.08.1.tar.xz";
-      sha256 = "0j37pzih616fv1k6i3hll6qkxh42v9gkhy5vl57ancx7a5kxikyc";
-      name = "kdeartwork-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksirk-15.08.3.tar.xz";
+      sha256 = "1y6y0dcgvrpflfmircbf3nj7mjgvkbnddlmbxsws4h0737lqkg21";
+      name = "ksirk-15.08.3.tar.xz";
     };
   };
-  ktp-accounts-kcm = {
-    version = "15.08.1";
+  ksnakeduel = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-accounts-kcm-15.08.1.tar.xz";
-      sha256 = "1qk25v0ivxkv8cyq4y44ixz9rx28djfxk06zcvn2m1rwjqhrx204";
-      name = "ktp-accounts-kcm-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksnakeduel-15.08.3.tar.xz";
+      sha256 = "1zpz3fa9lp44iv5kxdwy1sk93bpkin9h64n6qj0lcpjj3f8a5cy5";
+      name = "ksnakeduel-15.08.3.tar.xz";
     };
   };
-  kdepim-runtime = {
-    version = "15.08.1";
+  ksnapshot = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdepim-runtime-15.08.1.tar.xz";
-      sha256 = "1hcg900bnjryxii3f1c2yjj2nr3z4pn7yigdxclmwpfk6gvlkqm4";
-      name = "kdepim-runtime-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksnapshot-15.08.3.tar.xz";
+      sha256 = "1xnbf73dr8z95kwq047zwjl0yml25nbnw5gnc319q2nlcnxk5gc3";
+      name = "ksnapshot-15.08.3.tar.xz";
     };
   };
-  kfloppy = {
-    version = "15.08.1";
+  kspaceduel = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kfloppy-15.08.1.tar.xz";
-      sha256 = "0yg94p5gj9xazl9kk503mblawyndv2j6m0scf6na68xksgx0yplv";
-      name = "kfloppy-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kspaceduel-15.08.3.tar.xz";
+      sha256 = "12dbdybqfd5klfg427q48rbv2s63ybanay8c5d44znwk5qi9wwf7";
+      name = "kspaceduel-15.08.3.tar.xz";
     };
   };
-  kopete = {
-    version = "15.08.1";
+  ksquares = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kopete-15.08.1.tar.xz";
-      sha256 = "0949m4xw94hnw79c6ar8m9qjcx7r14qs6jww3pcnab7r0ax4xahb";
-      name = "kopete-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksquares-15.08.3.tar.xz";
+      sha256 = "1jr7slw9ml01zffj5kjv56fmwq8snz0jxdkczr2crr15cljrsmwj";
+      name = "ksquares-15.08.3.tar.xz";
     };
   };
-  okular = {
-    version = "15.08.1";
+  kstars = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/okular-15.08.1.tar.xz";
-      sha256 = "0nicpz25srpn9zmwjxrnz8h2ba597ixsqcyhymki465dv5hgx5x7";
-      name = "okular-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kstars-15.08.3.tar.xz";
+      sha256 = "17n2g1a53ps0cx1s62qz1s7yn8nn0sgq0p4ifdyq9rk5iwaq5yp8";
+      name = "kstars-15.08.3.tar.xz";
     };
   };
-  kdf = {
-    version = "15.08.1";
+  ksudoku = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdf-15.08.1.tar.xz";
-      sha256 = "062rz8syp7kxc9xyl4ldcqx66fdrjh5fhgdqgdjdgpn273n5v447";
-      name = "kdf-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksudoku-15.08.3.tar.xz";
+      sha256 = "0rw02qdvv132i6gf2n1v37b7rmahzmmz5jx174j1syda4wwpyhgr";
+      name = "ksudoku-15.08.3.tar.xz";
     };
   };
-  kfourinline = {
-    version = "15.08.1";
+  ksystemlog = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kfourinline-15.08.1.tar.xz";
-      sha256 = "19rssc5mf8hn6fv9pm91pbhdcxp123z9c1wrmay1wmja7fmnyv9s";
-      name = "kfourinline-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksystemlog-15.08.3.tar.xz";
+      sha256 = "12gacxya366rln3q9m2vzv28irrwnsj4lb1pqymxvsfyijfsjd7x";
+      name = "ksystemlog-15.08.3.tar.xz";
     };
   };
-  kdeedu-data = {
-    version = "15.08.1";
+  kteatime = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdeedu-data-15.08.1.tar.xz";
-      sha256 = "1yfx8526i753ifmcyh9r481cqiqzs4wh3xm1ys5x8pspg9rpn0wi";
-      name = "kdeedu-data-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kteatime-15.08.3.tar.xz";
+      sha256 = "1yij4230wc7qc9wzj5kam6jjv97xdcnz57j0kpa54iw1c3camwlx";
+      name = "kteatime-15.08.3.tar.xz";
     };
   };
-  kubrick = {
-    version = "15.08.1";
+  ktimer = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kubrick-15.08.1.tar.xz";
-      sha256 = "1sanlaz70m1jpaxjwlx2gljh57gg4gdcz7y9g2w191667yk0kq8g";
-      name = "kubrick-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktimer-15.08.3.tar.xz";
+      sha256 = "06p2dar8ry4xrkn21npxsnfkxq92sg66lmrnhqpkzv3dcvz98n50";
+      name = "ktimer-15.08.3.tar.xz";
     };
   };
-  svgpart = {
-    version = "15.08.1";
+  ktnef = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/svgpart-15.08.1.tar.xz";
-      sha256 = "10vvnsm7xlgy5fia8l8cz6cgj4xsjshiqkiiwkzlmyzzx081zi57";
-      name = "svgpart-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktnef-15.08.3.tar.xz";
+      sha256 = "1r68cms5hv8drrdl2zhz8q9hsiln63c1rylbv68dxjz44w5jsw84";
+      name = "ktnef-15.08.3.tar.xz";
     };
   };
-  kanagram = {
-    version = "15.08.1";
+  ktouch = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kanagram-15.08.1.tar.xz";
-      sha256 = "0bchwvr87wj9p82v1vgdmfw0a8d1gax08ccq24lzigrny6ljlizr";
-      name = "kanagram-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktouch-15.08.3.tar.xz";
+      sha256 = "07piq43fngk7i5568vqpsd0xhfmfbwm4gwbdgvg0qx5cm2np00pp";
+      name = "ktouch-15.08.3.tar.xz";
     };
   };
-  klickety = {
-    version = "15.08.1";
+  ktp-accounts-kcm = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/klickety-15.08.1.tar.xz";
-      sha256 = "1prbr2401jy4pifcyn8dy6q34f1nrhvhh8gm8p5jbr1jkzxmm1k1";
-      name = "klickety-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-accounts-kcm-15.08.3.tar.xz";
+      sha256 = "04q89vay1936rr94g9n54japqml7b40p8qh2nh8wc13vbiiffbq0";
+      name = "ktp-accounts-kcm-15.08.3.tar.xz";
     };
   };
-  kgpg = {
-    version = "15.08.1";
+  ktp-approver = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kgpg-15.08.1.tar.xz";
-      sha256 = "0728pb6d70qfrbmd1d16lwxshy3ifb8snx5bi8vp9rrs7ncy8r4a";
-      name = "kgpg-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-approver-15.08.3.tar.xz";
+      sha256 = "131gb9h8pqa2ac4kv8by5wa5f9cdv32413d2039ggkc0zfhyqlbb";
+      name = "ktp-approver-15.08.3.tar.xz";
     };
   };
-  kdepim = {
-    version = "15.08.1";
+  ktp-auth-handler = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdepim-15.08.1.tar.xz";
-      sha256 = "06j6zmizkc8yg59dvnbcla82jb4csrwrvzzk3al18j6js0sdjnqr";
-      name = "kdepim-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-auth-handler-15.08.3.tar.xz";
+      sha256 = "1k9y83miwy77c2pjm8frm6zbkddm463bkdr08lrl3cf9y0azj6xl";
+      name = "ktp-auth-handler-15.08.3.tar.xz";
     };
   };
-  granatier = {
-    version = "15.08.1";
+  ktp-common-internals = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/granatier-15.08.1.tar.xz";
-      sha256 = "1ngdjgf3imdbv1hmp88fhnpvpspjgl2zpaig3d96fjlhxh0bgng1";
-      name = "granatier-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-common-internals-15.08.3.tar.xz";
+      sha256 = "1p1qg4nkjmly7iilx6nra0qwn7g6kdwn4hw6bs2ikdvsg36kkr72";
+      name = "ktp-common-internals-15.08.3.tar.xz";
     };
   };
-  knetwalk = {
-    version = "15.08.1";
+  ktp-contact-list = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/knetwalk-15.08.1.tar.xz";
-      sha256 = "0biis3gz943s09dzdxxdpkpizy3qzp9csi72njbm3bapxwmcflr2";
-      name = "knetwalk-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-contact-list-15.08.3.tar.xz";
+      sha256 = "15g7nnz8bggscpba74vk6riizv9xn5ndar1lkay77ikfbbyhb0x6";
+      name = "ktp-contact-list-15.08.3.tar.xz";
     };
   };
-  rocs = {
-    version = "15.08.1";
+  ktp-contact-runner = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/rocs-15.08.1.tar.xz";
-      sha256 = "1s3mdi9hqhajryax4yg074dn0h5yq9fq4a8j6ksgg7a2ggl4l8kv";
-      name = "rocs-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-contact-runner-15.08.3.tar.xz";
+      sha256 = "09angbgm877x81wqsbn7cpg75skiv7x4war1lq1yma6nirs7369p";
+      name = "ktp-contact-runner-15.08.3.tar.xz";
     };
   };
-  kde-dev-utils = {
-    version = "15.08.1";
+  ktp-desktop-applets = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-dev-utils-15.08.1.tar.xz";
-      sha256 = "0jashpk1gjcf74b4vpkyrab2izp18ddwi0xky4v47micicl7wm5n";
-      name = "kde-dev-utils-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-desktop-applets-15.08.3.tar.xz";
+      sha256 = "18x08b38s46pz6crd1qg1b6qy7xxfhhp0pk2hsc5v4s7j931q8v9";
+      name = "ktp-desktop-applets-15.08.3.tar.xz";
     };
   };
-  kdesdk-thumbnailers = {
-    version = "15.08.1";
+  ktp-filetransfer-handler = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdesdk-thumbnailers-15.08.1.tar.xz";
-      sha256 = "0719qaw9whp1aa15cxcz7axfhmcm30iwwrr78xypzcy097f63q4v";
-      name = "kdesdk-thumbnailers-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-filetransfer-handler-15.08.3.tar.xz";
+      sha256 = "1w7hnhbjmnl7ba1357b6q440266fgh7kyim9cn919i89aah2d11y";
+      name = "ktp-filetransfer-handler-15.08.3.tar.xz";
     };
   };
-  kigo = {
-    version = "15.08.1";
+  ktp-kded-module = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kigo-15.08.1.tar.xz";
-      sha256 = "1vwkan7zlafisx4kap4bby4d2ndqnqbj7jrc00xgbw43l81kn4ix";
-      name = "kigo-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-kded-module-15.08.3.tar.xz";
+      sha256 = "0s86d0yad758hgzbd9nb9hpq8iglq8bcmy7wdn0ji2nyppprf0jc";
+      name = "ktp-kded-module-15.08.3.tar.xz";
     };
   };
-  jovie = {
-    version = "15.08.1";
+  ktp-send-file = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/jovie-15.08.1.tar.xz";
-      sha256 = "021j7rxbbv5p2jjp4d7m7vsdy5117myng2min42bn6vfz4g6s5rx";
-      name = "jovie-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-send-file-15.08.3.tar.xz";
+      sha256 = "15pc0p6f87hwh19kwf6wzd04rf96r2z7xj8h89y86xwirn02spgv";
+      name = "ktp-send-file-15.08.3.tar.xz";
     };
   };
-  amor = {
-    version = "15.08.1";
+  ktp-text-ui = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/amor-15.08.1.tar.xz";
-      sha256 = "125s9hsj4s3h21khgri9p52abkaa78a9yz7fnw5ij4i0ivhbks6a";
-      name = "amor-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-text-ui-15.08.3.tar.xz";
+      sha256 = "04lxwq5cm7rg7xras47lngzn0pwfy6yp41lrybl2ywg9rvbdfv4s";
+      name = "ktp-text-ui-15.08.3.tar.xz";
     };
   };
-  kspaceduel = {
-    version = "15.08.1";
+  ktuberling = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kspaceduel-15.08.1.tar.xz";
-      sha256 = "0anviqhcmyfnyq9zz6hh8cka75hy5ydxq5yvz7q0g6c3flj34fq2";
-      name = "kspaceduel-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktuberling-15.08.3.tar.xz";
+      sha256 = "0bs41wlriak2087r1q3zlkblcjl504g1dvhrxx3fymmxgxkir6k6";
+      name = "ktuberling-15.08.3.tar.xz";
     };
   };
-  libkipi = {
-    version = "15.08.1";
+  kturtle = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkipi-15.08.1.tar.xz";
-      sha256 = "0mmk8zfwffns7gacdjhjh45ki762wpd21nwvgbjclf3rjzgbyxz8";
-      name = "libkipi-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kturtle-15.08.3.tar.xz";
+      sha256 = "0i4n3k2rji85y0x5aacrpab4jxx5skh3c96yfb9190s6ick3s4jg";
+      name = "kturtle-15.08.3.tar.xz";
     };
   };
-  kgeography = {
-    version = "15.08.1";
+  ktux = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kgeography-15.08.1.tar.xz";
-      sha256 = "1ilb9l6v8pf7aq9dzs29bbdqb60fzf7a0dwjjdfvjq8jbnhcxa9v";
-      name = "kgeography-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktux-15.08.3.tar.xz";
+      sha256 = "0dcida7qjwglra7b17hb15dn240nnbsryps49d9k0fmv7y8cdicd";
+      name = "ktux-15.08.3.tar.xz";
     };
   };
-  kajongg = {
-    version = "15.08.1";
+  kubrick = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kajongg-15.08.1.tar.xz";
-      sha256 = "1ialza77fc0a6541yg71b8qbjvq78sww7l0g3s1rn30pj1j1r3rx";
-      name = "kajongg-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kubrick-15.08.3.tar.xz";
+      sha256 = "07bq203ds77v41nqjrydlls25whhpmaqq4wvqqnafz6j3122972m";
+      name = "kubrick-15.08.3.tar.xz";
     };
   };
-  kolourpaint = {
-    version = "15.08.1";
+  kuser = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kolourpaint-15.08.1.tar.xz";
-      sha256 = "1m0dwv2wxf5nsisg4zc6h1cqbnzv4187il7y45rbkxli430jh43d";
-      name = "kolourpaint-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kuser-15.08.3.tar.xz";
+      sha256 = "1lhrrrfg0zfkxv87kclfz7lw57knhalfclik9g2g84mjd2mrp23c";
+      name = "kuser-15.08.3.tar.xz";
     };
   };
-  marble = {
-    version = "15.08.1";
+  kwalletmanager = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/marble-15.08.1.tar.xz";
-      sha256 = "0dx0r1hjcfn3mvmsw0wgaw57jkn42166aj97ky0zdhdavkqv4j3j";
-      name = "marble-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kwalletmanager-15.08.3.tar.xz";
+      sha256 = "1wh4gkqyz003qx50q4m35987rabjh80npg1hiqmybz60syq1bash";
+      name = "kwalletmanager-15.08.3.tar.xz";
     };
   };
-  kblog = {
-    version = "15.08.1";
+  kwordquiz = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kblog-15.08.1.tar.xz";
-      sha256 = "0a5ycnk0ljw8k4m5pm7cn37ijjq9x1p2hxf4k77jb7aw1apyqv15";
-      name = "kblog-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kwordquiz-15.08.3.tar.xz";
+      sha256 = "1fr68aq6f1ilfvfvcxvjg90dpwsig36nxb5v35rbpg1kjz8lxdl3";
+      name = "kwordquiz-15.08.3.tar.xz";
     };
   };
-  kget = {
-    version = "15.08.1";
+  libkcddb = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kget-15.08.1.tar.xz";
-      sha256 = "02npfzdk283930jywhjch6sscnj16w2n3nn4ik04bx8hxv74br74";
-      name = "kget-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkcddb-15.08.3.tar.xz";
+      sha256 = "0yspqyj11q4l5b0hmy9068hg7kkbqwy5zq72clbf30lys6h9mqb6";
+      name = "libkcddb-15.08.3.tar.xz";
     };
   };
-  ktuberling = {
-    version = "15.08.1";
+  libkcompactdisc = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktuberling-15.08.1.tar.xz";
-      sha256 = "1y9ifgg2086zz45pj32xxjrgnbsgiq7ajbjl8cybjxcx624j66ic";
-      name = "ktuberling-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkcompactdisc-15.08.3.tar.xz";
+      sha256 = "1fvf219dj1dbl69nmdyzvyds9c1f77zqzqwv2l87brk5syshsywp";
+      name = "libkcompactdisc-15.08.3.tar.xz";
     };
   };
-  krfb = {
-    version = "15.08.1";
+  libkdcraw = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/krfb-15.08.1.tar.xz";
-      sha256 = "0cpypajr483iwch385240zi5l0vf4j28k0sng0kszhizspkhvp35";
-      name = "krfb-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkdcraw-15.08.3.tar.xz";
+      sha256 = "0m1zc23k68gm0hrdl18sizw5qnpa216m03lzik92m50msndz34bc";
+      name = "libkdcraw-15.08.3.tar.xz";
     };
   };
-  ktp-filetransfer-handler = {
-    version = "15.08.1";
+  libkdeedu = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-filetransfer-handler-15.08.1.tar.xz";
-      sha256 = "135zpcl0g81xd9hljch05cjngs6x05cnzngzx5h5hsjf13fgz9cn";
-      name = "ktp-filetransfer-handler-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkdeedu-15.08.3.tar.xz";
+      sha256 = "1z8dp47900ybppnkpbfvckjkiib9q0ggqm0m83vbmgwzanx7k7sn";
+      name = "libkdeedu-15.08.3.tar.xz";
     };
   };
-  ktouch = {
-    version = "15.08.1";
+  libkdegames = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktouch-15.08.1.tar.xz";
-      sha256 = "1hlg1l1xpmpwvzz47vmif395pw9szjy93p8yxhqsdhkh1f4mdssq";
-      name = "ktouch-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkdegames-15.08.3.tar.xz";
+      sha256 = "1jg6z4qfagijkr1b2hd05sr0jdb0qvfn1dphd43ma6gi7bl5khn4";
+      name = "libkdegames-15.08.3.tar.xz";
     };
   };
-  kmplot = {
-    version = "15.08.1";
+  libkeduvocdocument = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmplot-15.08.1.tar.xz";
-      sha256 = "1a1b6vcxp1wkp6qfidwj42vqkh6wm4m64q0hm7zv6h01l10fzdm2";
-      name = "kmplot-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkeduvocdocument-15.08.3.tar.xz";
+      sha256 = "1b16p9m14v8w0qg1v9jwiiljvpc2samlrcp6bszrld02ghii5649";
+      name = "libkeduvocdocument-15.08.3.tar.xz";
     };
   };
-  okteta = {
-    version = "15.08.1";
+  libkexiv2 = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/okteta-15.08.1.tar.xz";
-      sha256 = "14mbfqc61rw2g89shh0ad38ph24c6nrj76qx9g1diazvr3p9sf1j";
-      name = "okteta-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkexiv2-15.08.3.tar.xz";
+      sha256 = "0q44gjhdjiy74q5a40kmmcry0m0pnzw454j5ynrimd3nk8r2l6nl";
+      name = "libkexiv2-15.08.3.tar.xz";
     };
   };
-  kdepimlibs = {
-    version = "15.08.1";
+  libkface = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdepimlibs-15.08.1.tar.xz";
-      sha256 = "0sjh4n2hgcfd3ngbvzk051yzglkchcjhx0nnn12li0lw2bg7l9w3";
-      name = "kdepimlibs-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkface-15.08.3.tar.xz";
+      sha256 = "0jiv41f1mqf4813m882v84vczkyxmbmjf8bf7d5iq13i9xr190wg";
+      name = "libkface-15.08.3.tar.xz";
     };
   };
-  kwalletmanager = {
-    version = "15.08.1";
+  libkgeomap = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kwalletmanager-15.08.1.tar.xz";
-      sha256 = "1ibfiaglwgqxnsmx1f8pcylv0kzywpd2mvyawcdhcl3yqdpyw4v7";
-      name = "kwalletmanager-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkgeomap-15.08.3.tar.xz";
+      sha256 = "1jscbp31q91viv2ym09zal4c0vx8xx3lqd4vg78mr9591y1bgr7l";
+      name = "libkgeomap-15.08.3.tar.xz";
     };
   };
-  kmime = {
-    version = "15.08.1";
+  libkipi = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmime-15.08.1.tar.xz";
-      sha256 = "1rz9nmx01rd4asv8iggh47m7snm0fdvlc9f59jpkbch1wxf70vqc";
-      name = "kmime-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkipi-15.08.3.tar.xz";
+      sha256 = "1v70k9xx8va0xk3439sqllh9sl9sx56bayl0b24gkdc3ddj8l0rk";
+      name = "libkipi-15.08.3.tar.xz";
     };
   };
-  ktp-auth-handler = {
-    version = "15.08.1";
+  libkmahjongg = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktp-auth-handler-15.08.1.tar.xz";
-      sha256 = "0dwpaw2pvigc0lyqa29gxq49fp6rp5hh2wg6ysr1d00s54lr2qgw";
-      name = "ktp-auth-handler-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkmahjongg-15.08.3.tar.xz";
+      sha256 = "05zff791i1jih5abx6ywfagxh1rwc38nblfcfci66pqvknmya2x1";
+      name = "libkmahjongg-15.08.3.tar.xz";
     };
   };
-  ktux = {
-    version = "15.08.1";
+  libkomparediff2 = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktux-15.08.1.tar.xz";
-      sha256 = "1vw0ybkvrcqcng6sz0hw12bhsspig98m0wjn8phlyljfd5d8p4h3";
-      name = "ktux-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkomparediff2-15.08.3.tar.xz";
+      sha256 = "03aaz64s6f3xc6kv188p301qivnjh27xd8jpmj6yq98laj3v2xrl";
+      name = "libkomparediff2-15.08.3.tar.xz";
     };
   };
-  ffmpegthumbs = {
-    version = "15.08.1";
+  libksane = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ffmpegthumbs-15.08.1.tar.xz";
-      sha256 = "00bk11zq5hkdkwxj7d4fydslh2gybhzxz2gyldjfdd8agjcl1rfm";
-      name = "ffmpegthumbs-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libksane-15.08.3.tar.xz";
+      sha256 = "01x24gxk0xj6j9zwyyavklphykgjb3w0wra61ivyrsim1za8y0qa";
+      name = "libksane-15.08.3.tar.xz";
     };
   };
-  libkomparediff2 = {
-    version = "15.08.1";
+  lokalize = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkomparediff2-15.08.1.tar.xz";
-      sha256 = "1g8j5idy18a4fnc2m9cjg3xzq6kck070yq5ki4l9lbjinrhl3jpr";
-      name = "libkomparediff2-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/lokalize-15.08.3.tar.xz";
+      sha256 = "1xzxbgiq5q1v578d9w9pir279n05z2dyqlgq98213zhama6df18z";
+      name = "lokalize-15.08.3.tar.xz";
     };
   };
-  kalgebra = {
-    version = "15.08.1";
+  lskat = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kalgebra-15.08.1.tar.xz";
-      sha256 = "1an9lc9h1178d94pq2a60pnw9wadxdni3drbx40w1l1kfaa38ghy";
-      name = "kalgebra-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/lskat-15.08.3.tar.xz";
+      sha256 = "1kag1wqr5m1r7s3i29h8ls2zrva2whmaxjj400zgn9j404dyjmmd";
+      name = "lskat-15.08.3.tar.xz";
     };
   };
-  kblocks = {
-    version = "15.08.1";
+  marble = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kblocks-15.08.1.tar.xz";
-      sha256 = "1vvlxna5dmnf7igr53p3m5z224zj1ni92qifjnnblwr55gqqwsva";
-      name = "kblocks-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/marble-15.08.3.tar.xz";
+      sha256 = "0i18wss2zq3nfaxr9h7bnj3nb4ib07d3rylphhbjpi766z6k2cbl";
+      name = "marble-15.08.3.tar.xz";
     };
   };
-  kblackbox = {
-    version = "15.08.1";
+  mplayerthumbs = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kblackbox-15.08.1.tar.xz";
-      sha256 = "1hnxsjdp9gbjc0049jx7bnzx0cykyc7qf6f2z3mrir8knin0fmi5";
-      name = "kblackbox-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/mplayerthumbs-15.08.3.tar.xz";
+      sha256 = "03zda3iy20zq42kn51894yzsbmyq92gvrlzs2hm7fyp5lv199ybm";
+      name = "mplayerthumbs-15.08.3.tar.xz";
     };
   };
-  kdegraphics-mobipocket = {
-    version = "15.08.1";
+  okteta = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdegraphics-mobipocket-15.08.1.tar.xz";
-      sha256 = "0fnrd2za98plc8aw2gmn83yar0m7ix5rg84lpfm0vnshkhrslqg6";
-      name = "kdegraphics-mobipocket-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/okteta-15.08.3.tar.xz";
+      sha256 = "11540qlv95iwzmwi17ncbgklakywwdj4r4iylnkpw7fv4sx6fhrd";
+      name = "okteta-15.08.3.tar.xz";
     };
   };
-  ksnakeduel = {
-    version = "15.08.1";
+  okular = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksnakeduel-15.08.1.tar.xz";
-      sha256 = "1q0hcya6dl2lfahqnwx18hl6cwmibsvlyf25x41d42669f7vm1zz";
-      name = "ksnakeduel-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/okular-15.08.3.tar.xz";
+      sha256 = "1inbvcyafa8dfy7kignb2ksc984kriax7n2qrz3rxydw9n0r6bi5";
+      name = "okular-15.08.3.tar.xz";
     };
   };
-  kde-wallpapers = {
-    version = "15.08.1";
+  oxygen-icons = {
+    version = "15.04.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-wallpapers-15.08.1.tar.xz";
-      sha256 = "01q5yh4q7kjjryab3jc8g4qwi4w18la6na0ra2mf0cf637xnlh83";
-      name = "kde-wallpapers-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz";
+      sha256 = "07npzyrbw2fn1qd04imnv7cz0sisk7yllrwr2y21yr2i1gbncfqk";
+      name = "oxygen-icons-15.04.3.tar.xz";
     };
   };
-  konsole = {
-    version = "15.08.1";
+  palapeli = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/konsole-15.08.1.tar.xz";
-      sha256 = "15d401xxqhd8sfjc6gpn7f1zcs5w8l6y2bjvjvidmpzmr24xky1j";
-      name = "konsole-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/palapeli-15.08.3.tar.xz";
+      sha256 = "167svcjz7a8x032585jx63m94jy3xza5zb1b61rchn2xxbar7fx9";
+      name = "palapeli-15.08.3.tar.xz";
     };
   };
-  kdelibs = {
-    version = "4.14.12";
+  parley = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdelibs-4.14.12.tar.xz";
-      sha256 = "1s4p3x5si0mx64rhfqplgpyqm04c84wj4mpmbmi86wxwyr5d65rg";
-      name = "kdelibs-4.14.12.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/parley-15.08.3.tar.xz";
+      sha256 = "07gshvn8c3ifyzfkscakc1x7kgbzgxcxx12f05n56nm60rbq89w5";
+      name = "parley-15.08.3.tar.xz";
     };
   };
-  cantor = {
-    version = "15.08.1";
+  picmi = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/cantor-15.08.1.tar.xz";
-      sha256 = "0qcx077khzzjs8gaz2m1dph1r4ql3gpfsq536626fd94cb5is83x";
-      name = "cantor-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/picmi-15.08.3.tar.xz";
+      sha256 = "0cjj6xrdacvwpc6v6xb88j31m60k4gimc7k4hlmyv102vvagmv8y";
+      name = "picmi-15.08.3.tar.xz";
     };
   };
-  kmbox = {
-    version = "15.08.1";
+  poxml = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmbox-15.08.1.tar.xz";
-      sha256 = "1b4b9kk99kvcz4krixnzwvwf7ydkpbsrzza74f8ljbl40ldn94jn";
-      name = "kmbox-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/poxml-15.08.3.tar.xz";
+      sha256 = "0vls7kdqswwx9cnn8iw1iwq9jl861cmzjk2avrdllpsa4vbjfxal";
+      name = "poxml-15.08.3.tar.xz";
     };
   };
-  kde-dev-scripts = {
-    version = "15.08.1";
+  print-manager = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-dev-scripts-15.08.1.tar.xz";
-      sha256 = "01s13qwji4d2sgbg85kj0ggg4mnl2vggangi8fpvaps03fpq7571";
-      name = "kde-dev-scripts-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/print-manager-15.08.3.tar.xz";
+      sha256 = "19jw5xpwhblxfdh1kf6dniwy3pqmqaq7cimdn8zrzliclfjdfq2m";
+      name = "print-manager-15.08.3.tar.xz";
     };
   };
-  krdc = {
-    version = "15.08.1";
+  rocs = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/krdc-15.08.1.tar.xz";
-      sha256 = "1gx3vhl8w64ya71894lgy2i3kkggr84r1c5sx8nbwvapw5v4ngiz";
-      name = "krdc-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/rocs-15.08.3.tar.xz";
+      sha256 = "0qb0krn9cw5jn9djf3drg7c28lxnb6ih2a6q9a6wdl7snc4cxp5r";
+      name = "rocs-15.08.3.tar.xz";
     };
   };
-  ktnef = {
-    version = "15.08.1";
+  signon-kwallet-extension = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ktnef-15.08.1.tar.xz";
-      sha256 = "04jq60qpbgaclscgpwx3sj0l67sqzk9zr01zr6fx127apqzc2xmh";
-      name = "ktnef-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/signon-kwallet-extension-15.08.3.tar.xz";
+      sha256 = "0h7ixsxd2d9x4lqxilrajaxw260gdpj6lp68qgkq2vfv4v2hnfpv";
+      name = "signon-kwallet-extension-15.08.3.tar.xz";
     };
   };
-  kdenlive = {
-    version = "15.08.1";
+  step = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kdenlive-15.08.1.tar.xz";
-      sha256 = "03rbkl3jblzprwb6sd7wycizpnpk65551ji53i2h7rxwsns53hig";
-      name = "kdenlive-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/step-15.08.3.tar.xz";
+      sha256 = "092byp3y91ljp91n1qp3clsgi5bvfp9c8q90y14llkk3693nq6qa";
+      name = "step-15.08.3.tar.xz";
     };
   };
-  kwordquiz = {
-    version = "15.08.1";
+  superkaramba = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kwordquiz-15.08.1.tar.xz";
-      sha256 = "0b20n7k8ging2gw6l0k09r71ww1dg0fh5y5lqzlzcl8vqhdwkwpp";
-      name = "kwordquiz-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/superkaramba-15.08.3.tar.xz";
+      sha256 = "1z9pz9syqlz180hb0imvabag3cmwfix89811vbz9lqwa91a4i199";
+      name = "superkaramba-15.08.3.tar.xz";
     };
   };
-  libkface = {
-    version = "15.08.1";
+  svgpart = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/libkface-15.08.1.tar.xz";
-      sha256 = "0k2rsmnzfyab1x1nyirlhs48c19b2i2f0x60w1igp7b66n6819kd";
-      name = "libkface-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/svgpart-15.08.3.tar.xz";
+      sha256 = "0pdj8dlxdws7ccafj4nldi3xwdzsmbyi2c079ddq3pbrglm2r16h";
+      name = "svgpart-15.08.3.tar.xz";
     };
   };
-  kde-baseapps = {
-    version = "15.08.1";
+  sweeper = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kde-baseapps-15.08.1.tar.xz";
-      sha256 = "1ngi571gs62qnpz1ph106ard13pfh9f1ljg4y4cyv77nv90x4a2k";
-      name = "kde-baseapps-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/sweeper-15.08.3.tar.xz";
+      sha256 = "0mmhw0d63b3m88x9wv2dynp1xm04f0kkhp6iqnm69y91wdgy7kq5";
+      name = "sweeper-15.08.3.tar.xz";
     };
   };
-  cervisia = {
-    version = "15.08.1";
+  syndication = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/cervisia-15.08.1.tar.xz";
-      sha256 = "0cha7j0769ib8hc2jjgdxm1pv81cqwii721ww94dd4d614isv4pk";
-      name = "cervisia-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/syndication-15.08.3.tar.xz";
+      sha256 = "05hjxpfyqd8z4q0142n5f97qcwpfwr131xxpvsj1pzrqrx52im27";
+      name = "syndication-15.08.3.tar.xz";
     };
   };
-  kmousetool = {
-    version = "15.08.1";
+  umbrello = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/kmousetool-15.08.1.tar.xz";
-      sha256 = "0snyqp2410bjkc5krxhkk08i3lyd5724513vs48lxdasv24jc0nz";
-      name = "kmousetool-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/umbrello-15.08.3.tar.xz";
+      sha256 = "0pk4xc7sn1b1i1waxngrna33lhs2p03ny0vqm159qfhqawb3fpyg";
+      name = "umbrello-15.08.3.tar.xz";
     };
   };
-  ksaneplugin = {
-    version = "15.08.1";
+  zeroconf-ioslave = {
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.1/src/ksaneplugin-15.08.1.tar.xz";
-      sha256 = "0fx0y4js4nbbky342ly3aw59rbzz25mjb1da0hkykky9kxrcwnxk";
-      name = "ksaneplugin-15.08.1.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/zeroconf-ioslave-15.08.3.tar.xz";
+      sha256 = "1vbag0ajhr1b3psg4232j7y0nnff6gdn32r4212ybfzaxnh51479";
+      name = "zeroconf-ioslave-15.08.3.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index bc4c97d1f21..0b9cbe02999 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew
+{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
-, zlib, fftw
+, zlib, fftw, opensubdiv
 , jackaudioSupport ? false, libjack2
 , cudaSupport ? false, cudatoolkit
 , colladaSupport ? true, opencollada
@@ -10,17 +10,18 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.75a";
+  name = "blender-2.76b";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "09lxb2li70p6fg7hbakin9ffy3b3101c1gdjqi3pykks5q3h9sq4";
+    sha256 = "0pb0mlj4vj0iir528ifqq67nsh3ca1942933d9cwlbpcja2jm1dx";
   };
 
   buildInputs =
     [ SDL boost cmake ffmpeg gettext glew ilmbase libXi
       libjpeg libpng libsamplerate libsndfile libtiff mesa openal
       opencolorio openexr openimageio /* openjpeg */ python zlib fftw
+      (opensubdiv.override { inherit cudaSupport; })
     ]
     ++ optional jackaudioSupport libjack2
     ++ optional cudaSupport cudatoolkit
@@ -41,6 +42,7 @@ stdenv.mkDerivation rec {
       "-DWITH_GAMEENGINE=ON"
       "-DWITH_OPENCOLORIO=ON"
       "-DWITH_PLAYER=ON"
+      "-DWITH_OPENSUBDIV=ON"
       "-DPYTHON_LIBRARY=python${python.majorVersion}m"
       "-DPYTHON_LIBPATH=${python}/lib"
       "-DPYTHON_INCLUDE_DIR=${python}/include/python${python.majorVersion}m"
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index e3f3f25a071..6bd176d7357 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-${version}";
-  version = "2.38.0";
+  name = "calibre-${meta.version}";
 
   src = fetchurl {
-    url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "075axil53djss99fj9drfh5cvxdbjw6z5z5qk53vm13k5pw6bmhn";
+    url = "https://github.com/kovidgoyal/calibre/releases/download/v${meta.version}/${name}.tar.xz";
+    sha256 = "0d1sn2wc6h3c5girllsmnqg3jhmkal693ww3j6cj1mz2rraw45xr";
   };
 
   inherit python;
@@ -59,10 +58,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "2.44.0";
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ viric iElectric pSub ];
+    maintainers = with maintainers; [ viric iElectric pSub AndersonTorres ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 9f97e1eccee..890bc2c016b 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeWrapper, qtbase, qtquick1, qmltermwidget }:
+{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     sed -i -e '/qmltermwidget/d' cool-retro-term.pro
   '';
 
-  buildInputs = [ makeWrapper qtbase qtquick1 qmltermwidget ];
+  buildInputs = [ qtbase qtquick1 qmltermwidget ];
+  nativeBuildInputs = [ makeQtWrapper ];
 
   configurePhase = "qmake PREFIX=$out";
 
diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index 1ba3ee5268f..ac1852cd893 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,35 +1,28 @@
-{stdenv, fetchurl, libX11, libXinerama, enableXft, libXft, zlib}:
-
-with stdenv.lib;
+{stdenv, fetchurl, libX11, libXinerama, libXft, zlib}:
 
 stdenv.mkDerivation rec {
-  name = "dmenu-4.5";
+  name = "dmenu-4.6";
 
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "0l58jpxrr80fmyw5pgw5alm5qry49aw6y049745wl991v2cdcb08";
-  };
-
-  xftPatch = fetchurl {
-    url = "http://tools.suckless.org/dmenu/patches/${name}-xft.diff";
-    sha256 = "efb4095d65e5e86f9dde97294732174409c24f319bdd4824cc22fa1404972b4f";
+    sha256 = "1cwnvamqqlgczvd5dv5rsgqbhv8kp0ddjnhmavb3q732i8028yja";
   };
 
-  buildInputs = [ libX11 libXinerama ] ++ optionals enableXft [zlib libXft];
-
-  patches = optional enableXft xftPatch;
+  buildInputs = [ libX11 libXinerama zlib libXft ];
 
   postPatch = ''
     sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
   '';
 
-  preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+  preConfigure = ''
+    sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk
+  '';
 
-  meta = { 
-      description = "a generic, highly customizable, and efficient menu for the X Window System";
+  meta = with stdenv.lib; {
+      description = "A generic, highly customizable, and efficient menu for the X Window System";
       homepage = http://tools.suckless.org/dmenu;
-      license = stdenv.lib.licenses.mit;
-      maintainers = with stdenv.lib.maintainers; [viric];
-      platforms = with stdenv.lib.platforms; all;
+      license = licenses.mit;
+      maintainers = with maintainers; [ viric pSub ];
+      platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 4324a33d238..d81061f3207 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -37,5 +37,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric ];
     platforms = with platforms; linux;
+    hydraPlatforms = [];
   };
 }
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index ed37b0d96bc..4ac4c93471e 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   name = "electrum-${version}";
-  version = "2.4.3";
+  version = "2.5.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/Electrum-${version}.tar.gz";
-    sha256 = "00z02rdlhasryccjsw1j7563xl76i6x40ah1lnn9asad1gp6520f";
+    sha256 = "0wjqf2ifw1ww6iyj0h0i63zjmy0yhmzl91sgc5hc4j2x5bd2c3am";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/gnuradio-nacl/default.nix b/pkgs/applications/misc/gnuradio-nacl/default.nix
new file mode 100644
index 00000000000..6298e083617
--- /dev/null
+++ b/pkgs/applications/misc/gnuradio-nacl/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio, uhd
+, makeWrapper, libsodium, cppunit
+, pythonSupport ? true, python, swig
+}:
+
+assert pythonSupport -> python != null && swig != null;
+
+stdenv.mkDerivation rec {
+  name = "gnuradio-nacl-${version}";
+  version = "2015-11-05";
+
+  src = fetchFromGitHub {
+    owner = "stwunsch";
+    repo = "gr-nacl";
+    rev = "d6dd3c02dcda3f601979908b61b1595476f6bf95";
+    sha256 = "0q28lgkndcw9921hm6cw5ilxd83n65hjajwl78j50mh6yc3bim35";
+  };
+
+  buildInputs = [
+    cmake pkgconfig boost gnuradio uhd makeWrapper libsodium cppunit
+  ] ++ stdenv.lib.optionals pythonSupport [ python swig ];
+
+  postInstall = ''
+    for prog in "$out"/bin/*; do
+        wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out")
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Gnuradio block for encryption";
+    homepage = https://github.com/stwunsch/gr-nacl;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mog ];
+  };
+}
diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index a5cc1ae0932..ab02238606a 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.7.1";
+  version = "3.7.8.1";
 
   src = fetchurl {
     url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "0kjqav1rdyi60vq85djmigyrgh606ga625icwj15iarlqwzv29rb";
+    sha256 = "1ap5gbgisnbny3jbnm2i5wm2sy6qkbhz747av3sjxp2z12fz81l4";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix
index eafa5c10405..4c0e091bf65 100644
--- a/pkgs/applications/misc/gphoto2/default.nix
+++ b/pkgs/applications/misc/gphoto2/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gphoto2-2.5.5";
+  name = "gphoto2-2.5.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "1d0lvp5gsrss72597wixhgh8prcw4g7izfg3zdzzsswjgnlsxsal";
+    sha256 = "0kgfql6c64ha1gahjdwlqhmkslnfywmc2fkys4c5682zv4awvax9";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix
index 6cd50406ed7..0625219c276 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/applications/misc/gpsbabel/default.nix
@@ -1,19 +1,17 @@
-{ fetchurl, stdenv, zlib, expat, which }:
+{ stdenv, fetchurl, zlib, qt5, which }:
 
-let version = "1.4.3"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "gpsbabel-${version}";
+  version = "1.5.2";
 
   src = fetchurl {
     # gpgbabel.org makes it hard to get the source tarball automatically, so
     # get it from elsewhere.
     url = "mirror://debian/pool/main/g/gpsbabel/gpsbabel_${version}.orig.tar.gz";
-    sha256 = "1s31xa36ivf836h89m1f3qiaz3c3znvqjdm0bnh8vr2jjlrz9jdi";
+    sha256 = "0xf7wmy2m29g2lm8lqc74yf8rf7sxfl3cfwbk7dpf0yf42pb0b6w";
   };
 
-  # FIXME: Would need libxml2 for one of the tests, but that in turns require
-  # network access for the XML schemas.
-  buildInputs = [ zlib expat which ];
+  buildInputs = [ zlib qt5.base which ];
 
   /* FIXME: Building the documentation, with "make doc", requires this:
 
@@ -25,10 +23,14 @@ stdenv.mkDerivation {
   configureFlags = [ "--with-zlib=system" ];
 
   doCheck = true;
+  preCheck = ''
+    patchShebangs testo
+    substituteInPlace testo \
+      --replace "-x /usr/bin/hexdump" ""
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Convert, upload and download data from GPS and Map programs";
-
     longDescription = ''
       GPSBabel converts waypoints, tracks, and routes between popular
       GPS receivers and mapping programs.  It also has powerful
@@ -47,12 +49,9 @@ stdenv.mkDerivation {
       process data that may (or may not be) placed on a map, such as
       waypoints, tracks, and routes.
     '';
-
     homepage = http://www.gpsbabel.org/;
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.gnu;         # arbitrary choice
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
deleted file mode 100644
index 467fcc21cdf..00000000000
--- a/pkgs/applications/misc/grass/default.nix
+++ /dev/null
@@ -1,190 +0,0 @@
-{ config, libXmu, libXext, libXp, libX11, libXt, libSM, libICE, libXpm
-   , libXaw, libXrender
-  , composableDerivation, stdenv, fetchurl
-   , lib, flex, bison, cairo, fontconfig
-   , gdal, zlib, ncurses, gdbm, proj, pkgconfig, swig
-   , blas, liblapack, libjpeg, libpng, mysql, unixODBC, mesa, postgresql, python
-   , readline, sqlite, tcl, tk, libtiff, freetype, makeWrapper, wxGTK, ffmpeg, fftw
-   , wxPython, motif, opendwg }@a:
-
-# You can set gui by exporting GRASS_GUI=..
-# see http://grass.itc.it/gdp/html_grass64/g.gui.html
-# defaulting to wxpython because this is used in the manual
-let inherit (builtins) getAttr;
-    inherit (a.composableDerivation) edf wwf;
-    inherit (a.stdenv.lib) maybeAttr optionalString;
-
-    # wrapper for wwf call
-    # lib: the lib whose include and lib paths should be passed
-    # {}@args: additional args being merged before passing everything to wwf
-    wwfp = lib: {name, ...}@args:
-      let mbEnable = maybeAttr "enable" {} args;
-      in wwf (args // {
-      enable =  mbEnable // {
-        buildInputs = [ lib ]
-          ++ maybeAttr "buildInputs" [] mbEnable;
-        configureFlags = [
-          "--with-${name}-libs=${lib}/lib"
-          "--with-${name}-includes=${lib}/include"
-        ] ++ maybeAttr "configureFlags" [] mbEnable;
-      };
-    });
-in
-a.composableDerivation.composableDerivation {} (fix: {
-
-  name = "grass-6.4.0RC6";
-
-  buildInputs = [
-    # gentoos package depends on gmath ?
-    a.pkgconfig
-    a.flex a.bison a.libXmu a.libXext a.libXp a.libX11 a.libXt a.libSM a.libICE
-    a.libXpm a.libXaw a.flex a.bison a.gdbm
-    a.makeWrapper
-  ];
-
-  cfg = {
-    _64bitSupport = config.grass."64bitSupport" or true;
-    cursesSupport = config.grass.curses or true;
-    gdalSupport = config.grass.gdal or true;
-    pythonSupport = config.grass.python or true;
-    wxwidgetsSupport = config.grass.wxwidgets or true;
-    readlineSupport = config.grass.readline or true;
-    jpegSupport = config.grass.jpeg or true;
-    tiffSupport = config.grass.tiff or true;
-    pngSupport = config.grass.png or true;
-    tcltkSupport = config.grass.tcltk or true;
-    postgresSupport = config.grass.postgres or true;
-    mysqlSupport = config.grass.mysql or true;
-    sqliteSupport = config.grass.sqlite or true;
-    ffmpegSupport = config.grass.ffmpeg or true;
-    openglSupport = config.grass.opengl or true;
-    odbcSupport = config.grass.odbc or false; # fails to find libodbc - why ?
-    fftwSupport = config.grass.fftw or true;
-    blasSupport = config.grass.blas or true;
-    lapackSupport = config.grass.lapack or true;
-    cairoSupport = config.grass.cairo or true;
-    motifSupport = config.grass.motif or true;
-    freetypeSupport = config.grass.freetype or true;
-    projSupport = config.grass.proj or true;
-    opendwgSupport = config.grass.dwg or false;
-    largefileSupport = config.grass.largefile or true;
-  };
-
-  # ?? NLS support:                no
-  # ?? GLw support:                no
-  # ?? DWG support:                no
-  flags = {
-
-    python = {
-      configureFlags = [ "--with-python=${a.python}/bin/python-config" ];
-      buildInputs = [a.python a.swig];
-    };
-
-  }
-  // edf { name = "_64bit"; feat = "64bit"; }
-  // wwfp a.ncurses { name = "curses"; }
-  // wwfp a.gdal { name = "gdal"; }
-  // wwfp a.wxGTK { name = "wxwidgets"; value = "${a.wxGTK}/bin/wx-config"; }
-  // wwfp a.readline { name = "readline"; }
-  // wwfp a.libjpeg { name = "jpeg"; }
-  // wwfp a.libtiff { name = "tiff"; }
-  // wwfp a.libpng { name = "png"; }
-  // wwfp a.tk { name = "tcltk"; enable.buildInputs = [ a.tcl ]; }
-  // wwfp a.postgresql { name = "postgres"; }
-  // wwf {
-    name = "mysql";
-    enable = {
-      buildInputs = [ a.mysql.lib ];
-      configureFlags = [
-        "--with-mysql-libs=${a.mysql.lib}/lib/mysql"
-        "--with-mysql-includes=${a.mysql.lib}/include/mysql"
-      ];
-    };
-  }
-  // wwfp a.sqlite { name = "sqlite"; }
-  // wwf {
-    name = "ffmpeg";
-    enable = {
-      configureFlags = [
-        "--with-ffmpeg-libs=${a.ffmpeg.out}/lib"
-        "--with-ffmpeg-includes=${a.ffmpeg.dev}/include"
-      ];
-      # is there a nicer way to pass additional include directories?
-      # this should work: --with-ffmpeg-includes=/usr/include/lib[av|sw]*
-      # I did not try
-      preConfigure = ''
-        for dir in ${a.ffmpeg.dev}/include/*; do
-          if [ -d $dir ]; then
-            NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$dir"
-          fi
-        done
-      '';
-      buildInputs = [a.ffmpeg];
-    };
-  }
-  // wwfp a.mesa { name = "opengl"; }
-  // wwfp a.unixODBC { name = "odbc"; }
-  // wwfp a.fftw { name = "fftw"; }
-  // wwf {
-    name = "blas";
-    enable.configureFlags = [ "--with-blas-libs=${a.blas}/lib" ];
-  }
-  // wwf {
-    name = "lapack";
-    enable.configureFlags = [ "--with-lapack-libs=${a.liblapack}/lib" ];
-  }
-  // wwfp a.cairo {
-    name = "cairo";
-    enable.buildInputs = [ a.fontconfig a.libXrender ];
-  }
-  // wwfp a.motif { name = "motif"; }
-  // wwf {
-    name="freetype";
-    enable = {
-      buildInputs = [ a.freetype ];
-      configureFlags = [
-        "--with-freetype-libs=${a.freetype}/lib"
-        "--with-freetype-includes=${a.freetype}/include/freetype2"
-      ];
-    };
-  }
-  // wwfp a.proj { name = "proj"; enable.configureFlags = [ "--with-proj-share=${a.proj}/share"]; }
-  // wwfp a.opendwg { name = "opendwg"; }
-  // edf {
-    name = "largefile";
-  };
-  /* ?
-  // wwf {
-    name = "x";
-    enable.buildInputs = [];
-  };
-  */
-
-  src = a.fetchurl {
-    url = "http://grass.itc.it/grass64/source/grass-6.4.0RC6.tar.gz";
-    sha256 = "043cxa224rd4q1x2mq7sl7ylnxv2vvb4k8laycgcjnp60nzhlmaz";
-  };
-
-  postInstall = ''
-    e=$(echo $out/bin/grass*)
-    mv $out/bin/{,.}$(basename $e)
-    cat >> $e << EOF
-    #!/bin/sh
-    export PATH=${a.python}/bin:\$PATH
-    export GRASS_WISH=\${a.tk}/bin/wish
-    export GRASS_GUI=\''${GRASS_GUI:-wxpython}
-    export SHELL=/bin/sh
-    ${optionalString fix.fixed.cfg.wxwidgetsSupport ''export PYTHONPATH=\$PYTHONPATH\''${PYTHONPATH:+:}:$(toPythonPath ${a.wxPython})''}
-    exec $out/bin/.$(basename $e)
-    EOF
-    chmod +x $e
-  '';
-
-  meta = {
-    description = "free Geographic Information System (GIS) software used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization";
-    homepage = http://grass.itc.it/index.php;
-    license = "GPL";
-    broken = true;
-  };
-
-})
diff --git a/pkgs/applications/misc/hackrf/default.nix b/pkgs/applications/misc/hackrf/default.nix
index b815884a29c..efe7c96b608 100644
--- a/pkgs/applications/misc/hackrf/default.nix
+++ b/pkgs/applications/misc/hackrf/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "An open source SDR platform";
     homepage = http://greatscottgadgets.com/hackrf/;
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = with maintainers; [ sjmackenzie the-kenny ];
   };
 }
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 3a94456e6cc..52298e6c297 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils
 , intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3
+, hicolor_icon_theme
 }:
 
 # TODO: Add optional dependency 'wnck', for "workspace tracking" support. Fixes
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     sha256 = "1a85rcg561792kdyv744cgzw7mmpmgv6d6li1sijfdpqa1ninf8g";
   };
 
-  buildInputs = [ docbook2x libxslt gnome_doc_utils intltool dbus_glib ];
+  buildInputs = [
+    docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme
+  ];
 
   propagatedBuildInputs = [ pygobject pygtk pyxdg gnome_python dbus sqlite3 ];
 
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
new file mode 100644
index 00000000000..1a46b7c7afb
--- /dev/null
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, libjpeg }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.6";
+  name = "jp2a-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/jp2a/${name}.tar.gz";
+    sha256 = "076frk3pa16s4r1b10zgy81vdlz0385zh3ykbnkaij25jn5aqc09";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  buildInputs = [ libjpeg ];
+
+  meta = with stdenv.lib; {
+    homepage = https://csl.name/jp2a/;
+    description = "A small utility that converts JPG images to ASCII.";
+    license = licenses.gpl2;
+  };
+}
diff --git a/pkgs/applications/misc/keybase/default.nix b/pkgs/applications/misc/keybase/default.nix
index fb1c492b48e..dea0e9062df 100644
--- a/pkgs/applications/misc/keybase/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -11,11 +11,11 @@ let
 
 in nodePackages.buildNodePackage rec {
   name = "keybase-${version}";
-  version = "0.7.8";
+  version = "0.8.22";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1ak27bd7jwyss85i7plnfr5al33ykfifqknncyx1ir2r2ldagzc7";
+    sha256 = "1dvwz2iqcybd687hp6zbw6lkpx27vp8ah6kk251147vxvwfjb422";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index f1e2467362c..ac566c9609b 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.6.0";
+  version = "0.6.3";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "1ag6p416iibwgvijjc8bwyrssxw3s3j559700xfgp10vj0nqk1hb";
+    sha256 = "1dn1v4ycgqbq8vknz1dy710asq8cizxmzaynn69xknwkpgda7fm9";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/pkgs/applications/misc/librecad/2.0.nix b/pkgs/applications/misc/librecad/2.0.nix
deleted file mode 100644
index b8419d32fed..00000000000
--- a/pkgs/applications/misc/librecad/2.0.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
-
-stdenv.mkDerivation {
-  name = "librecad-2.0.7";
-
-  src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.7;
-    name = "librecad-2.0.7.tar.gz";
-    sha256 = "0r6d7fk9jl8368rbxzk9rwv0mciw28hlv77z29jf36amc42n6z4d";
-  };
-
-  patchPhase = ''
-    sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
-    sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
-  '';
-
-  configurePhase = ''
-    qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin $out/share
-    cp -R unix/librecad $out/bin
-    cp -R unix/resources $out/share/librecad
-  '';
-
-  buildInputs = [ qt4 muparser which boost ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "A 2D CAD package based upon Qt";
-    homepage = http://librecad.org;
-    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
-    license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/misc/librecad/default.nix b/pkgs/applications/misc/librecad/default.nix
index b2960e9f47d..135291a1490 100644
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@@ -1,20 +1,23 @@
-{ stdenv, fetchurl, qt4, muparser, which}:
+{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:
 
-stdenv.mkDerivation {
-  name = "librecad-1.0.4";
+stdenv.mkDerivation rec {
+  version = "2.0.8";
+  name = "librecad-${version}";
 
   src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4;
-    name = "librecad-1.0.4.tar.gz";
-    sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m";
+    url = "https://github.com/LibreCAD/LibreCAD/tarball/${version}";
+    name = name + ".tar.gz";
+    sha256 = "110vn1rvzidg8k6ifz1zws2wsn4cd05xl5ha0hbff2ln7izy84zc";
   };
 
   patchPhase = ''
     sed -i -e s,/bin/bash,`type -P bash`, scripts/postprocess-unix.sh
-    sed -i -e s,/usr/share,$out/share, src/lib/engine/rs_system.cpp
+    sed -i -e s,/usr/share,$out/share, librecad/src/lib/engine/rs_system.cpp
   '';
 
-  configurePhase = "qmake PREFIX=$out";
+  configurePhase = ''
+    qmake librecad.pro PREFIX=$out MUPARSER_DIR=${muparser} BOOST_DIR=${boost.dev}
+  '';
 
   installPhase = ''
     mkdir -p $out/bin $out/share
@@ -22,11 +25,15 @@ stdenv.mkDerivation {
     cp -R unix/resources $out/share/librecad
   '';
 
-  buildInputs = [ qt4 muparser which ];
+  buildInputs = [ qt4 muparser which boost ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "A 2D CAD package based upon Qt";
     homepage = http://librecad.org;
+    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [viric];
     platforms = with stdenv.lib.platforms; linux;
diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 55de1425787..a7dfac1eb0d 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.77";
+  version = "0.7.79";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
+    sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3";
   };
 
   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 5c6f3f9a148..560e0ef1433 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.77";
+  version = "0.7.79";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0n15z1jlj5s69pwk3mdv4r5c8ncfy7qjbdw5wfwynwypkl5382pn";
+    sha256 = "0qwb3msw9gfzdymlirpvzah0lcszc2p67jg8k5ca2camymnfcvx3";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix
index 221b459f84a..a270dca910c 100644
--- a/pkgs/applications/misc/merkaartor/default.nix
+++ b/pkgs/applications/misc/merkaartor/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt4, boost, proj, gdal_1_11_2}:
+{stdenv, fetchurl, qt4, boost, proj, gdal_1_11}:
 
 stdenv.mkDerivation rec {
   name = "merkaartor-0.18.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     qmake -makefile PREFIX=$out
   '';
 
-  buildInputs = [ qt4 boost proj gdal_1_11_2 ];
+  buildInputs = [ qt4 boost proj gdal_1_11 ];
 
   meta = {
     description = "An openstreetmap editor";
diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix
index d6a0bfcd120..b407c739c70 100644
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/pkgs/applications/misc/printrun/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, python27Packages, fetchgit }:
-let
-  py = python27Packages;
-in
-py.buildPythonPackage rec {
-  name = "printrun";
+{ stdenv, python27Packages, fetchFromGitHub }:
 
-  src = fetchgit {
-    url = "https://github.com/kliment/Printrun";
-    rev = "2299962bb338d3f4335b97211ee609ebaea008f7"; # printrun-20140801
-    sha256 = "19nay7xclm36x56hpm87gw4ca6rnygpqaw5ypbmrz0hyxx140abj";
+python27Packages.buildPythonPackage rec {
+  name = "printrun-20150310";
+
+  src = fetchFromGitHub {
+    owner = "kliment";
+    repo = "Printrun";
+    rev = name;
+    sha256 = "09ijv8h4k5h15swg64s7igamvynawz7gdi7hiymzrzywdvr0zwsa";
   };
 
-  propagatedBuildInputs = with py; [ wxPython30 pyserial dbus psutil
-    numpy pyopengl pyglet cython ];
+  propagatedBuildInputs = with python27Packages; [
+    wxPython30 pyserial dbus psutil numpy pyopengl pyglet cython
+  ];
 
   doCheck = false;
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index e768a692f59..39cd5530bf4 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.1";
+  version = "1.0.4";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz";
+    sha256 = "c6bcb1792f22c48844b49c5bd05f3bf5c1c2ebad249246797a273383c9f08f8c";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qt5.base ];
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 454bc48afe9..5899708a682 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -1,18 +1,19 @@
 { stdenv, fetchurl, autoconf, automake, pkgconfig
-, libX11, libXinerama, libXft, pango
-, i3Support ? false, i3
+, libX11, libXinerama, libXft, pango, cairo
+, libstartup_notification, i3Support ? false, i3
 }:
 
 stdenv.mkDerivation rec {
   name = "rofi-${version}";
-  version = "0.15.8";
+  version = "0.15.10";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/archive/${version}.tar.gz";
-    sha256 = "1qhj8xrxfnzy16g577w0zxg1cy885rbqydlbbxgfk0dpjvq70lq6";
+    sha256 = "0wwdc9dj8qfmqv4pcllq78h38hqmz9s3hqf71fsk71byiid69ln9";
   };
 
   buildInputs = [ autoconf automake pkgconfig libX11 libXinerama libXft pango
+                  cairo libstartup_notification
                 ] ++ stdenv.lib.optional i3Support i3;
 
   preConfigure = ''
diff --git a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 6a1acca48d9..03a505591b7 100644
--- a/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit }:
+{ stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "urxvt-perls-2015-03-28";
+stdenv.mkDerivation rec {
+  name = "urxvt-perls-${version}";
+  version = "2.2";
 
-  src = fetchgit {
-    url = "git://github.com/muennich/urxvt-perls";
-    rev = "e4dbde31edd19e2f4c2b6c91117ee91e2f83ddd7";
-    sha256 = "1f8a27c3d54377fdd4ab0be2f4efb8329d4900bb1c792b306dc23b5ee59260b1";
+  src = fetchFromGitHub {
+    owner = "muennich";
+    repo = "urxvt-perls";
+    rev = version;
+    sha256 = "1cb0jbjmwfy2dlq2ny8wpc04k79jp3pz9qhbmgagsxs3sp1jg2hz";
   };
 
   installPhase = ''
diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix
index bfbc66cc0b9..1a5fa03c54c 100644
--- a/pkgs/applications/misc/slic3r/default.nix
+++ b/pkgs/applications/misc/slic3r/default.nix
@@ -3,13 +3,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.7";
+  version = "1.2.9";
   name = "slic3r-${version}";
 
   src = fetchgit {
     url = "git://github.com/alexrj/Slic3r";
     rev = "refs/tags/${version}";
-    sha256 = "1bybbl8b0lfh9wkn1k9cxd11hlc5064wzh0fk6zdmc9vnnay399i";
+    sha256 = "1xwl8ay5m6pwrrnhbmnmpwyh4wc8hsi4ldzgq98f4bh6szj6jh4z";
   };
 
   buildInputs = with perlPackages; [ perl makeWrapper which
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 8086e8ca56d..7dce7c7fbcd 100644
--- a/pkgs/applications/misc/synapse/default.nix
+++ b/pkgs/applications/misc/synapse/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, glib, libnotify, gtk3, libgee
-, keybinder3, json_glib, zeitgeist, vala
+, keybinder3, json_glib, zeitgeist, vala, hicolor_icon_theme
 }:
 
 with stdenv.lib;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     intltool pkgconfig glib libnotify gtk3 libgee keybinder3 json_glib zeitgeist 
-    vala
+    vala hicolor_icon_theme
   ];
 
   meta = { 
diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 7f3ca422323..97acc18211e 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
-  version = "2.4.4";
+  version = "2.5.0";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
-    sha256 = "7ff406414e0be480f91981831507ac255297aab33d8246f98dbfd2b1b2df8e3b";
+    sha256 = "0dj66c4pwdmfnzdlm1r23gqim6banycyzvmq266114v9b90ng3jd";
   };
 
   nativeBuildInputs = [ cmake libuuid gnutls ];
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index 6cd2ea4cbeb..43b7312cda6 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -6,11 +6,11 @@
 stdenv.mkDerivation rec {
 
   name = "tilda-${version}";
-  version = "1.2.2";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz";
-    sha256 = "1mzly0llsrxpc2yd1hml3gmwm023my2j3aszjw383pp34dab2nl5";
+    sha256 = "1f7b52c5d8cfd9038ad2e41fc633fce935f420fa657ed15e3942722c8570751e";
   };
 
   buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix
index c338a101563..b116a176aed 100644
--- a/pkgs/applications/misc/vue/default.nix
+++ b/pkgs/applications/misc/vue/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "vue-${version}";
-  version = "3.2.2";
+  version = "3.3.0";
   src = fetchurl {
-    url = "releases.atech.tufts.edu/jenkins/job/VUE/64/deployedArtifacts/download/artifact.2";
-    sha256 = "0sb1kgan8fvph2cqfxk3906cwx5wy83zni2vlz4zzi6yg4zvfxld";
+    url = "releases.atech.tufts.edu/jenkins/job/VUE/116/deployedArtifacts/download/artifact.1";
+    sha256 = "0yfzr80pw632lkayg4qfmwzrqk02y30yz8br7isyhmgkswyp5rnx";
   };
 
   phases = "installPhase";
diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix
new file mode 100644
index 00000000000..1c6dc8f63c2
--- /dev/null
+++ b/pkgs/applications/misc/wcalc/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, mpfr, readline }:
+
+stdenv.mkDerivation rec {
+  name = "wcalc-${version}";
+  version = "2.5";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/w-calc/${name}.tar.bz2";
+    sha256 = "1vi8dl6rccqiq1apmpwawyg2ywx6a1ic1d3cvkf2hlwk1z11fb0f";
+  };
+
+  buildInputs = [ mpfr readline ];
+
+  meta = with stdenv.lib; {
+    description = "A command line calculator";
+    homepage = http://w-calc.sourceforge.net;
+    license = licenses.gpl2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
new file mode 100644
index 00000000000..91e6c33310d
--- /dev/null
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, python3, python3Packages, fetchFromGitHub }:
+
+let version = "1.0"; in
+
+python3Packages.buildPythonPackage {
+  name = "zscroll-${version}";
+  # don't prefix with python version
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "noctuid";
+    repo = "zscroll";
+    rev = "v${version}";
+    sha256 = "0rf9m1czy19hzpcp8dq9c5zawk0nhwfzzjxlhk9r2n06lhb81ig5";
+  };
+
+  doCheck = false;
+
+  propogatedBuildInputs = [ python3 ];
+
+  meta = with stdenv.lib; {
+    description = "A text scroller for use with panels and shells";
+    homepage = https://github.com/noctuid/zscroll;
+    license = licenses.bsd2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index 5c8c25553ee..e662e9bf836 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -37,7 +37,7 @@ mkChromiumDerivation (base: rec {
   meta = {
     description = "An open source web browser from Google";
     homepage = http://www.chromium.org/;
-    maintainers = with maintainers; [ goibhniu chaoflow aszlig ];
+    maintainers = with maintainers; [ chaoflow aszlig ];
     license = licenses.bsd3;
     platforms = platforms.linux;
   };
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 2f3a8738cc5..943c87bd0a3 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -174,6 +174,7 @@ let
     } // optionalAttrs proprietaryCodecs {
       # enable support for the H.264 codec
       proprietary_codecs = true;
+      enable_hangout_services_extension = true;
       ffmpeg_branding = "Chrome";
     } // optionalAttrs (stdenv.system == "x86_64-linux") {
       target_arch = "x64";
diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 965c7885416..da962c6b768 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -45,10 +45,11 @@ in stdenv.mkDerivation {
   '';
 
   patches =
-    if versionOlder version "45.0.0.0"
-    then singleton ./nix_plugin_paths_44.patch
-    else singleton ./nix_plugin_paths_46.patch ++
-         optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch;
+    (if versionOlder version "45.0.0.0"
+     then singleton ./nix_plugin_paths_44.patch
+     else singleton ./nix_plugin_paths_46.patch ++
+          optional (!versionOlder version "46.0.0.0") ./build_fixes_46.patch) ++
+    singleton ./widevine.patch;
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index b80e3b534fb..3ce3dd813c1 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,10 +7,10 @@
     sha256bin64 = "1ycdp37ikdc9w4hp9qgpzjp47zh37g01ax8x4ack202vrv0dxhsh";
   };
   beta = {
-    version = "46.0.2490.42";
-    sha256 = "0nw6sc6vc5vm5j133hrjq06bibaljq5calqlmzha8ckx21zrr5yy";
-    sha256bin32 = "1a1xi4w7f16chb9w1c102ya7890lj31c0fyyrwgvmpymlw9msnh0";
-    sha256bin64 = "11758h6674d7g6c5bb820x1pg5z9q78j582kd0sa0p73g5888wd0";
+    version = "46.0.2490.64";
+    sha256 = "1k2zir4rbs7hwdasbjpwyjr4ibis2vm6lx45bfm2r2f469mf3y2g";
+    sha256bin32 = "0j1xncws0r5z2rvvjsi0gxxmnslfcbiasaxr6bjhbxnzjv7chrd4";
+    sha256bin64 = "1m8vv3qh79an3719afz7n2ijqanf4cyxz2q4bzm512x52z5zipl7";
   };
   stable = {
     version = "45.0.2454.101";
diff --git a/pkgs/applications/networking/browsers/chromium/source/widevine.patch b/pkgs/applications/networking/browsers/chromium/source/widevine.patch
new file mode 100644
index 00000000000..45048cada87
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/widevine.patch
@@ -0,0 +1,12 @@
+diff -upr chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h
+--- chromium-42.0.2311.90.orig/third_party/widevine/cdm/widevine_cdm_version.h	2015-04-15 01:18:59.000000000 +0300
++++ chromium-42.0.2311.90/third_party/widevine/cdm/widevine_cdm_version.h	2015-04-15 09:09:49.157260050 +0300
+@@ -14,4 +14,8 @@
+ //  - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
+ //    as a string, e.g., "1.0.123.456").
+ 
++#include "third_party/widevine/cdm/widevine_cdm_common.h"
++#define WIDEVINE_CDM_AVAILABLE
++#define WIDEVINE_CDM_VERSION_STRING "@WIDEVINE_VERSION@"
++
+ #endif  // WIDEVINE_CDM_VERSION_H_
diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index f617cf5636b..2008822fddc 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_source.rb > source.nix
 
 {
-  version = "41.0.1";
+  version = "41.0.2";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha1 = "cfb24e0fd6e10febf2381101d4a8f3de1516a732"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha1 = "642d44d0fe13be4eaf4d1b495dfc7b285f7c2de7"; }
-    { locale = "af"; arch = "linux-i686"; sha1 = "b4e5ce516dbc5d4157bd1c85b23b5cc233bbf8d5"; }
-    { locale = "af"; arch = "linux-x86_64"; sha1 = "40f9b3a3ac3089f6bbf9c42a3259a484b49a659a"; }
-    { locale = "an"; arch = "linux-i686"; sha1 = "0bfa3cd6867316ca10ebe57ab2cebd03a59b096c"; }
-    { locale = "an"; arch = "linux-x86_64"; sha1 = "69369093f488223decdb77f2d12676be4aeb4d95"; }
-    { locale = "ar"; arch = "linux-i686"; sha1 = "3a091005a265c6b06a77416223caa45a51d36056"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha1 = "0f9c79ae4aa4498bc9f8a3e372b26b0b000a0db9"; }
-    { locale = "as"; arch = "linux-i686"; sha1 = "cf996943809573aca05dc88ed4d843afda11710f"; }
-    { locale = "as"; arch = "linux-x86_64"; sha1 = "609860ebd75ea9731912b4fcbb343fa027ebbb77"; }
-    { locale = "ast"; arch = "linux-i686"; sha1 = "5adbd6c9194f8f214c94b587a41c5399116316d4"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha1 = "feaeae77f9578a452cb98893701f14047d65a5d3"; }
-    { locale = "az"; arch = "linux-i686"; sha1 = "8718585cb6fb8b7823a572ddc21f910877287133"; }
-    { locale = "az"; arch = "linux-x86_64"; sha1 = "0834d8d8a29f805b435c2d6a29403c9180471837"; }
-    { locale = "be"; arch = "linux-i686"; sha1 = "abb5002f7275cb5b65942a735864783bf32c4d9e"; }
-    { locale = "be"; arch = "linux-x86_64"; sha1 = "bc0ef337ec080b46db30728a425695d78a908d46"; }
-    { locale = "bg"; arch = "linux-i686"; sha1 = "7bcee63546e75aa94ccd9fd65db18ebf8360e5ba"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha1 = "8c9c23313710f7467bc34d2ea462dd8e9df6fcde"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "fa80f7049f926205878e1f9e99d2abba876ea9d9"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "add645cc1b73affbc35c265ec2f82a9d97abddf6"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a391b6305ecf256a5be3e7b29427ff1979b90a9e"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "77d637809f26bf3214fc93d39547863d56b9949d"; }
-    { locale = "br"; arch = "linux-i686"; sha1 = "a7e0fc1a0b340232585c2b4630834e67b2ee565a"; }
-    { locale = "br"; arch = "linux-x86_64"; sha1 = "80f61d890df9c5c126846ee293a0c1295f3b52bc"; }
-    { locale = "bs"; arch = "linux-i686"; sha1 = "f007e6bac7ae796822496b4b06fed7f9112032ad"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha1 = "7abfb01029faa86d2245a273381ef8e5453dc89a"; }
-    { locale = "ca"; arch = "linux-i686"; sha1 = "3bbdf70ed21803dacb4cf000055f27d8f11bf6a2"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha1 = "de2696a5c031b05479d12319d57dd44dd644f1ff"; }
-    { locale = "cs"; arch = "linux-i686"; sha1 = "0d678464f64f2ba1ff8e924336992faf9f50659c"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha1 = "86d68fde6d6255407b8b0f46845416141745b805"; }
-    { locale = "cy"; arch = "linux-i686"; sha1 = "eb0270f0315d31a0c8f9d2919eb4408996b4cdeb"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha1 = "004c5d1cfbcf7535765bc1cb3d8a8ea2d72386e5"; }
-    { locale = "da"; arch = "linux-i686"; sha1 = "e333b6e553bc208c50c71d89d41ce0075e72bed9"; }
-    { locale = "da"; arch = "linux-x86_64"; sha1 = "dacd29f1fb10cfab134d302ca50092d50ebf8936"; }
-    { locale = "de"; arch = "linux-i686"; sha1 = "349d731fae24d6717d35e5b945add7c992a587e2"; }
-    { locale = "de"; arch = "linux-x86_64"; sha1 = "635fc409b6433c6a8b4bb48799fe76c50153f944"; }
-    { locale = "dsb"; arch = "linux-i686"; sha1 = "ed8520837da7170a1e6ba63b1c97e34730ad2f1d"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "7ea5a1cfe9f25364e9d7902cf93459478fddac5e"; }
-    { locale = "el"; arch = "linux-i686"; sha1 = "831e7929fa7fff2e410359b6a599e293f7587f71"; }
-    { locale = "el"; arch = "linux-x86_64"; sha1 = "fb9829b8a41fc07f54ca21260b0e33f178a8c392"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha1 = "f122389f405bb36231139a50198e969a11898273"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "919e765df3434d4349c3d5a8dbd5a3030f749d09"; }
-    { locale = "en-US"; arch = "linux-i686"; sha1 = "a75b1c5106eaefec2c6c68538b870f6fa21667c1"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "5ed50e7ba72beec9b46155ffc2958b7ec3c287af"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "061a683c163d48c79246a28562b7047f492f87e3"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "d10d80b665c85b8e90be69b3192ec8d0ec623bf3"; }
-    { locale = "eo"; arch = "linux-i686"; sha1 = "65e68765f422a3c829faf7f25f6b832223c27711"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha1 = "a036d85b96a319bd677b17f640329a247d7046ed"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha1 = "9fdccf38442e4d46aca7ad7f0d2936cf2430840f"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "c28754a1f2dd926202edaf13241d0b22de744cd1"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha1 = "900b4573ee4611c537cd97ac353c9200d4a09387"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "235dfe745c2e5de80deadc22e9e0fcfef0d48ee4"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha1 = "1236b095b4a6aed92a574c96aa0d724abf6de934"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "f4d83aa231a22f981c4177971414061b562620fb"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha1 = "fd5e4b7f019b12a307909ab481579d4b717a0ae2"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "4b4a33fd2a6aa8061008f7a22c5c970490f64127"; }
-    { locale = "et"; arch = "linux-i686"; sha1 = "db06c7ea90e42b7dd55e95c3c1c65c3464842056"; }
-    { locale = "et"; arch = "linux-x86_64"; sha1 = "2842e4cb8c1c07dc221acca4dc4965ed25a2c993"; }
-    { locale = "eu"; arch = "linux-i686"; sha1 = "bf5d17a4ba5f08574e7aaa9d34507cff22da87d6"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha1 = "74fef0cd9fe3ec31e2d3127662d33d0b2f02cfe5"; }
-    { locale = "fa"; arch = "linux-i686"; sha1 = "05b07e6d1d274fafbc9a2ce201d36ea3cccbffd3"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha1 = "8e9ad7e990c8091fccda1a6651a5711b61147cd9"; }
-    { locale = "ff"; arch = "linux-i686"; sha1 = "86cf25b38865428ea4c744a3fe438bf88d2994f3"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha1 = "c90ad173f42267a0b8ef16ad4c0b4f29299e6eed"; }
-    { locale = "fi"; arch = "linux-i686"; sha1 = "e22411eeb539a1fde08f20b44cfb1b5ff017b582"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha1 = "ed7b3383209ceb588126a0bcb4433e5bbda2b46f"; }
-    { locale = "fr"; arch = "linux-i686"; sha1 = "90c2a9fb92335d504a9dc9d8a6afedd494b69f8b"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha1 = "80e4efdd06b1aa47f348e4056c134bf24a74f4cc"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "122998b498e79a8eb6daf0e877e38fafeeedd679"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "99eb9694ecbd3aa892524467ced78bbc0a97d1fd"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "adb3d58c050adfb38576fcbbc62a28bfab5f196d"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "9a5a8a4a78c9b2f114609552e952a5ad4f7c1603"; }
-    { locale = "gd"; arch = "linux-i686"; sha1 = "876bb49fa2399e53d68bf8bd9c403b008068c5c9"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha1 = "06dd806eba47b93f85d49cfabaefbb1d4ed04f49"; }
-    { locale = "gl"; arch = "linux-i686"; sha1 = "3b5867e14e051c8405ebe79f1147c89340ccdfed"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha1 = "25f5e9ca92c194cbca6d3b06089e884b8c0aed13"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "df3db443c51ea75a22a9ca0666c92c28b43db5e4"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "2af9d3810a60e0cb2674c74925f9076996abef3d"; }
-    { locale = "he"; arch = "linux-i686"; sha1 = "b8b89d4a3e7836c2bf26819e917b7a655aee44d5"; }
-    { locale = "he"; arch = "linux-x86_64"; sha1 = "9a56a307750c21cdfbefda1abaf1763c2aab1875"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "0b8ddcb306d23fdd67abcc098c11420133fea996"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "ae56f2f5caf403ab2f569f843e234cb983e6eb85"; }
-    { locale = "hr"; arch = "linux-i686"; sha1 = "3a829bf25984b0004edb130ef9df5d826ddac5a9"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha1 = "ada293b8ab51d393eda5be8f078e69c584ef6dda"; }
-    { locale = "hsb"; arch = "linux-i686"; sha1 = "3ed330ee86404bdc6080feaeef0f6a095ca0fbee"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "ee20f0c59b0340f68f066a78f7455d9c0d95fd2f"; }
-    { locale = "hu"; arch = "linux-i686"; sha1 = "ff66764fe50e5115bf70acce753aa240feffea28"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha1 = "5e7605de920f18b64b0b4974d46e5fc2f2f4e869"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "c074b5ce903cd4d8ab66ea79a15025b4eb492774"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "7284c71aaa692a98a451ac862af9e0ed6519df55"; }
-    { locale = "id"; arch = "linux-i686"; sha1 = "80fa7c3cd2dea7ee4e4acccc74c8b6936cfe3fa7"; }
-    { locale = "id"; arch = "linux-x86_64"; sha1 = "7ddf8a8c2c3b590a76463e13f8f677c3cb985302"; }
-    { locale = "is"; arch = "linux-i686"; sha1 = "a52ad05729c59acfe826cb211f5da631036aa366"; }
-    { locale = "is"; arch = "linux-x86_64"; sha1 = "7e21475ef56523e7b7bd92cba2e2f4a46bb437e4"; }
-    { locale = "it"; arch = "linux-i686"; sha1 = "48191529939cf46cf0c0573a4fcd53a9703c8db8"; }
-    { locale = "it"; arch = "linux-x86_64"; sha1 = "6b1d93070e8c29573e32abd3ba7b7bf7f07ab269"; }
-    { locale = "ja"; arch = "linux-i686"; sha1 = "136b76925e0b7f766ccf9ca1ee1dcdb7a2046509"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha1 = "0fe5a34c842963e83b14a79c2309b6a906eae5f8"; }
-    { locale = "kk"; arch = "linux-i686"; sha1 = "98c8801e99639de3609dcaba57eacfd2d3eaffc6"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha1 = "ae3d6c13e877ae207c36c2c6e9e4eb5da3d76fff"; }
-    { locale = "km"; arch = "linux-i686"; sha1 = "4bfa2ddd28447fd34fd9e50b3f75033c8212d3c2"; }
-    { locale = "km"; arch = "linux-x86_64"; sha1 = "bbf1b20376f92c353859d671536436a22a87faa9"; }
-    { locale = "kn"; arch = "linux-i686"; sha1 = "edf31da5957d27e2b60a13d91b4520c7f67da77a"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha1 = "275c253e1b913f8cc2a2437602c7edd66eaab011"; }
-    { locale = "ko"; arch = "linux-i686"; sha1 = "b213520660c5d6a1c85c3f6a11ff7c9d7f947274"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha1 = "65a37cccaf55c9fa251157da1d93dcafc4ddc3b8"; }
-    { locale = "lij"; arch = "linux-i686"; sha1 = "368a3517809b7560908162efeee6d10842f537ea"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha1 = "212b14ce7e8bbd96a60d23fcd8a8598f8f9ed900"; }
-    { locale = "lt"; arch = "linux-i686"; sha1 = "d27ccfe0459f6b3567818af9e5ccd5d84dd810ba"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha1 = "f47264b2fa1e6f073d0300f0476fed32fb8bca48"; }
-    { locale = "lv"; arch = "linux-i686"; sha1 = "abf68081c4c011552974cf191463186fb350bf7e"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha1 = "d3a3d999205418043bef4680c256f1555ab4e615"; }
-    { locale = "mai"; arch = "linux-i686"; sha1 = "2f88361cb70283bd29f641762b0ba9205a3db932"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha1 = "4802f3a575d68d4e471eab9fbb638f8dcf6801f3"; }
-    { locale = "mk"; arch = "linux-i686"; sha1 = "1a82499a0b9eb4bcdc4ffcf305de7e250d4ddf91"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha1 = "6d0eaf89b4f7d0821be181fbe877935db0cd6ea5"; }
-    { locale = "ml"; arch = "linux-i686"; sha1 = "16f7c329c62c7430b7e989e4d20b4fa406d34e57"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha1 = "ea6b4c37abb4bde4c3c97a6de01414df336546b9"; }
-    { locale = "mr"; arch = "linux-i686"; sha1 = "e21203ab9285444b5dd19a7add22efd7750a75c4"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha1 = "0992eabe63f8a9b759be99a410a600df53f70c80"; }
-    { locale = "ms"; arch = "linux-i686"; sha1 = "7c5314f43623fa25ca1813c58f8a0f3bfcb19624"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha1 = "8be86e6ff4f8c0baa220143d2798c3f707db6752"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "fcc032e0ceddbe41527d8adad42c55a4a8626660"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8c4365d752844adb31df201901c951b720b7401a"; }
-    { locale = "nl"; arch = "linux-i686"; sha1 = "42adac56689caf8c2cb838bad8c14b6a81c61456"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha1 = "3c835567fe91ae8c386199957b2d64d185020ca9"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "47c29bceee08af768f90f54883300704630ac478"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "57ac712d8b93d19a155ebf08929ee395d5975b09"; }
-    { locale = "or"; arch = "linux-i686"; sha1 = "a96e39bb3eceb2e7252ad9e659981e14975c025b"; }
-    { locale = "or"; arch = "linux-x86_64"; sha1 = "004b52fb5ce3da6106c6875369299a85fd9f2091"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "4cf037c5878372a87f18122e8dc205ace8292f68"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "30128d1d927194cc1eac4b8d297faa5ab5d74b1c"; }
-    { locale = "pl"; arch = "linux-i686"; sha1 = "93aae61fcb7f17f5e83ee1ac8af190ee9c28bf5b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha1 = "f7ae0d826144607bb814c7b1c8dde63ad679148c"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "48cedf32ea01a9548902c8ce0a998c01d2c3da12"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f31b4c25be102bc96f8795721a19c3c9fdd00043"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "e735996d21d15020bea72d9b01b0686d8fb1cd9e"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "705dedac0d8b9df87301eb06251b81e8d5f34d47"; }
-    { locale = "rm"; arch = "linux-i686"; sha1 = "ad7ce0ef601763795f5998e56b89d77f466f50de"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha1 = "50f08008a9a12172f379dafaea656cae3f7a2d5b"; }
-    { locale = "ro"; arch = "linux-i686"; sha1 = "6f925c413fe655a35ffad0b9d3b22bc6c9af15d1"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha1 = "6592bf15bdf465100dbb00a00b5e77eb10f42cae"; }
-    { locale = "ru"; arch = "linux-i686"; sha1 = "2bf3af22a827f6ea9ba849bcbe2da6687fecaa2c"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha1 = "35817ed10d23415bc8c8359fc0ac080c84a648fc"; }
-    { locale = "si"; arch = "linux-i686"; sha1 = "084109d7bb0b17da1d44d0cd954d55e1ce0b03ee"; }
-    { locale = "si"; arch = "linux-x86_64"; sha1 = "83c8e57b708a62cfa159f5a58b3d808fd3ca7e2d"; }
-    { locale = "sk"; arch = "linux-i686"; sha1 = "ea7637b7c8228ae9edab0d82bebc4bb7bda7c2a1"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha1 = "6b6a13d882eb59d14d51a24be90153b6c928ce01"; }
-    { locale = "sl"; arch = "linux-i686"; sha1 = "dfbce85ca19bdb9aeecf23027a9f4e6e4eb4dba8"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha1 = "09ba3868ae42a1e937f21c30d7b56d8c74668e5c"; }
-    { locale = "son"; arch = "linux-i686"; sha1 = "05c37865cea7ebc007099c14b2a38c315541477b"; }
-    { locale = "son"; arch = "linux-x86_64"; sha1 = "de6aafaaff37f9ffd5dc2a5dc793a8034340eb16"; }
-    { locale = "sq"; arch = "linux-i686"; sha1 = "0c2b5a383d33a347e2c136a76f99c6a72fdf14a1"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha1 = "e6fb929c285406656ae25156eeb8e446f69cb5ec"; }
-    { locale = "sr"; arch = "linux-i686"; sha1 = "2699adadaf32b89077b2e11fff1966841e4df500"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha1 = "53c0d1d7559b4a9f6310b2bbec039a9d02a42200"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "5e680c4a9f9c0be0b74fee65688a4e748b73a7ec"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "feafa153bf9dc1827acb64a219e2eeecda99e49d"; }
-    { locale = "ta"; arch = "linux-i686"; sha1 = "d372de893c61af574ce5543dbea51b86e89ac24b"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha1 = "774e8166ca5418be29bbf75665431301bab0c261"; }
-    { locale = "te"; arch = "linux-i686"; sha1 = "84619cf1f9fca5bc49312e6929e0e27fb38ea058"; }
-    { locale = "te"; arch = "linux-x86_64"; sha1 = "abc1565856241ebb91ceb41c6891c8db843946dd"; }
-    { locale = "th"; arch = "linux-i686"; sha1 = "337b5d30b5da8eef79992c33755956efd2c98297"; }
-    { locale = "th"; arch = "linux-x86_64"; sha1 = "02e7c2ab7ed3ff5da36cb3fca19e019961dd015c"; }
-    { locale = "tr"; arch = "linux-i686"; sha1 = "e3e0caef6f82a09edfbe9024701d829c0e5bc625"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha1 = "184ffa3647d57adaf419f9209682aca913249b49"; }
-    { locale = "uk"; arch = "linux-i686"; sha1 = "0ae60e506d63373730895526bc7bcb9dc5c7b814"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha1 = "f54d9fb8b704178bceed03646af17ab8e49a94d4"; }
-    { locale = "uz"; arch = "linux-i686"; sha1 = "77973a500608be31185ea172b4c4f21191838e9d"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha1 = "5cb1cb1618cdc2b4515b3569c2ef8341b91d547b"; }
-    { locale = "vi"; arch = "linux-i686"; sha1 = "d957cedd5a36546f7d9cef3ddcdbdfb9dfb376a3"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha1 = "992d5939c9db596dfc1e118c80a5fb2c08c96753"; }
-    { locale = "xh"; arch = "linux-i686"; sha1 = "1eab731be806a22e29940676d3766190becf9561"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha1 = "fe4872dd673fdbf867921f7c1fbc36ae0be74c3e"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "8cc0e2ea6342577761a6ef9655c4f07f9dae1367"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "5854d58a2ec318d5dc16f905853fa808774c956d"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "875013ebba184c5a656abb2ab4fee3948689beef"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "7e416b11856aae2d52bc24b7629fc2d90719e9b1"; }
+    { locale = "ach"; arch = "linux-i686"; sha1 = "f28f6b40891d3e2626c752e94cb671bcd16cf09c"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha1 = "b09ff7642423f0c94cd0acea890618dbb986b30a"; }
+    { locale = "af"; arch = "linux-i686"; sha1 = "98f6805e3fad98b1ff0ae260318566b279748927"; }
+    { locale = "af"; arch = "linux-x86_64"; sha1 = "1297fe1d68644b30d72f74010b4e93cb705ce084"; }
+    { locale = "an"; arch = "linux-i686"; sha1 = "0b9bf558713e7172aa1d6082b2ee706772dd7f50"; }
+    { locale = "an"; arch = "linux-x86_64"; sha1 = "e1a041106bb1e823359cc8aba5d6774e5622c065"; }
+    { locale = "ar"; arch = "linux-i686"; sha1 = "7dc31eb10e280c847b003167cba3566c7566eb8f"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha1 = "2ac37f86880230b589bede4326f3a9fc51dc04a6"; }
+    { locale = "as"; arch = "linux-i686"; sha1 = "7157ef7c0cddaf2b5203134dd1a9c59257ba4e7b"; }
+    { locale = "as"; arch = "linux-x86_64"; sha1 = "2f8f4e33a321dc1a5f2ccf6c12ab564ef47c1351"; }
+    { locale = "ast"; arch = "linux-i686"; sha1 = "517d6cea54258e6f37534b7c59b00633e50264ba"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha1 = "de74737e383ef9eb33ba9894bead1249d5bdfa17"; }
+    { locale = "az"; arch = "linux-i686"; sha1 = "2cb8468902daf4237ec3a307d89523db08256c17"; }
+    { locale = "az"; arch = "linux-x86_64"; sha1 = "26556ef189be09392a6dc2f057ab2eb78f1b86d8"; }
+    { locale = "be"; arch = "linux-i686"; sha1 = "c27213ffcd4718d5669dfca004ec3517264d1181"; }
+    { locale = "be"; arch = "linux-x86_64"; sha1 = "5c50b0b407268161ebaa1a6a1cdc67b4c66ac387"; }
+    { locale = "bg"; arch = "linux-i686"; sha1 = "6d8af51f1278731da288ef3638687a31fbc77335"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha1 = "cd697af203a4c82afe06271059ba03ff01d81606"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha1 = "1b24d5641b50a2f22e72429d65a2c3bb266fb534"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "e470a6bc6b82c3145bc074b0a8f3b9bfff9bb219"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha1 = "0b2fe41d3ed5ccd9ceb941bdf72c27919258cd92"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "9c0253add017c3747fc59b89561baa1e348207f6"; }
+    { locale = "br"; arch = "linux-i686"; sha1 = "ed0292dda6fc1a42d636a10bb0c45f8918e9dc18"; }
+    { locale = "br"; arch = "linux-x86_64"; sha1 = "6f3dfed52c47f940de86a42598f7df81ff33f8ca"; }
+    { locale = "bs"; arch = "linux-i686"; sha1 = "9c78bd5b4f5be28557cb0576a0faa43b674ce481"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha1 = "a2d41fb95f6c8acf6cc5b1bfd0dec5bce661a2e9"; }
+    { locale = "ca"; arch = "linux-i686"; sha1 = "9e0149621e049af657f1533a2ceebeb303eea9ff"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha1 = "686bf22667c5c621e2182626edc21cb549253f8e"; }
+    { locale = "cs"; arch = "linux-i686"; sha1 = "38d487b5c1193608a3c4f9e83978c34f5c70e668"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha1 = "2031026f3989429b87eaba9ceef96b7b59921725"; }
+    { locale = "cy"; arch = "linux-i686"; sha1 = "27f44852ca65bb2dd61375d7d52eb4a7b30d5cbe"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha1 = "148da60b7247c602082c99ae451e62261602d6c4"; }
+    { locale = "da"; arch = "linux-i686"; sha1 = "4bec4af409742393fc91ff74689ede4dc872b0c2"; }
+    { locale = "da"; arch = "linux-x86_64"; sha1 = "e7a918306d7195a97933761699b74920b9d6bd2e"; }
+    { locale = "de"; arch = "linux-i686"; sha1 = "9295267b1d2e308335166e9ceaeedb7c223c6f5c"; }
+    { locale = "de"; arch = "linux-x86_64"; sha1 = "adab84a80a4cd32be09c6a90e47f99b4428024bb"; }
+    { locale = "dsb"; arch = "linux-i686"; sha1 = "79687bd933bb08a9c789976913a5ae7d90d4ef15"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha1 = "4c307bc31606a579b007cee13d1e7bf3a14f5286"; }
+    { locale = "el"; arch = "linux-i686"; sha1 = "02d0e04554ef168b84143b78180b9280c4ce4410"; }
+    { locale = "el"; arch = "linux-x86_64"; sha1 = "8c84668f4a856a5b5bcedc694d261bbeab71dfea"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha1 = "c5949c47c761ee65707877a9449cd4f9aff3a76a"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "c9a2fb70e37861983d33b5fe0c999e6091671fc1"; }
+    { locale = "en-US"; arch = "linux-i686"; sha1 = "c6fc2b42f50ae06c7fd91823ed61d755e0356d9b"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha1 = "68664136ec20e48faa4516d6a7d48081a365d3b2"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha1 = "4393198c2b4849d840b0e9c1e5ccbf20cbc9cf79"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "e533254eb720b64ca76ab3507a422e923048a7b7"; }
+    { locale = "eo"; arch = "linux-i686"; sha1 = "b4ebd01b5491c5ba159cf239783e4e5caef04690"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha1 = "b25dc3f751e89e517f8cb1850ada4fdfbadf9f4a"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha1 = "0839ccab9c807979f56346dc2470a56f5581ae68"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "a82c320792f2ea05b29c5bc5ed643035d442fb95"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha1 = "9d9d9261fbb51a830a10e83037b22e447ad6c27d"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "07dee6c8bc2c980ecb8cd8cbb5a63600cf362f5f"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha1 = "b01a5d91bdaade225269d3cf11d2084cfd4761cf"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "4bfbf00ea35a78de8b090c08757f670c4627eef2"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha1 = "7f23abb538237c2ee92877d8f101f4673ac0f2da"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cc75fba6bf1744d22aa74608bf09671b9d81506e"; }
+    { locale = "et"; arch = "linux-i686"; sha1 = "b4805599f84bbde52e46c2d171eca6107cba2aba"; }
+    { locale = "et"; arch = "linux-x86_64"; sha1 = "2893a417c825ea340c4ff1002679d0b2fd832903"; }
+    { locale = "eu"; arch = "linux-i686"; sha1 = "9f44826b49aa5302e1219f593b53d91ae9b158ab"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha1 = "01367745cf5e68adedba8459e837d15d4be6bdb4"; }
+    { locale = "fa"; arch = "linux-i686"; sha1 = "776a0d78acc1f4cf4f1f6bfb6dfad251ad3ffd97"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha1 = "aaa3ee98401cbe9d1e55284260077117eb80b6c2"; }
+    { locale = "ff"; arch = "linux-i686"; sha1 = "1294a53f08e1527b215ced2ac588c1f8c4f64c76"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha1 = "ea127b16239a3c7916399f824ea0f06201509271"; }
+    { locale = "fi"; arch = "linux-i686"; sha1 = "84075e77d0cf621992620c9b1783da1306a83d95"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha1 = "1c944f62ead881b5b48288afefb925db7cfbacde"; }
+    { locale = "fr"; arch = "linux-i686"; sha1 = "30eeed505e00b77aad1a31a969db78191e87cf87"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha1 = "562f2d0c347dc531c8ac663e9ece59691394b148"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha1 = "8679515a53b1ef3f763c7b569ab326704988ca82"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "d8f3db4850fe58c7d059c368993f066d241b021f"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha1 = "508a198d8b02b25587d40ad246d5bdc1a44988b9"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "1a335d85bb0173b71de3d70c1d147cb905166e92"; }
+    { locale = "gd"; arch = "linux-i686"; sha1 = "316a75f2ee606b19eb83c5b8cd57258a8a6dc1dc"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha1 = "55504df9a96de3319d2b3610512a6e2a2eed9cb9"; }
+    { locale = "gl"; arch = "linux-i686"; sha1 = "06be057d4d5480e239b5e368d16efe72c75196a2"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha1 = "9026a4497593920a004cc1aec8ef0353144a56da"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha1 = "1149415676f1e3b9c9280c0579e0daff1da4b729"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "6b0047659dbe79c57949baf759ab17c498208d58"; }
+    { locale = "he"; arch = "linux-i686"; sha1 = "118dd35ef57c44057da4808884fbc8f8c8181246"; }
+    { locale = "he"; arch = "linux-x86_64"; sha1 = "c37aa77d1ff50384c6482efd67fa2fd3c9a13f9f"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d9259311610b6fe978f2e45beda9f2a1b78c6cfa"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b68136415d53dfb865fe82132457abf5016f4df0"; }
+    { locale = "hr"; arch = "linux-i686"; sha1 = "a6a6e98ac3932b5332b423a730806e4ee4bf834f"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha1 = "34b8017490d86359fa6530fa5c3b1b5b15975c28"; }
+    { locale = "hsb"; arch = "linux-i686"; sha1 = "f8560358636bfd0d705b963b248dcdce34bbdb5d"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha1 = "287aba425ef473b8fe5c0ff0a8d75fafd8448bf2"; }
+    { locale = "hu"; arch = "linux-i686"; sha1 = "6cbe1731f7d28f91e4ce86e2d8a9816fc35eb3bd"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha1 = "797ef6d8493bf3515ba25096dc8daeea8b9513f4"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha1 = "f2b64ab6b75736d93c8480854dc56563624c2b9d"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "8609dd55931b027665e3763ca13b7e6b9a313ca1"; }
+    { locale = "id"; arch = "linux-i686"; sha1 = "698a344f8ecf81f2d1a8526a32e3771e8461e809"; }
+    { locale = "id"; arch = "linux-x86_64"; sha1 = "291eb09d08e552231726639c9055d53ca5c2c016"; }
+    { locale = "is"; arch = "linux-i686"; sha1 = "fb30ef94ce3f31e65c67f176ed7adb59d91cf81e"; }
+    { locale = "is"; arch = "linux-x86_64"; sha1 = "ad932eb32b20745f34f91fdd91dc32bda217b19f"; }
+    { locale = "it"; arch = "linux-i686"; sha1 = "eae49df656303ae15411d398f998b21bd0e1657d"; }
+    { locale = "it"; arch = "linux-x86_64"; sha1 = "5461ae930d32eb51f2ffdcfc5bc22104454088df"; }
+    { locale = "ja"; arch = "linux-i686"; sha1 = "addac275389073eef9d0fbc296738eb3a61d532d"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha1 = "6e07be0a7261d18b081241d237acb5c8d3f1b3b1"; }
+    { locale = "kk"; arch = "linux-i686"; sha1 = "85e79bf11e71b9163fa44e9bae325d10b8efd761"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha1 = "1bab828e561666296b5e81bc191139d0f1609764"; }
+    { locale = "km"; arch = "linux-i686"; sha1 = "9651d39d746ceaadef2b7eda2bdb766beb4bf649"; }
+    { locale = "km"; arch = "linux-x86_64"; sha1 = "3d5ab65a949d78d8be8fc5ef7da2bbfe4fb76175"; }
+    { locale = "kn"; arch = "linux-i686"; sha1 = "ce1ba808ae2433cec57c7f46288cc5b19e127fc6"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha1 = "8ab3ac9d4e1fcb034a726c85f4de64e8908a752f"; }
+    { locale = "ko"; arch = "linux-i686"; sha1 = "34914da7a6e0f1806f04fcb4327a7debdb90a2ea"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha1 = "6084229e0f1b0861ad35ac958e8d788918955f1d"; }
+    { locale = "lij"; arch = "linux-i686"; sha1 = "a768cadd13ae282e977b44f18e71d232aeba5f56"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha1 = "e47841fd4827a907380fe605643898dd8d88cf99"; }
+    { locale = "lt"; arch = "linux-i686"; sha1 = "10e8a3d6833f904d181daf974b6da2792681f824"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha1 = "411ce9b9b89722de20310bc32b38edb82454ff58"; }
+    { locale = "lv"; arch = "linux-i686"; sha1 = "8d2ec7350ba90242a152024681e0812a6260f064"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha1 = "9035394603007edd34946d32230386e4ebf861ce"; }
+    { locale = "mai"; arch = "linux-i686"; sha1 = "2df94bc41f93706d671de419481d8c90468b9fb0"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha1 = "6f534e605bc96dfde98b699ca8b31d7b542f3342"; }
+    { locale = "mk"; arch = "linux-i686"; sha1 = "6d83eec6d7b54dad5c926da0efe7f205442ec7f8"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha1 = "7e1c3bddcbeadebcaf1a2c0d30940617662f998d"; }
+    { locale = "ml"; arch = "linux-i686"; sha1 = "7b8cfb0adf27ca3cbe70b90b45a15e6ce17ecd6c"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha1 = "8dada691c38ea84829e8f097d3a4c8c8f92b5dbb"; }
+    { locale = "mr"; arch = "linux-i686"; sha1 = "2f2558df6b06b948e1d80a6721021aff6080e23e"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha1 = "6f6fda2c3c4194f4ec309c0ff9585c8f5f764f13"; }
+    { locale = "ms"; arch = "linux-i686"; sha1 = "3006ffc5a77760fb42f3e3ec47185f09cdb2bd71"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha1 = "a5f6a23ba5ee065186fd6abde7678218013a1904"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha1 = "b4418503c6d4c6eb558f5ecbf752014e4daa9940"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "8551b8464566f57313b394de089545c5e3d30673"; }
+    { locale = "nl"; arch = "linux-i686"; sha1 = "e2fb71322600bee83e601309c956c8192dbdf2d7"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha1 = "042a29623fca08048dddb2e3ecbde03fd4453d36"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha1 = "f72a166a539df1e45f8d9c5cd5529b2d0d01e813"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "f66d7d7f6218cd0f320ad1061aead0733ccab242"; }
+    { locale = "or"; arch = "linux-i686"; sha1 = "81f146d076fc68fd87956001b31a34adac1d1af0"; }
+    { locale = "or"; arch = "linux-x86_64"; sha1 = "87d7d7a747f83a26b1f9b501d902e88032af38da"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha1 = "49239260e0abb385e5b3c6ae23c0a809306402e8"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "105fae6a1e1e9a4ae186054c6bcb418ab607d587"; }
+    { locale = "pl"; arch = "linux-i686"; sha1 = "4f5d41cbe93f931d3751b7cf229ea0781edf9c7c"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha1 = "0cce4925e602d36e9c25a6691b60dc61680c45bb"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha1 = "3b98ed2e3186ef2b6cd418fa45faec6a5acbbdd2"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ccaab26ba92b44b60a1de4e1d75504e0233cbc76"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha1 = "159941d190c72b219586450acf1214f039d7207b"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "c650d657e97653364926ad1b877d3a186d3d6dca"; }
+    { locale = "rm"; arch = "linux-i686"; sha1 = "2b79dbc77bbf971a2856ae80107fabe0aa0e18cb"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha1 = "e8584e6791dd50626cd9dcafe45e5536a1eb35fd"; }
+    { locale = "ro"; arch = "linux-i686"; sha1 = "8083ae297080f3543751a24ca3f8638a8bbc2a02"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha1 = "43967d6adbe01454696de9330f056731048458a9"; }
+    { locale = "ru"; arch = "linux-i686"; sha1 = "c939bd0154475d4c3153446b6f6de1d5e17b1215"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha1 = "58bc5cb7c33063455ea2ed79da9b9c38d2a8e061"; }
+    { locale = "si"; arch = "linux-i686"; sha1 = "4f66548142a828b9331f9588955eeae7ff8b4ffd"; }
+    { locale = "si"; arch = "linux-x86_64"; sha1 = "795f8920aafdf38feae90d6cf9013bb4da4d275c"; }
+    { locale = "sk"; arch = "linux-i686"; sha1 = "7fc858a8bea682e6c4b0b46dc0036f5b33d569b6"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha1 = "15c049314dd8beb396c4f8f169b5c5d522d53d31"; }
+    { locale = "sl"; arch = "linux-i686"; sha1 = "2abcb66b66093b4b5a5c502d50b395d3967d5375"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha1 = "deda484b890c22c0c15845891eb5ece860ecbca2"; }
+    { locale = "son"; arch = "linux-i686"; sha1 = "b031c68c64e77ae2e6332c141f367052afb571ba"; }
+    { locale = "son"; arch = "linux-x86_64"; sha1 = "2e6b18cb89b6bb6299caa0dd3c128e170984f394"; }
+    { locale = "sq"; arch = "linux-i686"; sha1 = "88295bd36eaa1ec0ba42b1b2eb8af581ef2efe51"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha1 = "8e8b4782d6352bfe055482c2d82bc5356bb8059c"; }
+    { locale = "sr"; arch = "linux-i686"; sha1 = "399cd05823725f4e5d5514aad3c32716a7b69fb3"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha1 = "d78069ed45897c256860cb7a2be74c42906f277c"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha1 = "90b136366b4309258417725c7979e424cd20236e"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "e604010468adfb6d6925c3d6e82b95a6836bd645"; }
+    { locale = "ta"; arch = "linux-i686"; sha1 = "d81a2a85e1f01f55d8e65b82d703a89391aff87a"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha1 = "dbbd03bf0deae8dd50c264217c38d66eb8f6abb6"; }
+    { locale = "te"; arch = "linux-i686"; sha1 = "b9e27b19acdf0c6c97b85361e51d04ef4dfb71ef"; }
+    { locale = "te"; arch = "linux-x86_64"; sha1 = "a78bffc96adcedc797cd328c3aeda5cb59ff5154"; }
+    { locale = "th"; arch = "linux-i686"; sha1 = "df7728a57a7f46035b5a5b491c34110a1871316c"; }
+    { locale = "th"; arch = "linux-x86_64"; sha1 = "8ccd4665a12b5db9ab8457c2363243a1cbcd05ed"; }
+    { locale = "tr"; arch = "linux-i686"; sha1 = "49dca58d2925f70c8ec7fd7d28d04475c05acff1"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha1 = "ae887516cf189462a38240d62a608f1bd86713fa"; }
+    { locale = "uk"; arch = "linux-i686"; sha1 = "fa1d11f740987538c0ca3967b3428a341e2f1c8d"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha1 = "f65ae80186d0fa616197ee46968ec94c0dbebc2d"; }
+    { locale = "uz"; arch = "linux-i686"; sha1 = "69b24ed58ca2db356bf97c809f91b3551e9f1b20"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha1 = "2fb40c9c55f1e0eb83602fa7cb06415846657b67"; }
+    { locale = "vi"; arch = "linux-i686"; sha1 = "1817398c00bfff76c09151450cba4e901c0fd93a"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha1 = "f754bb817367da0640e6bfbe53129a4221250751"; }
+    { locale = "xh"; arch = "linux-i686"; sha1 = "8c3a7a0da6775d06b75d74e763add35eb2b02969"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha1 = "724db968c33bfd30540ddb36f8d26e19073aa328"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha1 = "de2b4c514a237f120bb0d9de5039a75b8bb519b0"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "6b6f8caece54a911124b33c3fce9233d760ae46e"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha1 = "aa85f39ee92c62d2d1809cf50e158f04a1bb88ea"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "0f859da4a12559d8b28411b5206b17739ddf869b"; }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index df176caaa2d..168223f1a7e 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -18,14 +18,14 @@ assert stdenv.cc ? libc && stdenv.cc.libc != null;
 
 let
 
-common = { pname, version, sha1 }: stdenv.mkDerivation rec {
+common = { pname, version, sha256 }: stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url =
       let ext = if lib.versionAtLeast version "41.0" then "xz" else "bz2";
       in "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.${ext}";
-    inherit sha1;
+    inherit sha256;
   };
 
   buildInputs =
@@ -83,7 +83,11 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec {
     ''
       mkdir ../objdir
       cd ../objdir
-      configureScript=../mozilla-*/configure
+      if [ -e ../${name} ]; then
+        configureScript=../${name}/configure
+      else
+        configureScript=../mozilla-*/configure
+      fi
     '';
 
   preInstall =
@@ -129,14 +133,14 @@ in {
 
   firefox = common {
     pname = "firefox";
-    version = "41.0.1";
-    sha1 = "4f6bf34b7b286e033f401d7d4112ec6310577aae";
+    version = "42.0";
+    sha256 = "1bm37p1ydxvnflh7kb52g6wfblxqc0kbgjn09sv7g0i9k5k38jlr";
   };
 
   firefox-esr = common {
     pname = "firefox-esr";
-    version = "38.3.0esr";
-    sha1 = "57d2c255348ac13b6ffbb952c5e0d57757aa0290";
+    version = "38.4.0esr";
+    sha256 = "1izj0zi4dhp3957ya1nlh0mp6gyb7gvmwnlfv6q1cc3bw5y1z2h2";
   };
 
 }
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index 4b05dcd2675..5b3ceeae70a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -10,7 +10,7 @@ let
     [gtk glib stdenv.cc.cc];
 
   rpathPlugin = makeLibraryPath
-    [ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libuuid libXcomposite libpulseaudio ];
+    ([ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
 
 in
 
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 01c64340875..5f790fc9cea 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,7 +36,7 @@
 
 let
   # -> http://get.adobe.com/flashplayer/
-  version = "11.2.202.508";
+  version = "11.2.202.540";
 
   src =
     if stdenv.system == "x86_64-linux" then
@@ -47,7 +47,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz";
-        sha256 = "1i0301vnz94pxcwm9wk1jjyv7gwywy6p7z26ikd5cg259myxbg75";
+        sha256 = "0zya9n5h669wbna182ig6dl4yf5sv4lvqk19rqhcwv3i718b0ai6";
       }
     else if stdenv.system == "i686-linux" then
       if debug then
@@ -60,7 +60,7 @@ let
       else rec {
         inherit version;
         url = "http://fpdownload.adobe.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz";
-        sha256 = "1483bi34ymchv1cqg57whxhlrhhvwhcw33zjgwzmy7bacxbkj9ia";
+        sha256 = "1n8ik5f257s388ql7gkmfh1iqil0g4kzxh3zsv2x8r6ssrvpq1by";
       }
     else throw "Flash Player is not supported on this platform";
 
@@ -91,5 +91,6 @@ stdenv.mkDerivation {
     description = "Adobe Flash Player browser plugin";
     homepage = http://www.adobe.com/products/flashplayer/;
     license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.enolan ];
   };
 }
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index b29f2d1974c..ab199ff97cd 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -50,8 +50,9 @@ stdenv.mkDerivation rec {
 
   preFixup =
     ''
+    rm $out/bin/uninstall-opera
     find $out/lib/opera -type f | while read f; do
-      type=$(readelf -h "$f" 2>/dev/null | grep 'Type:' | sed -e 's/ *Type: *\([A-Z]*\) (.*/\1/')
+      type=$(readelf -h "$f" 2>/dev/null | sed -n 's/ *Type: *\([A-Z]*\).*/\1/p' || true)
       if [ -z "$type" ]; then
         :
       elif [ $type == "EXEC" ]; then
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 7f2190ab82c..267b0871f08 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, python, buildPythonPackage, qt5, pyqt5, jinja2, pygments, pyyaml, pypeg2,
   gst_plugins_base, gst_plugins_good, gst_ffmpeg }:
 
-let version = "0.4.0"; in
+let version = "0.4.1"; in
 
 buildPythonPackage {
   name = "qutebrowser-${version}";
@@ -9,8 +9,8 @@ buildPythonPackage {
 
   src = fetchgit {
     url = "https://github.com/The-Compiler/qutebrowser.git";
-    rev = "e11fcda240eaad1b83b26c7d6424c427d2ad3b96";
-    sha256 = "0hpd6fibzcl0s6jrsj60rs12dyliwr05r8h9wvngh19a3pmg8q74";
+    rev = "8d9e9851f1dcff5deb6363586ad0f1edec040b72";
+    sha256 = "1qsdad10swnk14qw4pfyvb94y6valhkscyvl46zbxxs7ck6llsm2";
   };
 
   # Needs tox
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 08a4b0dacbd..2b3296d502d 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -20,11 +20,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.8.9";
+  version = "3.10.9";
   sha256 =
     {
-      "x86_64-linux" = "1mdhf57bqi4vihbzv5lz8zk4n576c1qjm7hzcq4f5qvkdsmp5in2";
-      "i686-linux" = "0gighh782jjmlgqgbw2d00a3ri5h3inqdik7v70f1yygvkr7awy8";
+      "x86_64-linux" = "1kg6x1z8if63s15464xiz59qwncb5xhv108icicb5s2yhjzzyi29";
+      "i686-linux" = "172x9f7x425w5ljr6xa0srvv19qysmvr3gs3jkbmnxfwrfxyxf79";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 5786d708cd6..1a36dd8ae20 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-let version = "2015-09-06"; in
+let version = "2.1"; in
 stdenv.mkDerivation rec {
   name = "rsstail-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "1rfzib5fzm0i8wf3njld1lvxgbci0hxxnvp2qx1k4bwpv744xkpx";
-    rev = "16636539e4cc75dafbfa7f05539769be7dad4b66";
+    sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
+    rev = "6f2436185372b3f945a4989406c4b6a934fe8a95";
     repo = "rsstail";
     owner = "flok99";
   };
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional doCheck cppcheck;
 
   postPatch = ''
-    substituteInPlace Makefile --replace -liconv ""
+    substituteInPlace Makefile --replace -liconv_hook ""
   '';
 
   makeFlags = "prefix=$(out)";
diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 51b5df176cc..6c8df2fcd65 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml }:
 
-let version = "3.14.0"; in
+let version = "3.14.1"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "1zbrsmrqnxzj6cnf2y1sx384nv6c8l3338ynazjfbiqbyfs5lf4j";
+    sha256 = "0v6lb7miy6jbnswii816na8818xqxlvs1vadnii21xfmrsv7225i";
   };
 
   configureFlags = [
diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index db2934785eb..e085adbdcda 100644
--- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
+++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
@@ -1,18 +1,27 @@
-{ stdenv, fetchurl, ocamlPackages, zlib }:
+{ stdenv, fetchFromGitHub, ocamlPackages, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "google-drive-ocamlfuse-0.5.12";
-  src = fetchurl {
-    url = "https://forge.ocamlcore.org/frs/download.php/1489/${name}.tar.gz";
-    sha256 = "0yfzzrv4h7vplw6qjm9viymy51jaqqari012agar96zwa86fsrdr";
+  name = "google-drive-ocamlfuse-${version}";
+  version = "0.5.18";
+
+  src = fetchFromGitHub {
+    owner  = "astrada";
+    repo   = "google-drive-ocamlfuse";
+    rev    = "v${version}";
+    sha256 = "0a545zalsqw3jndrvkc0bsn4aab74cf8lwnsw09b5gjm8pm79b9r";
   };
 
   buildInputs = [ zlib ] ++ (with ocamlPackages; [ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]);
+
   configurePhase = "ocaml setup.ml -configure --prefix \"$out\"";
   buildPhase = "ocaml setup.ml -build";
   installPhase = "ocaml setup.ml -install";
 
   meta = {
-    
+    homepage = http://gdfuse.forge.ocamlcore.org/;
+    description = "A FUSE-based file system backed by Google Drive, written in OCaml";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ obadz ];
   };
 }
diff --git a/pkgs/applications/networking/ids/bro/default.nix b/pkgs/applications/networking/ids/bro/default.nix
index 8d6515f2dd2..8d4ae68b0a5 100644
--- a/pkgs/applications/networking/ids/bro/default.nix
+++ b/pkgs/applications/networking/ids/bro/default.nix
@@ -2,11 +2,11 @@
 , geoip, gperftools }:
 
 stdenv.mkDerivation rec {
-  name = "bro-2.4";
+  name = "bro-2.4.1";
   
   src = fetchurl {
     url = "http://www.bro.org/downloads/release/${name}.tar.gz";
-    sha256 = "1ch8w8iakr2ajbigaad70b6mfv01s2sbdqgmrqm9q9zc1c5hs33l";
+    sha256 = "1xn8qwgnxihlr4lmg7kz2vqjk46aqgwc8878pbv30ih2lmrrdffq";
   };
   
   buildInputs = [ cmake flex bison openssl libpcap perl zlib file curl geoip
diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix
index 9339bfef6e0..e0c40280bce 100644
--- a/pkgs/applications/networking/ids/daq/default.nix
+++ b/pkgs/applications/networking/ids/daq/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ flex bison libpcap libdnet libnfnetlink libnetfilter_queue];
 
-  configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib"; 
+  configureFlags = "--enable-nfq-module=yes --with-dnet-includes=${libdnet}/includes --with-dnet-libraries=${libdnet}/lib";
 
   meta = {
     description = "Data AcQuisition library (DAQ), for packet I/O";
diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index 62c784a7fb7..a55b80df2b2 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -1,4 +1,4 @@
-{stdenv, makeWrapper, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}:
+{stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison, makeWrapper}:
 
 stdenv.mkDerivation rec {
   version = "2.9.7.2";
@@ -14,10 +14,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine";
+  configureFlags = "--disable-static-daq --enable-control-socket --with-daq-includes=${daq}/includes --with-daq-libraries=${daq}/lib"; 
 
   postInstall = ''
-    wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq"
+    wrapProgram $out/bin/snort --add-flags "--daq-dir ${daq}/lib/daq --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"
   '';
   
   meta = {
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index d41ba5fcdb3..2b60b3a7a46 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.14";
+  version = "0.4.15";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "19vn63j6dpybjy14mgnwf0yk2jbcbfdjs50whzwyrrkcv6ipj6hc";
+    sha256 = "13712li6y3ikwzl17j46w25xyv3z98yqj7zpr3jifyvbna9ls5r3";
   };
   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/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
new file mode 100644
index 00000000000..2674dd52132
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "bitlbee-steam-2015-09-10";
+
+  src = fetchFromGitHub {
+    rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587";
+    owner = "jgeboski";
+    repo = "bitlbee-steam";
+    sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7";
+  };
+
+  buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib libgcrypt ];
+
+  preConfigure = ''
+    export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = "Steam protocol plugin for BitlBee";
+
+    homepage = https://github.com/jgeboski/bitlbee-steam;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 69497f87c6b..b2325e87e0d 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -7,7 +7,6 @@
 , enableRST ? true
 , enableSpelling ? true, gtkspell ? null
 , enableNotifications ? false
-, enableLaTeX ? false, texLive ? null
 }:
 
 assert enableJingle -> farstream != null && gst_plugins_bad != null
@@ -16,17 +15,16 @@ assert enableE2E -> pythonPackages.pycrypto != null;
 assert enableRST -> pythonPackages.docutils != null;
 assert enableSpelling -> gtkspell != null;
 assert enableNotifications -> pythonPackages.notify != null;
-assert enableLaTeX -> texLive != null;
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.3";
+  version = "0.16.4";
 
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "05a59hf9wna6n9fi0a4bhz1hifqj21bwb4ff9rd0my23rdwmij51";
+    sha256 = "0zyfs7q1qg8iqszr8l1gb18gqla6zrrfsgpmbxblpi9maqxas5i1";
   };
 
   patches = [
@@ -51,11 +49,6 @@ stdenv.mkDerivation rec {
   '' + optionalString enableSpelling ''
     sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|'   \
       src/gtkspell.py
-  '' + optionalString enableLaTeX ''
-    sed -i -e "s|try_run(.'dvipng'|try_run(['${texLive}/bin/dvipng'|" \
-           -e "s|try_run(.'latex'|try_run(['${texLive}/bin/latex'|"   \
-           -e 's/tmpfd.close()/os.close(tmpfd)/'                      \
-           src/common/latex.py
   '';
 
   buildInputs = [
@@ -68,8 +61,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
     ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils
-    ++ optional enableNotifications pythonPackages.notify
-    ++ optional enableLaTeX texLive;
+    ++ optional enableNotifications pythonPackages.notify;
 
   postInstall = ''
     install -m 644 -t "$out/share/gajim/icons/hicolor" \
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
new file mode 100644
index 00000000000..1c717eb97fb
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-skypeweb/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, pkgconfig, pidgin, json_glib }:
+
+let
+  rev = "b92a05c67e";
+  date = "2015-10-02";
+in
+stdenv.mkDerivation rec {
+  name = "pidgin-skypeweb-${date}-${rev}";
+
+  src = fetchFromGitHub {
+    owner = "EionRobb";
+    repo = "skype4pidgin";
+    rev = "${rev}";
+    sha256 = "00r57w9iwx2yp68ld6f3zkhf53vsk679b42w3xxla6bqblpcxzxl";
+  };
+
+  sourceRoot = "skype4pidgin-${rev}-src/skypeweb";
+
+  buildInputs = [ pkgconfig pidgin json_glib ];
+
+  makeFlags = [
+    "PLUGIN_DIR_PURPLE=/lib/pidgin/"
+    "DATA_ROOT_DIR_PURPLE=/share"
+    "DESTDIR=$(out)"
+  ];
+
+  postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-skypeweb";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/EionRobb/skype4pidgin;
+    description = "SkypeWeb Plugin for Pidgin";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index ece4b9f0e01..a18ffac5d63 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype
-, xorg, fontconfig, qt5, xkeyboard_config, alsaLib, libpulseaudio ? null
+, xorg, fontconfig, qt55, xkeyboard_config, alsaLib, libpulseaudio ? null
 , libredirect, quazip, less, which, unzip
 }:
 
 let
 
   arch = if stdenv.is64bit then "amd64" else "x86";
- 
+
   libDir = if stdenv.is64bit then "lib64" else "lib";
 
   deps =
     [ zlib glib libpng freetype xorg.libSM xorg.libICE xorg.libXrender
       xorg.libXrandr xorg.libXfixes xorg.libXcursor xorg.libXinerama
-      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt5.base libpulseaudio
+      xorg.libxcb fontconfig xorg.libXext xorg.libX11 alsaLib qt55.qtbase libpulseaudio
     ];
 
   desktopItem = makeDesktopItem {
@@ -30,7 +30,7 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.16";
+  version = "3.0.18.1";
 
   src = fetchurl {
     urls = [
@@ -38,9 +38,9 @@ stdenv.mkDerivation rec {
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
       "http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
-    sha256 = if stdenv.is64bit 
-                then "0gvphrmrkyy1g2nprvdk7cvawznzlv4smw0mlvzd4b9mvynln0v2"
-                else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz";
+    sha256 = if stdenv.is64bit
+                then "1bc9m2niagqmijmzlki8jmp48vhns041xdjlji9fyqay6l5mx5fw"
+                else "156dirxjys7pbximw19qs7j52my36p4kp98df3kgrsiiv8mz6v68";
   };
 
   # grab the plugin sdk for the desktop icon
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   installPhase =
     ''
       # Delete unecessary libraries - these are provided by nixos.
-      rm *.so.*
+      rm *.so.* *.so
       rm qt.conf
 
       # Install files.
@@ -89,15 +89,16 @@ stdenv.mkDerivation rec {
       ln -s $out/lib/teamspeak/ts3client $out/bin/ts3client
 
       wrapProgram $out/bin/ts3client \
-        --set LD_PRELOAD "${libredirect}/lib/libredirect.so:${quazip}/lib/libquazip.so" \
+        --set LD_LIBRARY_PATH "${quazip}/lib" \
+        --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
         --set QT_PLUGIN_PATH "$out/lib/teamspeak/platforms" \
         --set NIX_REDIRECTS /usr/share/X11/xkb=${xkeyboard_config}/share/X11/xkb
     '';
 
   dontStrip = true;
   dontPatchELF = true;
-  
-  meta = { 
+
+  meta = {
     description = "The TeamSpeak voice communication tool";
     homepage = http://teamspeak.com/;
     license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest";
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index f226ff16a1c..b29165fde97 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -29,7 +29,7 @@
 
 with stdenv.lib;
 
-let version = "3.11.1"; in
+let version = "3.12.0"; in
 
 stdenv.mkDerivation {
   name = "claws-mail-${version}";
@@ -40,16 +40,20 @@ stdenv.mkDerivation {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ maintainers.khumba ];
-    priority = 10;  # Resolve the conflict with the share/mime link we create.
   };
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/claws-mail/Claws%20Mail/${version}/claws-mail-${version}.tar.bz2";
-    sha256 = "0w13xzri9d3165qsxf1dig1f0gxn3ib4lysfc9pgi4zpyzd0zgrw";
+    url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
+    sha256 = "1jnnwivpcplv8x4w0ibb1qcnasl37fr53lbfybhgb936l2mdcai7";
   };
 
   patches = [ ./mime.patch ];
 
+  postPatch = ''
+    substituteInPlace src/procmime.c \
+        --subst-var-by MIMEROOTDIR ${shared_mime_info}/share
+  '';
+
   buildInputs =
     [ curl dbus dbus_glib gtk gnutls hicolor_icon_theme
       libetpan perl pkgconfig python
@@ -90,7 +94,5 @@ stdenv.mkDerivation {
   postInstall = ''
     mkdir -p $out/share/applications
     cp claws-mail.desktop $out/share/applications
-
-    ln -sT ${shared_mime_info}/share/mime $out/share/mime
   '';
 }
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
index 5437c1c65d7..62f5df4b69a 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
+++ b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
@@ -1,14 +1,15 @@
---- a/src/procmime.c	2015-09-18 04:03:11.767654094 -0700
-+++ b/src/procmime.c	2015-09-18 04:08:38.834503034 -0700
+--- a/src/procmime.c	2015-10-01 23:02:16.629908590 -0700
++++ b/src/procmime.c	2015-10-01 23:02:46.932001337 -0700
 @@ -1196,11 +1196,7 @@
  	if (mime_type_list) 
  		return mime_type_list;
  	
 -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- 	if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) 
+-	if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) 
 -#else
 -	if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL) 
 -#endif
++	if ((fp = procmime_fopen("@MIMEROOTDIR@/mime/globs", "rb")) == NULL) 
  	{
  		fp_is_glob_file = FALSE;
  		if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) {
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 04d4eaebaa7..c7921b8553b 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "notmuch-0.20.2";
+  name = "notmuch-0.21";
 
   passthru = {
     pythonSourceRoot = "${name}/bindings/python";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "1v5dcnlg4km5hfaq0i0qywq5fn66fi0rq4aaibyqkwxz8mis4hgp";
+    sha256 = "1cr53rbpkcy3pvrmhbg2gq7sjpwb0c8xd7a4zhzxbiv8s7z8yvyh";
   };
 
   buildInputs = [ bash emacs glib gmime gnupg pkgconfig talloc xapian sphinx python ]
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index afe27eb3814..dac1a9ada3b 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -1,71 +1,153 @@
-{ stdenv, fetchurl, pkgconfig
-, avahi, boost, libopus, celt, libsndfile, protobuf, qt4, speex
+{ stdenv, fetchurl, fetchgit, pkgconfig
+, qt4, qt5, avahi, boost, libopus, libsndfile, protobuf, speex, libcap
+, alsaLib
 , jackSupport ? false, libjack2 ? null
 , speechdSupport ? false, speechd ? null
 , pulseSupport ? false, libpulseaudio ? null
+, iceSupport ? false, zeroc_ice ? null
 }:
 
 assert jackSupport -> libjack2 != null;
 assert speechdSupport -> speechd != null;
 assert pulseSupport -> libpulseaudio != null;
+assert iceSupport -> zeroc_ice != null;
 
+with stdenv.lib;
 let
-  optional = stdenv.lib.optional;
-  optionalString = stdenv.lib.optionalString;
-in
-stdenv.mkDerivation rec {
-  name = "mumble-${version}";
-  version = "1.2.10";
-
-  src = fetchurl {
-    url = "https://github.com/mumble-voip/mumble/releases/download/${version}/${name}.tar.gz";
-    sha256 = "012vm0xf84x13414jlsx964c5a1nwnbn41jnspkciajlxxipldn6";
+  generic = overrides: source: stdenv.mkDerivation (source // overrides // {
+    name = "${overrides.type}-${source.version}";
+
+    patches = optional jackSupport ./mumble-jack-support.patch;
+
+    nativeBuildInputs = [ pkgconfig ]
+      ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
+      ++ (overrides.nativeBuildInputs or [ ]);
+    buildInputs = [ boost protobuf avahi ]
+      ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
+      ++ (overrides.buildInputs or [ ]);
+
+    configureFlags = [
+      "CONFIG+=shared"
+      "CONFIG+=no-g15"
+      "CONFIG+=packaged"
+      "CONFIG+=no-update"
+      "CONFIG+=no-embed-qt-translations"
+      "CONFIG+=bundled-celt"
+      "CONFIG+=no-bundled-opus"
+      "CONFIG+=no-bundled-speex"
+    ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
+      ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio"
+      ++ (overrides.configureFlags or [ ]);
+
+    configurePhase = ''
+      qmake $configureFlags DEFINES+="PLUGIN_PATH=$out/lib"
+    '';
+
+    makeFlags = [ "release" ];
+
+    installPhase = ''
+      mkdir -p $out/{lib,bin}
+      find release -type f -not -name \*.\* -exec cp {} $out/bin \;
+      find release -type f -name \*.\* -exec cp {} $out/lib \;
+
+      mkdir -p $out/share/man/man1
+      cp man/mum* $out/share/man/man1
+    '' + (overrides.installPhase or "");
+
+    meta = {
+      description = "Low-latency, high quality voice chat software";
+      homepage = "http://mumble.sourceforge.net/";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ viric jgeerds wkennington ];
+      platforms = platforms.linux;
+    };
+  });
+
+  client = source: generic {
+    type = "mumble";
+
+    nativeBuildInputs = optional (source.qtVersion == 5) qt5.qttools;
+    buildInputs = [ libopus libsndfile speex ]
+      ++ optional (source.qtVersion == 5) qt5.qtsvg
+      ++ optional stdenv.isLinux alsaLib
+      ++ optional jackSupport libjack2
+      ++ optional speechdSupport speechd
+      ++ optional pulseSupport libpulseaudio;
+
+    configureFlags = [
+      "CONFIG+=no-server"
+    ];
+
+    installPhase = ''
+      cp scripts/mumble-overlay $out/bin
+      sed -i "s,/usr/lib,$out/lib,g" $out/bin/mumble-overlay
+
+      mkdir -p $out/share/applications
+      cp scripts/mumble.desktop $out/share/applications
+
+      mkdir -p $out/share/icons{,/hicolor/scalable/apps}
+      cp icons/mumble.svg $out/share/icons
+      ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
+    '';
+  } source;
+
+  server = generic {
+    type = "murmur";
+
+    postPatch = optional iceSupport ''
+      sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
+    '';
+
+    configureFlags = [
+      "CONFIG+=no-client"
+    ];
+
+    buildInputs = [ libcap ] ++ optional iceSupport [ zeroc_ice ];
+  };
+
+  stableSource = rec {
+    version = "1.2.10";
+    qtVersion = 4;
+
+    src = fetchurl {
+      url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz";
+      sha256 = "012vm0xf84x13414jlsx964c5a1nwnbn41jnspkciajlxxipldn6";
+    };
   };
 
-  patches = optional jackSupport ./mumble-jack-support.patch;
-
-  configureFlags = [
-    "CONFIG+=shared"
-    "CONFIG+=no-g15"
-    "CONFIG+=packaged"
-    "CONFIG+=no-update"
-    "CONFIG+=no-server"
-    "CONFIG+=no-embed-qt-translations"
-    "CONFIG+=no-bundled-celt"
-    "CONFIG+=no-bundled-opus"
-    "CONFIG+=no-bundled-speex"
-  ] ++ optional (!speechdSupport) "CONFIG+=no-speechd"
-    ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio";
-
-  configurePhase = ''
-    qmake $configureFlags
-  '';
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${celt}/include/celt" ];
-
-  buildInputs = [ avahi boost libopus celt libsndfile protobuf qt4 speex ]
-    ++ optional jackSupport libjack2
-    ++ optional speechdSupport speechd
-    ++ optional pulseSupport libpulseaudio;
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r ./release $out/bin
-
-    mkdir -p $out/share/applications
-    cp scripts/mumble.desktop $out/share/applications
-
-    mkdir -p $out/share/icons
-    cp icons/mumble.svg $out/share/icons
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Low-latency, high quality voice chat software";
-    homepage = "http://mumble.sourceforge.net/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ viric jgeerds ];
-    platforms = platforms.linux;
+  gitSource = rec {
+    version = "1.3.0-git-2015-11-08";
+    qtVersion = 5;
+
+    src = fetchgit {
+      url = "https://github.com/mumble-voip/mumble";
+      rev = "72038f6aa038f5964e2bba5a09d3d391d4680e5f";
+      sha256 = "03978b85f7y0bffl8vwkmakjnxxjqapfz3pn0b8zf3b1ppwjy9g4";
+    };
+
+    # TODO: Remove fetchgit as it requires git
+    /*src = fetchFromGitHub {
+      owner = "mumble-voip";
+      repo = "mumble";
+      rev = "13e494c60beb20748eeb8be126b27e1226d168c8";
+      sha256 = "024my6wzahq16w7fjwrbksgnq98z4jjbdyy615kfyd9yk2qnpl80";
+    };
+
+    theme = fetchFromGitHub {
+      owner = "mumble-voip";
+      repo = "mumble-theme";
+      rev = "16b61d958f131ca85ab0f601d7331601b63d8f30";
+      sha256 = "0rbh825mwlh38j6nv2sran2clkiwvzj430mhvkdvzli9ysjxgsl3";
+    };
+
+    prePatch = ''
+      rmdir themes/Mumble
+      ln -s ${theme} themes/Mumble
+    '';*/
   };
+in {
+  mumble     = client stableSource;
+  mumble_git = client gitSource;
+  murmur     = server stableSource;
+  murmur_git = server gitSource;
 }
diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix
deleted file mode 100644
index cb10fca6cd9..00000000000
--- a/pkgs/applications/networking/mumble/murmur.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, qt4, boost, protobuf, mumble
-, avahi, libcap, pkgconfig
-, iceSupport ? false
-, zeroc_ice ? null
-}:
-
-assert iceSupport -> zeroc_ice != null;
-
-let
-  optional = stdenv.lib.optional;
-  optionalString = stdenv.lib.optionalString;
-in
-stdenv.mkDerivation rec {
-  name = "murmur-${version}";
-
-  inherit (mumble) version src;
-
-  patchPhase = optional iceSupport ''
-    sed -i 's,/usr/share/Ice/,${zeroc_ice}/,g' src/murmur/murmur.pro
-  '';
-
-  configurePhase = ''
-    qmake CONFIG+=no-client CONFIG+=no-embed-qt \
-    ${optionalString (!iceSupport) "CONFIG+=no-ice"}
-  '';
-
-  buildInputs = [ qt4 boost protobuf avahi libcap pkgconfig ]
-    ++ optional iceSupport [ zeroc_ice ];
-
-  installPhase = ''
-    mkdir -p $out
-    cp -r ./release $out/bin
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://mumble.sourceforge.net/";
-    description = "Low-latency, high quality voice chat software";
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ viric ];
-  };
-}
diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix
new file mode 100644
index 00000000000..f3faa0128bb
--- /dev/null
+++ b/pkgs/applications/networking/nload/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, ncurses }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.4";
+  name = "nload-${version}";
+
+  src = fetchurl {
+    url = "http://www.roland-riegel.de/nload/${name}.tar.gz";
+    sha256 = "1rb9skch2kgqzigf19x8bzk211jdfjfdkrcvaqyj89jy2pkm3h61";
+  };
+
+  buildInputs = [ ncurses ];
+
+  meta = {
+    description = "Monitors network traffic and bandwidth usage with ncurses graphs";
+    longDescription = ''
+      nload is a console application which monitors network traffic and
+      bandwidth usage in real time. It visualizes the in- and outgoing traffic
+      using two graphs and provides additional info like total amount of
+      transfered data and min/max network usage.
+    '';
+    homepage = http://www.roland-riegel.de/nload/index.html;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.devhell ];
+  };
+}
diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index 4e705711677..80f8eb840f1 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -1,56 +1,67 @@
-{ stdenv, fetchurl, ant, jdk }:
+{ stdenv, fetchurl, fetchgit, ant, jdk, makeWrapper }:
 
 let
-  # The .gitmodules in freenet-official-20130413-eccc9b3198
-  # points to freenet-contrib-staging-ce3b7d5
   freenet_ext = fetchurl {
     url = https://downloads.freenetproject.org/latest/freenet-ext.jar;
-    sha1 = "507ab3f6ee91f47c187149136fb6d6e98f9a8c7f";
+    sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij";
   };
 
   bcprov = fetchurl {
-    url = http://www.bouncycastle.org/download/bcprov-jdk15on-148.jar;
-    sha256 = "12129q8rmqwlvj6z4j0gc3w0hq5ccrkf2gdlsggp3iws7cp7wjw0";
+    url = https://downloads.freenetproject.org/latest/bcprov-jdk15on-152.jar;
+    sha256 = "0wqpdcvcfh939fk8yr033ijzr1vjbp6ydlnv5ly8jiykwj0x3i0d";
   };
+  seednodes = fetchurl {
+    url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref;
+    sha256 = "109zn9w8axdkjwhkkcm2s8dvib0mq0n8imjgs3r8hvi128cjsmg9";
+  };
+  version = "build01470";
 in
 stdenv.mkDerivation {
-  name = "freenet-20130413-eccc9b3198";
+  name = "freenet-${version}";
+
 
-  src = fetchurl {
-    url = https://github.com/freenet/fred-official/tarball/eccc9b3198;
-    name = "freenet-official-eccc9b3198.tar.gz";
-    sha256 = "0x0s8gmb95770l7968r99sq0588vf0n1687ivc2hixar19cw620y";
+  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.jar
+    cp ${bcprov} lib/bcprov-jdk15on-152.jar
 
     sed '/antcall.*-ext/d' -i build.xml
+    sed 's/@unknown@/${version}/g' -i build-clean.xml
   '';
 
-  buildInputs = [ ant jdk ];
+  buildInputs = [ ant jdk makeWrapper ];
 
   buildPhase = "ant package-only";
 
+  freenetWrapper = ./freenetWrapper;
+
   installPhase = ''
     mkdir -p $out/share/freenet $out/bin
-    cp lib/bcprov.jar $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
 
-    cat <<EOF > $out/bin/freenet
+    cat <<EOF > $out/bin/freenet.wrapped
     #!${stdenv.shell}
-    ${jdk.jre}/bin/java -cp $out/share/freenet/bcprov.jar:$out/share/freenet/freenet-ext.jar:$out/share/freenet/freenet.jar \\
+    ${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
+    chmod +x $out/bin/freenet.wrapped
+    makeWrapper $freenetWrapper $out/bin/freenet \
+      --set FREENET_ROOT "$out" \
+      --set FREENET_SEEDNODES "${seednodes}"
   '';
 
   meta = {
     description = "Decentralised and censorship-resistant network";
     homepage = https://freenetproject.org/;
     license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.doublec ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper
new file mode 100755
index 00000000000..c1667f158b9
--- /dev/null
+++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper
@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+
+export FREENET_HOME="$HOME/.local/share/freenet"
+if [ -n "$XDG_DATA_HOME" ]
+  then export FREENET_HOME="$XDG_DATA_HOME/freenet"
+fi
+
+if [ ! -d $FREENET_HOME ]; then
+  mkdir -p $FREENET_HOME
+fi
+
+cp -u $FREENET_SEEDNODES $FREENET_HOME/seednodes.fref
+chmod u+rw $FREENET_HOME/seednodes.fref
+
+cd $FREENET_HOME
+exec $FREENET_ROOT/bin/freenet.wrapped "$@"
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index c762edb857b..d8685da8d81 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -8,19 +8,19 @@ let
     name = "twister-html";
     src = fetchgit {
       url = "git://github.com/miguelfreitas/twister-html.git";
-      rev = "891f7bf24e1c3df7ec5e1db23c765df2d7c2d5a9";
-      sha256 = "0d96rfkpwxyiz32k2pd6a64r2kr3600qgp9v73ddcpq593wf11qb";
+      rev = "01e7f7ca9b7e42ed90f91bc42da2c909ca5c0b9b";
+      sha256 = "0scjbin6s1kmi0bqq0dx0qyjw4n5xgmj567n0156i39f9h0dabqy";
     };
   };
 
 in stdenv.mkDerivation rec {
   name = "twister-${version}";
-  version = "0.9.22";
+  version = "0.9.30";
 
   src = fetchurl {
     url = "https://github.com/miguelfreitas/twister-core/"
         + "archive/v${version}.tar.gz";
-    sha256 = "1haq0d7ypnazs599g4kcq1x914fslc04wazqj54rlvjdp7yx4j3f";
+    sha256 = "1i39iqq6z25rh869vi5k76g84rmyh30p05xid7z9sqjrqdfpyyzk";
   };
 
   configureFlags = [
@@ -29,6 +29,7 @@ in stdenv.mkDerivation rec {
     "--disable-deprecated-functions"
     "--enable-tests"
     "--enable-python-binding"
+    "--with-boost-libdir=${boost.lib}/lib"
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
new file mode 100644
index 00000000000..2523c4459ec
--- /dev/null
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -0,0 +1,157 @@
+{ stdenv
+, requireFile
+, makeWrapper
+, libredirect
+, busybox
+, file
+, makeDesktopItem
+, tzdata
+, cacert
+, glib
+, gtk
+, atk
+, gdk_pixbuf
+, cairo
+, pango
+, gnome3
+, xlibs
+, libpng12
+, freetype
+, fontconfig
+, gtk_engines
+, alsaLib
+}:
+
+stdenv.mkDerivation rec {
+  name = "citrix-receiver-${version}";
+  version = "13.2.1";
+  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html;
+
+  prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
+
+  src = requireFile rec {
+    name = "${prefixWithBitness}-${version}.328635.tar.gz";
+    sha256 =
+      if stdenv.is64bit
+      then "3a11d663b1a11cc4ebb3e3595405d520ec279e1330462645c53edd5cc79d9ca0"
+      else "0yjw8q8mh4adns2i04m4p273vb4ifakixal7yi3hnbg43b36wfaw";
+    message = ''
+      In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
+      the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+
+      ${homepage}#ctx-dl-eula
+
+      Once you have downloaded the file, please use the following command and re-run the
+      installation:
+
+      nix-prefetch-url file://${name}
+    '';
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  sourceRoot = ".";
+
+  buildInputs = [
+    makeWrapper
+    busybox
+    file
+    gtk
+    gdk_pixbuf
+  ];
+
+  libPath = stdenv.lib.makeLibraryPath [
+    glib
+    gtk
+    atk
+    gdk_pixbuf
+    cairo
+    pango
+    gnome3.dconf
+    xlibs.libX11
+    xlibs.libXext
+    xlibs.libXrender
+    xlibs.libXinerama
+    xlibs.libXfixes
+    libpng12
+    gtk_engines
+    freetype
+    fontconfig
+    alsaLib
+    stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
+  ];
+
+  desktopItem = makeDesktopItem {
+    name = "wfica";
+    desktopName = "Citrix Receiver";
+    genericName = "Citrix Receiver";
+    exec = "wfica";
+    icon = "wfica";
+    comment = "Connect to remote Citrix server";
+    categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
+    mimeType = "application/x-ica";
+  };
+
+  installPhase = ''
+    export ICAInstDir="$out/opt/citrix-icaclient"
+
+    sed -i \
+      -e 's,^main_install_menu$,install_ICA_client,g' \
+      -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
+      -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
+      -e 's,/bin/true,true,g' \
+      ./${prefixWithBitness}/hinst
+
+    # Run the installer...
+    ./${prefixWithBitness}/hinst CDROM "`pwd`"
+
+    echo "Deleting broken links..."
+    for link in `find $ICAInstDir -type l `
+    do
+      [ -f "$link" ] || rm -v "$link"
+    done
+
+    echo "Expanding certificates..."
+    # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
+    pushd "$ICAInstDir/keystore/cacerts"
+    awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
+    popd
+
+    echo "Patching executables..."
+    find $ICAInstDir -type f -exec file {} \; |
+      grep 'ELF.*executable' |
+      cut -f 1 -d : |
+      xargs -t -n 1 patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        --set-rpath "$ICAInstDir:$libPath"
+
+    echo "Wrapping wfica..."
+    mkdir "$out/bin"
+
+    makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
+      --set ICAROOT "$ICAInstDir" \
+      --set GTK_PATH "${gtk}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+      --set LD_LIBRARY_PATH "$libPath" \
+      --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+
+    echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
+    echo UTC > "$ICAInstDir/timezone"
+
+    echo "Installing desktop item..."
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+
+    # We introduce a dependency on the source file so that it need not be redownloaded everytime
+    echo $src >> "$out/share/nix_dependencies.pin"
+  '';
+
+  meta = with stdenv.lib; {
+    license = stdenv.lib.licenses.unfree;
+    homepage = homepage;
+    description = "Citrix Receiver";
+    maintainers = with maintainers; [ obadz a1russell ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/remote/teamviewer/10.nix b/pkgs/applications/networking/remote/teamviewer/10.nix
index 7e97a31c3a9..5de60180c69 100644
--- a/pkgs/applications/networking/remote/teamviewer/10.nix
+++ b/pkgs/applications/networking/remote/teamviewer/10.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchurl, libX11, libXtst, libXext, libXdamage, libXfixes,
-wineUnstable, makeWrapper, libXau , bash, patchelf, config,
-acceptLicense ? false }:
+wineUnstable, makeWrapper, libXau , patchelf, config }:
 
 with stdenv.lib;
 
@@ -30,22 +29,23 @@ stdenv.mkDerivation {
     rm -R $out/share/teamviewer/tv_bin/wine/{bin,lib,share}
 
     cat > $out/bin/teamviewer << EOF
-    #!${bash}/bin/sh
+    #!${stdenv.shell}
     export LD_LIBRARY_PATH=${toldpath}\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
     export PATH=${topath}\''${PATH:+:\$PATH}
     $out/share/teamviewer/tv_bin/script/teamviewer "\$@"
     EOF
     chmod +x $out/bin/teamviewer
 
-    patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
     ln -s $out/share/teamviewer/tv_bin/teamviewerd $out/bin/
-    ${optionalString acceptLicense "
-      cat > $out/share/teamviewer/config/global.conf << EOF
-      [int32] EulaAccepted = 1
-      [int32] EulaAcceptedRevision = 6
-      EOF
-    "}
+    rm -rf  $out/share/teamviewer/logfiles $out/share/teamviewer/config
+    ln -sv /var/tmp/teamviewer10/logs/ $out/share/teamviewer/logfiles
+    ln -sv /var/tmp/teamviewer10/config/ $out/share/teamviewer/config
+  '';
+
+  # the fixupPhase undoes the rpath patch
+  postFixup = ''
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer/tv_bin/teamviewerd
+    patchelf --set-rpath "${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer/tv_bin/teamviewerd
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix
index 63bec355f22..108135cea37 100644
--- a/pkgs/applications/networking/seafile-client/default.nix
+++ b/pkgs/applications/networking/seafile-client/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec
 {
-  version = "4.0.6";
+  version = "4.4.2";
   name = "seafile-client-${version}";
 
   src = fetchurl
   {
     url = "https://github.com/haiwen/seafile-client/archive/v${version}.tar.gz";
-    sha256 = "0hx8zjmgj4ki2p5fkdyz32fy8db60p6rvi3my9l59j7fslv71k1z";
+    sha256 = "0aj39xiayibxp3vcrwi58pn51h9vcsy2z04q8jm17qadmk9dzyw6";
   };
 
   buildInputs = [ pkgconfig cmake qt4 seafile-shared makeWrapper ];
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index 1a6ab883c4a..fd060ad0880 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -12,19 +12,19 @@ let
     else if stdenv.system == "i686-linux" then "ld-linux.so.2"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "0ax5ij3fwq3q9agf7qkw2zg53fcd82llg734pq3swzpn3z1ajs38"
-    else if stdenv.system == "i686-linux" then "18hvgx8bvd2khnqfn434gd4mflv0w5y8kvim72rvya2kwxsyf3i1"
+  sha256 = if stdenv.system == "x86_64-linux" then "88fd785647def79ee36621fa2a8a5bea73c513de03103f068dd10bc25f3cf356"
+    else if stdenv.system == "i686-linux" then "8c23271291f40aa144bbf38ceb3cc2a05bed00759c87a65bd798cf8bb289d07a"
     else throw "Spideroak client for: ${stdenv.system} not supported!";
 
   ldpath = stdenv.lib.makeSearchPath "lib" [
-    glib fontconfig libXext libX11 freetype libXrender 
+    glib fontconfig libXext libX11 freetype libXrender
   ];
 
-  version = "5.1.6";
+  version = "6.0.1";
 
 in stdenv.mkDerivation {
   name = "spideroak-${version}";
-  
+
   src = fetchurl {
     name = "spideroak-${version}-${arch}";
     url = "https://spideroak.com/getbuild?platform=slackware&arch=${arch}&version=${version}";
@@ -36,17 +36,17 @@ in stdenv.mkDerivation {
   unpackCmd = "tar -xzf $curSrc";
 
   installPhase = ''
-    ensureDir "$out"
+    mkdir "$out"
     cp -r "./"* "$out"
-    ensureDir "$out/bin"
-    rm "$out/usr/bin/SpiderOak"
+    mkdir "$out/bin"
+    rm "$out/usr/bin/SpiderOakONE"
 
     patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
-      "$out/opt/SpiderOak/lib/SpiderOak"
+      "$out/opt/SpiderOakONE/lib/SpiderOakONE"
 
-    RPATH=$out/opt/SpiderOak/lib:${ldpath}
-    makeWrapper $out/opt/SpiderOak/lib/SpiderOak $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \
-      --set QT_PLUGIN_PATH $out/opt/SpiderOak/lib/plugins/ \
+    RPATH=$out/opt/SpiderOakONE/lib:${ldpath}
+    makeWrapper $out/opt/SpiderOakONE/lib/SpiderOakONE $out/bin/spideroak --set LD_LIBRARY_PATH $RPATH \
+      --set QT_PLUGIN_PATH $out/opt/SpiderOakONE/lib/plugins/ \
       --set SpiderOak_EXEC_SCRIPT $out/bin/spideroak
   '';
 
diff --git a/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch b/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch
new file mode 100644
index 00000000000..73b47994691
--- /dev/null
+++ b/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch
@@ -0,0 +1,18 @@
+diff -aur lsyncd-release-2.1.5.orig/configure.ac lsyncd-release-2.1.5/configure.ac
+--- lsyncd-release-2.1.5.orig/configure.ac	2013-06-07 18:24:02.000000000 +0600
++++ lsyncd-release-2.1.5/configure.ac	2014-03-04 13:24:15.390350812 +0600
+@@ -15,10 +15,10 @@
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ 
+-#AC_PATH_PROG([A2X], [a2x], [no])
+-#if test x${A2X} = xno ; then
+-#	AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required])
+-#fi
++AC_PATH_PROG([A2X], [a2x], [no])
++if test x${A2X} = xno ; then
++	AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required])
++fi
+ 
+ ###
+ # Checks for Lua
\ No newline at end of file
diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix
new file mode 100644
index 00000000000..775da905ea9
--- /dev/null
+++ b/pkgs/applications/networking/sync/lsyncd/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, automake, autoconf, lua, pkgconfig, rsync,
+  asciidoc, libxml2, docbook_xml_dtd_45, docbook_xml_xslt, libxslt }:
+
+stdenv.mkDerivation rec {
+  name = "lsyncd-${version}";
+  version = "2.1.5";
+
+  src = fetchFromGitHub {
+    owner = "axkibe";
+    repo = "lsyncd";
+    rev = "release-${version}";
+    sha256 = "0jvr2rv34jyjrv7188vdv1z8vgvm4wydqwsp9x5ksfzh9drbq5gn";
+  };
+
+  patches = [ ./configure-a2x-fix.patch ];
+
+  preConfigurePhase = ''
+    substituteInPlace default-rsync.lua \
+      --replace "binary        = '/usr/bin/rsync'," "binary        = '${rsync}/bin/rsync',"
+  '';
+
+  configurePhase = ''
+    ./autogen.sh --prefix=$out
+    ./configure --prefix=$out
+  '';
+
+  buildInputs = [
+    rsync
+    automake autoconf lua pkgconfig
+    asciidoc libxml2 docbook_xml_dtd_45 docbook_xml_xslt libxslt
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/axkibe/lsyncd;
+    description = "A utility that synchronizes local directories with remote targets";
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ bobvanderlinden ];
+  };
+}
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index 3d0f408659f..b2cba633db8 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     description = "Console-based network statistics utility for Linux";
     maintainers = with maintainers; [ nckx ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/networking/yafc/default.nix b/pkgs/applications/networking/yafc/default.nix
index 2e60b9aa322..f283631cb07 100644
--- a/pkgs/applications/networking/yafc/default.nix
+++ b/pkgs/applications/networking/yafc/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, readline, libssh, intltool, libbsd}:
+{stdenv, fetchurl, readline, libssh, intltool, libbsd, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  name = "yafc-1.3.2";
+  name = "yafc-1.3.6";
   src = fetchurl {
-    url = "http://www.yafc-ftp.com/upload/${name}.tar.xz";
-    sha256 = "0rrhik00xynxg5s3ffqlyynvy8ssv8zfaixkpb77baxa274gnbd7";
+    url = "http://www.yafc-ftp.com/downloads/${name}.tar.xz";
+    sha256 = "0wvrljihliggysfnzczc0s74i3ab2c1kzjjs99iqk98nxmb2b8v3";
   };
 
-  buildInputs = [ readline libssh intltool libbsd ];
+  buildInputs = [ readline libssh intltool libbsd pkgconfig ];
 
   meta = {
     description = "ftp/sftp client with readline, autocompletion and bookmarks";
diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index 3d1eada1db6..7c2131d2fcb 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -1,36 +1,40 @@
-{ stdenv, fetchurl, automoc4, cmake, kdelibs, attica, perl, zlib, libpng, boost, mesa
-, kdepimlibs, createresources ? null, eigen, qca2, exiv2, soprano, marble, lcms2
-, fontconfig, freetype, sqlite, icu, libwpd, libwpg, pkgconfig, poppler_qt4
-, libkdcraw, libxslt, fftw, glew, gsl, shared_desktop_ontologies, okular
-, libvisio, kactivities, mysql, postgresql, freetds, xbase, openexr, ilmbase
-, libodfgen, opencolorio, openjpeg, pstoedit, librevenge
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
+, exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
+, libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
+, freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
+, kactivities, okular, git, oxygen_icons, makeWrapper
+# TODO: not found
+#, xbase, openjpeg
+# TODO: package libWPS, Spnav, m2mml, LibEtonyek
 }:
 
 stdenv.mkDerivation rec {
-  name = "calligra-2.8.7";
+  name = "calligra-2.9.8";
 
   src = fetchurl {
     url = "mirror://kde/stable/${name}/${name}.tar.xz";
-    sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg";
+    sha256 = "08a5k8gjmzp9yzq46xy0p1sw7dpvxmxh8zz6dyj8q1dq29719kkc";
   };
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-# TODO: package Vc, libWPS, Spnav, m2mml, LibEtonyek, poppler-qt4-xpdf-headers
-# not found: xbase, openjpeg(too new)
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
 
   buildInputs = [
-    kdelibs attica zlib libpng boost mesa kdepimlibs
-    createresources eigen qca2 exiv2 soprano marble lcms2 fontconfig freetype
-    sqlite icu libwpd libwpg poppler_qt4 libkdcraw libxslt fftw glew gsl
-    shared_desktop_ontologies okular libodfgen opencolorio openjpeg
-    libvisio kactivities mysql.lib postgresql freetds xbase openexr pstoedit
-    librevenge
+    kdelibs lcms2 libpng eigen
+    exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
+    libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
+    freetds fftw glew libkdcraw opencolorio kdepimlibs
+    kactivities okular git
   ];
 
-  patches = [ ./librevenge.patch ];
+  enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  postInstall = ''
+    for i in $out/bin/*; do
+      wrapProgram $i \
+        --prefix PATH ':' "${pstoedit}/bin" \
+        --prefix XDG_DATA_DIRS ':' "${oxygen_icons}/share"
+    done
+  '';
 
   meta = {
     description = "A suite of productivity applications";
diff --git a/pkgs/applications/office/calligra/librevenge.patch b/pkgs/applications/office/calligra/librevenge.patch
deleted file mode 100644
index ced0ff07407..00000000000
--- a/pkgs/applications/office/calligra/librevenge.patch
+++ /dev/null
@@ -1,882 +0,0 @@
-From 8e8f99cc314435f100d367f41c110becd19d3885 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 27 May 2014 16:15:52 +0200
-Subject: [PATCH] switch to librevenge-based import libs
-
----
- CMakeLists.txt                                  | 10 ++++++
- cmake/modules/FindLibEtonyek.cmake              |  6 ++--
- cmake/modules/FindLibOdfGen.cmake               |  6 ++--
- cmake/modules/FindLibRevenge.cmake              | 37 +++++++++++++++++++++
- cmake/modules/FindLibVisio.cmake                |  6 ++--
- cmake/modules/FindLibWpd.cmake                  | 22 +++----------
- cmake/modules/FindLibWpg.cmake                  |  6 ++--
- cmake/modules/FindLibWps.cmake                  |  6 ++--
- filters/flow/visio/import/CMakeLists.txt        |  3 +-
- filters/flow/visio/import/VSDXImport.cpp        |  9 ++---
- filters/flow/wpg/import/CMakeLists.txt          |  3 +-
- filters/flow/wpg/import/WPGImport.cpp           |  9 ++---
- filters/karbon/wpg/CMakeLists.txt               |  4 +--
- filters/karbon/wpg/WPGImport.cpp                | 39 ++++++++--------------
- filters/libodfhandler/DiskDocumentHandler.cxx   | 13 ++++----
- filters/libodfhandler/DiskDocumentHandler.hxx   |  8 ++---
- filters/libodfhandler/OutputFileHelper.cxx      |  6 ++--
- filters/libodfhandler/OutputFileHelper.hxx      |  9 ++---
- filters/libodfhandler/StdOutHandler.cxx         | 13 ++++----
- filters/libodfhandler/StdOutHandler.hxx         |  8 ++---
- filters/stage/keynote/import/CMakeLists.txt     |  5 +--
- filters/stage/keynote/import/KeyImport.cpp      | 15 +++++----
- filters/words/wordperfect/import/CMakeLists.txt |  3 +-
- filters/words/wordperfect/import/WPDImport.cpp  | 44 ++++++++++++++-----------
- filters/words/works/import/CMakeLists.txt       |  3 +-
- filters/words/works/import/WPSImport.cpp        | 18 +++++-----
- 26 files changed, 177 insertions(+), 134 deletions(-)
- create mode 100644 cmake/modules/FindLibRevenge.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b6b764..c337864 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -697,6 +697,16 @@ macro_optional_find_package(Okular)
- macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
- 
- ##
-+## Test for librevenge
-+##
-+macro_optional_find_package(LibRevenge)
-+macro_log_feature(LIBREVENGE_FOUND "LibRevenge"
-+                  "A base library for writing document import filters"
-+                  "http://sf.net/p/libwpd/librevenge/" FALSE ""
-+                  "Required by various import filters"
-+)
-+
-+##
- ## Test for libodfgen
- ##
- macro_optional_find_package(LibOdfGen)
-diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake
-index 5b78964..ad10d79 100644
---- a/cmake/modules/FindLibEtonyek.cmake
-+++ b/cmake/modules/FindLibEtonyek.cmake
-@@ -10,16 +10,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBETONYEK LibWpd)
--libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.0)
-+libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.1)
- 
- find_path(LIBETONYEK_INCLUDE_DIR
-     NAMES libetonyek/libetonyek.h
-     HINTS ${LIBETONYEK_PKGCONF_INCLUDE_DIRS} ${LIBETONYEK_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libetonyek-0.0
-+    PATH_SUFFIXES libetonyek-0.1
- )
- 
- find_library(LIBETONYEK_LIBRARY
--    NAMES etonyek etonyek-0.0
-+    NAMES etonyek etonyek-0.1
-     HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake
-index 9ab80d1..355c345 100644
---- a/cmake/modules/FindLibOdfGen.cmake
-+++ b/cmake/modules/FindLibOdfGen.cmake
-@@ -9,16 +9,16 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- 
- include(LibFindMacros)
--libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.0)
-+libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.1)
- 
- find_path(LIBODFGEN_INCLUDE_DIR
-     NAMES libodfgen/libodfgen.hxx
-     HINTS ${LIBODFGEN_PKGCONF_INCLUDE_DIRS} ${LIBODFGEN_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libodfgen-0.0
-+    PATH_SUFFIXES libodfgen-0.1
- )
- 
- find_library(LIBODFGEN_LIBRARY
--    NAMES odfgen-0.0
-+    NAMES odfgen-0.1
-     HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake
-new file mode 100644
-index 0000000..8ed18b1
---- /dev/null
-+++ b/cmake/modules/FindLibRevenge.cmake
-@@ -0,0 +1,37 @@
-+# - Try to find the librevenge
-+# Once done this will define
-+#
-+#  LIBREVENGE_FOUND - system has LIBREVENGE
-+#  LIBREVENGE_INCLUDE_DIRS - the LIBREVENGE include directory
-+#  LIBREVENGE_LIBRARIES - Link these to use LIBREVENGE
-+#  LIBREVENGE_DEFINITIONS - Compiler switches required for using LIBREVENGE
-+#
-+
-+include(LibFindMacros)
-+libfind_pkg_check_modules(REVENGE_PKGCONF librevenge-0.0)
-+
-+find_path(REVENGE_INCLUDE_DIR
-+    NAMES librevenge/librevenge.h
-+    HINTS ${REVENGE_PKGCONF_INCLUDE_DIRS} ${REVENGE_PKGCONF_INCLUDEDIR}
-+    PATH_SUFFIXES librevenge-0.0
-+)
-+
-+find_path(REVENGE_STREAM_INCLUDE_DIR
-+    NAMES librevenge-stream/librevenge-stream.h
-+    HINTS ${REVENGE_STREAM_PKGCONF_INCLUDE_DIRS} ${REVENGE_STREAM_PKGCONF_INCLUDEDIR}
-+    PATH_SUFFIXES librevenge-0.0
-+)
-+
-+find_library(REVENGE_LIBRARY
-+    NAMES revenge librevenge revenge-0.0 librevenge-0.0
-+    HINTS ${REVENGE_STREAM_PKGCONF_LIBRARY_DIRS} ${REVENGE_STREAM_PKGCONF_LIBDIR}
-+)
-+
-+find_library(REVENGE_STREAM_LIBRARY
-+    NAMES revenge-stream librevenge-stream revenge-stream-0.0 librevenge-stream-0.0
-+    HINTS ${REVENGE_PKGCONF_LIBRARY_DIRS} ${REVENGE_PKGCONF_LIBDIR}
-+)
-+
-+set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
-+set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
-+libfind_process(LIBREVENGE)
-diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake
-index a8533ee..49871b3 100644
---- a/cmake/modules/FindLibVisio.cmake
-+++ b/cmake/modules/FindLibVisio.cmake
-@@ -12,16 +12,16 @@
- include(LibFindMacros)
- libfind_package(LIBWPD LibWpd)
- libfind_package(LIBWPG LibWpg)
--libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.0)
-+libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.1)
- 
- find_path(LIBVISIO_INCLUDE_DIR
-     NAMES libvisio/libvisio.h
-     HINTS ${LIBVISIO_PKGCONF_INCLUDE_DIRS} ${LIBVISIO_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libvisio-0.0
-+    PATH_SUFFIXES libvisio-0.1
- )
- 
- find_library(LIBVISIO_LIBRARY
--    NAMES visio visio-0.0
-+    NAMES visio visio-0.1
-     HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake
-index 2a324cc..ed9bc26 100644
---- a/cmake/modules/FindLibWpd.cmake
-+++ b/cmake/modules/FindLibWpd.cmake
-@@ -8,31 +8,19 @@
- #
- 
- include(LibFindMacros)
--libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.9)
--libfind_pkg_check_modules(WPD_STREAM_PKGCONF libwpd-stream-0.9)
-+libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.10)
- 
- find_path(WPD_INCLUDE_DIR
-     NAMES libwpd/libwpd.h
-     HINTS ${WPD_PKGCONF_INCLUDE_DIRS} ${WPD_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwpd-0.9
--)
--
--find_path(WPD_STREAM_INCLUDE_DIR
--    NAMES libwpd-stream/libwpd-stream.h
--    HINTS ${WPD_STREAM_PKGCONF_INCLUDE_DIRS} ${WPD_STREAM_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwpd-0.9
-+    PATH_SUFFIXES libwpd-0.10
- )
- 
- find_library(WPD_LIBRARY
--    NAMES wpd libwpd wpd-0.9 libwpd-0.9
-+    NAMES wpd libwpd wpd-0.10 libwpd-0.10
-     HINTS ${WPD_PKGCONF_LIBRARY_DIRS} ${WPD_PKGCONF_LIBDIR}
- )
- 
--find_library(WPD_STREAM_LIBRARY
--    NAMES wpd-stream libwpd-stream wpd-stream-0.9 libwpd-stream-0.9
--    HINTS ${WPD_STREAM_PKGCONF_LIBRARY_DIRS} ${WPD_STREAM_PKGCONF_LIBDIR}
--)
--
--set(LIBWPD_PROCESS_LIBS WPD_LIBRARY WPD_STREAM_LIBRARY)
--set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR WPD_STREAM_INCLUDE_DIR)
-+set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
-+set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
- libfind_process(LIBWPD)
-diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake
-index 56d9302..16c2a1c 100644
---- a/cmake/modules/FindLibWpg.cmake
-+++ b/cmake/modules/FindLibWpg.cmake
-@@ -11,16 +11,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBWPG LibWpd)
--libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.2)
-+libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.3)
- 
- find_path(LIBWPG_INCLUDE_DIR
-     NAMES libwpg/libwpg.h
-     HINTS ${LIBWPG_PKGCONF_INCLUDE_DIRS} ${LIBWPG_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwpg-0.2
-+    PATH_SUFFIXES libwpg-0.3
- )
- 
- find_library(LIBWPG_LIBRARY
--    NAMES wpg wpg-0.2
-+    NAMES wpg wpg-0.3
-     HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
- )
- 
-diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
-index 149f34c..f8c8225 100644
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
-@@ -10,16 +10,16 @@
- 
- include(LibFindMacros)
- libfind_package(LIBWPS LibWpd)
--libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.2)
-+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
- 
- find_path(LIBWPS_INCLUDE_DIR
-     NAMES libwps/libwps.h
-     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
--    PATH_SUFFIXES libwps-0.2
-+    PATH_SUFFIXES libwps-0.3
- )
- 
- find_library(LIBWPS_LIBRARY
--    NAMES wps wps-0.2
-+    NAMES wps wps-0.3
-     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
- )
- 
-diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt
-index 1de4385..4c2a391 100644
---- a/filters/flow/visio/import/CMakeLists.txt
-+++ b/filters/flow/visio/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBVISIO_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS
- 
- kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS})
- 
--target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBVISIO_LIBRARIES})
-+target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES})
- 
- install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp
-index 70a54d9..eb3a208 100644
---- a/filters/flow/visio/import/VSDXImport.cpp
-+++ b/filters/flow/visio/import/VSDXImport.cpp
-@@ -17,7 +17,7 @@
- #include "VSDXImport.h"
- 
- #include <libvisio/libvisio.h>
--#include <libodfgen/OdgGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include "OutputFileHelper.hxx"
- #include <KoFilterChain.h>
-@@ -39,7 +39,7 @@ public:
-     ~OdgOutputFileHelper() {}
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
-     {
-         if (!libvisio::VisioDocument::isSupported(input))
-         {
-@@ -49,9 +49,10 @@ private:
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-     {
--        OdgGenerator exporter(handler, streamType);
-+        OdgGenerator exporter;
-+        exporter.addDocumentHandler(handler, streamType);
-         return libvisio::VisioDocument::parse(input, &exporter);
-     }
- };
-diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt
-index 524d1b1..e2ee2a5 100644
---- a/filters/flow/wpg/import/CMakeLists.txt
-+++ b/filters/flow/wpg/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBVISIO_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS
- 
- kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
- 
--target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES})
-+target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES})
- 
- install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp
-index b4e0fa7..563ae6e 100644
---- a/filters/flow/wpg/import/WPGImport.cpp
-+++ b/filters/flow/wpg/import/WPGImport.cpp
-@@ -17,7 +17,7 @@
- #include "WPGImport.h"
- 
- #include <libwpg/libwpg.h>
--#include <libodfgen/OdgGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include "OutputFileHelper.hxx"
- #include <KoFilterChain.h>
-@@ -39,7 +39,7 @@ public:
-     ~OdgOutputFileHelper() {}
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
-     {
-         if (!libwpg::WPGraphics::isSupported(input))
-         {
-@@ -49,9 +49,10 @@ private:
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
-     {
--        OdgGenerator exporter(handler, streamType);
-+        OdgGenerator exporter;
-+        exporter.addDocumentHandler(handler, streamType);
-         return libwpg::WPGraphics::parse(input, &exporter);
-     }
- };
-diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt
-index 5f578e9..ffa7742 100644
---- a/filters/karbon/wpg/CMakeLists.txt
-+++ b/filters/karbon/wpg/CMakeLists.txt
-@@ -1,11 +1,11 @@
- 
--include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
-+include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBREVENGE_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
- 
- set(wpg2svg_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(calligra_filter_wpg2svg ${wpg2svg_PART_SRCS})
- 
--target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${LIBWPD_LIBRARIES})
-+target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBREVENGE_LIBRARIES})
- 
- install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp
-index f1852ee..4457bec 100644
---- a/filters/karbon/wpg/WPGImport.cpp
-+++ b/filters/karbon/wpg/WPGImport.cpp
-@@ -32,14 +32,12 @@
- #include <QString>
- #include <QFile>
- 
-+#include <librevenge/librevenge.h>
-+#include <librevenge-stream/librevenge-stream.h>
-+
- #include <libwpg/libwpg.h>
--#if LIBWPG_VERSION_MINOR<2
--#include <libwpg/WPGStreamImplementation.h>
--#else
--#include <libwpd-stream/libwpd-stream.h>
--#include <libwpd/libwpd.h>
--#endif
- 
-+#include <cassert>
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
-     if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
--#if LIBWPG_VERSION_MINOR<2
--    WPXInputStream* input = new libwpg::WPGFileStream(m_chain->inputFile().toLocal8Bit());
--    if (input->isOLEStream()) {
--        WPXInputStream* olestream = input->getDocumentOLEStream();
--        if (olestream) {
--            delete input;
--            input = olestream;
--        }
--    }
--    libwpg::WPGString output;
--#else
--    WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
--    if (input->isOLEStream()) {
--        WPXInputStream* olestream = input->getDocumentOLEStream("Anything");
-+    librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(m_chain->inputFile().toLocal8Bit());
-+    if (input->isStructured()) {
-+        librevenge::RVNGInputStream* olestream = input->getSubStreamByName("Anything");
-         if (olestream) {
-             delete input;
-             input = olestream;
-         }
-      }
--     ::WPXString output;
--#endif
--
-     if (!libwpg::WPGraphics::isSupported(input)) {
-         kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+     ::librevenge::RVNGStringVector output;
-+     librevenge::RVNGSVGDrawingGenerator generator(output, "");
-+
-+    if (!libwpg::WPGraphics::parse(input, &generator)) {
-         kWarning() << "ERROR: SVG Generation failed!";
-         delete input;
-         return KoFilter::ParsingError;
-     }
-+    assert(1 == output.size());
- 
-     delete input;
- 
-@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
-         kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-         return KoFilter::InternalError;
-     }
--    outputFile.write(output.cstr());
-+    outputFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-+    outputFile.write(output[0].cstr());
-     outputFile.close();
- 
-     return KoFilter::OK;
-diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx
-index e035fdc..f8ca273 100644
---- a/filters/libodfhandler/DiskDocumentHandler.cxx
-+++ b/filters/libodfhandler/DiskDocumentHandler.cxx
-@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) :
- {
- }
- 
--void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
-+void DiskOdfDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
- {
- 	if (mbIsTagOpened)
- 	{
-@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL
- 	}
- 	PUTSTRING("<");
- 	PUTSTRING(psName);
--	WPXPropertyList::Iter i(xPropList);
-+	librevenge::RVNGPropertyList::Iter i(xPropList);
- 	for (i.rewind(); i.next(); )
- 	{
--		// filter out libwpd elements
--		if (strncmp(i.key(), "libwpd", 6) != 0)
-+		// filter out librevenge properties
-+		if (strncmp(i.key(), "librevenge", 10) != 0)
- 		{
- 			PUTSTRING(" ");
- 			PUTSTRING(i.key());
-@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName)
- 	}
- }
- 
--void DiskOdfDocumentHandler::characters(const WPXString &sCharacters)
-+void DiskOdfDocumentHandler::characters(const librevenge::RVNGString &sCharacters)
- {
- 	if (mbIsTagOpened)
- 	{
- 		PUTSTRING(">");
- 		mbIsTagOpened = false;
- 	}
--	WPXString sEscapedCharacters(sCharacters, true);
-+	librevenge::RVNGString sEscapedCharacters;
-+	sEscapedCharacters.appendEscapedXML(sCharacters);
- 	if (sEscapedCharacters.len() > 0)
- 		PUTSTRING(sEscapedCharacters.cstr());
- }
-diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx
-index 17f7eb7..d52a256 100644
---- a/filters/libodfhandler/DiskDocumentHandler.hxx
-+++ b/filters/libodfhandler/DiskDocumentHandler.hxx
-@@ -23,7 +23,7 @@
- #ifndef _DISKDOCUMENTHANDLER_H
- #define _DISKDOCUMENTHANDLER_H
- 
--#include <libodfgen/OdfDocumentHandler.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-@@ -45,9 +45,9 @@ public:
- #endif
- 	virtual void startDocument() {}
- 	virtual void endDocument();
--	virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
-+	virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
- 	virtual void endElement(const char *psName);
--	virtual void characters(const WPXString &sCharacters);
-+	virtual void characters(const librevenge::RVNGString &sCharacters);
- 
- private:
- 	DiskOdfDocumentHandler(DiskOdfDocumentHandler const &);
-@@ -58,7 +58,7 @@ private:
- 	FemtoZip *mpOutput;
- #endif
- 	bool mbIsTagOpened;
--	WPXString msOpenedTagName;
-+	librevenge::RVNGString msOpenedTagName;
- };
- #endif
- 
-diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx
-index 8786d4c..61e48e9 100644
---- a/filters/libodfhandler/OutputFileHelper.cxx
-+++ b/filters/libodfhandler/OutputFileHelper.cxx
-@@ -37,7 +37,7 @@
- 
- #include "DiskDocumentHandler.hxx"
- #include "StdOutHandler.hxx"
--#include <libwpd-stream/WPXStreamImplementation.h>
-+#include <librevenge-stream/librevenge-stream.h>
- 
- struct OutputFileHelperImpl
- {
-@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str
- 
- bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType)
- {
--	WPXFileStream input(inFileName);
-+	librevenge::RVNGFileStream input(inFileName);
- 
- 	if (!_isSupportedFormat(&input, m_impl->mpPassword))
- 		return false;
- 
--	input.seek(0, WPX_SEEK_SET);
-+	input.seek(0, librevenge::RVNG_SEEK_SET);
- 
- 	OdfDocumentHandler *pHandler;
- #ifdef USE_GSF_OUTPUT
-diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx
-index a61b9a0..d2632a9 100644
---- a/filters/libodfhandler/OutputFileHelper.hxx
-+++ b/filters/libodfhandler/OutputFileHelper.hxx
-@@ -22,9 +22,10 @@
- #ifndef _OUTPUTFILEHELPER_HXX
- #define _OUTPUTFILEHELPER_HXX
- 
--#include <libodfgen/OdfDocumentHandler.hxx>
-+#include <libodfgen/libodfgen.hxx>
-+
-+#include <librevenge-stream/librevenge-stream.h>
- 
--class WPXInputStream;
- struct OutputFileHelperImpl;
- 
- class OutputFileHelper
-@@ -38,8 +39,8 @@ public:
- 	bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType);
- 
- private:
--	virtual bool _isSupportedFormat(WPXInputStream *input, const char *password) = 0;
--	virtual bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
-+	virtual bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) = 0;
-+	virtual bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
- 	OutputFileHelperImpl *m_impl;
- 
- private:
-diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx
-index 6864266..16e19f0 100644
---- a/filters/libodfhandler/StdOutHandler.cxx
-+++ b/filters/libodfhandler/StdOutHandler.cxx
-@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() :
- 	printf("<?xml version=\"1.0\"?>\n");
- }
- 
--void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
-+void StdOutHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
- {
- 	if (mbIsTagOpened)
- 	{
-@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro
- 		mbIsTagOpened = false;
- 	}
- 	printf("<%s", psName);
--	WPXPropertyList::Iter i(xPropList);
-+	librevenge::RVNGPropertyList::Iter i(xPropList);
- 	for (i.rewind(); i.next(); )
- 	{
--		// filter out libwpd elements
--		if (strncmp(i.key(), "libwpd", 6) != 0)
-+		// filter out librevenge properties
-+		if (strncmp(i.key(), "librevenge", 10) != 0)
- 			printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
- 	}
- 	mbIsTagOpened = true;
-@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName)
- 	}
- }
- 
--void StdOutHandler::characters(const WPXString &sCharacters)
-+void StdOutHandler::characters(const librevenge::RVNGString &sCharacters)
- {
- 	if (mbIsTagOpened)
- 	{
- 		printf(">");
- 		mbIsTagOpened = false;
- 	}
--	WPXString sEscapedCharacters(sCharacters, true);
--	printf("%s", sEscapedCharacters.cstr());
-+	printf("%s", librevenge::RVNGString::escapeXML(sCharacters).cstr());
- }
- 
- void StdOutHandler::endDocument()
-diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx
-index a18189a..44fa1e7 100644
---- a/filters/libodfhandler/StdOutHandler.hxx
-+++ b/filters/libodfhandler/StdOutHandler.hxx
-@@ -23,7 +23,7 @@
- #ifndef _STDOUTHANDLER_H
- #define _STDOUTHANDLER_H
- 
--#include <libodfgen/OdfDocumentHandler.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- class StdOutHandler : public OdfDocumentHandler
- {
-@@ -31,12 +31,12 @@ public:
- 	StdOutHandler();
- 	virtual void startDocument() {}
- 	virtual void endDocument();
--	virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
-+	virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
- 	virtual void endElement(const char *psName);
--	virtual void characters(const WPXString &sCharacters);
-+	virtual void characters(const librevenge::RVNGString &sCharacters);
- private:
- 	bool mbIsTagOpened;
--	WPXString msOpenedTagName;
-+	librevenge::RVNGString msOpenedTagName;
- };
- #endif
- 
-diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
-index 6a0e2d7..ffb3c70 100644
---- a/filters/words/wordperfect/import/CMakeLists.txt
-+++ b/filters/words/wordperfect/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBWPD_INCLUDE_DIRS}
-     ${LIBWPG_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
-@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS
- kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS})
- 
- target_link_libraries(calligra_filter_wpd2odt
--    komain ${LIBODFGEN_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
-+    komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
- 
- install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
- 
-diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp
-index af9d9b6..edf1c91 100644
---- a/filters/words/wordperfect/import/WPDImport.cpp
-+++ b/filters/words/wordperfect/import/WPDImport.cpp
-@@ -18,8 +18,7 @@
- 
- #include <libwpd/libwpd.h>
- #include <libwpg/libwpg.h>
--#include <libodfgen/OdtGenerator.hxx>
--#include <libodfgen/OdgGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include <OutputFileHelper.hxx>
- #include <KoFilterChain.h>
-@@ -31,6 +30,7 @@
- #include <QString>
- #include <QByteArray>
- 
-+#include <cassert>
- #include <stdio.h>
- 
- class OdtOutputFileHelper : public OutputFileHelper
-@@ -41,20 +41,20 @@ public:
-     ~OdtOutputFileHelper() {};
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char *password)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password)
-     {
--        WPDConfidence confidence = WPDocument::isFileFormatSupported(input);
--        if (WPD_CONFIDENCE_EXCELLENT != confidence && WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
-+        libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(input);
-+        if (libwpd::WPD_CONFIDENCE_EXCELLENT != confidence && libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
-         {
-             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");
-             return false;
-         }
--        if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
-+        if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
-         {
-             fprintf(stderr, "ERROR: The WordPerfect document is encrypted and you did not give us a password.\n");
-             return false;
-         }
--        if (confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (WPD_PASSWORD_MATCH_OK != WPDocument::verifyPassword(input, password)))
-+        if (confidence == libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (libwpd::WPD_PASSWORD_MATCH_OK != libwpd::WPDocument::verifyPassword(input, password)))
-         {
-             fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either\n");
-             fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.\n");
-@@ -64,41 +64,47 @@ private:
-         return true;
-     }
- 
--    static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
-+    static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
-     {
--        OdgGenerator exporter(pHandler, streamType);
-+        OdgGenerator exporter;
-+        exporter.addDocumentHandler(pHandler, streamType);
- 
-         libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
- 
--        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(data.getDataStream())))
-+        if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(data.getDataStream())))
-             fileFormat = libwpg::WPG_WPG1;
- 
--        return libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(data.getDataStream()), &exporter, fileFormat);
-+        return libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter, fileFormat);
-     }
- 
--    static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &output)
-+    static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output)
-     {
--        WPXString svgOutput;
-         libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
- 
--        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(input.getDataStream())))
-+        if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(input.getDataStream())))
-             fileFormat = libwpg::WPG_WPG1;
- 
--        if (!libwpg::WPGraphics::generateSVG(const_cast<WPXInputStream *>(input.getDataStream()), svgOutput, fileFormat))
-+        librevenge::RVNGStringVector svgOutput;
-+        librevenge::RVNGSVGDrawingGenerator generator(svgOutput, "");
-+        if (!libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()), &generator, fileFormat))
-             return false;
-+        assert(1 == svgOutput.size());
- 
-         output.clear();
--        output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr()));
-+        const librevenge::RVNGString svgPrefix("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
-+        output.append((unsigned char *)svgPrefix.cstr(), svgPrefix.size());
-+        output.append((unsigned char *)svgOutput[0].cstr(), svgOutput[0].size());
- 
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
-     {
--        OdtGenerator collector(handler, streamType);
-+        OdtGenerator collector;
-+        collector.addDocumentHandler(handler, streamType);
-         collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject);
-         collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage);
--        if (WPD_OK == WPDocument::parse(input, &collector, password))
-+        if (libwpd::WPD_OK == libwpd::WPDocument::parse(input, &collector, password))
-             return true;
-         return false;
-     }
-diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt
-index 76317ae..2c51937 100644
---- a/filters/words/works/import/CMakeLists.txt
-+++ b/filters/words/works/import/CMakeLists.txt
-@@ -1,6 +1,7 @@
- include_directories(
-     ../../../libodfhandler/
-     ${LIBODFGEN_INCLUDE_DIRS}
-+    ${LIBREVENGE_INCLUDE_DIRS}
-     ${LIBWPS_INCLUDE_DIRS}
-     ${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS
- 
- kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS})
- 
--target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBWPS_LIBRARIES})
-+target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES})
- 
- install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
-index c2058e5..545daf3 100644
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
-@@ -16,9 +16,9 @@
- 
- #include "WPSImport.h"
- 
--#include <libwpd/libwpd.h>
-+#include <librevenge/librevenge.h>
- #include <libwps/libwps.h>
--#include <libodfgen/OdtGenerator.hxx>
-+#include <libodfgen/libodfgen.hxx>
- 
- #include "OutputFileHelper.hxx"
- #include <KoFilterChain.h>
-@@ -40,10 +40,11 @@ public:
-     ~OdtOutputFileHelper() {};
- 
- private:
--    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
-+    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
-     {
--        WPSConfidence confidence = WPSDocument::isFileFormatSupported(input);
--        if (confidence == WPS_CONFIDENCE_NONE || confidence == WPS_CONFIDENCE_POOR)
-+        libwps::WPSKind kind = libwps::WPS_TEXT;
-+        libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind);
-+        if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT))
-         {
-             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.\n");
-             return false;
-@@ -52,10 +53,11 @@ private:
-         return true;
-     }
- 
--    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
-+    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
-     {
--        OdtGenerator collector(handler, streamType);
--        if (WPS_OK == WPSDocument::parse(input, &collector))
-+        OdtGenerator collector;
-+        collector.addDocumentHandler(handler, streamType);
-+        if (libwps::WPS_OK == libwps::WPSDocument::parse(input, &collector))
-             return true;
-         return false;
-     }
--- 
-1.9.3
-
-
diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix
index 8e01d30c44f..cddde10f916 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.23";
+  name = "gnumeric-1.12.24";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnumeric/1.12/${name}.tar.xz";
-    sha256 = "0lcmw4jrfg9y2fhx13xw8w85vi7bcmgyn2sdjxi21xkh3szlqiq0";
+    sha256 = "0lcm8k0jb8rd5y4ii803f21nv8rx6gc3mmdlrj5h0rkkn9qm57f5";
   };
 
   configureFlags = "--disable-component";
diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix
index 8ab2d8fedcc..b1eb4ddf021 100644
--- a/pkgs/applications/office/homebank/default.nix
+++ b/pkgs/applications/office/homebank/default.nix
@@ -1,8 +1,9 @@
-{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool }:
+{ fetchurl, stdenv, gtk, pkgconfig, libofx, intltool, wrapGAppsHook
+, hicolor_icon_theme}:
 
 let
    download_root = "http://homebank.free.fr/public/";
-   name = "homebank-5.0.0";
+   name = "homebank-5.0.6";
    lastrelease = download_root + name + ".tar.gz";
    oldrelease = download_root + "old/" + name + ".tar.gz";
 in
@@ -12,10 +13,10 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     urls = [ lastrelease oldrelease ];
-    sha256 = "062r61ryn2v1sxyw6zymhxnvnhk19wsr4nyzmiiwx5wrk0nk9m18";
+    sha256 = "1r1rn8lgnqnlwkspx230gly5f4i90ij0a3ddrvw51kdc41xfylja";
   };
 
-  buildInputs = [ pkgconfig gtk libofx intltool ];
+  buildInputs = [ pkgconfig gtk libofx intltool hicolor_icon_theme wrapGAppsHook ];
 
   meta = {
     description = "Free, easy, personal accounting for everyone";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f1adef86dc9..55bdd8eceb0 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -20,7 +20,7 @@ let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
   minor = "0";
-  patch = "1";
+  patch = "2";
   tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
@@ -47,14 +47,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "0z8qf4ri8wmzgc5601fxcwxwym1h9rwk0kaqpxhqbkj04h9z0xq7";
+      sha256 = "06w1gz78136bs6fbwslxz5zsg538yqfarkq1am7zn8rzczz2qplh";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0iz9jz0ppghzh33kzw7v0xqchim9brys6mnmlk74nzrhci2vj7f7";
+      sha256 = "157hypz093vhqbysygx5q4fbb81785m2b7slccfkp8x87dcsahj3";
     };
 
   };
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "06nj1wnx09a6v3kx9k48810mkb19dbkaln1af33f4m7bxg5bjl87";
+    sha256 = "0xn1pg72vfdajmhak6chajvd51h74jqvq2565xv3j823143niw01";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index ea6d565a10b..2f3e42d5774 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -12,14 +12,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.13.1-stable";
+  shortVersion = "1.15-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "21491da1608daf58da23e7e5eb7619b494b10192acc0f81575daff2a38720f50"
-    else "8db101b26dd2978e991421260a2e55d849014f64005930b2528080bbbaa78600";
+    then "16274a1ad981f8abd6facae88e8412eaf5c8b9b238ff4e07fa7c7b5f498c3cc7"
+    else "a455f0cf898f1df66dd5a38c656718a9f8b0f6e80ee7205b37635a8261f9d3cf";
 
   deps = [
     gcc.cc
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 8311ac46654..26ed355da39 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchsvn, writeScript, ocaml, camlp5 }:
+{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }:
 
 let
   start_script = ''
@@ -8,14 +8,14 @@ let
   '';
 in
 
-stdenv.mkDerivation rec {
-  name     = "hol_light-${version}";
-  version  = "244";
+stdenv.mkDerivation {
+  name     = "hol_light-2015-11-02";
 
-  src = fetchsvn {
-    url = http://hol-light.googlecode.com/svn/trunk;
-    rev = version;
-    sha256 = "1qzb48j7zbx7c327ixmvq2k0ap7y6fqvwal0195chfxvhs858lfq";
+  src = fetchFromGitHub {
+    owner  = "jrh13";
+    repo   = "hol-light";
+    rev    = "10265313397476ddff4ce13e7bbb588025e7272c";
+    sha256 = "17b6a7vk9fhppl0h366y7pw6a9sknq1a8gxqg67dzqpb47vda1n0";
   };
 
   buildInputs = [ ocaml camlp5 ];
diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0f13faf7513..79bfef08bb5 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "R-3.2.1";
+  name = "R-3.2.2";
 
   src = fetchurl {
     url = "http://cran.r-project.org/src/base/R-3/${name}.tar.gz";
-    sha256 = "d59dbc3f04f4604a5cf0fb210b8ea703ef2438b3ee65fd5ab536ec5234f4c982";
+    sha256 = "07a6s865bjnh7w0fqsrkv1pva76w99v86w0w787qpdil87km54cw";
   };
 
   buildInputs = [ bzip2 gfortran libX11 libXmu libXt
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     which jdk openblas
   ];
 
-  patches = [ ./no-usr-local-search-paths.patch ];
+  patches = [ ./no-usr-local-search-paths.patch
+              ./fix-tests-without-recommended-packages.patch ];
 
   preConfigure = ''
     configureFlagsArray=(
diff --git a/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch b/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch
new file mode 100644
index 00000000000..c736c7098a3
--- /dev/null
+++ b/pkgs/applications/science/math/R/fix-tests-without-recommended-packages.patch
@@ -0,0 +1,24 @@
+diff -Naur R-3.2.2-upstream/tests/reg-packages.R R-3.2.2/tests/reg-packages.R
+--- R-3.2.2-upstream/tests/reg-packages.R	2015-08-05 17:45:05.000000000 -0430
++++ R-3.2.2/tests/reg-packages.R	2015-10-01 02:11:05.484992903 -0430
+@@ -82,7 +82,8 @@
+ ## pkgB tests an empty R directory
+ dir.create(file.path(pkgPath, "pkgB", "R"), recursive = TRUE,
+ 	   showWarnings = FALSE)
+-p.lis <- if("Matrix" %in% row.names(installed.packages(.Library)))
++matrixIsInstalled <- "Matrix" %in% row.names(installed.packages(.Library))
++p.lis <- if(matrixIsInstalled)
+ 	     c("pkgA", "pkgB", "exNSS4") else "exNSS4"
+ for(p. in p.lis) {
+     cat("building package", p., "...\n")
+@@ -111,8 +112,8 @@
+   tools::assertError(is.null(pkgA:::nilData))
+ }
+ 
+-if(dir.exists(file.path("myLib", "exNSS4"))) {
+-    for(ns in c("pkgB", "pkgA", "Matrix", "exNSS4")) unloadNamespace(ns)
++if(matrixIsInstalled && dir.exists(file.path("myLib", "exNSS4"))) {
++    for(ns in c(rev(p.lis), "Matrix")) unloadNamespace(ns)
+     ## Both exNSS4 and Matrix define "atomicVector" *the same*,
+     ## but  'exNSS4'  has it extended - and hence *both* are registered in cache -> "conflicts"
+     requireNamespace("exNSS4", lib= "myLib")
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index b8f4dbd7717..631555234ce 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
-, qt4, xapian, file, python
-, djvulibre, groff, libxslt, unzip, xpdf, antiword, catdoc, lyx
+, qt4, xapian, file, python, perl
+, djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
 , libwpd, unrtf, untex
 , ghostscript, gawk, gnugrep, gnused, gnutar, gzip, libiconv }:
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
       substituteInPlace  $f --replace iconv         ${libiconv.bin}/bin/iconv
       substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
-      substituteInPlace  $f --replace pdftotext     ${xpdf}/bin/pdftotext
+      substituteInPlace  $f --replace pdftotext     ${poppler_utils}/bin/pdftotext
       substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 
       substituteInPlace  $f --replace sed           ${gnused}/bin/sed
       substituteInPlace  $f --replace tar           ${gnutar}/bin/tar
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace unrtf         ${unrtf}/bin/unrtf
       substituteInPlace  $f --replace untex         ${untex}/bin/untex
       substituteInPlace  $f --replace wpd2html      ${libwpd}/bin/wpd2html
+      substituteInPlace  $f --replace /usr/bin/perl ${perl}/bin/perl
     done
   '';
 
diff --git a/pkgs/applications/taxes/aangifte-2013-wa/default.nix b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
new file mode 100644
index 00000000000..5ee0edb4b5e
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2013-wa/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2013-wa";
+
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2013_linux.tar.gz;
+    sha256 = "1bx6qnxikzpzrn8r66qxcind3k9yznwgp05dm549ph0w4rjbhgc9";
+  };
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -prvd * $out/
+      wrapProgram $out/bin/wa2013ux --prefix PATH : ${xdg_utils}/bin \
+                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
+    '';
+
+  meta = {
+    description = "Elektronische aangifte WA 2013 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2013_linux;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/applications/taxes/aangifte-2014-wa/default.nix b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
new file mode 100644
index 00000000000..78bb8214257
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2014-wa/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2014-wa";
+
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/wa2014_linux.tar.gz;
+    sha256 = "0ckwk190vyvwgv8kq0xxsxvm1kniv3iip4l5aycjx1wcyic2289x";
+  };
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -prvd * $out/
+      wrapProgram $out/bin/wa2014ux --prefix PATH : ${xdg_utils}/bin \
+                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
+    '';
+
+  meta = {
+    description = "Elektronische aangifte WA 2014 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/applications/taxes/aangifte-2014/default.nix b/pkgs/applications/taxes/aangifte-2014/default.nix
new file mode 100644
index 00000000000..0151cca52b2
--- /dev/null
+++ b/pkgs/applications/taxes/aangifte-2014/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, xdg_utils, libX11, libXext, libSM }:
+
+stdenv.mkDerivation {
+  name = "aangifte2014-1";
+
+  src = fetchurl {
+    url = http://download.belastingdienst.nl/belastingdienst/apps/linux/ib2014_linux.tar.gz;
+    sha256 = "1lkpfn9ban122hw27vvscdlg3933i2lqcdhp7lk26f894jbwzq3j";
+  };
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  buildInputs = [ makeWrapper ];
+
+  buildPhase =
+    ''
+      for i in bin/*; do
+          patchelf \
+              --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+              --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-cc)/lib \
+              $i
+      done
+    '';
+
+  installPhase =
+    ''
+      mkdir -p $out
+      cp -prvd * $out/
+      wrapProgram $out/bin/ib2014ux --prefix PATH : ${xdg_utils}/bin \
+                                    --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-cc)/lib/libgcc_s.so.1
+    '';
+
+  meta = {
+    description = "Elektronische aangifte IB 2014 (Dutch Tax Return Program)";
+    url = http://www.belastingdienst.nl/wps/wcm/connect/bldcontentnl/themaoverstijgend/programmas_en_formulieren/aangifteprogramma_2014_linux;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    hydraPlatforms = [];
+  };
+}
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 6a365dc69a5..6d832f9778f 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -71,6 +71,8 @@ rec {
 
   tig = callPackage ./tig { };
 
+  transcrypt = callPackage ./transcrypt { };
+
   hub = import ./hub {
     inherit go;
     inherit stdenv fetchgit;
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index c13c5e07001..c0acb13740a 100644
--- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     make install PREFIX=$out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.agwa.name/projects/git-crypt";
     description = "transparent file encryption in git";
     longDescription = ''
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
       entire repository.
     '';
     downloadPage = "https://github.com/AGWA/git-crypt/releases";
-    license = stdenv.lib.licenses.gpl3;
+    license = licenses.gpl3;
     version = "0.5.0";
-    maintainers = [ "Desmond O. Chang <dochang@gmail.com>" ];
+    maintainers = [ maintainers.dochang ];
   };
 
 }
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 0710e38c941..0f079314959 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.5.3";
+  version = "2.6.3";
   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 = "06is8pq8gsia3dav8mgl2zlvms2ny4hs1x0w2792ya51azc2jk8j";
+    sha256 = "18vxb5fmwmrps504m23a4xdl29m7ibca3hmz0mn9jc38sz9y95yn";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/git-and-tools/tig/default.nix b/pkgs/applications/version-management/git-and-tools/tig/default.nix
index 4c8430ed5c5..362897d0e72 100644
--- a/pkgs/applications/version-management/git-and-tools/tig/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45
-, readline, makeWrapper, git
+, readline, makeWrapper, git, libiconv
 }:
 
 stdenv.mkDerivation rec {
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0bw5wivswwh7vx897q8xc2cqgkqhdzk8gh6fnav2kf34sngigiah";
   };
 
-  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ];
+  buildInputs = [ ncurses asciidoc xmlto docbook_xsl readline git makeWrapper ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 
   preConfigure = ''
     export XML_CATALOG_FILES='${docbook_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml'
diff --git a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
new file mode 100644
index 00000000000..2f42705c2b8
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, git, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "transcrypt-0.9.7";
+
+  src = fetchurl {
+    url = https://github.com/elasticdog/transcrypt/archive/v0.9.7.tar.gz;
+    sha256 = "0pgrf74wdc7whvwz7lkkq6qfk38n37dc5668baq7czgckibvjqdh";
+  };
+
+  buildInputs = [ git openssl ];
+
+  installPhase = ''
+    install -m 755 -D transcrypt $out/bin/transcrypt
+    install -m 644 -D man/transcrypt.1 $out/share/man/man1/transcrypt.1
+    install -m 644 -D contrib/bash/transcrypt $out/share/bash-completion/completions/transcrypt
+    install -m 644 -D contrib/zsh/_transcrypt $out/share/zsh/site-functions/_transcrypt
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Transparently encrypt files within a Git repository";
+    longDescription = ''
+      A script to configure transparent encryption of sensitive files stored in
+      a Git repository. Files that you choose will be automatically encrypted
+      when you commit them, and automatically decrypted when you check them
+      out. The process will degrade gracefully, so even people without your
+      encryption password can safely commit changes to the repository's
+      non-encrypted files.
+    '';
+    homepage = https://github.com/elasticdog/transcrypt;
+    license = licenses.mit;
+    maintainers = [ maintainers.elasticdog ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 5a44240fa76..0557b8a2c55 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
 , guiSupport ? false, tk ? null, hg-crecord ? null, curses
-, ApplicationServices }:
+, ApplicationServices, cf-private }:
 
 let
   version = "3.5.1";
@@ -20,7 +20,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ python makeWrapper docutils unzip ];
 
-  propagatedBuildInputs = stdenv.lib.optional stdenv.isDarwin ApplicationServices;
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin
+    [ ApplicationServices cf-private ];
 
   makeFlags = "PREFIX=$(out)";
 
diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
new file mode 100644
index 00000000000..f00e22bb385
--- /dev/null
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchdarcs, ocaml, findlib, cryptokit, yojson, lmdb, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "pijul-${version}";
+  version = "0.1";
+
+  src = fetchdarcs {
+    url = "http://pijul.org/";
+    rev = version;
+    sha256 = "0r189xx900w4smq6nyy1wnrjf9sgqrqw5as0l7k6gq0ra36szzff";
+  };
+
+  buildInputs = [ ocaml findlib cryptokit yojson lmdb zlib ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp pijul $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://pijul.org/;
+    description = "Fast DVCS based on a categorical theory of patches";
+    license = licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ puffnfresh ];
+  };
+}
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 3b48a447f6f..e2aaf30d0c3 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.5.6";
+  name = "avidemux-2.6.9";
 
   src = fetchurl {
-    url = mirror://sourceforge/avidemux/avidemux_2.5.6.tar.gz;
-    sha256 = "12wvxz0n2g85f079d8mdkkp2zm279d34m9v7qgcqndh48cn7znnn";
+    url = mirror://sourceforge/avidemux/avidemux_2.6.9.tar.gz;
+    sha256 = "01jhgricd7m9hdhr22yrdjfrnl41zccm2yxw7gfb02mwcswvswy0";
   };
 
   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];
+    maintainers = with stdenv.lib.maintainers; [ viric jagajaga ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index f681c7e04b8..5bd2087b345 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ffmpeg, makeDesktopItem, qt4 }:
 
-let version = "3.5.1"; in
+let version = "3.5.4"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
 
   src = fetchurl {
-    sha256 = "16hm7zv0yhxj7gdd8q462jcxy0jk6hicsk1mkhmarwrhifwsy4g9";
-    # The .tar.bz2 "Download" link is a binary blob, the source is .tar.gz!
+    sha256 = "1zvicmxnkldqnfri8y0q0vx6f5whsc7jc9jcsfzhpw47w92qvx5r";
+    # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "http://download.clipgrab.de/${name}.tar.gz";
   };
 
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 5bdb0bab934..792cb67f812 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -43,11 +43,11 @@ let
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "15.1";
+    version = "15.2";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "0187qxzyq4nhzbcwbhi71j4bl5k7pwjryhklil90gy5ziw6n3ckj";
+      sha256 = "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx";
     };
 
     buildInputs = [
@@ -107,6 +107,7 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
               [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump ]
             }"
+          --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \
       done
     '';
 
diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index f41d0e839ac..ed2fb0ac886 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -59,13 +59,13 @@ in
 
     plugin = "genesis";
     namespace = "plugin.video.genesis";
-    version = "4.0.1";
+    version = "5.1.3";
 
     src = fetchFromGitHub {
       owner = "lambda81";
       repo = "lambda-addons";
-      rev = "34af083980598177684eeb6e1e73da336b84575a";
-      sha256 = "1fh3j4ymkrx9flpvnlyjp1q4avfmjv5a6yfwl3cmqnslkkp6kn9n";
+      rev = "f2cd04f33af88d60e1330573bbf2ef9cee7f0a56";
+      sha256 = "0z0ldckqqif9v5nhnjr5n2495cm3z9grjmrh7czl4xlnq4bvviqq";
     };
 
     meta = with stdenv.lib; {
@@ -81,13 +81,13 @@ in
 
     plugin = "svtplay";
     namespace = "plugin.video.svtplay";
-    version = "4.0.14";
+    version = "4.0.15";
 
     src = fetchFromGitHub {
       owner = "nilzen";
       repo = "xbmc-" + plugin;
-      rev = "a6041aa6cf8f8461c0ebb093d901320822539094";
-      sha256 = "1nxa2855i1if4vsflhb88i9s12flp2yzgan2wzdv2117cmll4pvd";
+      rev = "3b926898b7007827b469ecb1c27ede4238fd26f6";
+      sha256 = "1bx2c3z8rbkk75hykpmls956hfkwvsm4d8gvlrh53s8zimlwgv7k";
     };
 
     meta = with stdenv.lib; {
@@ -105,4 +105,4 @@ in
 
   };
 
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 040f74c16ff..b65dfe921c4 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -4,17 +4,17 @@
 
 stdenv.mkDerivation rec {
   name = "makemkv-${ver}";
-  ver = "1.9.5";
+  ver = "1.9.7";
   builder = ./builder.sh;
 
   src_bin = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz";
-    sha256 = "1qzkdrij89s748rvmibx083g1irfm8dqx257skr45i2gsg2qqijp";
+    sha256 = "1b1kdfs89ms2vyi4406ydw01py0mvvij01rx9anblgy10bc0yvfy";
   };
 
   src_oss = fetchurl {
     url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz";
-    sha256 = "1immnlx1rld8iw89fxgq2sk2l050sa8h046ka8mdwg8682d75lfg";
+    sha256 = "169fl1v3i133ihldyfq3akj3x30qsxndw7q52vv90gmn5r52bzb9";
   };
 
   buildInputs = [openssl qt4 mesa zlib pkgconfig libav];
diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
new file mode 100644
index 00000000000..c029e90f49c
--- /dev/null
+++ b/pkgs/applications/video/mkcast/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz
+, xdpyinfo, makeWrapper, gtk, xorg, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "mkcast-2015-03-13";
+
+  src = fetchFromGitHub {
+    owner = "KeyboardFire";
+    repo = "mkcast";
+    rev = "cac22cb6c6f8ec2006339698af5e9199331759e0";
+    sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p";
+  };
+
+  buildInputs = with pythonPackages; [ makeWrapper pygtk gtk xlib ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    for f in $out/bin/*; do #*/
+      wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin"
+    done
+
+    rm -r screenkey/.bzr
+    cp -R screenkey $out/bin
+
+    wrapProgram $out/bin/screenkey/screenkey \
+      --prefix PATH : "${xorg.xmodmap}/bin"\
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid";
+    homepage = https://github.com/KeyboardFire/mkcast;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ iElectric pSub ];
+  };
+}
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index e3f586a3a0f..ed02850730c 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -6,6 +6,7 @@
 , legacyGUI ? true, wxGTK ? null
 # For now both qt5 and wxwidgets gui's are enabled, if wxwidgets is disabled the
 # build system doesn't install desktop entries, icons, etc...
+, libiconv
 }:
 
 let
@@ -51,7 +52,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     boost expat file flac libebml libmatroska libogg libvorbis xdg_utils zlib
-  ] ++ optional withGUI qt5
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]
+    ++ optional withGUI qt5
     ++ optional legacyGUI wxGTK;
 
   enableParallelBuilding = true;
@@ -69,6 +71,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.bunkus.org/videotools/mkvtoolnix/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ codyopel fuuzetsu ];
-    platforms = platforms.unix;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 5ac70413d16..96f0c2f38f9 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -23,10 +23,6 @@
 , vaapiSupport ? false, libva ? null
 }:
 
-# TODO: Wayland support
-# TODO: investigate caca support
-# TODO: investigate lua5_sockets bug
-
 assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
 assert xineramaSupport -> (libXinerama != null && x11Support);
 assert xvSupport -> (libXv != null && x11Support);
@@ -51,19 +47,21 @@ let
 
   # Purity: Waf is normally downloaded by bootstrap.py, but
   # for purity reasons this behavior should be avoided.
+  wafVersion = "1.8.12";
   waf = fetchurl {
-    url = http://ftp.waf.io/pub/release/waf-1.8.5;
-    sha256 = "0gh266076pd9fzwkycskyd3kkv2kds9613blpxmn9w4glkiwmmh5";
+    urls = [ "http://ftp.waf.io/pub/release/waf-${wafVersion}"
+             "http://waf.io/waf-${wafVersion}" ];
+    sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1";
   };
 in
 
 stdenv.mkDerivation rec {
-  name = "mpv-${version}";
-  version = "0.9.2";
+
+  name = "mpv-${meta.version}";
 
   src = fetchurl {
-    url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "0la7pmy75mq92kcrawdiw5idw6a46z7d15mlkgs0axyivdaqy560";
+    url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz";
+    sha256 = "1i3cinyjg1k7rp93cgf641zi8j98hl6qd6al9ws51n29qx22096z";
   };
 
   patchPhase = ''
@@ -127,6 +125,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.12.0";
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;
@@ -140,3 +139,6 @@ stdenv.mkDerivation rec {
     '';
   };
 }
+# TODO: Wayland support
+# TODO: investigate caca support
+# TODO: investigate lua5_sockets bug
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index b231aad07cc..79661ca1f30 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -17,11 +17,11 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "https://github.com/jp9000/obs-studio/archive/${version}.tar.gz";
-    sha256 = "12g1y6y8ixvgvwk75x7qgq0j06d5khd0w3if6kahswlc58q65fm8";
+    sha256 = "0nkfzy9wzsy7y0r02vc0648gx2aa6f7ibahrv89hxqr4x6x8d7di";
   };
 
   buildInputs = [ cmake
diff --git a/pkgs/applications/video/popcorntime/default.nix b/pkgs/applications/video/popcorntime/default.nix
index 41d8b5a577d..e74c8e9a5a8 100644
--- a/pkgs/applications/video/popcorntime/default.nix
+++ b/pkgs/applications/video/popcorntime/default.nix
@@ -44,6 +44,7 @@ in
       license = stdenv.lib.licenses.gpl3;
       platforms = platforms.linux;
       maintainers = with maintainers; [ bobvanderlinden ];
+      broken = true;  # popcorntime.io is dead
     };
   }
   ''
diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix
index 4517f27ce7d..d4221e8f57e 100644
--- a/pkgs/applications/video/qarte/default.nix
+++ b/pkgs/applications/video/qarte/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "qarte-2.3.0";
+  name = "qarte-2.4.0";
   src = fetchbzr {
     url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;
-    rev = "148";
-    sha256 = "0bp2qbl2g3dygmb31lwlarki9lybkb9zxixda4lwrlz628w93fxh";
+    rev = "150";
+    sha256 = "0fj11jx9l5qi968c906rrksdic7w4yj414m47k6axlb4v6ghdnar";
   };
 
   buildInputs = [ makeWrapper ];
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 67c60a05ee9..37583648a74 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -6,7 +6,7 @@
 , mpeg2dec, udev, gnutls, avahi, libcddb, libjack2, SDL, SDL_image
 , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz
 , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus
-, libvdpau, libsamplerate
+, libvdpau, libsamplerate, live555
 , onlyLibVLC ? false
 , qt4 ? null
 , withQt5 ? false, qtbase ? null
@@ -36,13 +36,15 @@ stdenv.mkDerivation rec {
       udev gnutls avahi libcddb SDL SDL_image libmtp unzip taglib
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xorg.xlibsWrapper xorg.libXv xorg.libXvMC xorg.libXpm xorg.xcbutilkeysyms
-      libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate
+      libdc1394 libraw1394 libopus libebml libmatroska libvdpau libsamplerate live555
     ]
     ++ [(if withQt5 then qtbase else qt4)]
     ++ optional jackSupport libjack2;
 
   nativeBuildInputs = [ pkgconfig ];
 
+  LIVE555_PREFIX = live555;
+
   configureFlags =
     [ "--enable-alsa"
       "--with-kde-solid=$out/share/apps/solid/actions"
diff --git a/pkgs/applications/virtualization/nova/client.nix b/pkgs/applications/virtualization/nova/client.nix
deleted file mode 100644
index bcc72d19bb3..00000000000
--- a/pkgs/applications/virtualization/nova/client.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, pythonPackages }:
-
-pythonPackages.buildPythonPackage rec {
-  name = "novaclient-2012.1";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "http://pypi.python.org/packages/source/p/python-novaclient/python-${name}.tar.gz";
-    md5 = "8f53a308e08b2af4645281917be77ffc";
-  };
-
-  pythonPath = [ pythonPackages.prettytable pythonPackages.argparse pythonPackages.httplib2 ];
-
-  buildInputs = [ pythonPackages.mock pythonPackages.nose ];
-
-  meta = {
-    homepage = https://github.com/rackspace/python-novaclient;
-    description = "Client library and command line tool for the OpenStack Nova API";
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/virtualization/nova/convert.patch b/pkgs/applications/virtualization/nova/convert.patch
deleted file mode 100644
index f11c9a7fc4f..00000000000
--- a/pkgs/applications/virtualization/nova/convert.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' nova-2011.2-orig//bin/nova-manage nova-2011.2//bin/nova-manage
---- nova-2011.2-orig//bin/nova-manage	2011-04-15 04:57:52.000000000 +0200
-+++ nova-2011.2//bin/nova-manage	2011-06-09 18:28:39.063299654 +0200
-@@ -1009,7 +1009,7 @@
-         if (FLAGS.image_service == 'nova.image.local.LocalImageService'
-             and directory == os.path.abspath(FLAGS.images_path)):
-             new_dir = "%s_bak" % directory
--            os.move(directory, new_dir)
-+            os.rename(directory, new_dir)
-             os.mkdir(directory)
-             directory = new_dir
-         for fn in glob.glob("%s/*/info.json" % directory):
diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix
deleted file mode 100644
index 45e15de9880..00000000000
--- a/pkgs/applications/virtualization/nova/default.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl, novaclient }:
-
-with stdenv.lib;
-
-let version = "2011.2"; in
-
-stdenv.mkDerivation rec {
-  name = "nova-${version}";
-
-  src = fetchurl {
-    url = "http://launchpad.net/nova/cactus/${version}/+download/nova-${version}.tar.gz";
-    sha256 = "1s2w0rm332y9x34ngjz8sys9sbldg857rx9d6r3nb1ik979fx8p7";
-  };
-
-  patches =
-    [ ./convert.patch ];
-
-  pythonPath = with pythonPackages;
-    [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      paste_deploy m2crypto ipy twisted sqlalchemy_migrate
-      distutils_extra simplejson readline glance cheetah lockfile httplib2
-      # !!! should libvirt be a build-time dependency?  Note that
-      # libxml2Python is a dependency of libvirt.py.
-      libvirt libxml2Python
-      novaclient
-    ];
-
-  buildInputs =
-    [ pythonPackages.python
-      pythonPackages.wrapPython
-      pythonPackages.mox
-      intltool
-    ] ++ pythonPath;
-
-  PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
-
-  preConfigure =
-    ''
-      # Set the built-in state location to something sensible.
-      sed -i nova/flags.py \
-        -e "/DEFINE.*'state_path'/ s|../|/var/lib/nova|"
-
-      substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl.bin}/bin/curl
-
-      substituteInPlace nova/api/ec2/cloud.py \
-        --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh
-    '';
-
-  buildPhase = "python setup.py build";
-
-  installPhase =
-    ''
-      p=$(toPythonPath $out)
-      export PYTHONPATH=$p:$PYTHONPATH
-      mkdir -p $p
-      python setup.py install --prefix=$out
-
-      # Nova doesn't like to be called ".nova-foo-wrapped" because it
-      # computes some stuff from its own argv[0].  So put the wrapped
-      # programs in $out/libexec under their original names.
-      mkdir -p $out/libexec/nova
-
-      wrapProgram() {
-          local prog="$1"
-          local hidden=$out/libexec/nova/$(basename "$prog")
-          mv $prog $hidden
-          makeWrapper $hidden $prog "$@"
-      }
-
-      wrapPythonPrograms
-
-      cp -prvd etc $out/etc
-
-      # Nova makes some weird assumptions about where to find its own
-      # programs relative to the Python directory.
-      ln -sfn $out/bin $out/lib/${pythonPackages.python.libPrefix}/site-packages/bin
-
-      # Install the certificate generation script.
-      cp nova/CA/genrootca.sh $out/libexec/nova/
-      cp nova/CA/openssl.cnf.tmpl $out/libexec/nova/
-
-      # Allow nova-manage etc. to find the proper configuration file.
-      ln -s /etc/nova/nova.conf $out/libexec/nova/nova.conf
-    '';
-
-  doCheck = false; # !!! fix
-
-  checkPhase = "python setup.py test";
-
-  meta = {
-    homepage = http://nova.openstack.org/;
-    description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller";
-    broken = true;
-  };
-}
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
new file mode 100644
index 00000000000..0ae461bcca9
--- /dev/null
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@@ -0,0 +1,69 @@
+
+{ stdenv, fetchurl, pythonPackages, sqlite, which, strace }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "glance-${version}";
+  version = "11.0.0";
+  namePrefix = "";
+
+  PBR_VERSION = "${version}";
+
+  src = fetchurl {
+    url = "https://github.com/openstack/glance/archive/${version}.tar.gz";
+    sha256 = "05rz1lmzdmpnw8sf87vvi0l6q9g6s840z934zyinw17yfcvmqrdg";
+  };
+
+  # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
+  propagatedBuildInputs = with pythonPackages; [
+     pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
+     httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
+     jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
+     WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile
+
+     # oslo componenets
+     oslo-config oslo-context oslo-concurrency oslo-service oslo-utils oslo-db
+     oslo-i18n oslo-log oslo-messaging oslo-middleware oslo-policy oslo-serialization
+  ];
+
+  buildInputs = with pythonPackages; [
+    Babel coverage fixtures mox3 mock oslosphinx requests2 testrepository pep8
+    testresources testscenarios testtools psutil_1 oslotest psycopg2 MySQL_python
+    sqlite which strace
+  ];
+
+  patchPhase = ''
+    # it's not a test, but a class mixin
+    sed -i 's/ImageCacheTestCase/ImageCacheMixin/' glance/tests/unit/test_image_cache.py
+
+    # these require network access, see https://bugs.launchpad.net/glance/+bug/1508868
+    sed -i 's/test_get_image_data_http/noop/' glance/tests/unit/common/scripts/test_scripts_utils.py
+    sed -i 's/test_set_image_data_http/noop/' glance/tests/unit/common/scripts/image_import/test_main.py
+    sed -i 's/test_create_image_with_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py
+    sed -i 's/test_upload_image_http_nonexistent_location_url/noop/' glance/tests/unit/v1/test_api.py
+
+    # TODO: couldn't figure out why this test is failing
+    sed -i 's/test_all_task_api/noop/' glance/tests/integration/v2/test_tasks_api.py
+  '';
+
+  postInstall = ''
+    # check all binaries don't crash
+    for i in $out/bin/*; do
+      case "$i" in
+      *glance-artifacts) # https://bugs.launchpad.net/glance/+bug/1508879
+          :
+          ;;
+      *)
+          $i --help
+      esac
+    done
+
+    cp etc/*-paste.ini $out/etc/
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://glance.openstack.org/;
+    description = "Services for discovering, registering, and retrieving virtual machine images";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
new file mode 100644
index 00000000000..3060dcb04cb
--- /dev/null
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -0,0 +1,55 @@
+{ stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "keystone-${version}";
+  version = "8.0.0";
+  namePrefix = "";
+
+  PBR_VERSION = "${version}";
+
+  src = fetchurl {
+    url = "https://github.com/openstack/keystone/archive/${version}.tar.gz";
+    sha256 = "1xbrs7xgwjzrs07zyxxcl2lq18dh582gd6lx1zzzji8c0qmffy0z";
+  };
+
+  # remove on next version bump
+  patches = [ ./remove-oslo-policy-tests.patch ];
+
+  # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
+  propagatedBuildInputs = with pythonPackages; [
+    pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
+    sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached
+    keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
+    xmlsec MySQL_python
+
+    # oslo
+    oslo-cache oslo-concurrency oslo-config oslo-context oslo-messaging oslo-db
+    oslo-i18n oslo-log oslo-middleware oslo-policy oslo-serialization oslo-service
+    oslo-utils
+  ];
+
+  buildInputs = with pythonPackages; [
+    coverage fixtures mock subunit tempest-lib testtools testrepository
+    ldap ldappool webtest requests2 oslotest pep8 pymongo which
+  ];
+
+  makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"];
+
+  postInstall = ''
+    # install .ini files
+    mkdir -p $out/etc
+    cp etc/* $out/etc
+
+    # check all binaries don't crash
+    for i in $out/bin/*; do
+      $i --help
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://keystone.openstack.org/;
+    description = "Authentication, authorization and service discovery mechanisms via HTTP";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
new file mode 100644
index 00000000000..ce3e71b16ee
--- /dev/null
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@@ -0,0 +1,65 @@
+
+{ stdenv, fetchurl, pythonPackages, xmlsec, which }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "neutron-${version}";
+  version = "7.0.0";
+  namePrefix = "";
+
+  PBR_VERSION = "${version}";
+
+  src = fetchurl {
+    url = "https://github.com/openstack/neutron/archive/${version}.tar.gz";
+    sha256 = "02ll081xly7zfjmgkal81fy3aplbnn5zgx8xfy3yy1nv3kfnyi40";
+  };
+
+  # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
+  propagatedBuildInputs = with pythonPackages; [
+   pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
+   jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six
+   stevedore pecan ryu networking-hyperv MySQL_python
+
+   # clients
+   keystoneclient neutronclient novaclient
+
+   # oslo components
+   oslo-concurrency oslo-config oslo-context oslo-db oslo-i18n oslo-log oslo-messaging
+   oslo-middleware oslo-policy oslo-rootwrap oslo-serialization oslo-service oslo-utils
+   oslo-versionedobjects
+  ];
+
+  # make sure we include migrations
+  patchPhase = ''
+    echo "graft neutron" >> MANIFEST.in
+  '';
+
+  buildInputs = with pythonPackages; [
+    cliff coverage fixtures mock subunit requests-mock oslosphinx testrepository
+    testtools testresources testscenarios webtest oslotest os-testr tempest-lib
+    ddt pep8
+  ];
+
+  postInstall = ''
+    # requires extra optional dependencies
+    # TODO: package networking_mlnx, networking_vsphere, bsnstacklib, XenAPI
+    rm $out/bin/{neutron-mlnx-agent,neutron-ovsvapp-agent,neutron-restproxy-agent,neutron-rootwrap-xen-dom0}
+
+    # check all binaries don't crash
+    for i in $out/bin/*; do
+      case "$i" in
+      *neutron-pd-notify|*neutron-rootwrap-daemon|*neutron-rootwrap)
+        :
+        ;;
+      *)
+         $i --help
+      esac
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://neutron.openstack.org/;
+    description = "Virtual network service for Openstack";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
new file mode 100644
index 00000000000..ee139868ba0
--- /dev/null
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@@ -0,0 +1,68 @@
+{ stdenv, fetchurl, pythonPackages, openssl, openssh }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "nova-${version}";
+  version = "12.0.0";
+  namePrefix = "";
+
+  PBR_VERSION = "${version}";
+
+  src = fetchurl {
+    url = "https://github.com/openstack/nova/archive/${version}.tar.gz";
+    sha256 = "175n1znvmy8f5vqvabc2fa4qy8y17685z4gzpq8984mdsdnpv21w";
+  };
+
+  # otherwise migrate.cfg is not installed
+  patchPhase = ''
+    echo "graft nova" >> MANIFEST.in
+  '';
+
+  # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
+  propagatedBuildInputs = with pythonPackages; [
+    pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography
+    webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
+    netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
+    stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
+    keystonemiddleware MySQL_python
+
+    # oslo components
+    oslo-rootwrap oslo-reports oslo-utils oslo-i18n oslo-config oslo-context
+    oslo-log oslo-serialization oslo-middleware oslo-db oslo-service oslo-messaging
+    oslo-concurrency oslo-versionedobjects
+
+    # clients
+    cinderclient neutronclient glanceclient
+  ];
+
+  buildInputs = with pythonPackages; [
+    coverage fixtures mock mox3 subunit requests-mock pillow oslosphinx
+    oslotest testrepository testresources testtools tempest-lib bandit
+    oslo-vmware pep8 barbicanclient ironicclient openssl openssh
+  ];
+
+  postInstall = ''
+    cp -prvd etc $out/etc
+
+    # check all binaries don't crash
+    for i in $out/bin/*; do
+      case "$i" in
+      *nova-dhcpbridge*)
+         :
+         ;;
+      *nova-rootwrap*)
+         :
+         ;;
+      *)
+         $i --help
+         ;;
+      esac
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://nova.openstack.org/;
+    description = "OpenStack Compute (a.k.a. Nova), a cloud computing fabric controller";
+    license = stdenv.lib.licenses.asl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch
new file mode 100644
index 00000000000..3cdc27a2d2a
--- /dev/null
+++ b/pkgs/applications/virtualization/openstack/remove-oslo-policy-tests.patch
@@ -0,0 +1,61 @@
+From 6016d017004acaae288312b196ef07ea98e9962d Mon Sep 17 00:00:00 2001
+From: Brant Knudson <bknudson@us.ibm.com>
+Date: Mon, 12 Oct 2015 15:12:45 -0500
+Subject: [PATCH] Remove oslo.policy implementation tests from keystone
+
+oslo.policy 0.12.0 contains a change to use requests to do the http
+check rather than urllib. This change caused keystone tests to fail
+because the keystone tests were mocking urllib, making assumptions
+about how oslo.policy is implemented. Keystone doesn't need to test
+internal features of oslo.policy, so these tests are removed.
+
+Change-Id: I9d6e4950b9fe75cbb94100c8effdcec002642027
+Closes-Bug: 1505374
+---
+ keystone/tests/unit/test_policy.py | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/keystone/tests/unit/test_policy.py b/keystone/tests/unit/test_policy.py
+index b2f0e52..686e2b7 100644
+--- a/keystone/tests/unit/test_policy.py
++++ b/keystone/tests/unit/test_policy.py
+@@ -16,10 +16,8 @@
+ import json
+ import os
+ 
+-import mock
+ from oslo_policy import policy as common_policy
+ import six
+-from six.moves.urllib import request as urlrequest
+ from testtools import matchers
+ 
+ from keystone import exception
+@@ -118,28 +116,6 @@ def test_enforce_good_action(self):
+         action = "example:allowed"
+         rules.enforce(self.credentials, action, self.target)
+ 
+-    def test_enforce_http_true(self):
+-
+-        def fakeurlopen(url, post_data):
+-            return six.StringIO("True")
+-
+-        action = "example:get_http"
+-        target = {}
+-        with mock.patch.object(urlrequest, 'urlopen', fakeurlopen):
+-            result = rules.enforce(self.credentials, action, target)
+-        self.assertTrue(result)
+-
+-    def test_enforce_http_false(self):
+-
+-        def fakeurlopen(url, post_data):
+-            return six.StringIO("False")
+-
+-        action = "example:get_http"
+-        target = {}
+-        with mock.patch.object(urlrequest, 'urlopen', fakeurlopen):
+-            self.assertRaises(exception.ForbiddenAction, rules.enforce,
+-                              self.credentials, action, target)
+-
+     def test_templatized_enforcement(self):
+         target_mine = {'project_id': 'fake'}
+         target_not_mine = {'project_id': 'another'}
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 1bedb404a2a..13cb7df3479 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -11,7 +11,7 @@
 
 with stdenv.lib;
 let
-  version = "2.4.0";
+  version = "2.4.1";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "0836gqv5zcl0xswwjcns3mlkn18lyz2fiq8rl1ihcm6cpf8vkc3j";
+    sha256 = "0xx1wc7lj5m3r2ab7f0axlfknszvbd8rlclpqz4jk48zid6czmg3";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 1d03eece46c..790afe75645 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,47 +2,53 @@
 , fetchurl, fetchFromGitHub }:
 
 let
-  coreosImageRelease = "738.1.0";
+  coreosImageRelease = "794.1.0";
+  coreosImageSystemdVersion = "222";
+  stage1Flavour = "coreos";
 
 in stdenv.mkDerivation rec {
-  version = "0.8.0";
+  version = "0.10.0";
   name = "rkt-${version}";
+  BUILDDIR="build-${name}";
 
   src = fetchFromGitHub {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0";
+      sha256 = "1d9n00wkzib4v5mfl46f2mqc8zfpv33kqixifmv8p4azqv78cbxn";
   };
 
-  stage1image = fetchurl {
+  stage1BaseImage = fetchurl {
     url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "1rnb9rwms5g7f142d9yh169a5k2hxiximpgk4y4kqmc1294lqnl0";
+    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
   buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
 
   preConfigure = ''
     ./autogen.sh
+    configureFlagsArray=(
+      --with-stage1=${stage1Flavour}
+      --with-stage1-image-path=$out/stage1-${stage1Flavour}.aci
+      --with-coreos-local-pxe-image-path=${stage1BaseImage}
+      --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion}
+    );
   '';
 
   preBuild = ''
-    # hack to avoid downloading image during build, this has been
-    # improved in rkt master
-    mkdir -p build-rkt-0.8.0/tmp/usr_from_coreos
-    cp -v ${stage1image} build-rkt-0.8.0/tmp/usr_from_coreos/pxe.img
+    export BUILDDIR
   '';
 
   installPhase = ''
     mkdir -p $out/bin
-    cp -Rv build-rkt-${version}/bin/* $out/bin
+    cp -Rv $BUILDDIR/bin/* $out/bin
   '';
 
   meta = with lib; {
     description = "A fast, composable, and secure App Container runtime for Linux";
-    homepage = http://rkt.io;
+    homepage = https://github.com/coreos/rkt;
     license = licenses.asl20;
-    maintainers = with maintainers; [ ragge ];
+    maintainers = with maintainers; [ ragge steveej ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix
new file mode 100644
index 00000000000..fe016da6e58
--- /dev/null
+++ b/pkgs/applications/virtualization/tini/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.3";
+  name = "tini-${version}";
+  src = fetchurl {
+    url = "https://github.com/krallin/tini/archive/v0.8.3.tar.gz";
+    sha256 ="1w7rj4crrcyv25idmh4asbp2sxzwyihy5mbpw384bzxjzaxn9xpa";
+  };
+  NIX_CFLAGS_COMPILE = [
+    "-DPR_SET_CHILD_SUBREAPER=36"
+    "-DPR_GET_CHILD_SUBREAPER=37"
+  ];
+  buildInputs = [ cmake ];
+  postInstall = ''
+    rm $out/bin/tini-static
+  '';
+  meta = with stdenv.lib; {
+    description = "A tiny but valid init for containers";
+    homepage = https://github.com/krallin/tini;
+    license = licenses.mit;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index a98ebe424c6..0b1cf9ebc52 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl, python
 , wrapGAppsHook, virtinst, pyGtkGlade, pythonDBus, gnome_python, gtkvnc, vte
 , gtk3, gobjectIntrospection, libvirt-glib, gsettings_desktop_schemas, glib
-, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3
+, avahi, dconf, spiceSupport ? true, spice_gtk, libosinfo, gnome3, system-libvirt
 }:
 
 with stdenv.lib;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs =
     [ eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      paste_deploy m2crypto ipy twisted sqlalchemy_migrate
+      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glance cheetah lockfile httplib2
       urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
       libvirt libxml2Python ipaddr vte libosinfo
@@ -37,8 +37,13 @@ buildPythonPackage rec {
       gsettings_desktop_schemas
       gnome3.defaultIconTheme
       wrapGAppsHook
+      dconf
     ];
 
+  patchPhase = ''
+    sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
+  '';
+
   configurePhase = ''
     sed -i 's/from distutils.core/from setuptools/g' setup.py
     sed -i 's/from distutils.command.install/from setuptools.command.install/g' setup.py
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 6441bb88423..adcefe6004a 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -14,15 +14,15 @@ stdenv.mkDerivation rec {
 
   pythonPath = with pythonPackages;
     [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
-      paste_deploy m2crypto ipy twisted sqlalchemy_migrate
+      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glance cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
-      # libxml2Python is a dependency of libvirt.py. 
+      # libxml2Python is a dependency of libvirt.py.
       libvirt libxml2Python urlgrabber
     ];
 
   buildInputs =
-    [ pythonPackages.python 
+    [ pythonPackages.python
       pythonPackages.wrapPython
       pythonPackages.mox
       intltool
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 17ef89b36e6..5e198607676 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,7 +18,7 @@ let
   # revision/hash as well. See
   # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
   # for hashes.
-  version = "5.0.4";
+  version = "5.0.6";
 
   forEachModule = action: ''
     for mod in \
@@ -39,12 +39,12 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "102546";
+  extpackRevision = "103037";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
-    sha256 = "e4618e7847eff7c31426f4639bcd83c37bd817147081d3218f21c8e7b6bc7cfa";
+    sha256 = "4eed4f3d253bffe4ce61ee9431d79cbe1f897b3583efc2ff3746f453450787b5";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "b19e23fc8e71f38aef7c059f44e59fcbff3bb2ce85baa8de81f1629b85f68fcf";
+    sha256 = "0hsqd9bvbbzs3ihlfp2m15z6vx3nydjirv6drhfs6r9iqhl3zmi2";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index dcc6646f48e..0d2e0568523 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "de4abc28832d4e96b826efef3e7e69e69d6b941babfdc6317185f1fd6e22ffcf";
+    sha256 = "59ed9911c2bb22357345448c3df6104938b45fa780311d20c330e39c6e309991";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";
diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix
new file mode 100644
index 00000000000..ec900949392
--- /dev/null
+++ b/pkgs/applications/window-managers/clfswm/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, pkgs, fetchgit, autoconf, sbcl, lispPackages, xdpyinfo, texinfo4
+, makeWrapper , rlwrap, gnused, gnugrep, coreutils, xprop
+, extraModulePaths ? [] }:
+
+stdenv.mkDerivation rec {
+  name = "clfswm";
+
+  src = fetchgit {
+    url = "https://gitlab.common-lisp.net/clfswm/clfswm.git";
+    rev = "refs/heads/master";
+    sha256 = "1hkm6bn5xww932w34l13bg87m5hsnwnd0i1lka6sw0cq8whndya0";
+  };
+
+  buildInputs = [
+    texinfo4 makeWrapper autoconf
+    sbcl
+    lispPackages.clx
+    lispPackages.cl-ppcre
+    xdpyinfo
+  ];
+
+  patches = [ ./require-clx.patch ];
+
+  # Stripping destroys the generated SBCL image
+  dontStrip = true;
+
+  installPhase = ''
+    mkdir -pv $out/bin
+    make DESTDIR=$out install
+
+    # Paths in the compressed image $out/bin/clfswm are not
+    # recognized by Nix. Add explicit reference here.
+    mkdir $out/nix-support
+    echo ${xdpyinfo} ${lispPackages.clx} ${lispPackages.cl-ppcre} > $out/nix-support/depends
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A(nother) Common Lisp FullScreen Window Manager";
+    homepage    = https://common-lisp.net/project/clfswm/;
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ robgssp ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/clfswm/require-clx.patch b/pkgs/applications/window-managers/clfswm/require-clx.patch
new file mode 100644
index 00000000000..ae2234461d2
--- /dev/null
+++ b/pkgs/applications/window-managers/clfswm/require-clx.patch
@@ -0,0 +1,13 @@
+diff --git a/load.lisp b/load.lisp
+index c8c4cf0..8c9ca2e 100644
+--- a/load.lisp
++++ b/load.lisp
+@@ -111,6 +111,8 @@ from $XDG_CONFIG_HOME/clfswm/clfswmrc")
+ ;;;------------------
+ (load-info "Requiring CLX")
+ 
++(require 'clx)
++
+ ;;; Loading clisp dynamic module. This part needs clisp >= 2.50
+ ;;#+(AND CLISP (not CLX))
+ ;;(when (fboundp 'require)
diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 626a0926a67..c11a9a53989 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, libX11, libXinerama, patches ? []}:
+{stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}:
 
 let
-  name = "dwm-6.0";
+  name = "dwm-6.1";
 in
 stdenv.mkDerivation {
   inherit name;
  
   src = fetchurl {
     url = "http://dl.suckless.org/dwm/${name}.tar.gz";
-    sha256 = "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj";
+    sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2";
   };
  
-  buildInputs = [ libX11 libXinerama ];
+  buildInputs = [ libX11 libXinerama libXft ];
  
   prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
 
diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 9ac17566b94..8cd7932a8d1 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
-  version = "4.10.4";
+  version = "4.11";
 
   src = fetchurl {
     url = "http://i3wm.org/downloads/${name}.tar.bz2";
-    sha256 = "0pk580jkv7cxmsrr276q25fgdbrkzldiiz4ny61szzmqqnjsfkyx";
+    sha256 = "0bwqklb6irgjmgvj7mlyz4brr4lggfm3zqmvclvxcbyrzc31xkkq";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
new file mode 100644
index 00000000000..595f989ff4e
--- /dev/null
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, pkgconfig, dbus_glib, autoreconfHook, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "kbdd";
+
+  src = fetchgit {
+    url = https://github.com/qnikst/kbdd;
+    rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
+    sha256 = "1b9a66d216326a9759cad26393fbf8259fe7a0c2dd1075047fc989f0e52d969f";
+  };
+
+  buildInputs = [ pkgconfig xorg.libX11 dbus_glib autoreconfHook ];
+
+  meta = {
+    description = "Simple daemon and library to make per window layout using XKB";
+    homepage = https://github.com/qnikst/kbdd;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.wedens ];
+  };
+}
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 3a26666a529..1043e3a1f64 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   name = "qtile-${version}";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "1g02lvk2cqy6w6y6nw6dnsmy4i9k4fyawyibpkf0a7a1nfrd6a99";
+    sha256 = "0dhdwjr4pdlzli68fa8glrnsjzxp6agdab9cnmpsqlwiwh97x9a6";
   };
 
   patches = [ ./restart_executable.patch ];