about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-10-15 10:22:28 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-10-15 10:22:28 -0700
commit8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36 (patch)
tree90013bf1e284372e7de0ad6b3715dc5a0ea926d1 /pkgs/applications
parent1283e3da5d0bc4657677d40fa3cb117b66489ee5 (diff)
parent62e676b9598d2638e846761160082f6fec392ffe (diff)
downloadnixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar
nixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.gz
nixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.bz2
nixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.lz
nixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.xz
nixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.tar.zst
nixlib-8a44a36ca496d2c61904b22f8ba6a77ec5aa0b36.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/audio/ardour/default.nix4
-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/non/default.nix29
-rw-r--r--pkgs/applications/audio/yoshimi/default.nix4
-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.nix30
-rw-r--r--pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch16
-rw-r--r--pkgs/applications/editors/eclipse/plugins.nix12
-rw-r--r--pkgs/applications/editors/emacs-24/default.nix6
-rw-r--r--pkgs/applications/editors/emacs-24/macport-24.5.nix4
-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/geany/default.nix4
-rw-r--r--pkgs/applications/editors/geany/with-vte.nix6
-rw-r--r--pkgs/applications/editors/idea/default.nix6
-rw-r--r--pkgs/applications/editors/neovim/default.nix8
-rw-r--r--pkgs/applications/editors/textadept/default.nix15
-rw-r--r--pkgs/applications/editors/vim/default.nix4
-rw-r--r--pkgs/applications/gis/saga/default.nix6
-rw-r--r--pkgs/applications/graphics/feh/default.nix7
-rw-r--r--pkgs/applications/graphics/simple-scan/default.nix4
-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.08/default.nix2
-rwxr-xr-xpkgs/applications/kde-apps-15.08/fetchsrcs.sh40
-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/srcs.nix1998
-rw-r--r--pkgs/applications/misc/blender/default.nix10
-rw-r--r--pkgs/applications/misc/calibre/default.nix4
-rw-r--r--pkgs/applications/misc/hamster-time-tracker/default.nix5
-rw-r--r--pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix16
-rw-r--r--pkgs/applications/misc/rxvt_unicode/default.nix6
-rw-r--r--pkgs/applications/misc/synapse/default.nix4
-rw-r--r--pkgs/applications/misc/wcalc/default.nix20
-rw-r--r--pkgs/applications/networking/browsers/chromium/source/sources.nix8
-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/feedreaders/rsstail/default.nix8
-rw-r--r--pkgs/applications/networking/google-drive-ocamlfuse/default.nix21
-rw-r--r--pkgs/applications/networking/ids/snort/default.nix10
-rw-r--r--pkgs/applications/networking/instant-messengers/baresip/default.nix4
-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/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/twister/default.nix9
-rw-r--r--pkgs/applications/networking/spideroak/default.nix24
-rw-r--r--pkgs/applications/office/libreoffice/default.nix8
-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/version-management/git-and-tools/git-crypt/default.nix6
-rw-r--r--pkgs/applications/version-management/mercurial/default.nix5
-rw-r--r--pkgs/applications/video/kodi/default.nix1
-rw-r--r--pkgs/applications/video/makemkv/default.nix6
-rw-r--r--pkgs/applications/virtualization/qemu/default.nix4
-rw-r--r--pkgs/applications/virtualization/virt-manager/default.nix1
-rw-r--r--pkgs/applications/virtualization/virtualbox/default.nix8
-rw-r--r--pkgs/applications/virtualization/virtualbox/guest-additions/default.nix2
68 files changed, 1657 insertions, 1351 deletions
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index e47dbfb856bf..56ba68df70b4 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ardour";
     repo = "ardour";
-    rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7";
-    sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f";
+    rev = "05e3a00b7e3a52a838bc5ec9ee7b3b9e6a271feb";
+    sha256 = "1j8zw0bvh16qwyy8qrqynpak9nghl9j3qhjjcdl7wh9raafjqc00";
   };
 
   buildInputs =
diff --git a/pkgs/applications/audio/meterbridge/buf_rect.patch b/pkgs/applications/audio/meterbridge/buf_rect.patch
new file mode 100644
index 000000000000..f108b80c1019
--- /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 000000000000..e15febda2310
--- /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/non/default.nix b/pkgs/applications/audio/non/default.nix
new file mode 100644
index 000000000000..6c9e7eb708ac
--- /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/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index cd334c4254ff..dc2fe0ba6492 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/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index 5a0e8c7cfbdc..f86ab91344f1 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 dc50ced1a606..7437d0fcfafc 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.3";
 in
 stdenv.mkDerivation rec {
   name = "lightdm-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz";
-    sha256 = "062jj21bjrl29mk66lpihwhrff038h2wny3p6b5asacf2mklf0hq";
+    sha256 = "0jsvpg86nzwzacnr1bfzw81432j6m6lg2daqgy04ywj976k0x2y8";
   };
 
   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 7deb3e2e1bd9..000000000000
--- 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 82cd8bd3091e..aad4bccb4181 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, makeWrapper, fetchFromGitHub, cmake, pkgconfig, libxcb, libpthreadstubs
+, libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }:
 
 let
-  version = "0.11.0";
+  version = "0.12.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 = "09amr61srvl52nvxlqqgs9fzn33pc2gjv5hc83gxx43x6q2j19gg";
   };
 
+  patches = [ ./sddm-ignore-config-mtime.patch ];
+
   nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase qtdeclarative pam systemd ];
 
-  patches = [ (fetchpatch {
-                url = "https://github.com/sddm/sddm/commit/9bc21ee7da5de6b2531d47d1af4d7b0a169990b9.patch";
-                sha256 = "1pda0wf4xljdadja7iyh5c48h0347imadg9ya1dw5slgb7w1d94l";
-              })
-              ./cmake_paths.patch
-            ];
-
-  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 000000000000..9edd9a7b5382
--- /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/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index b80d63f69d34..493858f93c8a 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.9.0.201508291549";
+    version = "6.11.0.201510052139";
 
     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.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
+      sha256 = "166nasgv3zsys7rlafvfnldfb6hiwiq3vil3papd59prwvky75fz";
     };
 
     meta = with stdenv.lib; {
@@ -335,16 +335,16 @@ rec {
 
   testng = buildEclipsePlugin rec {
     name = "testng-${version}";
-    version = "6.9.5.201508210528";
+    version = "6.9.7.201510070420";
 
     srcFeature = fetchurl {
       url = "http://beust.com/eclipse/features/org.testng.eclipse_${version}.jar";
-      sha256 = "0xalm7pvj0vx61isgkjkgj073b4hlqlzx6xnkrnnnyi0r212a26j";
+      sha256 = "185m6zcz1havhl94qgwms9szcs7vhrrq8rckbrb1vz02208yyhpn";
     };
 
     srcPlugin = fetchurl {
       url = "http://beust.com/eclipse/plugins/org.testng.eclipse_${version}.jar";
-      sha256 = "07wmivfvfsq6cjw5zwciajdxkfa7drk108jsr44gf4i1bv9fj055";
+      sha256 = "1rw678cd9nm623dvaddncadaclif62zcb15jl7ryzcmck2y380l5";
     };
 
     meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index e0d74afabcd3..eb814eab6f52 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -47,10 +47,8 @@ stdenv.mkDerivation rec {
         imagemagick gconf ]
     ++ stdenv.lib.optional (withX && withGTK2) gtk2
     ++ stdenv.lib.optional (withX && withGTK3) gtk3
-    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
-
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
-  ];
+    ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo
+    ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc ];
 
   NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
     "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index 879c0f551376..13a888484e07 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -4,7 +4,7 @@ libobjc, Cocoa, WebKit, Quartz, ImageCaptureCore, OSAKit
 
 stdenv.mkDerivation rec {
   emacsName = "emacs-24.5";
-  name = "${emacsName}-mac-5.10";
+  name = "${emacsName}-mac-5.11";
 
   #builder = ./builder.sh;
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   macportSrc = fetchurl {
     url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz";
-    sha256 = "0d4r4mgqxcdba715lbr7rk4bxz7yjxi6wv63kyh6gaqbfgql41vf";
+    sha256 = "0p4jh6s1qi6jm6zr82grk65x33ix1hb0fbpih4vh3vnx6310iwsb";
   };
 
   NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations";
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 000000000000..7176b289b8b5
--- /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 1276e4754ebd..f7289a3b400c 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/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index 8d4002c9ef85..5dd839d56514 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 000000000000..ffffed1b8532
--- /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 8824711fec65..1148e1ca6cb9 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";
     };
   };
 
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index c55d4b0e76a7..be0a00482f3d 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -14,7 +14,7 @@ with stdenv.lib;
 
 let
 
-  version = "2015-06-09";
+  version = "2015-10-12";
 
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
   neovimLibvterm = let version = "2015-02-23"; in stdenv.mkDerivation {
@@ -58,8 +58,8 @@ let
     name = "neovim-${version}";
 
     src = fetchFromGitHub {
-      sha256 = "1lycql0lwi7ynrsaln4kxybwvxb9fvganiq3ba4pnpcfgl155k1j";
-      rev = "6270d431aaeed71e7a8782411f36409ab8e0ee35";
+      sha256 = "1rlybdldz708pz7k0qs2rpm0cjk8ywwyj5s38hyq4mzsswqszdsc";
+      rev = "a3f048ee06dea15490d7b874d295c3fc850cdc51";
       repo = "neovim";
       owner = "neovim";
     };
@@ -103,7 +103,7 @@ let
     '' + optionalString withPython ''
       ln -s ${pythonEnv}/bin/python $out/bin/nvim-python
     '' + 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/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix
index 9eb1bdc7e43c..a8f12bd4ece0 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/default.nix b/pkgs/applications/editors/vim/default.nix
index 3bdd44529ddb..cb151548f79d 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 }:
+, CoreServices, CoreData, Cocoa, Foundation, libobjc, cf-private }:
 
 stdenv.mkDerivation rec {
   name = "vim-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ ncurses pkgconfig ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreData CoreServices Cocoa Foundation libobjc ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ cf-private CoreData CoreServices Cocoa Foundation libobjc ];
   nativeBuildInputs = [ gettext ];
 
   configureFlags = [
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 7ba523d3a602..46fefc9fd7b5 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 266f70e3008f..8602a9a04f85 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -2,14 +2,15 @@
 , 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";
   };
 
-  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/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index c5d1b936233b..d5f5d6c672c1 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool, libusb
 , libxml2, makeWrapper, packagekit, pkgconfig, saneBackends, systemd, vala }:
 
-let version = "3.18.0"; in
+let version = "3.18.1"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
 
   src = fetchurl {
-    sha256 = "09qki4h1px65fxwpr7jppzqsi5cfcb8168p13blp3wcfizjgb9gl";
+    sha256 = "1i37j36kbn1h8yfzcvbis6f38xz2nj5512ls3gb0j5na0bvja2cw";
     url = "https://launchpad.net/simple-scan/3.18/${version}/+download/${name}.tar.xz";
   };
 
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 478553d2c00a..d01b1a14018d 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 e3b7d001174f..51c41e01bf9c 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.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix
index 45484964ff92..3d1049f8d5b9 100644
--- a/pkgs/applications/kde-apps-15.08/default.nix
+++ b/pkgs/applications/kde-apps-15.08/default.nix
@@ -63,6 +63,6 @@ let
     print-manager = callPackage ./print-manager.nix {};
   };
 
-  newScope = scope: pkgs.kf513.newScope ({ inherit kdeApp; } // scope);
+  newScope = scope: pkgs.kf514.newScope ({ inherit kdeApp; } // scope);
 
 in lib.makeScope newScope packages
diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
index e696bb11d93b..aa7adc49123a 100755
--- a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
+++ b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
@@ -9,29 +9,38 @@ EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
 
+rm -f ../srcs.csv
+
 wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_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 +48,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/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/applications/kde-apps-15.08/kdelibs/0003-remove_xdg_impurities.patch
new file mode 100644
index 000000000000..a79d7b2b7d16
--- /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 06788006f61e..18d51e94d7ca 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/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix
index 97e1e774303a..3c89c39b5edb 100644
--- a/pkgs/applications/kde-apps-15.08/srcs.nix
+++ b/pkgs/applications/kde-apps-15.08/srcs.nix
@@ -1,1149 +1,1157 @@
-# 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 = {
+  akonadi = {
     version = "15.08.1";
     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.1/src/akonadi-15.08.1.tar.xz";
+      sha256 = "19222mzvi34lqdaxavcpx0d1mxfnfynvhv5562rw3d7iqmhvbms6";
+      name = "akonadi-15.08.1.tar.xz";
     };
   };
-  kollision = {
+  akonadi-calendar = {
     version = "15.08.1";
     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.1/src/akonadi-calendar-15.08.1.tar.xz";
+      sha256 = "00iyv123s18157v46y3xdg56lyfr0w6f0zz8qsp6js7vn0fa468j";
+      name = "akonadi-calendar-15.08.1.tar.xz";
     };
   };
-  libkmahjongg = {
+  akonadi-search = {
     version = "15.08.1";
     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.1/src/akonadi-search-15.08.1.tar.xz";
+      sha256 = "0mzhil4ihs2b7k6dg29d5igpwsiwiv6awzvj6b5xn76i4xax1jk1";
+      name = "akonadi-search-15.08.1.tar.xz";
     };
   };
-  superkaramba = {
+  amor = {
     version = "15.08.1";
     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.1/src/amor-15.08.1.tar.xz";
+      sha256 = "125s9hsj4s3h21khgri9p52abkaa78a9yz7fnw5ij4i0ivhbks6a";
+      name = "amor-15.08.1.tar.xz";
     };
   };
-  kcharselect = {
+  analitza = {
     version = "15.08.1";
     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.1/src/analitza-15.08.1.tar.xz";
+      sha256 = "0zxkpsccnp0m8r7z1p243h5vh4fz4dzq2dz932vfac8hs45lcaki";
+      name = "analitza-15.08.1.tar.xz";
     };
   };
-  umbrello = {
+  ark = {
     version = "15.08.1";
     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.1/src/ark-15.08.1.tar.xz";
+      sha256 = "0lmqi9qdf46v9yap6f7s5favx4y66w3sixhplby4q1cm085yg5hl";
+      name = "ark-15.08.1.tar.xz";
     };
   };
-  kde-runtime = {
+  artikulate = {
     version = "15.08.1";
     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.1/src/artikulate-15.08.1.tar.xz";
+      sha256 = "0pz66hrnd89519ivk1cw8gzddjv6043x59nbkhmnlk8f5hvvkk2k";
+      name = "artikulate-15.08.1.tar.xz";
     };
   };
-  kcontacts = {
+  audiocd-kio = {
     version = "15.08.1";
     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.1/src/audiocd-kio-15.08.1.tar.xz";
+      sha256 = "0sqh21x12za743xqmyfyd8h4z0wz0nzd2zjp6fzga76xfcryci5j";
+      name = "audiocd-kio-15.08.1.tar.xz";
     };
   };
-  kontactinterface = {
+  baloo-widgets = {
     version = "15.08.1";
     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.1/src/baloo-widgets-15.08.1.tar.xz";
+      sha256 = "021lgivqmahad2b5mwdg4vngyyfi6gcsk3xgn9rbzkxg67k2ivbc";
+      name = "baloo-widgets-15.08.1.tar.xz";
     };
   };
-  ktp-desktop-applets = {
+  blinken = {
     version = "15.08.1";
     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.1/src/blinken-15.08.1.tar.xz";
+      sha256 = "0yh5ay2cpgb45y4any6sanzpwcngfxl98x3gnc5n81zl2kzb9y8m";
+      name = "blinken-15.08.1.tar.xz";
     };
   };
-  kldap = {
+  bomber = {
     version = "15.08.1";
     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.1/src/bomber-15.08.1.tar.xz";
+      sha256 = "08l8ksqzap8hyza7mmf1wwddj8xkl03hsrc0mwvxsvyp7h7v3rxq";
+      name = "bomber-15.08.1.tar.xz";
     };
   };
-  kaccounts-providers = {
+  bovo = {
     version = "15.08.1";
     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.1/src/bovo-15.08.1.tar.xz";
+      sha256 = "1lj2hwjdwkn70gfgyk3v0r8wdrdlpqkx9n17fd15x0jm8xjxc7wj";
+      name = "bovo-15.08.1.tar.xz";
     };
   };
-  signon-kwallet-extension = {
+  cantor = {
     version = "15.08.1";
     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.1/src/cantor-15.08.1.tar.xz";
+      sha256 = "0qcx077khzzjs8gaz2m1dph1r4ql3gpfsq536626fd94cb5is83x";
+      name = "cantor-15.08.1.tar.xz";
     };
   };
-  klines = {
+  cervisia = {
     version = "15.08.1";
     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.1/src/cervisia-15.08.1.tar.xz";
+      sha256 = "0cha7j0769ib8hc2jjgdxm1pv81cqwii721ww94dd4d614isv4pk";
+      name = "cervisia-15.08.1.tar.xz";
     };
   };
-  kompare = {
+  dolphin = {
     version = "15.08.1";
     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.1/src/dolphin-15.08.1.tar.xz";
+      sha256 = "09mr54zbyyq4kd3ddi054c86ji63b0k5fjd3y8x44vnd3id8jpjs";
+      name = "dolphin-15.08.1.tar.xz";
     };
   };
-  analitza = {
+  dolphin-plugins = {
     version = "15.08.1";
     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.1/src/dolphin-plugins-15.08.1.tar.xz";
+      sha256 = "1fpsbxcds2wzivcpc6vf6bqwi658mw4jrlpwd52w2nlsjpmgr31x";
+      name = "dolphin-plugins-15.08.1.tar.xz";
     };
   };
-  kalzium = {
+  dragon = {
     version = "15.08.1";
     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.1/src/dragon-15.08.1.tar.xz";
+      sha256 = "0ffb0jspckwp8alis70akhrv7kkjq69zba34y61axm67f65izh9l";
+      name = "dragon-15.08.1.tar.xz";
     };
   };
-  kcachegrind = {
+  ffmpegthumbs = {
     version = "15.08.1";
     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.1/src/ffmpegthumbs-15.08.1.tar.xz";
+      sha256 = "00bk11zq5hkdkwxj7d4fydslh2gybhzxz2gyldjfdd8agjcl1rfm";
+      name = "ffmpegthumbs-15.08.1.tar.xz";
     };
   };
-  kuser = {
+  filelight = {
     version = "15.08.1";
     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.1/src/filelight-15.08.1.tar.xz";
+      sha256 = "085n071j5mpzh2yr4035bdxgfay782g4zx386lr2s03ywc5icsw2";
+      name = "filelight-15.08.1.tar.xz";
     };
   };
-  libkgeomap = {
+  gpgmepp = {
     version = "15.08.1";
     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.1/src/gpgmepp-15.08.1.tar.xz";
+      sha256 = "1nr4k3k34cmmvn4mznnr4kgvbi4raan96phbiqzgh6mzkq2rc8yr";
+      name = "gpgmepp-15.08.1.tar.xz";
     };
   };
-  artikulate = {
+  granatier = {
     version = "15.08.1";
     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.1/src/granatier-15.08.1.tar.xz";
+      sha256 = "1ngdjgf3imdbv1hmp88fhnpvpspjgl2zpaig3d96fjlhxh0bgng1";
+      name = "granatier-15.08.1.tar.xz";
     };
   };
-  kscd = {
+  gwenview = {
     version = "15.08.1";
     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.1/src/gwenview-15.08.1.tar.xz";
+      sha256 = "0lks7chyd8bylz1m3nv3bfch5jcffkv52aawxv9r5www9wd7jq69";
+      name = "gwenview-15.08.1.tar.xz";
     };
   };
-  akonadi-calendar = {
+  jovie = {
     version = "15.08.1";
     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.1/src/jovie-15.08.1.tar.xz";
+      sha256 = "021j7rxbbv5p2jjp4d7m7vsdy5117myng2min42bn6vfz4g6s5rx";
+      name = "jovie-15.08.1.tar.xz";
     };
   };
-  kdesdk-strigi-analyzers = {
+  juk = {
     version = "15.08.1";
     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.1/src/juk-15.08.1.tar.xz";
+      sha256 = "0l6zq90jvhkhppjq0djmj1ij1c1yjjvhh5ss4czqn39bay33r2a7";
+      name = "juk-15.08.1.tar.xz";
     };
   };
-  killbots = {
+  kaccessible = {
     version = "15.08.1";
     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.1/src/kaccessible-15.08.1.tar.xz";
+      sha256 = "10crgqpiqkbrb0hil1660cy4dcywiljicqhnhr3nns0ncllvw2vi";
+      name = "kaccessible-15.08.1.tar.xz";
     };
   };
-  ksirk = {
+  kaccounts-integration = {
     version = "15.08.1";
     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.1/src/kaccounts-integration-15.08.1.tar.xz";
+      sha256 = "07kryp71xq2zwfdm05g8mcmkmxhlj2wb2l9fi2sxbhsr360z33mx";
+      name = "kaccounts-integration-15.08.1.tar.xz";
     };
   };
-  ark = {
+  kaccounts-providers = {
     version = "15.08.1";
     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.1/src/kaccounts-providers-15.08.1.tar.xz";
+      sha256 = "15sl3rwwpshqvzjrkfiray3gg3ja84awsyk3y5n9jbf97rw47v3k";
+      name = "kaccounts-providers-15.08.1.tar.xz";
     };
   };
-  kde-l10n-el = {
+  kajongg = {
     version = "15.08.1";
     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.1/src/kajongg-15.08.1.tar.xz";
+      sha256 = "1ialza77fc0a6541yg71b8qbjvq78sww7l0g3s1rn30pj1j1r3rx";
+      name = "kajongg-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ug = {
+  kalarmcal = {
     version = "15.08.1";
     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.1/src/kalarmcal-15.08.1.tar.xz";
+      sha256 = "02m2fd98jdacr7hm71dl6hsshil152c09p1daaa9b58yrgb9dqd9";
+      name = "kalarmcal-15.08.1.tar.xz";
     };
   };
-  kde-l10n-sl = {
+  kalgebra = {
     version = "15.08.1";
     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.1/src/kalgebra-15.08.1.tar.xz";
+      sha256 = "1an9lc9h1178d94pq2a60pnw9wadxdni3drbx40w1l1kfaa38ghy";
+      name = "kalgebra-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ar = {
+  kalzium = {
     version = "15.08.1";
     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.1/src/kalzium-15.08.1.tar.xz";
+      sha256 = "0jhfv5cw5vhgy13ld5km664r7ydqv52nwd4k450x2d62rvq63nfp";
+      name = "kalzium-15.08.1.tar.xz";
     };
   };
-  kde-l10n-wa = {
+  kamera = {
     version = "15.08.1";
     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.1/src/kamera-15.08.1.tar.xz";
+      sha256 = "0czpr3wb3irlbczrx0dczph6l9dwhz3wv9amrz2lvb8p9c8j4nmd";
+      name = "kamera-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ro = {
+  kanagram = {
     version = "15.08.1";
     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.1/src/kanagram-15.08.1.tar.xz";
+      sha256 = "0bchwvr87wj9p82v1vgdmfw0a8d1gax08ccq24lzigrny6ljlizr";
+      name = "kanagram-15.08.1.tar.xz";
     };
   };
-  kde-l10n-it = {
+  kapman = {
     version = "15.08.1";
     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.1/src/kapman-15.08.1.tar.xz";
+      sha256 = "070zckasm7bm1g01rvp55gbilyzxqs5gsrp56zp3lyids0ycjfgz";
+      name = "kapman-15.08.1.tar.xz";
     };
   };
-  kde-l10n-he = {
+  kapptemplate = {
     version = "15.08.1";
     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.1/src/kapptemplate-15.08.1.tar.xz";
+      sha256 = "1pc3dq3h30lx7d51zan52mnz5zwb70g6r84cskkgc2dmws7mrl0k";
+      name = "kapptemplate-15.08.1.tar.xz";
     };
   };
-  kde-l10n-et = {
+  kate = {
     version = "15.08.1";
     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.1/src/kate-15.08.1.tar.xz";
+      sha256 = "0hrbr4lnmz0hgs856kfb966k85p8ccdzva8h4f6ifvacgxppb5iz";
+      name = "kate-15.08.1.tar.xz";
     };
   };
-  kde-l10n-pa = {
+  katomic = {
     version = "15.08.1";
     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.1/src/katomic-15.08.1.tar.xz";
+      sha256 = "0rj6sgh8v8x57fqbjvhik9xcw563nx0dvv8rin05nr22hlid8l9y";
+      name = "katomic-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ja = {
+  kblackbox = {
     version = "15.08.1";
     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.1/src/kblackbox-15.08.1.tar.xz";
+      sha256 = "1hnxsjdp9gbjc0049jx7bnzx0cykyc7qf6f2z3mrir8knin0fmi5";
+      name = "kblackbox-15.08.1.tar.xz";
     };
   };
-  kde-l10n-bg = {
+  kblocks = {
     version = "15.08.1";
     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.1/src/kblocks-15.08.1.tar.xz";
+      sha256 = "1vvlxna5dmnf7igr53p3m5z224zj1ni92qifjnnblwr55gqqwsva";
+      name = "kblocks-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ko = {
+  kblog = {
     version = "15.08.1";
     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.1/src/kblog-15.08.1.tar.xz";
+      sha256 = "0a5ycnk0ljw8k4m5pm7cn37ijjq9x1p2hxf4k77jb7aw1apyqv15";
+      name = "kblog-15.08.1.tar.xz";
     };
   };
-  kde-l10n-tr = {
+  kbounce = {
     version = "15.08.1";
     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.1/src/kbounce-15.08.1.tar.xz";
+      sha256 = "127b7c4rpkz04nihqyl7d594k9vwjcvlq0758jfmkxijsgpjc334";
+      name = "kbounce-15.08.1.tar.xz";
     };
   };
-  kde-l10n-mr = {
+  kbreakout = {
     version = "15.08.1";
     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.1/src/kbreakout-15.08.1.tar.xz";
+      sha256 = "1l83iy6iad6npykl4dyh45s5z8pgamdp7aqi2r5c9r4awg16iq48";
+      name = "kbreakout-15.08.1.tar.xz";
     };
   };
-  kde-l10n-es = {
+  kbruch = {
     version = "15.08.1";
     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.1/src/kbruch-15.08.1.tar.xz";
+      sha256 = "1mdbrfj7g92v5yzpdi0cccmhf5vdy7y5blbnk50p56qaq8w8avm2";
+      name = "kbruch-15.08.1.tar.xz";
     };
   };
-  kde-l10n-hu = {
+  kcachegrind = {
     version = "15.08.1";
     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.1/src/kcachegrind-15.08.1.tar.xz";
+      sha256 = "1nmyw0nld1qasd2zz8dg854br8nqn3kby2xd2afr9a8frhzzmiv2";
+      name = "kcachegrind-15.08.1.tar.xz";
     };
   };
-  kde-l10n-km = {
+  kcalc = {
     version = "15.08.1";
     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.1/src/kcalc-15.08.1.tar.xz";
+      sha256 = "02xj9n6zv3f3m35g38gsmqnrshbswqkya930sc5nqc0mlyflli6m";
+      name = "kcalc-15.08.1.tar.xz";
     };
   };
-  kde-l10n-eo = {
+  kcalcore = {
     version = "15.08.1";
     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.1/src/kcalcore-15.08.1.tar.xz";
+      sha256 = "0dpip8hbc5fb8yw876lig19kp2wi71dkwcb1mj8k49lph09k3460";
+      name = "kcalcore-15.08.1.tar.xz";
     };
   };
-  kde-l10n-pt = {
+  kcalutils = {
     version = "15.08.1";
     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.1/src/kcalutils-15.08.1.tar.xz";
+      sha256 = "0l8kzz092wz93j58h52q4icpvhvl2djgagdbx12yl7qlwin7wnd3";
+      name = "kcalutils-15.08.1.tar.xz";
     };
   };
-  kde-l10n-pl = {
+  kcharselect = {
     version = "15.08.1";
     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.1/src/kcharselect-15.08.1.tar.xz";
+      sha256 = "0g785ab5iclv1db2dwwlzf14a2l6n9yznw6pb8hx589za7yc46v2";
+      name = "kcharselect-15.08.1.tar.xz";
     };
   };
-  kde-l10n-lv = {
+  kcolorchooser = {
     version = "15.08.1";
     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.1/src/kcolorchooser-15.08.1.tar.xz";
+      sha256 = "1ig03dg4baf29hhim1m77bzwnm6mqqyzbmyhk6g92mj5883nnfb7";
+      name = "kcolorchooser-15.08.1.tar.xz";
     };
   };
-  kde-l10n-en_GB = {
-    version = "en_GB-15.08.1";
+  kcontacts = {
+    version = "15.08.1";
     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.1/src/kcontacts-15.08.1.tar.xz";
+      sha256 = "1a9ww08m3k7sdqnkb2dpi2c0fpfihjschyzwx82kcp1z613agx1c";
+      name = "kcontacts-15.08.1.tar.xz";
     };
   };
-  kde-l10n-nn = {
+  kcron = {
     version = "15.08.1";
     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.1/src/kcron-15.08.1.tar.xz";
+      sha256 = "1s90bmlfbhcfiq6iizp4sq0z3ds8nrqghckcx9zrbyyj852llh0f";
+      name = "kcron-15.08.1.tar.xz";
     };
   };
-  kde-l10n-hr = {
+  kdeartwork = {
     version = "15.08.1";
     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.1/src/kdeartwork-15.08.1.tar.xz";
+      sha256 = "0j37pzih616fv1k6i3hll6qkxh42v9gkhy5vl57ancx7a5kxikyc";
+      name = "kdeartwork-15.08.1.tar.xz";
     };
   };
-  kde-l10n-fi = {
+  kde-baseapps = {
     version = "15.08.1";
     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.1/src/kde-baseapps-15.08.1.tar.xz";
+      sha256 = "1ngi571gs62qnpz1ph106ard13pfh9f1ljg4y4cyv77nv90x4a2k";
+      name = "kde-baseapps-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ia = {
+  kde-base-artwork = {
     version = "15.08.1";
     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.1/src/kde-base-artwork-15.08.1.tar.xz";
+      sha256 = "081mrc0s2lnbzwmmy9hwqas28cl6jzdycwxx3vfn4rvsgw4cgrp2";
+      name = "kde-base-artwork-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ga = {
+  kdebugsettings = {
     version = "15.08.1";
     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.1/src/kdebugsettings-15.08.1.tar.xz";
+      sha256 = "1h5wn6ilhkrygjacb592nmdv31791y9r0rx6m3l7xx3nbj9hy12c";
+      name = "kdebugsettings-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ca = {
+  kde-dev-scripts = {
     version = "15.08.1";
     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.1/src/kde-dev-scripts-15.08.1.tar.xz";
+      sha256 = "01s13qwji4d2sgbg85kj0ggg4mnl2vggangi8fpvaps03fpq7571";
+      name = "kde-dev-scripts-15.08.1.tar.xz";
     };
   };
-  kde-l10n-de = {
+  kde-dev-utils = {
     version = "15.08.1";
     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.1/src/kde-dev-utils-15.08.1.tar.xz";
+      sha256 = "0jashpk1gjcf74b4vpkyrab2izp18ddwi0xky4v47micicl7wm5n";
+      name = "kde-dev-utils-15.08.1.tar.xz";
     };
   };
-  kde-l10n-fr = {
+  kdeedu-data = {
     version = "15.08.1";
     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.1/src/kdeedu-data-15.08.1.tar.xz";
+      sha256 = "1yfx8526i753ifmcyh9r481cqiqzs4wh3xm1ys5x8pspg9rpn0wi";
+      name = "kdeedu-data-15.08.1.tar.xz";
     };
   };
-  kde-l10n-id = {
+  kdegraphics-mobipocket = {
     version = "15.08.1";
     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.1/src/kdegraphics-mobipocket-15.08.1.tar.xz";
+      sha256 = "0fnrd2za98plc8aw2gmn83yar0m7ix5rg84lpfm0vnshkhrslqg6";
+      name = "kdegraphics-mobipocket-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ca_valencia = {
-    version = "ca_valencia-15.08.1";
+  kdegraphics-strigi-analyzer = {
+    version = "15.08.1";
     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.1/src/kdegraphics-strigi-analyzer-15.08.1.tar.xz";
+      sha256 = "12yby24k5crsyz6mhm2r0wnl306gp7422yj1nrl6yqi16wd37rbs";
+      name = "kdegraphics-strigi-analyzer-15.08.1.tar.xz";
     };
   };
-  kde-l10n-nds = {
+  kdegraphics-thumbnailers = {
     version = "15.08.1";
     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.1/src/kdegraphics-thumbnailers-15.08.1.tar.xz";
+      sha256 = "1qavbvczjikad4kg28lq6zbb7dvllfw5nggilrs0s2qar7jqlrkw";
+      name = "kdegraphics-thumbnailers-15.08.1.tar.xz";
     };
   };
-  kde-l10n-nl = {
+  kde-l10n-ar = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ar-15.08.1.tar.xz";
+      sha256 = "101c1316wwxl3pf38fb9ch2h5nyra8h2cf79w9l1krdcp6s4776w";
+      name = "kde-l10n-ar-15.08.1.tar.xz";
     };
   };
-  kde-l10n-fa = {
+  kde-l10n-bg = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-bg-15.08.1.tar.xz";
+      sha256 = "1r515r3c03328ivwqkm7ijj2264l21liblzllgvjy6zmg7n8ilsp";
+      name = "kde-l10n-bg-15.08.1.tar.xz";
     };
   };
-  kde-l10n-da = {
+  kde-l10n-bs = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-bs-15.08.1.tar.xz";
+      sha256 = "0wyk547g8k3j6lcl1wipw4jwd0wqi8zrnb2h59g55il9rj7782q3";
+      name = "kde-l10n-bs-15.08.1.tar.xz";
     };
   };
-  kde-l10n-uk = {
+  kde-l10n-ca = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ca-15.08.1.tar.xz";
+      sha256 = "0ql4b550wasf31vkvha1kjyv7d0svyxk7wc77v39fbly0agxwbap";
+      name = "kde-l10n-ca-15.08.1.tar.xz";
     };
   };
-  kde-l10n-eu = {
-    version = "15.08.1";
+  kde-l10n-ca_valencia = {
+    version = "ca_valencia-15.08.1";
     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.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";
     };
   };
-  kde-l10n-sk = {
+  kde-l10n-cs = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-cs-15.08.1.tar.xz";
+      sha256 = "1lmln0q9r7cvkvs0qz2ky01rj8rjbrwl7g3vkz2zyr64gxgnjilz";
+      name = "kde-l10n-cs-15.08.1.tar.xz";
     };
   };
-  kde-l10n-kk = {
+  kde-l10n-da = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-da-15.08.1.tar.xz";
+      sha256 = "10sxs45bvs5qw02pj2qhykymm3ddl6ij3gvwgxj7r1kl84lfkil6";
+      name = "kde-l10n-da-15.08.1.tar.xz";
     };
   };
-  kde-l10n-zh_CN = {
-    version = "zh_CN-15.08.1";
+  kde-l10n-de = {
+    version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-de-15.08.1.tar.xz";
+      sha256 = "11ayw3n392qz1dyblw4gsw4pbdp3wll11z76cawhbmj2jscjd1yb";
+      name = "kde-l10n-de-15.08.1.tar.xz";
     };
   };
-  kde-l10n-lt = {
+  kde-l10n-el = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-el-15.08.1.tar.xz";
+      sha256 = "0qznnbk6mgbdjz4mm7rpmr04b6i9fya1yjhnmv8hpwlicl8n9sd6";
+      name = "kde-l10n-el-15.08.1.tar.xz";
     };
   };
-  kde-l10n-sv = {
-    version = "15.08.1";
+  kde-l10n-en_GB = {
+    version = "en_GB-15.08.1";
     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.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";
     };
   };
-  kde-l10n-nb = {
+  kde-l10n-eo = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-eo-15.08.1.tar.xz";
+      sha256 = "07rns0a5bb2sq13hcndvq79zg451lc3rj2cldmdxdyj5axl0c955";
+      name = "kde-l10n-eo-15.08.1.tar.xz";
     };
   };
-  kde-l10n-gl = {
+  kde-l10n-es = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-es-15.08.1.tar.xz";
+      sha256 = "1bb1vp8k6f323q2rjclxpja9yykfgm2di6wn0qhr787swr6qrxjb";
+      name = "kde-l10n-es-15.08.1.tar.xz";
     };
   };
-  kde-l10n-hi = {
+  kde-l10n-et = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-et-15.08.1.tar.xz";
+      sha256 = "027vpybfrm6zdmglwlhmyrh6157gmv8i5x1hx5d8f57m8jnh3nfq";
+      name = "kde-l10n-et-15.08.1.tar.xz";
     };
   };
-  kde-l10n-ru = {
+  kde-l10n-eu = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-eu-15.08.1.tar.xz";
+      sha256 = "01jcykc8d7nzlsfjp2xcbf7bkld7skf7mmrig7dllgl0igdkx1qm";
+      name = "kde-l10n-eu-15.08.1.tar.xz";
     };
   };
-  kde-l10n-sr = {
+  kde-l10n-fa = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-fa-15.08.1.tar.xz";
+      sha256 = "1bai66j03khb6f6y8v72axan6aggdlbwgv3bi91mxwlzhy8ycjxx";
+      name = "kde-l10n-fa-15.08.1.tar.xz";
     };
   };
-  kde-l10n-cs = {
+  kde-l10n-fi = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-fi-15.08.1.tar.xz";
+      sha256 = "0ajgy01p22h1c2dsarsq7ximwp3blvmxnf9217szikkf5yky2w9m";
+      name = "kde-l10n-fi-15.08.1.tar.xz";
     };
   };
-  kde-l10n-bs = {
+  kde-l10n-fr = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-fr-15.08.1.tar.xz";
+      sha256 = "1mclsk410ir9y6xvy8j8dswpa3k7hmjng232annq05fzapw7bda6";
+      name = "kde-l10n-fr-15.08.1.tar.xz";
     };
   };
-  kde-l10n-is = {
+  kde-l10n-ga = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ga-15.08.1.tar.xz";
+      sha256 = "06l39s9d6y33f4vvcxvry7cxw2m431xgvcz1wcmf6zhlpi5wwlmr";
+      name = "kde-l10n-ga-15.08.1.tar.xz";
     };
   };
-  kde-l10n-zh_TW = {
-    version = "zh_TW-15.08.1";
+  kde-l10n-gl = {
+    version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-gl-15.08.1.tar.xz";
+      sha256 = "0fapj4gmm4pp5bf3gj6xwnzjxw9094mal7njb0nisshvdfbpgr37";
+      name = "kde-l10n-gl-15.08.1.tar.xz";
     };
   };
-  kde-l10n-pt_BR = {
-    version = "pt_BR-15.08.1";
+  kde-l10n-he = {
+    version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-he-15.08.1.tar.xz";
+      sha256 = "1fgxnm6l45kcjrgjg19z2fg6fnsbpdy0agllj6rw0ffbcp68l863";
+      name = "kde-l10n-he-15.08.1.tar.xz";
     };
   };
-  kmix = {
+  kde-l10n-hi = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-hi-15.08.1.tar.xz";
+      sha256 = "0ys05gxcj6vkx4a8xjhwfym6faz6ifh50i5si175rynb6igyydnh";
+      name = "kde-l10n-hi-15.08.1.tar.xz";
     };
   };
-  kjumpingcube = {
+  kde-l10n-hr = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-hr-15.08.1.tar.xz";
+      sha256 = "0jlnig5rsmdxv3ng352hd8n0vqd020bf00xnjbdihcnvdwq625lv";
+      name = "kde-l10n-hr-15.08.1.tar.xz";
     };
   };
-  kruler = {
+  kde-l10n-hu = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-hu-15.08.1.tar.xz";
+      sha256 = "0jysfqb9pmhcw2kd48n6asmkci56mgk1jcsx8gxn9lcfrqnpc52g";
+      name = "kde-l10n-hu-15.08.1.tar.xz";
     };
   };
-  poxml = {
+  kde-l10n-ia = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ia-15.08.1.tar.xz";
+      sha256 = "1mgzpzy1s45v6nf2wbqgsam7bdg1x0fkmggnwy8k8f7kx5yxfcw4";
+      name = "kde-l10n-ia-15.08.1.tar.xz";
     };
   };
-  knavalbattle = {
+  kde-l10n-id = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-id-15.08.1.tar.xz";
+      sha256 = "13lls8w18c8zrfrqfaz2yjn7jcjrv6dsax09l8wda5144xhbsxw3";
+      name = "kde-l10n-id-15.08.1.tar.xz";
     };
   };
-  libkexiv2 = {
+  kde-l10n-is = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-is-15.08.1.tar.xz";
+      sha256 = "0n3ws9imns4jzvnnrkrm8dk8yzlfjcbxl7ip36m7a09lnnskc4zw";
+      name = "kde-l10n-is-15.08.1.tar.xz";
     };
   };
-  kcalutils = {
+  kde-l10n-it = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-it-15.08.1.tar.xz";
+      sha256 = "04blm19llvm2n885p9in4iicaj81ap9vvxsqmfnz7rwb93bsy4wl";
+      name = "kde-l10n-it-15.08.1.tar.xz";
     };
   };
-  palapeli = {
+  kde-l10n-ja = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ja-15.08.1.tar.xz";
+      sha256 = "0ir82yc2jmy7ijn02y9f2vxnv1cd5a92pjji3fzriqfg6dlgyiw9";
+      name = "kde-l10n-ja-15.08.1.tar.xz";
     };
   };
-  ksudoku = {
+  kde-l10n-kk = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-kk-15.08.1.tar.xz";
+      sha256 = "13zi7yh9hsxmb8v6x2jqlyh4wdb4waj653py27g91rbznsp1fjzp";
+      name = "kde-l10n-kk-15.08.1.tar.xz";
     };
   };
-  kdebugsettings = {
+  kde-l10n-km = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-km-15.08.1.tar.xz";
+      sha256 = "1yjckfma9dj8li9whwfa6bid289z05vllxqigbsjfy12721ahrc6";
+      name = "kde-l10n-km-15.08.1.tar.xz";
     };
   };
-  kdegraphics-strigi-analyzer = {
+  kde-l10n-ko = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ko-15.08.1.tar.xz";
+      sha256 = "19w7z4j7463lg0yzkf8ndfvf3664hk524qfcrdygf61f03hkp22l";
+      name = "kde-l10n-ko-15.08.1.tar.xz";
     };
   };
-  kturtle = {
+  kde-l10n-lt = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-lt-15.08.1.tar.xz";
+      sha256 = "03g7l9yyw6wajjpkqss16kfyg6piv50xjrzdy8611asdfabhccjs";
+      name = "kde-l10n-lt-15.08.1.tar.xz";
     };
   };
-  libkcddb = {
+  kde-l10n-lv = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-lv-15.08.1.tar.xz";
+      sha256 = "105lq8q97dg9y9j5p5zqf78gvk28qn4axr3ppk1j698576l1ihxl";
+      name = "kde-l10n-lv-15.08.1.tar.xz";
     };
   };
-  bomber = {
+  kde-l10n-mr = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-mr-15.08.1.tar.xz";
+      sha256 = "0ga55szsi9kbvjdcc2cjl8m15jzcfrpiryak1m78s46p056lfs7n";
+      name = "kde-l10n-mr-15.08.1.tar.xz";
     };
   };
-  ksquares = {
+  kde-l10n-nb = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-nb-15.08.1.tar.xz";
+      sha256 = "1y51kdmgnirfjsc5ka75rjvbqjbxxchqj2j4430h8jncjgvjvw6d";
+      name = "kde-l10n-nb-15.08.1.tar.xz";
     };
   };
-  konquest = {
+  kde-l10n-nds = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-nds-15.08.1.tar.xz";
+      sha256 = "0ifndqj0d58g6k71qw9n4xhd0a90fqba3xsk2qyd6yhnmygd48xd";
+      name = "kde-l10n-nds-15.08.1.tar.xz";
     };
   };
-  parley = {
+  kde-l10n-nl = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-nl-15.08.1.tar.xz";
+      sha256 = "11jzaf5dbyl52s61031lygn8xf6qjjqaldlyqgljz1scpp13f75b";
+      name = "kde-l10n-nl-15.08.1.tar.xz";
     };
   };
-  kate = {
+  kde-l10n-nn = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-nn-15.08.1.tar.xz";
+      sha256 = "01h9xysa8vghaghqpfp7gvps3rymiypb52ffz50srhrhjyh1zq0y";
+      name = "kde-l10n-nn-15.08.1.tar.xz";
     };
   };
-  baloo-widgets = {
+  kde-l10n-pa = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-pa-15.08.1.tar.xz";
+      sha256 = "05n9kaalsdx8nvn0p29wf33barhkhb64xxr3xg8cc0d3x21kmhx1";
+      name = "kde-l10n-pa-15.08.1.tar.xz";
     };
   };
-  kbreakout = {
+  kde-l10n-pl = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-pl-15.08.1.tar.xz";
+      sha256 = "0ifjvbvzm5qks35z54i5mdz151347690zg4rn8y033lag81c7ir1";
+      name = "kde-l10n-pl-15.08.1.tar.xz";
     };
   };
-  kshisen = {
+  kde-l10n-pt = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-pt-15.08.1.tar.xz";
+      sha256 = "0z5lginm78i6wrxhcdarv660sszybjih02ra3j4wghflzhwrgrhw";
+      name = "kde-l10n-pt-15.08.1.tar.xz";
     };
   };
-  dragon = {
-    version = "15.08.1";
+  kde-l10n-pt_BR = {
+    version = "pt_BR-15.08.1";
     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.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";
     };
   };
-  ktp-common-internals = {
+  kde-l10n-ro = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ro-15.08.1.tar.xz";
+      sha256 = "0j3qccfwarb9azsvm2pf0ikc12dsbywzfi7hv2xd244qcnjpp289";
+      name = "kde-l10n-ro-15.08.1.tar.xz";
     };
   };
-  ktp-text-ui = {
+  kde-l10n-ru = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ru-15.08.1.tar.xz";
+      sha256 = "1qdgh3y8q7hnkhjfbid35fxy4xjl1hj800kljhif7q4kg4ish86m";
+      name = "kde-l10n-ru-15.08.1.tar.xz";
     };
   };
-  kcalcore = {
+  kde-l10n-sk = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-sk-15.08.1.tar.xz";
+      sha256 = "13fcfrsdn0q7z0p2cxkcl54g597ix17327lyxz0ns4xn9ada198s";
+      name = "kde-l10n-sk-15.08.1.tar.xz";
     };
   };
-  kremotecontrol = {
+  kde-l10n-sl = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-sl-15.08.1.tar.xz";
+      sha256 = "12gg889lhq6l1h5bv6hlcwsq2zkqdfxgicxhkjnm3i7ly5laij4f";
+      name = "kde-l10n-sl-15.08.1.tar.xz";
     };
   };
-  ktp-kded-module = {
+  kde-l10n-sr = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-sr-15.08.1.tar.xz";
+      sha256 = "1ag5fj3iy5kycwgwhxiwcp4xl19j1q1lbk07b6nz69jm12kpsy6i";
+      name = "kde-l10n-sr-15.08.1.tar.xz";
     };
   };
-  kapptemplate = {
+  kde-l10n-sv = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-sv-15.08.1.tar.xz";
+      sha256 = "0dvgqf39xiz1fkfxvfn9232j454377d92c72dd0h3yl7mf9nndd7";
+      name = "kde-l10n-sv-15.08.1.tar.xz";
     };
   };
-  dolphin-plugins = {
+  kde-l10n-tr = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-tr-15.08.1.tar.xz";
+      sha256 = "1bca3scdg4ma6k6957pq45dmjxgp8hx3bm9jql2rqp0knqf9dwl8";
+      name = "kde-l10n-tr-15.08.1.tar.xz";
     };
   };
-  kpat = {
+  kde-l10n-ug = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-ug-15.08.1.tar.xz";
+      sha256 = "1brnbjnpwqhh52g058s2hqh77a6p2c81sygdfsjgngc0griahl4q";
+      name = "kde-l10n-ug-15.08.1.tar.xz";
     };
   };
-  akonadi = {
+  kde-l10n-uk = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-uk-15.08.1.tar.xz";
+      sha256 = "00f6mjs7nalg8q87ix7h66kqicy7xb9pgkghldbhpal0rqgzscph";
+      name = "kde-l10n-uk-15.08.1.tar.xz";
     };
   };
-  kcalc = {
+  kde-l10n-wa = {
     version = "15.08.1";
     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.1/src/kde-l10n/kde-l10n-wa-15.08.1.tar.xz";
+      sha256 = "0z9s118fc0wj2dg2ha7mv0rldvsa3rr8mhwjdgawkmfr9ns82w64";
+      name = "kde-l10n-wa-15.08.1.tar.xz";
     };
   };
-  sweeper = {
-    version = "15.08.1";
+  kde-l10n-zh_CN = {
+    version = "zh_CN-15.08.1";
     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.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";
     };
   };
-  lokalize = {
-    version = "15.08.1";
+  kde-l10n-zh_TW = {
+    version = "zh_TW-15.08.1";
     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.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";
     };
   };
-  step = {
+  kdelibs = {
+    version = "4.14.12";
+    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";
+    };
+  };
+  kdenetwork-filesharing = {
     version = "15.08.1";
     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.1/src/kdenetwork-filesharing-15.08.1.tar.xz";
+      sha256 = "03w78qf8sgwypzgwpyl5cfb5441787j6vzzhlddsbmkrl4vnhnff";
+      name = "kdenetwork-filesharing-15.08.1.tar.xz";
     };
   };
-  picmi = {
+  kdenetwork-strigi-analyzers = {
     version = "15.08.1";
     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.1/src/kdenetwork-strigi-analyzers-15.08.1.tar.xz";
+      sha256 = "0w3jlg9idsxi1pwxh97s9iawjyq8m2z51kz5mm0d0irwslkwaygk";
+      name = "kdenetwork-strigi-analyzers-15.08.1.tar.xz";
     };
   };
-  kig = {
+  kdenlive = {
     version = "15.08.1";
     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.1/src/kdenlive-15.08.1.tar.xz";
+      sha256 = "03rbkl3jblzprwb6sd7wycizpnpk65551ji53i2h7rxwsns53hig";
+      name = "kdenlive-15.08.1.tar.xz";
     };
   };
-  ktp-contact-runner = {
+  kdepim = {
     version = "15.08.1";
     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.1/src/kdepim-15.08.1.tar.xz";
+      sha256 = "06j6zmizkc8yg59dvnbcla82jb4csrwrvzzk3al18j6js0sdjnqr";
+      name = "kdepim-15.08.1.tar.xz";
     };
   };
-  kimap = {
+  kdepimlibs = {
     version = "15.08.1";
     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.1/src/kdepimlibs-15.08.1.tar.xz";
+      sha256 = "0sjh4n2hgcfd3ngbvzk051yzglkchcjhx0nnn12li0lw2bg7l9w3";
+      name = "kdepimlibs-15.08.1.tar.xz";
     };
   };
-  ksystemlog = {
+  kdepim-runtime = {
     version = "15.08.1";
     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.1/src/kdepim-runtime-15.08.1.tar.xz";
+      sha256 = "1hcg900bnjryxii3f1c2yjj2nr3z4pn7yigdxclmwpfk6gvlkqm4";
+      name = "kdepim-runtime-15.08.1.tar.xz";
     };
   };
-  kio-extras = {
+  kde-runtime = {
     version = "15.08.1";
     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.1/src/kde-runtime-15.08.1.tar.xz";
+      sha256 = "04vx2v9m5dz5jihvmqvcd6pvk312hdhgj7pkzv8q0lg3z81fqgyi";
+      name = "kde-runtime-15.08.1.tar.xz";
     };
   };
-  blinken = {
+  kdesdk-kioslaves = {
     version = "15.08.1";
     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.1/src/kdesdk-kioslaves-15.08.1.tar.xz";
+      sha256 = "161885bzayf804pdci5n1xh1n4zw3pddk2j53icn573gzpvczwla";
+      name = "kdesdk-kioslaves-15.08.1.tar.xz";
     };
   };
-  ktp-send-file = {
+  kdesdk-strigi-analyzers = {
     version = "15.08.1";
     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.1/src/kdesdk-strigi-analyzers-15.08.1.tar.xz";
+      sha256 = "1g2c511ba42mxg955yyh8w45ga5313mvvpkdl7yvbz7ikb2z6ji5";
+      name = "kdesdk-strigi-analyzers-15.08.1.tar.xz";
     };
   };
-  kdiamond = {
+  kdesdk-thumbnailers = {
     version = "15.08.1";
     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.1/src/kdesdk-thumbnailers-15.08.1.tar.xz";
+      sha256 = "0719qaw9whp1aa15cxcz7axfhmcm30iwwrr78xypzcy097f63q4v";
+      name = "kdesdk-thumbnailers-15.08.1.tar.xz";
     };
   };
-  kholidays = {
+  kde-wallpapers = {
     version = "15.08.1";
     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.1/src/kde-wallpapers-15.08.1.tar.xz";
+      sha256 = "01q5yh4q7kjjryab3jc8g4qwi4w18la6na0ra2mf0cf637xnlh83";
+      name = "kde-wallpapers-15.08.1.tar.xz";
     };
   };
-  kbounce = {
+  kdewebdev = {
     version = "15.08.1";
     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.1/src/kdewebdev-15.08.1.tar.xz";
+      sha256 = "00q25xp28m9sfgs7h4g89gyh34v36zwmliz1jvsq18aja45f5hpm";
+      name = "kdewebdev-15.08.1.tar.xz";
     };
   };
-  kaccounts-integration = {
+  kdf = {
     version = "15.08.1";
     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.1/src/kdf-15.08.1.tar.xz";
+      sha256 = "062rz8syp7kxc9xyl4ldcqx66fdrjh5fhgdqgdjdgpn273n5v447";
+      name = "kdf-15.08.1.tar.xz";
     };
   };
-  lskat = {
+  kdiamond = {
     version = "15.08.1";
     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.1/src/kdiamond-15.08.1.tar.xz";
+      sha256 = "1f81l6pnwrpirb5v0npcd2452dkdh0llpmzh57gfd8cik0n1agzm";
+      name = "kdiamond-15.08.1.tar.xz";
     };
   };
-  libkdeedu = {
+  kfloppy = {
     version = "15.08.1";
     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.1/src/kfloppy-15.08.1.tar.xz";
+      sha256 = "0yg94p5gj9xazl9kk503mblawyndv2j6m0scf6na68xksgx0yplv";
+      name = "kfloppy-15.08.1.tar.xz";
     };
   };
-  libkeduvocdocument = {
+  kfourinline = {
     version = "15.08.1";
     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.1/src/kfourinline-15.08.1.tar.xz";
+      sha256 = "19rssc5mf8hn6fv9pm91pbhdcxp123z9c1wrmay1wmja7fmnyv9s";
+      name = "kfourinline-15.08.1.tar.xz";
     };
   };
-  akonadi-search = {
+  kgeography = {
     version = "15.08.1";
     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.1/src/kgeography-15.08.1.tar.xz";
+      sha256 = "1ilb9l6v8pf7aq9dzs29bbdqb60fzf7a0dwjjdfvjq8jbnhcxa9v";
+      name = "kgeography-15.08.1.tar.xz";
     };
   };
-  katomic = {
+  kget = {
     version = "15.08.1";
     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.1/src/kget-15.08.1.tar.xz";
+      sha256 = "02npfzdk283930jywhjch6sscnj16w2n3nn4ik04bx8hxv74br74";
+      name = "kget-15.08.1.tar.xz";
     };
   };
-  kross-interpreters = {
+  kgoldrunner = {
     version = "15.08.1";
     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.1/src/kgoldrunner-15.08.1.tar.xz";
+      sha256 = "18xs36g9gmhzlwyg2gl9cc3842dzwc196dpfp0xshja2f1rlr6fp";
+      name = "kgoldrunner-15.08.1.tar.xz";
     };
   };
-  audiocd-kio = {
+  kgpg = {
     version = "15.08.1";
     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.1/src/kgpg-15.08.1.tar.xz";
+      sha256 = "0728pb6d70qfrbmd1d16lwxshy3ifb8snx5bi8vp9rrs7ncy8r4a";
+      name = "kgpg-15.08.1.tar.xz";
     };
   };
-  mplayerthumbs = {
+  khangman = {
     version = "15.08.1";
     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.1/src/khangman-15.08.1.tar.xz";
+      sha256 = "1g60s028b08vd34l7n8m4sd7d9zl419kz8f1hvdgs2z9zacd5zqg";
+      name = "khangman-15.08.1.tar.xz";
     };
   };
-  syndication = {
+  kholidays = {
     version = "15.08.1";
     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.1/src/kholidays-15.08.1.tar.xz";
+      sha256 = "1i875c7wpp5vlzjyw78bsxgyhmhv2y9846xbv6xi5y4b211iw6lf";
+      name = "kholidays-15.08.1.tar.xz";
     };
   };
-  kqtquickcharts = {
+  kidentitymanagement = {
     version = "15.08.1";
     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.1/src/kidentitymanagement-15.08.1.tar.xz";
+      sha256 = "0aslniqzp8bgayvvrxkdfb9ihvz57n6zf3rh99dsv34z20mfyc59";
+      name = "kidentitymanagement-15.08.1.tar.xz";
     };
   };
-  kmouth = {
+  kig = {
     version = "15.08.1";
     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.1/src/kig-15.08.1.tar.xz";
+      sha256 = "0wyvqfsgr1101vmzmsixribvd9plys91dvrx6cj9ji7mf4k5875g";
+      name = "kig-15.08.1.tar.xz";
     };
   };
-  dolphin = {
+  kigo = {
     version = "15.08.1";
     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.1/src/kigo-15.08.1.tar.xz";
+      sha256 = "1l1l0yxc6kz1y74pvr5nl5rdmynbzm5izrh412g30nzs30rj2hiw";
+      name = "kigo-15.08.1.tar.xz";
     };
   };
-  libkdcraw = {
+  killbots = {
     version = "15.08.1";
     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.1/src/killbots-15.08.1.tar.xz";
+      sha256 = "1p7lxi3rh8ghashy04252wc086kxz1crdxgnisfw4dv4kr17qmb2";
+      name = "killbots-15.08.1.tar.xz";
     };
   };
-  libksane = {
+  kimap = {
     version = "15.08.1";
     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.1/src/kimap-15.08.1.tar.xz";
+      sha256 = "07q4z16jfddh17khdd39dzasjfmnvd2zgdnph24s171815c2x2ps";
+      name = "kimap-15.08.1.tar.xz";
     };
   };
-  kmines = {
+  kio-extras = {
     version = "15.08.1";
     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.1/src/kio-extras-15.08.1.tar.xz";
+      sha256 = "06vnr10a3m4gs5bjz3dqx1bv1sqz3q69ihq1hlih4c8lyy9wd26q";
+      name = "kio-extras-15.08.1.tar.xz";
     };
   };
   kiriki = {
@@ -1154,828 +1162,820 @@
       name = "kiriki-15.08.1.tar.xz";
     };
   };
-  kaccessible = {
+  kiten = {
     version = "15.08.1";
     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.1/src/kiten-15.08.1.tar.xz";
+      sha256 = "1pz9frvf23hi2hy7g040prcgjvjssgv3yya2kvapafpmbwnd38dv";
+      name = "kiten-15.08.1.tar.xz";
     };
   };
-  ksnapshot = {
+  kjumpingcube = {
     version = "15.08.1";
     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.1/src/kjumpingcube-15.08.1.tar.xz";
+      sha256 = "1b0mqf9rhbdz4dfd0gbps59zzjqdif30zz642v4yi6mqnc002yv9";
+      name = "kjumpingcube-15.08.1.tar.xz";
     };
   };
-  kamera = {
+  kldap = {
     version = "15.08.1";
     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.1/src/kldap-15.08.1.tar.xz";
+      sha256 = "13mn0zkyd8qkp2rlcd75g821k3xpvwrj6xwjwvllfn25zsng32yw";
+      name = "kldap-15.08.1.tar.xz";
     };
   };
-  kdenetwork-filesharing = {
+  klettres = {
     version = "15.08.1";
     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.1/src/klettres-15.08.1.tar.xz";
+      sha256 = "0ykb5pfawiyby2xshfdq2gy7w66dw5vhqdd4vjkix6nyb87n703z";
+      name = "klettres-15.08.1.tar.xz";
     };
   };
-  kmag = {
+  klickety = {
     version = "15.08.1";
     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.1/src/klickety-15.08.1.tar.xz";
+      sha256 = "1prbr2401jy4pifcyn8dy6q34f1nrhvhh8gm8p5jbr1jkzxmm1k1";
+      name = "klickety-15.08.1.tar.xz";
     };
   };
-  kalarmcal = {
+  klines = {
     version = "15.08.1";
     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.1/src/klines-15.08.1.tar.xz";
+      sha256 = "17vnbk0qbiynyjycj5nda9w38ija5cvhlfhji1f580hq156qzsgl";
+      name = "klines-15.08.1.tar.xz";
     };
   };
-  kstars = {
+  kmag = {
     version = "15.08.1";
     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.1/src/kmag-15.08.1.tar.xz";
+      sha256 = "02bhjmmqb28qyacqzikrkxgh1zf4v1012kdjpdczsmnrgb1nmpgl";
+      name = "kmag-15.08.1.tar.xz";
     };
   };
-  ktp-approver = {
+  kmahjongg = {
     version = "15.08.1";
     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.1/src/kmahjongg-15.08.1.tar.xz";
+      sha256 = "193ynx3da2nyaf2ixq7gc93nv8p9djslh8m666kdnqcxarlxd2qn";
+      name = "kmahjongg-15.08.1.tar.xz";
     };
   };
-  kdesdk-kioslaves = {
+  kmailtransport = {
     version = "15.08.1";
     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.1/src/kmailtransport-15.08.1.tar.xz";
+      sha256 = "18gnhw49df0f7j0n0nzfnr5v6wvl37mf82slwbsrjqvhj60b2xsg";
+      name = "kmailtransport-15.08.1.tar.xz";
     };
   };
-  kdenetwork-strigi-analyzers = {
+  kmbox = {
     version = "15.08.1";
     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.1/src/kmbox-15.08.1.tar.xz";
+      sha256 = "1b4b9kk99kvcz4krixnzwvwf7ydkpbsrzza74f8ljbl40ldn94jn";
+      name = "kmbox-15.08.1.tar.xz";
     };
   };
-  juk = {
+  kmime = {
     version = "15.08.1";
     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.1/src/kmime-15.08.1.tar.xz";
+      sha256 = "1rz9nmx01rd4asv8iggh47m7snm0fdvlc9f59jpkbch1wxf70vqc";
+      name = "kmime-15.08.1.tar.xz";
     };
   };
-  kolf = {
+  kmines = {
     version = "15.08.1";
     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.1/src/kmines-15.08.1.tar.xz";
+      sha256 = "12n4im9vqyym5jr0chs4g3wjlr2d2a3i35jhm52j8ibdx7fnpmw6";
+      name = "kmines-15.08.1.tar.xz";
     };
   };
-  print-manager = {
+  kmix = {
     version = "15.08.1";
     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.1/src/kmix-15.08.1.tar.xz";
+      sha256 = "1lpzghasljw07kq9a94lw61l4qlvhif6cd7jypg0vici65lz8k7d";
+      name = "kmix-15.08.1.tar.xz";
     };
   };
-  kppp = {
+  kmousetool = {
     version = "15.08.1";
     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.1/src/kmousetool-15.08.1.tar.xz";
+      sha256 = "0snyqp2410bjkc5krxhkk08i3lyd5724513vs48lxdasv24jc0nz";
+      name = "kmousetool-15.08.1.tar.xz";
     };
   };
-  bovo = {
+  kmouth = {
     version = "15.08.1";
     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.1/src/kmouth-15.08.1.tar.xz";
+      sha256 = "1w6jgs9skis1y8g07hdzwpdsa7dmzfi5dw82wx0wnnmdm076vg41";
+      name = "kmouth-15.08.1.tar.xz";
     };
   };
-  ktimer = {
+  kmplot = {
     version = "15.08.1";
     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.1/src/kmplot-15.08.1.tar.xz";
+      sha256 = "1a1b6vcxp1wkp6qfidwj42vqkh6wm4m64q0hm7zv6h01l10fzdm2";
+      name = "kmplot-15.08.1.tar.xz";
     };
   };
-  kpimtextedit = {
+  knavalbattle = {
     version = "15.08.1";
     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.1/src/knavalbattle-15.08.1.tar.xz";
+      sha256 = "1j235kdnb0qx1dkq89gqcwk0qjj16m0iyf502d6p1mz8cskz7fkp";
+      name = "knavalbattle-15.08.1.tar.xz";
     };
   };
-  filelight = {
+  knetwalk = {
     version = "15.08.1";
     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.1/src/knetwalk-15.08.1.tar.xz";
+      sha256 = "0biis3gz943s09dzdxxdpkpizy3qzp9csi72njbm3bapxwmcflr2";
+      name = "knetwalk-15.08.1.tar.xz";
     };
   };
-  khangman = {
+  kolf = {
     version = "15.08.1";
     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.1/src/kolf-15.08.1.tar.xz";
+      sha256 = "05xldbfkbbvmq743029cksgdcsfn20xadn91sw1yp9146k0bd97h";
+      name = "kolf-15.08.1.tar.xz";
     };
   };
-  kteatime = {
+  kollision = {
     version = "15.08.1";
     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.1/src/kollision-15.08.1.tar.xz";
+      sha256 = "03bm9ydrfq0kicf7j2bmrvjgcffciq7ys0fz0xpcllkwglidsnar";
+      name = "kollision-15.08.1.tar.xz";
     };
   };
-  gpgmepp = {
+  kolourpaint = {
     version = "15.08.1";
     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.1/src/kolourpaint-15.08.1.tar.xz";
+      sha256 = "1m0dwv2wxf5nsisg4zc6h1cqbnzv4187il7y45rbkxli430jh43d";
+      name = "kolourpaint-15.08.1.tar.xz";
     };
   };
-  ktp-contact-list = {
+  kompare = {
     version = "15.08.1";
     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.1/src/kompare-15.08.1.tar.xz";
+      sha256 = "0n474f1nvbkxj1ryyv2x0yqm9qg3crdzmr30l2fbagi2fxmjxkli";
+      name = "kompare-15.08.1.tar.xz";
     };
   };
-  klettres = {
+  konquest = {
     version = "15.08.1";
     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.1/src/konquest-15.08.1.tar.xz";
+      sha256 = "0ss7gvr8ihk7ip4dhxyps8h1137i5m20m6sf0rv10c2h0y9cy0zk";
+      name = "konquest-15.08.1.tar.xz";
     };
   };
-  kidentitymanagement = {
+  konsole = {
     version = "15.08.1";
     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.1/src/konsole-15.08.1.tar.xz";
+      sha256 = "15d401xxqhd8sfjc6gpn7f1zcs5w8l6y2bjvjvidmpzmr24xky1j";
+      name = "konsole-15.08.1.tar.xz";
     };
   };
-  libkdegames = {
+  kontactinterface = {
     version = "15.08.1";
     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.1/src/kontactinterface-15.08.1.tar.xz";
+      sha256 = "1axsixl5yvawrczpgfbrcyax9d9mmc8yjvkxi0hi26mq8zzxkxnm";
+      name = "kontactinterface-15.08.1.tar.xz";
     };
   };
-  kmailtransport = {
+  kopete = {
     version = "15.08.1";
     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.1/src/kopete-15.08.1.tar.xz";
+      sha256 = "0949m4xw94hnw79c6ar8m9qjcx7r14qs6jww3pcnab7r0ax4xahb";
+      name = "kopete-15.08.1.tar.xz";
     };
   };
-  kbruch = {
+  kpat = {
     version = "15.08.1";
     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.1/src/kpat-15.08.1.tar.xz";
+      sha256 = "0cw17agpx23fsmnnvwkjn3xvq59d6hpppgydalnhrqka9321qy2d";
+      name = "kpat-15.08.1.tar.xz";
     };
   };
-  zeroconf-ioslave = {
+  kpimtextedit = {
     version = "15.08.1";
     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.1/src/kpimtextedit-15.08.1.tar.xz";
+      sha256 = "1djk0gyfdxsqjwhrqf4rnkjvy7hz1rysdm3idjqrnjhnlrjwsiwc";
+      name = "kpimtextedit-15.08.1.tar.xz";
     };
   };
-  kdegraphics-thumbnailers = {
+  kppp = {
     version = "15.08.1";
     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.1/src/kppp-15.08.1.tar.xz";
+      sha256 = "1v2dqb9bdi1yl4fpyn98iq8pg69r9pfy7z1wbq6b37nwlhlapva8";
+      name = "kppp-15.08.1.tar.xz";
     };
   };
-  kreversi = {
+  kqtquickcharts = {
     version = "15.08.1";
     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.1/src/kqtquickcharts-15.08.1.tar.xz";
+      sha256 = "0jjn8nrxqjpsg9cwfazqz7v4lacl99wxhdh9mclqxk4xy54ydxqc";
+      name = "kqtquickcharts-15.08.1.tar.xz";
     };
   };
-  kdewebdev = {
+  krdc = {
     version = "15.08.1";
     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.1/src/krdc-15.08.1.tar.xz";
+      sha256 = "1gx3vhl8w64ya71894lgy2i3kkggr84r1c5sx8nbwvapw5v4ngiz";
+      name = "krdc-15.08.1.tar.xz";
     };
   };
-  kgoldrunner = {
+  kremotecontrol = {
     version = "15.08.1";
     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.1/src/kremotecontrol-15.08.1.tar.xz";
+      sha256 = "01fck27b3ilni2h78lmhq27aq4sw89060bh69xhw8z80iad2bxyy";
+      name = "kremotecontrol-15.08.1.tar.xz";
     };
   };
-  kde-base-artwork = {
+  kreversi = {
     version = "15.08.1";
     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.1/src/kreversi-15.08.1.tar.xz";
+      sha256 = "0clxm23a0m5j8aj3cp1va5s38y0y5wr7akwmigpk37xjylzp1xdd";
+      name = "kreversi-15.08.1.tar.xz";
     };
   };
-  kiten = {
+  krfb = {
     version = "15.08.1";
     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.1/src/krfb-15.08.1.tar.xz";
+      sha256 = "0cpypajr483iwch385240zi5l0vf4j28k0sng0kszhizspkhvp35";
+      name = "krfb-15.08.1.tar.xz";
     };
   };
-  kmahjongg = {
+  kross-interpreters = {
     version = "15.08.1";
     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.1/src/kross-interpreters-15.08.1.tar.xz";
+      sha256 = "1lqkmxxw1kz23q4pmmvrwqgi9vkxp0pw6g3zpr0x4zkzsj62q2ff";
+      name = "kross-interpreters-15.08.1.tar.xz";
     };
   };
-  kcolorchooser = {
+  kruler = {
     version = "15.08.1";
     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.1/src/kruler-15.08.1.tar.xz";
+      sha256 = "06qlvdyd1cbw8vr2qcqs7q8jylj7kl0y218agp8b60h03nri9psj";
+      name = "kruler-15.08.1.tar.xz";
     };
   };
-  kapman = {
+  ksaneplugin = {
     version = "15.08.1";
     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.1/src/ksaneplugin-15.08.1.tar.xz";
+      sha256 = "0fx0y4js4nbbky342ly3aw59rbzz25mjb1da0hkykky9kxrcwnxk";
+      name = "ksaneplugin-15.08.1.tar.xz";
     };
   };
-  gwenview = {
+  kscd = {
     version = "15.08.1";
     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.1/src/kscd-15.08.1.tar.xz";
+      sha256 = "0alf1088p32spwlpjjj91wpgk48ahzqphvag8adgvh9cp8ij7m7j";
+      name = "kscd-15.08.1.tar.xz";
     };
   };
-  kcron = {
+  kshisen = {
     version = "15.08.1";
     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.1/src/kshisen-15.08.1.tar.xz";
+      sha256 = "1lrn5l4jscbn0ppppshpkh62plskzwy2km9dqp1hp5czpq5zvwk8";
+      name = "kshisen-15.08.1.tar.xz";
     };
   };
-  kdeartwork = {
+  ksirk = {
     version = "15.08.1";
     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.1/src/ksirk-15.08.1.tar.xz";
+      sha256 = "00zlmjyxf31hl910kickgxcc3sh5g2j9grg2mlps8qxdv9m4g1d5";
+      name = "ksirk-15.08.1.tar.xz";
     };
   };
-  ktp-accounts-kcm = {
+  ksnakeduel = {
     version = "15.08.1";
     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.1/src/ksnakeduel-15.08.1.tar.xz";
+      sha256 = "1q0hcya6dl2lfahqnwx18hl6cwmibsvlyf25x41d42669f7vm1zz";
+      name = "ksnakeduel-15.08.1.tar.xz";
     };
   };
-  kdepim-runtime = {
+  ksnapshot = {
     version = "15.08.1";
     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.1/src/ksnapshot-15.08.1.tar.xz";
+      sha256 = "19z3rbvkn55waig6dm1lvan6wlndshhjbiqwwdlc9nh2wng8dcd0";
+      name = "ksnapshot-15.08.1.tar.xz";
     };
   };
-  kfloppy = {
+  kspaceduel = {
     version = "15.08.1";
     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.1/src/kspaceduel-15.08.1.tar.xz";
+      sha256 = "0anviqhcmyfnyq9zz6hh8cka75hy5ydxq5yvz7q0g6c3flj34fq2";
+      name = "kspaceduel-15.08.1.tar.xz";
     };
   };
-  kopete = {
+  ksquares = {
     version = "15.08.1";
     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.1/src/ksquares-15.08.1.tar.xz";
+      sha256 = "17qx89q594w22nd2qhqcmb1wc291b89zs22jh62xrm62yr6h9ijj";
+      name = "ksquares-15.08.1.tar.xz";
     };
   };
-  okular = {
+  kstars = {
     version = "15.08.1";
     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.1/src/kstars-15.08.1.tar.xz";
+      sha256 = "049pnbqn1ddmqd663vc181yh5z204klbs255w41k7p1z1vl5zszr";
+      name = "kstars-15.08.1.tar.xz";
     };
   };
-  kdf = {
+  ksudoku = {
     version = "15.08.1";
     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.1/src/ksudoku-15.08.1.tar.xz";
+      sha256 = "1l6dgackab9k1rnzbwwz3rfpxlqvydp5q632ibpqs449c6pk3kww";
+      name = "ksudoku-15.08.1.tar.xz";
     };
   };
-  kfourinline = {
+  ksystemlog = {
     version = "15.08.1";
     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.1/src/ksystemlog-15.08.1.tar.xz";
+      sha256 = "1v18f6dcirr6rayaxy8h85swj04g5giafs67h64g9flq5gacykji";
+      name = "ksystemlog-15.08.1.tar.xz";
     };
   };
-  kdeedu-data = {
+  kteatime = {
     version = "15.08.1";
     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.1/src/kteatime-15.08.1.tar.xz";
+      sha256 = "0bsy22dgfpsibkpi0nv4245mxaf0xnh8rpaia8mzrh0d72gf2syb";
+      name = "kteatime-15.08.1.tar.xz";
     };
   };
-  kubrick = {
+  ktimer = {
     version = "15.08.1";
     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.1/src/ktimer-15.08.1.tar.xz";
+      sha256 = "07882zpgalf2yzqplg3mzl6sxh84zfkbk1jwlw8kwkr7pr7lmfvv";
+      name = "ktimer-15.08.1.tar.xz";
     };
   };
-  svgpart = {
+  ktnef = {
     version = "15.08.1";
     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.1/src/ktnef-15.08.1.tar.xz";
+      sha256 = "04jq60qpbgaclscgpwx3sj0l67sqzk9zr01zr6fx127apqzc2xmh";
+      name = "ktnef-15.08.1.tar.xz";
     };
   };
-  kanagram = {
+  ktouch = {
     version = "15.08.1";
     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.1/src/ktouch-15.08.1.tar.xz";
+      sha256 = "1hlg1l1xpmpwvzz47vmif395pw9szjy93p8yxhqsdhkh1f4mdssq";
+      name = "ktouch-15.08.1.tar.xz";
     };
   };
-  klickety = {
+  ktp-accounts-kcm = {
     version = "15.08.1";
     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.1/src/ktp-accounts-kcm-15.08.1.tar.xz";
+      sha256 = "1qk25v0ivxkv8cyq4y44ixz9rx28djfxk06zcvn2m1rwjqhrx204";
+      name = "ktp-accounts-kcm-15.08.1.tar.xz";
     };
   };
-  kgpg = {
+  ktp-approver = {
     version = "15.08.1";
     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.1/src/ktp-approver-15.08.1.tar.xz";
+      sha256 = "0qdax2zby93xc694s3s6s21y4bfjbfxsd292ag544cwazcjz8zp5";
+      name = "ktp-approver-15.08.1.tar.xz";
     };
   };
-  kdepim = {
+  ktp-auth-handler = {
     version = "15.08.1";
     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.1/src/ktp-auth-handler-15.08.1.tar.xz";
+      sha256 = "0dwpaw2pvigc0lyqa29gxq49fp6rp5hh2wg6ysr1d00s54lr2qgw";
+      name = "ktp-auth-handler-15.08.1.tar.xz";
     };
   };
-  granatier = {
+  ktp-common-internals = {
     version = "15.08.1";
     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.1/src/ktp-common-internals-15.08.1.tar.xz";
+      sha256 = "13alrk7zn3vq6khackdbyqbk209ivvcfza9mpqaxxll8sg9r3i3k";
+      name = "ktp-common-internals-15.08.1.tar.xz";
     };
   };
-  knetwalk = {
+  ktp-contact-list = {
     version = "15.08.1";
     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.1/src/ktp-contact-list-15.08.1.tar.xz";
+      sha256 = "0x8fvfqjjrhdnfaa9ybagf33lv1r21bywkipvkp2f81dalsd1sv0";
+      name = "ktp-contact-list-15.08.1.tar.xz";
     };
   };
-  rocs = {
+  ktp-contact-runner = {
     version = "15.08.1";
     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.1/src/ktp-contact-runner-15.08.1.tar.xz";
+      sha256 = "1m8jc39l9d394x3hqlqvc5msy7wi1aki9q8nd4bg6nmdz8v5dxz9";
+      name = "ktp-contact-runner-15.08.1.tar.xz";
     };
   };
-  kde-dev-utils = {
+  ktp-desktop-applets = {
     version = "15.08.1";
     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.1/src/ktp-desktop-applets-15.08.1.tar.xz";
+      sha256 = "16nan7vb2gzpll2fnc4li23sjjxhgy7ijzfp6zcp5gc1bxn86jj4";
+      name = "ktp-desktop-applets-15.08.1.tar.xz";
     };
   };
-  kdesdk-thumbnailers = {
+  ktp-filetransfer-handler = {
     version = "15.08.1";
     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.1/src/ktp-filetransfer-handler-15.08.1.tar.xz";
+      sha256 = "135zpcl0g81xd9hljch05cjngs6x05cnzngzx5h5hsjf13fgz9cn";
+      name = "ktp-filetransfer-handler-15.08.1.tar.xz";
     };
   };
-  kigo = {
+  ktp-kded-module = {
     version = "15.08.1";
     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.1/src/ktp-kded-module-15.08.1.tar.xz";
+      sha256 = "0l2s07z87q2j92q4w6n16rbvd7xm8k4zgchlk06djb5d9gwdgvl0";
+      name = "ktp-kded-module-15.08.1.tar.xz";
     };
   };
-  jovie = {
+  ktp-send-file = {
     version = "15.08.1";
     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.1/src/ktp-send-file-15.08.1.tar.xz";
+      sha256 = "07pk6d1rzz0hwfsw7nk4grixvvjja219jvr56j50vpnlmlza29xs";
+      name = "ktp-send-file-15.08.1.tar.xz";
     };
   };
-  amor = {
+  ktp-text-ui = {
     version = "15.08.1";
     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.1/src/ktp-text-ui-15.08.1.tar.xz";
+      sha256 = "1f7r47rbcciq12c5531qb9wr7xqz7nvsy04jk8gaxwdsr9a97ayf";
+      name = "ktp-text-ui-15.08.1.tar.xz";
     };
   };
-  kspaceduel = {
+  ktuberling = {
     version = "15.08.1";
     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.1/src/ktuberling-15.08.1.tar.xz";
+      sha256 = "1y9ifgg2086zz45pj32xxjrgnbsgiq7ajbjl8cybjxcx624j66ic";
+      name = "ktuberling-15.08.1.tar.xz";
     };
   };
-  libkipi = {
+  kturtle = {
     version = "15.08.1";
     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.1/src/kturtle-15.08.1.tar.xz";
+      sha256 = "0n6vbj2kvcby62cn8i65dq2rl5jv1zfp9xbg827s6vz681an2sqk";
+      name = "kturtle-15.08.1.tar.xz";
     };
   };
-  kgeography = {
+  ktux = {
     version = "15.08.1";
     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.1/src/ktux-15.08.1.tar.xz";
+      sha256 = "1vw0ybkvrcqcng6sz0hw12bhsspig98m0wjn8phlyljfd5d8p4h3";
+      name = "ktux-15.08.1.tar.xz";
     };
   };
-  kajongg = {
+  kubrick = {
     version = "15.08.1";
     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.1/src/kubrick-15.08.1.tar.xz";
+      sha256 = "1sanlaz70m1jpaxjwlx2gljh57gg4gdcz7y9g2w191667yk0kq8g";
+      name = "kubrick-15.08.1.tar.xz";
     };
   };
-  kolourpaint = {
+  kuser = {
     version = "15.08.1";
     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.1/src/kuser-15.08.1.tar.xz";
+      sha256 = "0qgvjfh1r4ri227zbcb2v9dg7njg1wq3pi189y0l3jzgfa4h1aph";
+      name = "kuser-15.08.1.tar.xz";
     };
   };
-  marble = {
+  kwalletmanager = {
     version = "15.08.1";
     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.1/src/kwalletmanager-15.08.1.tar.xz";
+      sha256 = "1ibfiaglwgqxnsmx1f8pcylv0kzywpd2mvyawcdhcl3yqdpyw4v7";
+      name = "kwalletmanager-15.08.1.tar.xz";
     };
   };
-  kblog = {
+  kwordquiz = {
     version = "15.08.1";
     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.1/src/kwordquiz-15.08.1.tar.xz";
+      sha256 = "0b20n7k8ging2gw6l0k09r71ww1dg0fh5y5lqzlzcl8vqhdwkwpp";
+      name = "kwordquiz-15.08.1.tar.xz";
     };
   };
-  kget = {
+  libkcddb = {
     version = "15.08.1";
     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.1/src/libkcddb-15.08.1.tar.xz";
+      sha256 = "1x26dpr26d6xc73203dbk3vni7hcn1w6jdk94ffs0aaf3bmifal2";
+      name = "libkcddb-15.08.1.tar.xz";
     };
   };
-  ktuberling = {
+  libkcompactdisc = {
     version = "15.08.1";
     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.1/src/libkcompactdisc-15.08.1.tar.xz";
+      sha256 = "19b6zjzdmjagz9d9x1bb46cc59r92qm9g0pbvim9br603crwsasd";
+      name = "libkcompactdisc-15.08.1.tar.xz";
     };
   };
-  krfb = {
+  libkdcraw = {
     version = "15.08.1";
     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.1/src/libkdcraw-15.08.1.tar.xz";
+      sha256 = "0kshhch81sqjlashbh3ww3nz9ahv99f1bsxlrly39rvfa8yg6vpv";
+      name = "libkdcraw-15.08.1.tar.xz";
     };
   };
-  ktp-filetransfer-handler = {
+  libkdeedu = {
     version = "15.08.1";
     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.1/src/libkdeedu-15.08.1.tar.xz";
+      sha256 = "09fv1fbxlf6n4k0fyiy49avykpnxbmvi833i6ibm90v9csrfv6hf";
+      name = "libkdeedu-15.08.1.tar.xz";
     };
   };
-  ktouch = {
+  libkdegames = {
     version = "15.08.1";
     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.1/src/libkdegames-15.08.1.tar.xz";
+      sha256 = "0khr3rih3yv2vh9q2dkvdc2r1lpxhky5hmh7gachhyjh0296i9nq";
+      name = "libkdegames-15.08.1.tar.xz";
     };
   };
-  kmplot = {
+  libkeduvocdocument = {
     version = "15.08.1";
     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.1/src/libkeduvocdocument-15.08.1.tar.xz";
+      sha256 = "0fz8fkcai1zdmqhvcic689sbwm07zg69z7jw4m6wgk7yqls8mkvq";
+      name = "libkeduvocdocument-15.08.1.tar.xz";
     };
   };
-  okteta = {
+  libkexiv2 = {
     version = "15.08.1";
     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.1/src/libkexiv2-15.08.1.tar.xz";
+      sha256 = "0cgbh6g5kqi8lzlnidd19yxlyzid71pncpxikmhqfmnwhdgrqq2f";
+      name = "libkexiv2-15.08.1.tar.xz";
     };
   };
-  kdepimlibs = {
+  libkface = {
     version = "15.08.1";
     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.1/src/libkface-15.08.1.tar.xz";
+      sha256 = "0k2rsmnzfyab1x1nyirlhs48c19b2i2f0x60w1igp7b66n6819kd";
+      name = "libkface-15.08.1.tar.xz";
     };
   };
-  kwalletmanager = {
+  libkgeomap = {
     version = "15.08.1";
     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.1/src/libkgeomap-15.08.1.tar.xz";
+      sha256 = "18y3pas4bx16ykf50jlwry7fbrx34cz1s0qflirxyrx6n8kh9lgm";
+      name = "libkgeomap-15.08.1.tar.xz";
     };
   };
-  kmime = {
+  libkipi = {
     version = "15.08.1";
     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.1/src/libkipi-15.08.1.tar.xz";
+      sha256 = "0mmk8zfwffns7gacdjhjh45ki762wpd21nwvgbjclf3rjzgbyxz8";
+      name = "libkipi-15.08.1.tar.xz";
     };
   };
-  ktp-auth-handler = {
+  libkmahjongg = {
     version = "15.08.1";
     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.1/src/libkmahjongg-15.08.1.tar.xz";
+      sha256 = "1jpcj2kj9wn6988gzz4csrwy4c2pwbnyi184iq6c39fmbvrv4f2r";
+      name = "libkmahjongg-15.08.1.tar.xz";
     };
   };
-  ktux = {
+  libkomparediff2 = {
     version = "15.08.1";
     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.1/src/libkomparediff2-15.08.1.tar.xz";
+      sha256 = "1g8j5idy18a4fnc2m9cjg3xzq6kck070yq5ki4l9lbjinrhl3jpr";
+      name = "libkomparediff2-15.08.1.tar.xz";
     };
   };
-  ffmpegthumbs = {
+  libksane = {
     version = "15.08.1";
     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.1/src/libksane-15.08.1.tar.xz";
+      sha256 = "0ih4axq0pcpvmgs8x12ad22bxixcccqpkqs160vxl7a29327rbdm";
+      name = "libksane-15.08.1.tar.xz";
     };
   };
-  libkomparediff2 = {
+  lokalize = {
     version = "15.08.1";
     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.1/src/lokalize-15.08.1.tar.xz";
+      sha256 = "15xsx430a9w3kr1abvlh4h3spn063992mc76rq17c7a8n1n7zr4b";
+      name = "lokalize-15.08.1.tar.xz";
     };
   };
-  kalgebra = {
+  lskat = {
     version = "15.08.1";
     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.1/src/lskat-15.08.1.tar.xz";
+      sha256 = "13vhfpi34qcv6q56qaxwk89apss8l921a59qvlmadmw999h7ms0s";
+      name = "lskat-15.08.1.tar.xz";
     };
   };
-  kblocks = {
+  marble = {
     version = "15.08.1";
     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.1/src/marble-15.08.1.tar.xz";
+      sha256 = "0dx0r1hjcfn3mvmsw0wgaw57jkn42166aj97ky0zdhdavkqv4j3j";
+      name = "marble-15.08.1.tar.xz";
     };
   };
-  kblackbox = {
+  mplayerthumbs = {
     version = "15.08.1";
     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.1/src/mplayerthumbs-15.08.1.tar.xz";
+      sha256 = "01l063iply1d4bfdb04agj11imha4fpnv131dcfd39ixi1icv8yb";
+      name = "mplayerthumbs-15.08.1.tar.xz";
     };
   };
-  kdegraphics-mobipocket = {
+  okteta = {
     version = "15.08.1";
     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.1/src/okteta-15.08.1.tar.xz";
+      sha256 = "14mbfqc61rw2g89shh0ad38ph24c6nrj76qx9g1diazvr3p9sf1j";
+      name = "okteta-15.08.1.tar.xz";
     };
   };
-  ksnakeduel = {
+  okular = {
     version = "15.08.1";
     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.1/src/okular-15.08.1.tar.xz";
+      sha256 = "0nicpz25srpn9zmwjxrnz8h2ba597ixsqcyhymki465dv5hgx5x7";
+      name = "okular-15.08.1.tar.xz";
     };
   };
-  kde-wallpapers = {
+  palapeli = {
     version = "15.08.1";
     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.08.1/src/palapeli-15.08.1.tar.xz";
+      sha256 = "09sbyw25ngvcg6inhh7ig0x5yyhsi3gw2il1p98sfdabjk2f8736";
+      name = "palapeli-15.08.1.tar.xz";
     };
   };
-  konsole = {
+  parley = {
     version = "15.08.1";
     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";
-    };
-  };
-  kdelibs = {
-    version = "4.14.12";
-    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.1/src/parley-15.08.1.tar.xz";
+      sha256 = "0f88ia58f9lw8rpz1mgr21hslkmwnwwf2ac0affm81b17nxx8zpc";
+      name = "parley-15.08.1.tar.xz";
     };
   };
-  cantor = {
+  picmi = {
     version = "15.08.1";
     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.1/src/picmi-15.08.1.tar.xz";
+      sha256 = "16sa0w3bhxbj8f8nl0wh5b639gzi6y45167g3mh62a7di6llw1rm";
+      name = "picmi-15.08.1.tar.xz";
     };
   };
-  kmbox = {
+  poxml = {
     version = "15.08.1";
     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.1/src/poxml-15.08.1.tar.xz";
+      sha256 = "076ksfa9pdjbs8xk38j5z1ysryqcq68fgk5zw157cmxjaxv4ahqm";
+      name = "poxml-15.08.1.tar.xz";
     };
   };
-  kde-dev-scripts = {
+  print-manager = {
     version = "15.08.1";
     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.1/src/print-manager-15.08.1.tar.xz";
+      sha256 = "0cy5ga11kk11ca4nzpr6wjb4a342ziaflilc9pz6l3b7r8vhjv09";
+      name = "print-manager-15.08.1.tar.xz";
     };
   };
-  krdc = {
+  rocs = {
     version = "15.08.1";
     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.1/src/rocs-15.08.1.tar.xz";
+      sha256 = "1s3mdi9hqhajryax4yg074dn0h5yq9fq4a8j6ksgg7a2ggl4l8kv";
+      name = "rocs-15.08.1.tar.xz";
     };
   };
-  ktnef = {
+  signon-kwallet-extension = {
     version = "15.08.1";
     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.1/src/signon-kwallet-extension-15.08.1.tar.xz";
+      sha256 = "1pb73zqs34kygvaphgrvvl08hj882znsws1nzwbyyskyn6gjsw2n";
+      name = "signon-kwallet-extension-15.08.1.tar.xz";
     };
   };
-  kdenlive = {
+  step = {
     version = "15.08.1";
     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.1/src/step-15.08.1.tar.xz";
+      sha256 = "15capfa297s4shrr6xwbpg62rn8pimwpmjm11p160g6lqdspwacm";
+      name = "step-15.08.1.tar.xz";
     };
   };
-  kwordquiz = {
+  superkaramba = {
     version = "15.08.1";
     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.1/src/superkaramba-15.08.1.tar.xz";
+      sha256 = "0pk7kr2bcj2yasf9af3bdqg207pidkg5m2yafmvp83dz2anyxad9";
+      name = "superkaramba-15.08.1.tar.xz";
     };
   };
-  libkface = {
+  svgpart = {
     version = "15.08.1";
     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.1/src/svgpart-15.08.1.tar.xz";
+      sha256 = "10vvnsm7xlgy5fia8l8cz6cgj4xsjshiqkiiwkzlmyzzx081zi57";
+      name = "svgpart-15.08.1.tar.xz";
     };
   };
-  kde-baseapps = {
+  sweeper = {
     version = "15.08.1";
     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.1/src/sweeper-15.08.1.tar.xz";
+      sha256 = "08vk9yq7py576irkg34d3rzkdrzi6bb6zhynbyziyx097sqj5khj";
+      name = "sweeper-15.08.1.tar.xz";
     };
   };
-  cervisia = {
+  syndication = {
     version = "15.08.1";
     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.1/src/syndication-15.08.1.tar.xz";
+      sha256 = "1kklbw77iiiqfcv8sydy9jkc8g630xw551y6r1jp1wbvrdkjwq47";
+      name = "syndication-15.08.1.tar.xz";
     };
   };
-  kmousetool = {
+  umbrello = {
     version = "15.08.1";
     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.1/src/umbrello-15.08.1.tar.xz";
+      sha256 = "0pq2d4iz1dmxb7cdmcja65703qlsakp590v5yjvhjsnlasnk8anj";
+      name = "umbrello-15.08.1.tar.xz";
     };
   };
-  ksaneplugin = {
+  zeroconf-ioslave = {
     version = "15.08.1";
     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.1/src/zeroconf-ioslave-15.08.1.tar.xz";
+      sha256 = "1h8v78b6fb82brpxkhlwyphb830ndzlq4z5llgav1dy7i0v8pd7r";
+      name = "zeroconf-ioslave-15.08.1.tar.xz";
     };
   };
 }
diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index bc4c97d1f213..149cd05bd7b7 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.76";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "09lxb2li70p6fg7hbakin9ffy3b3101c1gdjqi3pykks5q3h9sq4";
+    sha256 = "0daqirvlr0bwgrgrr7igyl8rcgjvpvrgns76z2z57kdxi6d696av";
   };
 
   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 5bd9bcf5c49e..9b1a6c6ad35a 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   name = "calibre-${version}";
-  version = "2.38.0";
+  version = "2.40.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "075axil53djss99fj9drfh5cvxdbjw6z5z5qk53vm13k5pw6bmhn";
+    sha256 = "1xzf910w3c15vajnlra32xzi0gwb4z7a9m9w5nfj0by2wss3fv7n";
   };
 
   inherit python;
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 3a94456e6cc7..52298e6c297b 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/rxvt_unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt_unicode-plugins/urxvt-perls/default.nix
index 6a1acca48d9a..03a505591b7a 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/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index c1d74c247cef..325a42b70b15 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlSupport, libX11, libXt, libXft, ncurses, perl,
+{ stdenv, fetchurl, fetchpatch, perlSupport, libX11, libXt, libXft, ncurses, perl,
   fontconfig, freetype, pkgconfig, libXrender, gdkPixbufSupport, gdk_pixbuf,
   unicode3Support }:
 
@@ -28,6 +28,10 @@ stdenv.mkDerivation (rec {
   patches = [
     ./rxvt-unicode-9.06-font-width.patch
     ./rxvt-unicode-256-color-resources.patch
+    (fetchpatch {
+      url = "https://raw.githubusercontent.com/mina86/urxvt-tabbedex/ad4f54c8b8d3a01fc17975fd3fd14aa674c07d2b/rxvt-unicode-scroll-bug-fix.patch";
+      sha256 = "1ild0r6y7jb800yiss5pgd4k60s7l9njv3nn3x280yvg1lx6ihpg";
+    })
   ]
   ++ stdenv.lib.optional stdenv.isDarwin ./rxvt-unicode-makefile-phony.patch;
 
diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix
index 8086e8ca56d4..7dce7c7fbcd2 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/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix
new file mode 100644
index 000000000000..1c6dc8f63c23
--- /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/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index b80e3b534fbb..94755ea3ad43 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.52";
+    sha256 = "00sgb1pnp3fcijwdwpngnnddmn5nrbljsqz7f6dlnd63qfc91xjw";
+    sha256bin32 = "10jgcxc2zwffg8lxi55zl9apql6pyxh1g1n3z46gcb6j6am4y5m5";
+    sha256bin64 = "0i839ir4qcjl9llpqnwy793hvbdfh898x1izc5k93h7nm6i34ry9";
   };
   stable = {
     version = "45.0.2454.101";
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 01c643408757..4b94ecdcf5fa 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.535";
 
   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 = "13fy842plbnv4w081sbhga0jrpbwz8yydg49c2v96l2marmzw9zp";
       }
     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 = "0z99nz1k0cf86dgs367ddxfnf05m32psidpmdzi5qiqaj10h6j6s";
       }
     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 b29f2d1974c0..ab199ff97cdf 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 7f2190ab82c6..267b0871f080 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/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 5786d708cd6c..1a36dd8ae205 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/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix
index db2934785eb7..e085adbdcda7 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/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix
index ea7e09626994..e6c45e7335f9 100644
--- a/pkgs/applications/networking/ids/snort/default.nix
+++ b/pkgs/applications/networking/ids/snort/default.nix
@@ -10,7 +10,15 @@ stdenv.mkDerivation rec {
     sha256 = "1gmlrh9ygpd5h6nnrr4090wk5n2yq2yrvwi7q6xbm6lxj4rcamyv";
   };
   
-  buildInputs = [ libpcap pcre libdnet daq zlib flex bison ];
+  buildInputs = [ makeWrapper libpcap pcre libdnet daq zlib flex bison ];
+
+  enableParallelBuilding = true;
+
+  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 --dynamic-preprocessor-lib-dir $out/lib/snort_dynamicpreprocessor/ --dynamic-engine-lib-dir $out/lib/snort_dynamicengine"
+  '';
   
   meta = {
     description = "Network intrusion prevention and detection system (IDS/IPS)";
diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index d41ba5fcdb3a..2b60b3a7a463 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/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 69497f87c6b2..b2325e87e0d5 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 000000000000..1c717eb97fba
--- /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 ece4b9f0e013..a18ffac5d63d 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 f226ff16a1c9..b29165fde97c 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 5437c1c65d76..62f5df4b69a7 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/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index afe27eb38149..8660d94a9e0b 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.base ]; }."qt${toString source.qtVersion}"
+      ++ (overrides.nativeBuildInputs or [ ]);
+    buildInputs = [ boost protobuf avahi ]
+      ++ { qt4 = [ qt4 ]; qt5 = [ qt5.base ]; }."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.tools;
+    buildInputs = [ libopus libsndfile speex ]
+      ++ optional (source.qtVersion == 5) qt5.svg
+      ++ 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-09-27";
+    qtVersion = 5;
+
+    src = fetchgit {
+      url = "https://github.com/mumble-voip/mumble";
+      rev = "13e494c60beb20748eeb8be126b27e1226d168c8";
+      sha256 = "1vihassis5i7hyljbb8qjihjj4y80n5l380x5dl0nwb55j2mylhg";
+    };
+
+    # 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 cb10fca6cd90..000000000000
--- 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 000000000000..f3faa0128bb5
--- /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/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index c762edb857ba..d8685da8d81f 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/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index 403630e25e55..525e15470232 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}/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/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index f1adef86dc94..55bdd8eceb06 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/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 0f13faf7513e..79bfef08bb50 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 000000000000..c736c7098a30
--- /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 3182f4a5c66c..555da3de6d53 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/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/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
index c13c5e070011..c0acb13740a8 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/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 5a44240fa769..0557b8a2c55e 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/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 3fd3d31c18cc..142822023fb9 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -110,6 +110,7 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
       done
     '';
diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 040f74c16ff8..b65dfe921c49 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/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 1bedb404a2a9..48cb3d0e758e 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.0.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 = "1nqv5p94zpnhcaqkifnn83ap7dd0qrb0qiicswbyhhby0f48pzpc";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index a98ebe424c6a..d2305f83067f 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -37,6 +37,7 @@ buildPythonPackage rec {
       gsettings_desktop_schemas
       gnome3.defaultIconTheme
       wrapGAppsHook
+      dconf
     ];
 
   configurePhase = ''
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 9136bba02155..b84272b7547f 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 76cc8c080caa..4ef62baa3d9f 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";