From fd0373c589ad1b9fde13b858a1b3e9a70b8c30df Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 10 Jul 2016 11:33:21 +0200
Subject: [PATCH 1/2] kde plasma: 5.6.5 -> 5.7.0

---
 maintainers/scripts/generate-kde-plasma.sh    |   2 +-
 .../ark/0001-fix-start-from-plasma.patch      |  10 +
 .../{ark.nix => ark/default.nix}              |   3 +
 .../kde-5/applications-16.04/default.nix      |   2 +-
 pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix |  18 -
 pkgs/desktops/kde-5/plasma-5.6/srcs.nix       | 333 ------------------
 .../{plasma-5.6 => plasma-5.7}/bluedevil.nix  |   0
 .../{plasma-5.6 => plasma-5.7}/breeze-gtk.nix |   0
 .../{plasma-5.6 => plasma-5.7}/breeze-qt4.nix |   0
 .../{plasma-5.6 => plasma-5.7}/breeze-qt5.nix |   0
 .../{plasma-5.6 => plasma-5.7}/default.nix    |   2 +-
 .../kactivitymanagerd.nix                     |   0
 .../kde-cli-tools.nix                         |   0
 .../kde-gtk-config/0001-follow-symlinks.patch |   0
 .../kde-gtk-config/default.nix                |   0
 .../kdecoration.nix                           |   0
 .../kdeplasma-addons.nix                      |   0
 .../{plasma-5.6 => plasma-5.7}/kgamma5.nix    |   0
 .../{plasma-5.6 => plasma-5.7}/khotkeys.nix   |   0
 .../kinfocenter.nix                           |   0
 .../{plasma-5.6 => plasma-5.7}/kmenuedit.nix  |   0
 .../{plasma-5.6 => plasma-5.7}/kscreen.nix    |   0
 .../kscreenlocker.nix                         |   0
 .../ksshaskpass.nix                           |   0
 .../{plasma-5.6 => plasma-5.7}/ksysguard.nix  |   0
 .../kwayland-integration.nix}                 |   8 +-
 .../0001-qdiriterator-follow-symlinks.patch   |   4 +-
 .../kwin/default.nix                          |   0
 .../{plasma-5.6 => plasma-5.7}/kwrited.nix    |   0
 .../{plasma-5.6 => plasma-5.7}/libkscreen.nix |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../libksysguard/default.nix                  |   0
 .../{plasma-5.6 => plasma-5.7}/milou.nix      |   0
 .../{plasma-5.6 => plasma-5.7}/oxygen.nix     |   0
 .../0001-qt-5.5-QML-import-paths.patch        |   0
 .../plasma-desktop/0002-hwclock.patch         |   0
 .../plasma-desktop/0003-tzdir.patch           |   0
 .../plasma-desktop/default.nix                |  10 +-
 .../plasma-integration.nix                    |   4 +-
 .../plasma-mediacenter.nix                    |   0
 ...-mobile-broadband-provider-info-path.patch |   0
 .../plasma-nm/default.nix                     |   0
 .../{plasma-5.6 => plasma-5.7}/plasma-pa.nix  |   0
 .../plasma-workspace-wallpapers.nix           |   0
 .../plasma-workspace/default.nix              |   0
 .../plasma-workspace/qml-import-path.patch    |  13 -
 .../plasma-workspace/series                   |   0
 .../polkit-kde-agent.nix                      |   0
 pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix |  18 +
 pkgs/desktops/kde-5/plasma-5.7/srcs.nix       | 325 +++++++++++++++++
 .../startkde/default.nix                      |   0
 .../startkde/startkde.sh                      |   0
 .../systemsettings.nix                        |   0
 pkgs/top-level/all-packages.nix               |   2 +-
 54 files changed, 374 insertions(+), 380 deletions(-)
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/ark/0001-fix-start-from-plasma.patch
 rename pkgs/desktops/kde-5/applications-16.04/{ark.nix => ark/default.nix} (92%)
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/srcs.nix
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/bluedevil.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/breeze-gtk.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/breeze-qt4.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/breeze-qt5.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/default.nix (98%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kactivitymanagerd.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kde-cli-tools.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kde-gtk-config/0001-follow-symlinks.patch (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kde-gtk-config/default.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kdecoration.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kdeplasma-addons.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kgamma5.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/khotkeys.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kinfocenter.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kmenuedit.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kscreen.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kscreenlocker.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/ksshaskpass.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/ksysguard.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6/kwayland.nix => plasma-5.7/kwayland-integration.nix} (57%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kwin/0001-qdiriterator-follow-symlinks.patch (89%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kwin/default.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/kwrited.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/libkscreen.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/libksysguard/default.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/milou.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/oxygen.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-desktop/0002-hwclock.patch (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-desktop/0003-tzdir.patch (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-desktop/default.nix (85%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-integration.nix (67%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-mediacenter.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-nm/default.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-pa.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-workspace-wallpapers.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-workspace/default.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-workspace/qml-import-path.patch (88%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/plasma-workspace/series (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/polkit-kde-agent.nix (100%)
 create mode 100644 pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.7/srcs.nix
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/startkde/default.nix (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/startkde/startkde.sh (100%)
 rename pkgs/desktops/kde-5/{plasma-5.6 => plasma-5.7}/systemsettings.nix (100%)

diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh
index fa804758f09..ad916f3a25b 100755
--- a/maintainers/scripts/generate-kde-plasma.sh
+++ b/maintainers/scripts/generate-kde-plasma.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./fetch-kde-qt.sh http://download.kde.org/stable/plasma/5.6.5/ -A '*.tar.xz'
+./fetch-kde-qt.sh http://download.kde.org/stable/plasma/5.7.0/ -A '*.tar.xz'
diff --git a/pkgs/desktops/kde-5/applications-16.04/ark/0001-fix-start-from-plasma.patch b/pkgs/desktops/kde-5/applications-16.04/ark/0001-fix-start-from-plasma.patch
new file mode 100644
index 00000000000..7590e49c498
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/ark/0001-fix-start-from-plasma.patch
@@ -0,0 +1,10 @@
+--- a/app/org.kde.ark.desktop.cmake
++++ b/app/org.kde.ark.desktop.cmake
+@@ -154,7 +154,6 @@
+ Terminal=false
+ X-DBUS-StartupType=Multi
+ X-DBUS-ServiceName=org.kde.ark
+-X-KDE-HasTempFileOption=true
+ Categories=Qt;KDE;Utility;Archiving;Compression;X-KDE-Utilities-File;
+ InitialPreference=3
+ Comment=Work with file archives
diff --git a/pkgs/desktops/kde-5/applications-16.04/ark.nix b/pkgs/desktops/kde-5/applications-16.04/ark/default.nix
similarity index 92%
rename from pkgs/desktops/kde-5/applications-16.04/ark.nix
rename to pkgs/desktops/kde-5/applications-16.04/ark/default.nix
index 331c8c647ca..4e68488b323 100644
--- a/pkgs/desktops/kde-5/applications-16.04/ark.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ark/default.nix
@@ -35,6 +35,9 @@ kdeApp {
     khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
     kpty kwidgetsaddons libarchive
   ];
+  patches = [
+    ./0001-fix-start-from-plasma.patch
+  ];
   postInstall = ''
     wrapQtProgram "$out/bin/ark" \
         --prefix PATH : "${PATH}"
diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
index d66285deb8b..0db0c72a6f1 100644
--- a/pkgs/desktops/kde-5/applications-16.04/default.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -31,7 +31,7 @@ let
 
     kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
 
-    ark = callPackage ./ark.nix {};
+    ark = callPackage ./ark/default.nix {};
     baloo-widgets = callPackage ./baloo-widgets.nix {};
     dolphin = callPackage ./dolphin.nix {};
     dolphin-plugins = callPackage ./dolphin-plugins.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
deleted file mode 100644
index 8f3b354b947..00000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
-, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
-, kidletime, kio, knotifyconfig, kwayland, libkscreen, plasma-workspace
-, qtx11extras, solid, udev
-}:
-
-plasmaPackage {
-  name = "powerdevil";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    kconfig kdbusaddons knotifyconfig solid udev kactivities kauth
-    kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
-    plasma-workspace qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
deleted file mode 100644
index 8307730a550..00000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
+++ /dev/null
@@ -1,333 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  bluedevil = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/bluedevil-5.6.5.tar.xz";
-      sha256 = "0zf9m02m039g2cpzaij56mnnffcq9bqa40xyq30r9sx5ji1wbnhx";
-      name = "bluedevil-5.6.5.tar.xz";
-    };
-  };
-  breeze = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/breeze-5.6.5.tar.xz";
-      sha256 = "0wzzixhpij8zb0jq6lsl7h3q22hfzpfz98pddlhnkf27dgmbd7zd";
-      name = "breeze-5.6.5.tar.xz";
-    };
-  };
-  breeze-grub = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/breeze-grub-5.6.5.tar.xz";
-      sha256 = "1khr8bqid58jq150snpszg3w1rnjh35y5fi20gwwa60hka556978";
-      name = "breeze-grub-5.6.5.tar.xz";
-    };
-  };
-  breeze-gtk = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/breeze-gtk-5.6.5.tar.xz";
-      sha256 = "0k4510jw89i1spb6gckf190mrspasxnwfwqddaxxrjdan4qklcbv";
-      name = "breeze-gtk-5.6.5.tar.xz";
-    };
-  };
-  breeze-plymouth = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/breeze-plymouth-5.6.5.tar.xz";
-      sha256 = "05ajv326ylbja9483k0ka6flqpk341knfaxgq056dfqlmiaq2cjp";
-      name = "breeze-plymouth-5.6.5.tar.xz";
-    };
-  };
-  discover = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/discover-5.6.5.tar.xz";
-      sha256 = "1k5jlq329k5scljdadj8yny5wxhz14c7jxx5wagazb28fq6yf3vj";
-      name = "discover-5.6.5.tar.xz";
-    };
-  };
-  kactivitymanagerd = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kactivitymanagerd-5.6.5.tar.xz";
-      sha256 = "1l0iyh6palbbw59xv6mhjv4y6c3v2xlqqk95rhhfcbpaq0kv0abh";
-      name = "kactivitymanagerd-5.6.5.tar.xz";
-    };
-  };
-  kde-cli-tools = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kde-cli-tools-5.6.5.tar.xz";
-      sha256 = "0fmlckjpc202n4ahc69mqjn6iv3xd0z9macvacx5fi2spc1i60kk";
-      name = "kde-cli-tools-5.6.5.tar.xz";
-    };
-  };
-  kdecoration = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kdecoration-5.6.5.tar.xz";
-      sha256 = "084a2ip5x15f9sdlh7icnbvbsczkc7h71qd4zzr7z9lmqk1b3sp1";
-      name = "kdecoration-5.6.5.tar.xz";
-    };
-  };
-  kde-gtk-config = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kde-gtk-config-5.6.5.tar.xz";
-      sha256 = "06nk5z1aqiwyd3vhpnmfjjpmsq6r32gx6dgij2la3c2y552d3hlx";
-      name = "kde-gtk-config-5.6.5.tar.xz";
-    };
-  };
-  kdeplasma-addons = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kdeplasma-addons-5.6.5.tar.xz";
-      sha256 = "19ijpvra2f5dbcjdl0g2lq0rivh6cvmgpryvsyhjyk740ys915kz";
-      name = "kdeplasma-addons-5.6.5.tar.xz";
-    };
-  };
-  kgamma5 = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kgamma5-5.6.5.tar.xz";
-      sha256 = "0qic1alkdzl6gxacm3i3m8xb5dxpd1hbixd8ixr1cabbviash1nw";
-      name = "kgamma5-5.6.5.tar.xz";
-    };
-  };
-  khotkeys = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/khotkeys-5.6.5.tar.xz";
-      sha256 = "1zsdpdibv2pnm6vgj28d09cpss8nizmacrnxxlilvizhmiyvrpla";
-      name = "khotkeys-5.6.5.tar.xz";
-    };
-  };
-  kinfocenter = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kinfocenter-5.6.5.tar.xz";
-      sha256 = "1ci9avkbix6366gvfc3vpwp3r5hwabk1vl29ajl40agrs7kgs9cl";
-      name = "kinfocenter-5.6.5.tar.xz";
-    };
-  };
-  kmenuedit = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kmenuedit-5.6.5.tar.xz";
-      sha256 = "1fxnmb07shbpnhwk7aw5lspaih79ldkkx69bwgrv99c2h7gbsbhg";
-      name = "kmenuedit-5.6.5.tar.xz";
-    };
-  };
-  kscreen = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kscreen-5.6.5.tar.xz";
-      sha256 = "16cnf0kmvp67jid3y4w2b2dxzidx8k8zld280svp249wwjyh3wzr";
-      name = "kscreen-5.6.5.tar.xz";
-    };
-  };
-  kscreenlocker = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kscreenlocker-5.6.5.tar.xz";
-      sha256 = "01hbjvkkhjb63ij3xqyg49s3w8ig68pqrback7r5iv1hsbybxw66";
-      name = "kscreenlocker-5.6.5.tar.xz";
-    };
-  };
-  ksshaskpass = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/ksshaskpass-5.6.5.tar.xz";
-      sha256 = "1qaja7alyx9czczkg2cpbc24jdvmsp8f9djsavgb650k6mv5h4va";
-      name = "ksshaskpass-5.6.5.tar.xz";
-    };
-  };
-  ksysguard = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/ksysguard-5.6.5.tar.xz";
-      sha256 = "0ji4q8js5g57vrirbq6nah9gwp6bzcn986pjig1l0q5sm7al95jq";
-      name = "ksysguard-5.6.5.tar.xz";
-    };
-  };
-  kwallet-pam = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kwallet-pam-5.6.5.tar.xz";
-      sha256 = "0ad2q9kwnaabv6klazg17ilsiy0ckkkcay3q2d51crn1d8kbv3gm";
-      name = "kwallet-pam-5.6.5.tar.xz";
-    };
-  };
-  kwayland = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kwayland-5.6.5.tar.xz";
-      sha256 = "1niac5g7jdyl0b840njppnw8lbl08a6g4npyxhplvr6mv744h6b9";
-      name = "kwayland-5.6.5.tar.xz";
-    };
-  };
-  kwayland-integration = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kwayland-integration-5.6.5.tar.xz";
-      sha256 = "1sf6d9062q191q5b4bngk9abnfx3ys8fmkgc04xp8pl5zq5f2m7h";
-      name = "kwayland-integration-5.6.5.tar.xz";
-    };
-  };
-  kwin = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kwin-5.6.5.tar.xz";
-      sha256 = "113q9m373wmi2dmi2v6im74gd6ava7xrwapkcxq0phyr53w5ihz4";
-      name = "kwin-5.6.5.tar.xz";
-    };
-  };
-  kwrited = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/kwrited-5.6.5.tar.xz";
-      sha256 = "19ra2pbr34ap309vxbssrkkykf2vki0829a6bqhgc482yw582k1r";
-      name = "kwrited-5.6.5.tar.xz";
-    };
-  };
-  libkscreen = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/libkscreen-5.6.5.tar.xz";
-      sha256 = "1651cj5mkpx7x43na4n9qvvm8r9zadfm3fmpvrv92idf7f3jg4hr";
-      name = "libkscreen-5.6.5.tar.xz";
-    };
-  };
-  libksysguard = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/libksysguard-5.6.5.tar.xz";
-      sha256 = "048hfxsjddqmw31w2cdzw72xwxrrnx0v6zzxq9514b5j7ak4f9jc";
-      name = "libksysguard-5.6.5.tar.xz";
-    };
-  };
-  milou = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/milou-5.6.5.tar.xz";
-      sha256 = "066k7dpjs5nrimqxfxk1krc8w771nkqjb9dinqqqrl3njn7rwvxf";
-      name = "milou-5.6.5.tar.xz";
-    };
-  };
-  oxygen = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/oxygen-5.6.5.tar.xz";
-      sha256 = "12qz947xy6xr8hzm46dy6m5hp8chmzc8ayczyy84xw5239piqa1c";
-      name = "oxygen-5.6.5.tar.xz";
-    };
-  };
-  plasma-desktop = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-desktop-5.6.5.tar.xz";
-      sha256 = "1lxvnymiivkrch7z64i5vkck5723jvv5la9hrqdlzjl8qjp2gfk6";
-      name = "plasma-desktop-5.6.5.tar.xz";
-    };
-  };
-  plasma-integration = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-integration-5.6.5.tar.xz";
-      sha256 = "1s473jg7xjw4jma7nn770q3cxj01d7bm2kf45fra5lbj6ipp3s20";
-      name = "plasma-integration-5.6.5.tar.xz";
-    };
-  };
-  plasma-mediacenter = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-mediacenter-5.6.5.tar.xz";
-      sha256 = "056wzqqhvkc6d53040g0pn22arjz9pcxdgqr8x0bqps5cq7gf846";
-      name = "plasma-mediacenter-5.6.5.tar.xz";
-    };
-  };
-  plasma-nm = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-nm-5.6.5.tar.xz";
-      sha256 = "1cmrd06l6mp478ixnwj93brkfz8gaw7081df4r4x6ql4vrga3a80";
-      name = "plasma-nm-5.6.5.tar.xz";
-    };
-  };
-  plasma-pa = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-pa-5.6.5.tar.xz";
-      sha256 = "19b43mwjhvvi1wpa68c1g2mk76rqlfg0h8gf51xgd7y3qjv462h0";
-      name = "plasma-pa-5.6.5.tar.xz";
-    };
-  };
-  plasma-sdk = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-sdk-5.6.5.tar.xz";
-      sha256 = "0v92b03ff40wkdps88aqkihs1cx4ggwg43x2cm6cdsa3gc84vyn8";
-      name = "plasma-sdk-5.6.5.tar.xz";
-    };
-  };
-  plasma-workspace = {
-    version = "5.6.5.1";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-workspace-5.6.5.1.tar.xz";
-      sha256 = "158lmnvvqbl3k5485yirw22vqb15qxfd1m0gc83p0hsi2lv7v7j5";
-      name = "plasma-workspace-5.6.5.1.tar.xz";
-    };
-  };
-  plasma-workspace-wallpapers = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/plasma-workspace-wallpapers-5.6.5.tar.xz";
-      sha256 = "1pkyqsaxqah8h9r8ay449g20135sjw5qsbdp0i0ahprzw07wwijr";
-      name = "plasma-workspace-wallpapers-5.6.5.tar.xz";
-    };
-  };
-  polkit-kde-agent = {
-    version = "1-5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/polkit-kde-agent-1-5.6.5.tar.xz";
-      sha256 = "1f7mzxfr463ac0cfpb653x8civ1ciwhkklndxv7mq37m5ssk4dah";
-      name = "polkit-kde-agent-1-5.6.5.tar.xz";
-    };
-  };
-  powerdevil = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/powerdevil-5.6.5.tar.xz";
-      sha256 = "07x0n311qbisycsrjjd9lkcwxcxlira0qkz1akg5xxll9q2a6qb7";
-      name = "powerdevil-5.6.5.tar.xz";
-    };
-  };
-  sddm-kcm = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/sddm-kcm-5.6.5.tar.xz";
-      sha256 = "07r20s0373y630x1vjrfgm740sgg8v6qsza4r3my1qbsdj3xwzky";
-      name = "sddm-kcm-5.6.5.tar.xz";
-    };
-  };
-  systemsettings = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/systemsettings-5.6.5.tar.xz";
-      sha256 = "01z3q8rp8barb7lyfiwcrwn407pxz17z22y46czxc7j56n4ixgim";
-      name = "systemsettings-5.6.5.tar.xz";
-    };
-  };
-  user-manager = {
-    version = "5.6.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.6.5/user-manager-5.6.5.tar.xz";
-      sha256 = "1fzfcq2kqrwja7y1ij8s7sbwlybharv6wqh62w7xza7pssz9yr7y";
-      name = "user-manager-5.6.5.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.7/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
rename to pkgs/desktops/kde-5/plasma-5.7/bluedevil.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.7/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix
rename to pkgs/desktops/kde-5/plasma-5.7/breeze-gtk.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.7/breeze-qt4.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix
rename to pkgs/desktops/kde-5/plasma-5.7/breeze-qt4.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.7/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
rename to pkgs/desktops/kde-5/plasma-5.7/breeze-qt5.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.7/default.nix
similarity index 98%
rename from pkgs/desktops/kde-5/plasma-5.6/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/default.nix
index d356dd4bd2f..d0b6ef1f6c9 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.7/default.nix
@@ -74,7 +74,7 @@ let
     kscreenlocker = callPackage ./kscreenlocker.nix {};
     ksshaskpass = callPackage ./ksshaskpass.nix {};
     ksysguard = callPackage ./ksysguard.nix {};
-    kwayland = callPackage ./kwayland.nix {};
+    kwayland-integration = callPackage ./kwayland-integration.nix {};
     kwin = callPackage ./kwin {};
     kwrited = callPackage ./kwrited.nix {};
     libkscreen = callPackage ./libkscreen.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma-5.7/kactivitymanagerd.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kactivitymanagerd.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.7/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kde-cli-tools.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.7/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kdeplasma-addons.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.7/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kgamma5.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.7/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
rename to pkgs/desktops/kde-5/plasma-5.7/khotkeys.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.7/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kinfocenter.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.7/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kmenuedit.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.7/kscreen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.7/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kscreenlocker.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.7/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
rename to pkgs/desktops/kde-5/plasma-5.7/ksshaskpass.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.7/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
rename to pkgs/desktops/kde-5/plasma-5.7/ksysguard.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix
similarity index 57%
rename from pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix
index 3c2788237fc..9045227a51a 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
+++ b/pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix
@@ -1,14 +1,16 @@
 { plasmaPackage
 , extra-cmake-modules
-, wayland
+, kidletime
+, kwayland
+, kwindowsystem
 }:
 
 plasmaPackage {
-  name = "kwayland";
+  name = "kwayland-integration";
   nativeBuildInputs = [
     extra-cmake-modules
   ];
   propagatedBuildInputs = [
-    wayland
+    kidletime kwindowsystem kwayland
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch
similarity index 89%
rename from pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch
index 797a32fc5f8..7a70fec0d2d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] qdiriterator follow symlinks
 
 diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
 index 781c960..ad5f420 100644
---- a/clients/aurorae/src/aurorae.cpp
-+++ b/clients/aurorae/src/aurorae.cpp
+--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
++++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
 @@ -211,7 +211,7 @@ void Helper::init()
      // so let's try to locate our plugin:
      QString pluginPath;
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.7/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kwin/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.7/kwrited.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
rename to pkgs/desktops/kde-5/plasma-5.7/kwrited.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix b/pkgs/desktops/kde-5/plasma-5.7/libkscreen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
rename to pkgs/desktops/kde-5/plasma-5.7/libkscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.7/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.7/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.7/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/libksysguard/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/milou.nix b/pkgs/desktops/kde-5/plasma-5.7/milou.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/milou.nix
rename to pkgs/desktops/kde-5/plasma-5.7/milou.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.7/oxygen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
rename to pkgs/desktops/kde-5/plasma-5.7/oxygen.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0002-hwclock.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0003-tzdir.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix
similarity index 85%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix
index 2a1d95806c1..3a61651644f 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix
@@ -1,6 +1,6 @@
 { plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
-, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils
-, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
+, attica, baloo, boost, fontconfig, kactivities, kactivities-stats
+, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
 , kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
 , knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
 , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
@@ -21,9 +21,9 @@ plasmaPackage rec {
     attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
     knotifications knotifyconfig kwallet libcanberra_kde libXcursor
     libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
-    xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth
-    kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner
-    kwin plasma-framework plasma-workspace qtdeclarative
+    xf86inputsynaptics xkeyboard_config xinput baloo kactivities
+    kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
+    ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
     qtquickcontrols qtx11extras ksysguard
   ];
   patches = [
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-integration.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix
similarity index 67%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-integration.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix
index 7bc41986a4f..97d30dcd773 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-integration.nix
+++ b/pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix
@@ -1,5 +1,5 @@
 { plasmaPackage, extra-cmake-modules
-, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
+, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
 , libXcursor
 }:
 
@@ -11,7 +11,7 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    kconfig kconfigwidgets kiconthemes kio kwayland
+    breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
     libXcursor
   ];
 }
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-mediacenter.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-mediacenter.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.7/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-nm/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-pa.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch
similarity index 88%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch
index 7842109669a..12eb65caa71 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
+++ b/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch
@@ -89,16 +89,3 @@ Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
  
  MouseEventListener {
      id: notificationsApplet
-Index: plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
-===================================================================
---- plasma-workspace-5.6.3.orig/applets/systemtray/package/contents/ui/main.qml
-+++ plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
- // import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
- import org.kde.private.systemtray 2.0 as SystemTray
--import "Layout.js" as LayoutManager
-+import "../code/Layout.js" as LayoutManager
- 
- Item {
-     id: root
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
rename to pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/series
diff --git a/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.7/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
rename to pkgs/desktops/kde-5/plasma-5.7/polkit-kde-agent.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix
new file mode 100644
index 00000000000..cbb2b9b019f
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix
@@ -0,0 +1,18 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
+, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
+, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
+, plasma-workspace, qtx11extras, solid, udev
+}:
+
+plasmaPackage {
+  name = "powerdevil";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
+    kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
+    networkmanager-qt plasma-workspace qtx11extras
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.7/srcs.nix b/pkgs/desktops/kde-5/plasma-5.7/srcs.nix
new file mode 100644
index 00000000000..2f017f0d52b
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.7/srcs.nix
@@ -0,0 +1,325 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  bluedevil = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/bluedevil-5.7.0.tar.xz";
+      sha256 = "10f507hj31asg08kz5c5j5g2qlzmn57x68jrbgx80hdrji6jv6qn";
+      name = "bluedevil-5.7.0.tar.xz";
+    };
+  };
+  breeze = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/breeze-5.7.0.tar.xz";
+      sha256 = "1sy400m8lkdqna926fxfq3nmcfsrd877b841an686qf9lb7iga2l";
+      name = "breeze-5.7.0.tar.xz";
+    };
+  };
+  breeze-grub = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/breeze-grub-5.7.0.tar.xz";
+      sha256 = "0lgf13kbv1mcl57hwm0al87xslwvc7cgnj4k8f3026fjf78dqzr8";
+      name = "breeze-grub-5.7.0.tar.xz";
+    };
+  };
+  breeze-gtk = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/breeze-gtk-5.7.0.tar.xz";
+      sha256 = "1h9hvhln5mwsi4fn7a7csf7gn6qlvx4d6bmxij2qsjm4i14izxhb";
+      name = "breeze-gtk-5.7.0.tar.xz";
+    };
+  };
+  breeze-plymouth = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/breeze-plymouth-5.7.0.tar.xz";
+      sha256 = "1kq3ys1dvw2asgda6p9qbb2kkgskpvhjyp0xj4mgi5yaklz0bxgv";
+      name = "breeze-plymouth-5.7.0.tar.xz";
+    };
+  };
+  discover = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/discover-5.7.0.tar.xz";
+      sha256 = "0j3339g6lrf44hg3xbvzh01pygcawrrf1c9vhijimrrd197qcqwg";
+      name = "discover-5.7.0.tar.xz";
+    };
+  };
+  kactivitymanagerd = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kactivitymanagerd-5.7.0.tar.xz";
+      sha256 = "0j2rf4qlha7cdwgdnvxrhlc90j2m8qacyhii27zdjz9iwv48zyjq";
+      name = "kactivitymanagerd-5.7.0.tar.xz";
+    };
+  };
+  kde-cli-tools = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kde-cli-tools-5.7.0.tar.xz";
+      sha256 = "05g4q6lf7mkm8ys39qhwqavy2g2xc17ahsfc037wkcpka47m6i3m";
+      name = "kde-cli-tools-5.7.0.tar.xz";
+    };
+  };
+  kdecoration = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kdecoration-5.7.0.tar.xz";
+      sha256 = "1i43b572yd3s0bgfvj97r18p0yk01skwmwqqzripb80pygw9yzvc";
+      name = "kdecoration-5.7.0.tar.xz";
+    };
+  };
+  kde-gtk-config = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kde-gtk-config-5.7.0.tar.xz";
+      sha256 = "01y4m3lyrfb0hngbmk6r3xpbak9r534vf1fqgf22956sdfrl5g2p";
+      name = "kde-gtk-config-5.7.0.tar.xz";
+    };
+  };
+  kdeplasma-addons = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kdeplasma-addons-5.7.0.tar.xz";
+      sha256 = "0kv0c2yxikbpdkr82n16pw016gsvbpmhp8kgbzdjdaqinicw4p2b";
+      name = "kdeplasma-addons-5.7.0.tar.xz";
+    };
+  };
+  kgamma5 = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kgamma5-5.7.0.tar.xz";
+      sha256 = "1scqi61agl8f1pmq29v32fs126x0ddw933q6yjswy1w2a0nn0i02";
+      name = "kgamma5-5.7.0.tar.xz";
+    };
+  };
+  khotkeys = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/khotkeys-5.7.0.tar.xz";
+      sha256 = "0l27frmam6amgay42vb4pl98l81pb6xasnwd9ww3069sr9kiq0vi";
+      name = "khotkeys-5.7.0.tar.xz";
+    };
+  };
+  kinfocenter = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kinfocenter-5.7.0.tar.xz";
+      sha256 = "1bs3yl916s4dpci481dk81193mmh7kd9vqq535q74w0hx8khcwlf";
+      name = "kinfocenter-5.7.0.tar.xz";
+    };
+  };
+  kmenuedit = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kmenuedit-5.7.0.tar.xz";
+      sha256 = "0l7vibvy50v5hqpv6zb2j7c2nf0jbd88vwxhbv6rg150f3qy9awb";
+      name = "kmenuedit-5.7.0.tar.xz";
+    };
+  };
+  kscreen = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kscreen-5.7.0.tar.xz";
+      sha256 = "1qiwz220lff8l48ysfasx0zysv9m1mm2dsk60j84rcr3v5jwim6h";
+      name = "kscreen-5.7.0.tar.xz";
+    };
+  };
+  kscreenlocker = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kscreenlocker-5.7.0.tar.xz";
+      sha256 = "0yg4k1v31fkqh23myd4lfc59b04qydgiym2hahdz66vnvkkdcvdv";
+      name = "kscreenlocker-5.7.0.tar.xz";
+    };
+  };
+  ksshaskpass = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/ksshaskpass-5.7.0.tar.xz";
+      sha256 = "0jv0i1gz36vv690x69isw6v856vjrbkjisy2gwd7z0l3986z54l0";
+      name = "ksshaskpass-5.7.0.tar.xz";
+    };
+  };
+  ksysguard = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/ksysguard-5.7.0.tar.xz";
+      sha256 = "093ksjk6gy5j2hgfwlw6vspd22gqnb28aby9x8nvrx9idaxldlrj";
+      name = "ksysguard-5.7.0.tar.xz";
+    };
+  };
+  kwallet-pam = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kwallet-pam-5.7.0.tar.xz";
+      sha256 = "0d1aba9mjb52cy8abm8ais5ypcfs3xny62dzjb7fd5ac1mdld0bz";
+      name = "kwallet-pam-5.7.0.tar.xz";
+    };
+  };
+  kwayland-integration = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kwayland-integration-5.7.0.tar.xz";
+      sha256 = "1p2l98dd7dl1knshivk27qc2cfpvar26vci4lpxxwhg6psqdsnam";
+      name = "kwayland-integration-5.7.0.tar.xz";
+    };
+  };
+  kwin = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kwin-5.7.0.tar.xz";
+      sha256 = "1mpdcr4dva447jigdfxvrhpd2mh67s83w3mzw28f9xb1r7zcfzpm";
+      name = "kwin-5.7.0.tar.xz";
+    };
+  };
+  kwrited = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/kwrited-5.7.0.tar.xz";
+      sha256 = "1wz56v9f3an65x17wj8bdg4f27a0j1mrsaz1v9gqks86cbmkkr5k";
+      name = "kwrited-5.7.0.tar.xz";
+    };
+  };
+  libkscreen = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/libkscreen-5.7.0.tar.xz";
+      sha256 = "0g5xs8sajzkmn91n0y92mi71zjadpn35k2sxw8b12ilp9r5qzkqc";
+      name = "libkscreen-5.7.0.tar.xz";
+    };
+  };
+  libksysguard = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/libksysguard-5.7.0.tar.xz";
+      sha256 = "1i3sl8wnfg1sl5psbfikw57w1d4bac6d61slkga60mp5z0jw4vss";
+      name = "libksysguard-5.7.0.tar.xz";
+    };
+  };
+  milou = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/milou-5.7.0.tar.xz";
+      sha256 = "1i778zang4rk3kvd1z7aszrcsxa3l1k2d5xiv2zqf2z6hnranvbd";
+      name = "milou-5.7.0.tar.xz";
+    };
+  };
+  oxygen = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/oxygen-5.7.0.tar.xz";
+      sha256 = "05vz4zixg9nfrydd2i7jjkv082vgmhxlv3v109vgkr652dh9kncf";
+      name = "oxygen-5.7.0.tar.xz";
+    };
+  };
+  plasma-desktop = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-desktop-5.7.0.tar.xz";
+      sha256 = "0f8pi90g1msrfzd769d7c26lxbq07hf7va5d9mclq3kfhk2wm951";
+      name = "plasma-desktop-5.7.0.tar.xz";
+    };
+  };
+  plasma-integration = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-integration-5.7.0.tar.xz";
+      sha256 = "0rhm0p6350jibqflh3f5b7df3rnm9k5p02sgna6p6gm5b2w145ii";
+      name = "plasma-integration-5.7.0.tar.xz";
+    };
+  };
+  plasma-mediacenter = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-mediacenter-5.7.0.tar.xz";
+      sha256 = "1xva1lyyafik6kq7f1s9fddvb7n35paz0lmcyzqbaxs149xz6r96";
+      name = "plasma-mediacenter-5.7.0.tar.xz";
+    };
+  };
+  plasma-nm = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-nm-5.7.0.tar.xz";
+      sha256 = "1aa8wv4jdmjjwmvn0pd80p0byyys498xi3i4fqy84r8spmb6xb9i";
+      name = "plasma-nm-5.7.0.tar.xz";
+    };
+  };
+  plasma-pa = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-pa-5.7.0.tar.xz";
+      sha256 = "15hziwyyvz9mqcyqnjwc49a31v2d2ysa7gaydkb8dizgqfd4pcs8";
+      name = "plasma-pa-5.7.0.tar.xz";
+    };
+  };
+  plasma-sdk = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-sdk-5.7.0.tar.xz";
+      sha256 = "0cbjbp9m0l3lik1j0x1czn4whd2h140954dlgqb87k4d55lxpxjh";
+      name = "plasma-sdk-5.7.0.tar.xz";
+    };
+  };
+  plasma-workspace = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-workspace-5.7.0.tar.xz";
+      sha256 = "047pqpwi2zgyyp592wbxqxai5j5hvxbnw01s79q4i4wpsq10b2fa";
+      name = "plasma-workspace-5.7.0.tar.xz";
+    };
+  };
+  plasma-workspace-wallpapers = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/plasma-workspace-wallpapers-5.7.0.tar.xz";
+      sha256 = "1f2nmnprj8pb6wl3svfmsgivl2565mabpmqyaywwfblhi5ycxj52";
+      name = "plasma-workspace-wallpapers-5.7.0.tar.xz";
+    };
+  };
+  polkit-kde-agent = {
+    version = "1-5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/polkit-kde-agent-1-5.7.0.tar.xz";
+      sha256 = "0cxjgmhrb26ghqlrdj4kksw5g7b90pfhfsz4jia85szk2nssivl3";
+      name = "polkit-kde-agent-1-5.7.0.tar.xz";
+    };
+  };
+  powerdevil = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/powerdevil-5.7.0.tar.xz";
+      sha256 = "1wc59vzzjbjr5brwnmlcnibh5hii61001hbc7hma3gngzr7j0b6m";
+      name = "powerdevil-5.7.0.tar.xz";
+    };
+  };
+  sddm-kcm = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/sddm-kcm-5.7.0.tar.xz";
+      sha256 = "14jnyv7fs2bscmb0iw3pdxzmk4qyv0czzlpszi1qd1i7k0f2dngy";
+      name = "sddm-kcm-5.7.0.tar.xz";
+    };
+  };
+  systemsettings = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/systemsettings-5.7.0.tar.xz";
+      sha256 = "13k325r7vy6l4a6lwrbhgm60bdmn91yjkld7zsd2xyxbw27vis3p";
+      name = "systemsettings-5.7.0.tar.xz";
+    };
+  };
+  user-manager = {
+    version = "5.7.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.0/user-manager-5.7.0.tar.xz";
+      sha256 = "16h7ifwa8dpn0yrg8cisi570dm2wigmb50pgxh9h8smfzgc0vg7k";
+      name = "user-manager-5.7.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix b/pkgs/desktops/kde-5/plasma-5.7/startkde/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix
rename to pkgs/desktops/kde-5/plasma-5.7/startkde/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma-5.7/startkde/startkde.sh
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh
rename to pkgs/desktops/kde-5/plasma-5.7/startkde/startkde.sh
diff --git a/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.7/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
rename to pkgs/desktops/kde-5/plasma-5.7/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7c8549faf8..ae9d92c908e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16143,7 +16143,7 @@ in
   kde5 =
     let
       frameworks = import ../desktops/kde-5/frameworks-5.22 { inherit pkgs; };
-      plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.7 { inherit pkgs; };
       applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; };
       merged = self:
         { plasma = plasma self;

From b42ff8182a6ca9c3a7d8b38f8ddc8fde3039f4d5 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Sun, 10 Jul 2016 11:36:14 +0200
Subject: [PATCH 2/2] kde frameworks: 5.22 -> 5.24

---
 .../scripts/generate-kde-frameworks.sh        |   2 +-
 pkgs/desktops/kde-5/frameworks-5.22/srcs.nix  | 581 ------------------
 .../attica.nix                                |   0
 .../baloo.nix                                 |   0
 .../bluez-qt.nix                              |   0
 .../breeze-icons.nix                          |   0
 .../default.nix                               |   1 +
 .../extra-cmake-modules/default.nix           |   0
 .../extra-cmake-modules/nix-lib-path.patch    |   0
 .../extra-cmake-modules/series                |   0
 .../extra-cmake-modules/setup-hook.sh         |   0
 .../frameworkintegration.nix                  |   0
 .../kactivities-stats.nix                     |   0
 .../kactivities.nix                           |   0
 .../kapidox.nix                               |   0
 .../karchive.nix                              |   0
 .../kauth/cmake-install-paths.patch           |   0
 .../kauth/default.nix                         |   0
 .../kauth/series                              |   0
 .../kbookmarks.nix                            |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kcmutils/default.nix                      |   0
 .../kcodecs.nix                               |   0
 .../kcompletion.nix                           |   0
 .../kconfig.nix                               |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kconfigwidgets/default.nix                |   0
 .../kcoreaddons.nix                           |   0
 .../kcrash.nix                                |   0
 .../kdbusaddons.nix                           |   0
 .../kdeclarative.nix                          |   0
 .../kded.nix                                  |   0
 .../kdelibs4support/default.nix               |   0
 .../kdelibs4support/nix-kde-include-dir.patch |   0
 .../kdelibs4support/series                    |   0
 .../kdelibs4support/setup-hook.sh             |   0
 .../kdesignerplugin.nix                       |   0
 .../kdesu.nix                                 |   0
 .../kdnssd.nix                                |   0
 .../kdoctools/default.nix                     |   0
 .../kdoctools-no-find-docbook-xml.patch       |   0
 .../kdoctools/setup-hook.sh                   |   0
 .../kemoticons.nix                            |   0
 .../kfilemetadata/cmake-install-paths.patch   |   0
 .../kfilemetadata/default.nix                 |   0
 .../kfilemetadata/series                      |   0
 .../kglobalaccel.nix                          |   0
 .../kguiaddons.nix                            |   0
 .../khtml.nix                                 |   0
 .../ki18n.nix                                 |   0
 .../kiconthemes/default-theme-breeze.patch    |   2 +-
 .../kiconthemes/default.nix                   |   4 +-
 .../kiconthemes/series                        |   0
 .../kidletime.nix                             |   0
 .../kimageformats.nix                         |   0
 .../kinit/default.nix                         |   0
 .../kinit/kinit-libpath.patch                 |   0
 .../kinit/series                              |   0
 .../kio/default.nix                           |   0
 .../kio/samba-search-path.patch               |   0
 .../kio/series                                |   0
 .../kitemmodels.nix                           |   0
 .../kitemviews.nix                            |   0
 .../kjobwidgets.nix                           |   0
 .../kjs.nix                                   |   0
 .../kjsembed.nix                              |   0
 .../kmediaplayer.nix                          |   0
 .../knewstuff.nix                             |   0
 .../knotifications.nix                        |   0
 .../knotifyconfig.nix                         |   0
 .../kpackage/allow-external-paths.patch       |   0
 .../kpackage/default.nix                      |   0
 .../qdiriterator-follow-symlinks.patch        |   0
 .../kpackage/series                           |   0
 .../kparts.nix                                |   0
 .../kpeople.nix                               |   0
 .../kplotting.nix                             |   0
 .../kpty.nix                                  |   0
 .../kross.nix                                 |   0
 .../krunner.nix                               |   0
 .../kservice/default.nix                      |   0
 .../kservice/no-canonicalize-path.patch       |   0
 .../qdiriterator-follow-symlinks.patch        |   0
 .../kservice/series                           |   0
 .../kservice/setup-hook.sh                    |   0
 .../ktexteditor/default.nix                   |   0
 .../ktexteditor/no-qcoreapplication.patch     |   0
 .../ktexteditor/series                        |   0
 .../ktextwidgets.nix                          |   0
 .../kunitconversion.nix                       |   0
 .../kwallet.nix                               |   0
 .../kde-5/frameworks-5.24/kwayland.nix        |  14 +
 .../kwidgetsaddons.nix                        |   0
 .../kwindowsystem.nix                         |   0
 .../kxmlgui.nix                               |   0
 .../kxmlrpcclient.nix                         |   0
 .../modemmanager-qt.nix                       |   0
 .../networkmanager-qt.nix                     |   0
 .../oxygen-icons5.nix                         |   0
 .../plasma-framework.nix                      |   0
 .../solid.nix                                 |   0
 .../sonnet.nix                                |   0
 pkgs/desktops/kde-5/frameworks-5.24/srcs.nix  | 581 ++++++++++++++++++
 .../threadweaver.nix                          |   0
 pkgs/top-level/all-packages.nix               |   2 +-
 105 files changed, 601 insertions(+), 586 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/attica.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/baloo.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/bluez-qt.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/breeze-icons.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/default.nix (99%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/extra-cmake-modules/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/extra-cmake-modules/nix-lib-path.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/extra-cmake-modules/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/frameworkintegration.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kactivities-stats.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kactivities.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kapidox.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/karchive.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kauth/cmake-install-paths.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kauth/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kauth/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kbookmarks.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kcmutils/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kcodecs.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kcompletion.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kconfig.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kconfigwidgets/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kcoreaddons.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kcrash.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdbusaddons.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdeclarative.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kded.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdelibs4support/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdelibs4support/nix-kde-include-dir.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdelibs4support/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdelibs4support/setup-hook.sh (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdesignerplugin.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdesu.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdnssd.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdoctools/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kdoctools/setup-hook.sh (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kemoticons.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kfilemetadata/cmake-install-paths.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kfilemetadata/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kfilemetadata/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kglobalaccel.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kguiaddons.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/khtml.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/ki18n.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kiconthemes/default-theme-breeze.patch (91%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kiconthemes/default.nix (70%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kiconthemes/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kidletime.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kimageformats.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kinit/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kinit/kinit-libpath.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kinit/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kio/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kio/samba-search-path.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kio/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kitemmodels.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kitemviews.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kjobwidgets.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kjs.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kjsembed.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kmediaplayer.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/knewstuff.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/knotifications.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/knotifyconfig.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kpackage/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kpackage/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kparts.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kpeople.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kplotting.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kpty.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kross.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/krunner.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kservice/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kservice/no-canonicalize-path.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kservice/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kservice/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kservice/setup-hook.sh (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/ktexteditor/default.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/ktexteditor/series (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/ktextwidgets.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kunitconversion.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kwallet.nix (100%)
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.24/kwayland.nix
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kwidgetsaddons.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kwindowsystem.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kxmlgui.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/kxmlrpcclient.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/modemmanager-qt.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/networkmanager-qt.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/oxygen-icons5.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/plasma-framework.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/solid.nix (100%)
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/sonnet.nix (100%)
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.24/srcs.nix
 rename pkgs/desktops/kde-5/{frameworks-5.22 => frameworks-5.24}/threadweaver.nix (100%)

diff --git a/maintainers/scripts/generate-kde-frameworks.sh b/maintainers/scripts/generate-kde-frameworks.sh
index aa693ced704..e690662b3f2 100755
--- a/maintainers/scripts/generate-kde-frameworks.sh
+++ b/maintainers/scripts/generate-kde-frameworks.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./fetch-kde-qt.sh http://download.kde.org/stable/frameworks/5.22/ -A '*.tar.xz'
+./fetch-kde-qt.sh http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz'
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
deleted file mode 100644
index 156a11ba216..00000000000
--- a/pkgs/desktops/kde-5/frameworks-5.22/srcs.nix
+++ /dev/null
@@ -1,581 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/attica-5.22.0.tar.xz";
-      sha256 = "1i26nwxyrb62icw49znlyz9y670cv7xvibzbdfnnxq9czsalwym7";
-      name = "attica-5.22.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/baloo-5.22.0.tar.xz";
-      sha256 = "0h51j41pa8b18jkdna0247z5alqfbvgfzlxc6s6p0c7g7658z0w3";
-      name = "baloo-5.22.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/bluez-qt-5.22.0.tar.xz";
-      sha256 = "1lrkkg2f2qjj8cy968l3scdrvi506m5hr9x22d1zn6r12fvq6304";
-      name = "bluez-qt-5.22.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/breeze-icons-5.22.0.tar.xz";
-      sha256 = "162698h01cs7116la4jfygn8ka4ffjmnv7nxjl6yhcqrs25nky7l";
-      name = "breeze-icons-5.22.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/extra-cmake-modules-5.22.0.tar.xz";
-      sha256 = "042ad7kp2ijp66gvz0q60glk95wj9f0fymrjyw68253rqynf3zj3";
-      name = "extra-cmake-modules-5.22.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/frameworkintegration-5.22.0.tar.xz";
-      sha256 = "0jf9y738r86ss520hqhfll8prrfpha73myj99hbz3sqrix7b0va9";
-      name = "frameworkintegration-5.22.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kactivities-5.22.0.tar.xz";
-      sha256 = "068jhc6lw47hcibvys968m4wa1b278ccy2gas9iymzzys1ccv6kr";
-      name = "kactivities-5.22.0.tar.xz";
-    };
-  };
-  kactivities-stats = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kactivities-stats-5.22.0.tar.xz";
-      sha256 = "1gx5wm337nwbwqb56xvl16vhk47v7a5qpx5hhn7ygpfxkgxh6wiq";
-      name = "kactivities-stats-5.22.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kapidox-5.22.0.tar.xz";
-      sha256 = "0cs133g1rvbcrdvy7zvk5c14p5iwwn0x0m76c2ifal0g8qh0hmd1";
-      name = "kapidox-5.22.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/karchive-5.22.0.tar.xz";
-      sha256 = "1ywd38j6jpwj21kdp504gs0pfvlnvg6ak8hjk6a269pkci3dyf91";
-      name = "karchive-5.22.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kauth-5.22.0.tar.xz";
-      sha256 = "1c0kp25g57nldh1x5vfq9fypbznc991jrry2lydvb06d3jh44vbn";
-      name = "kauth-5.22.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kbookmarks-5.22.0.tar.xz";
-      sha256 = "093rlg8pprjg7ba52dh2z9j2x5ir7s9kjas6ni4fqxxzpp15hh3p";
-      name = "kbookmarks-5.22.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcmutils-5.22.0.tar.xz";
-      sha256 = "1s7gw9l2n92rrcdzy9pnwq8na65axd8bkk9nphyhpbxk76zj1gyy";
-      name = "kcmutils-5.22.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcodecs-5.22.0.tar.xz";
-      sha256 = "0rlqs8m2ib2kkj679gn74zqqxzsddfcbywpgwlcd6b992i4cad87";
-      name = "kcodecs-5.22.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcompletion-5.22.0.tar.xz";
-      sha256 = "07jqjrddigdqsdy2adzari7g626sakilg9d765s75vncv5amrvzy";
-      name = "kcompletion-5.22.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kconfig-5.22.0.tar.xz";
-      sha256 = "0n0dzgba96pkabbvk1cfm34j9jirgbd84xha6adscpxs28506cg0";
-      name = "kconfig-5.22.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kconfigwidgets-5.22.0.tar.xz";
-      sha256 = "0jr6ygd8c0gap2ay2685wj3fx4scrahzbpaaj4bjhq2s79nvmlyg";
-      name = "kconfigwidgets-5.22.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcoreaddons-5.22.0.tar.xz";
-      sha256 = "0zzwcw0n9bd3pi3rv7cdwynb67x1bqf1bh3s59hjipf9d412wl15";
-      name = "kcoreaddons-5.22.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kcrash-5.22.0.tar.xz";
-      sha256 = "1r0i9ngk5jypzfhhssjm5b3n5sqli3jhh896r1qwpfcq9w15x7qg";
-      name = "kcrash-5.22.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdbusaddons-5.22.0.tar.xz";
-      sha256 = "0w9spb5i5qi2r5kfgrylpvw6mwjxfhd4j7yslc9jy0q4y8j3f1dk";
-      name = "kdbusaddons-5.22.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdeclarative-5.22.0.tar.xz";
-      sha256 = "06n6wqy8dm2hv6dbar453z4rmiyf6f34zak1fhs38sqkfy6syva1";
-      name = "kdeclarative-5.22.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kded-5.22.0.tar.xz";
-      sha256 = "1zfggr6pmiypw5bnh6hr22agms589hm7hw35nhfhc4r7qd1drf6q";
-      name = "kded-5.22.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kdelibs4support-5.22.0.tar.xz";
-      sha256 = "1mmrr54kkicnz4pjksnrh40md80m18mr5ba2la7kwjxmdyl6znm3";
-      name = "kdelibs4support-5.22.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdesignerplugin-5.22.0.tar.xz";
-      sha256 = "0cfnmpz845l39qpy5r6pknzm78js81bci9qi0xfnrf8gm3lvjg5l";
-      name = "kdesignerplugin-5.22.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdesu-5.22.0.tar.xz";
-      sha256 = "1jsr9m32dyzvsvsy743h3jih8v4yyr2zf15hh908anbamp7449bd";
-      name = "kdesu-5.22.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdewebkit-5.22.0.tar.xz";
-      sha256 = "0rmxa4j3jx7689jcf45fghh7jff16x34xrzrw0clg3fj4w47ik0b";
-      name = "kdewebkit-5.22.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdnssd-5.22.0.tar.xz";
-      sha256 = "1b0s5gwn51zh2h5w2mzpzjj86qaz6pl7gzqf5q88vpzsiqjg14vp";
-      name = "kdnssd-5.22.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kdoctools-5.22.0.tar.xz";
-      sha256 = "0y4ayms0hyj4nv5flr0a198lb545plfbxkwhqsmzc0c77gagcw5k";
-      name = "kdoctools-5.22.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kemoticons-5.22.0.tar.xz";
-      sha256 = "1swrpqm441ngmps00hr15pgvw1382zbf2q2ncndj7i30725nfq1g";
-      name = "kemoticons-5.22.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kfilemetadata-5.22.0.tar.xz";
-      sha256 = "0p6s1r2qv5396ghkw79wyf7yf4hzj562yp83wgplwmr6lgh4b2fc";
-      name = "kfilemetadata-5.22.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kglobalaccel-5.22.0.tar.xz";
-      sha256 = "1m1aviz5g0vwk58j0z9jckz4rzns7md7mr3zlqqpvp1r032qc30k";
-      name = "kglobalaccel-5.22.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kguiaddons-5.22.0.tar.xz";
-      sha256 = "10chxcvf4hxyfkgprsj7rg4dv788dzqjgsm6m0a4m6qmx12zhckh";
-      name = "kguiaddons-5.22.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/khtml-5.22.0.tar.xz";
-      sha256 = "1w5q41fjrqqq91j3dvhc9lrrhvrwy1izws6af7srh768gn6yig0m";
-      name = "khtml-5.22.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.22.1";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/ki18n-5.22.1.tar.xz";
-      sha256 = "0fasp8akj6wysn4acf9vyivcgb8x9dlnhkqmw7j0g7z1qgvjn4pv";
-      name = "ki18n-5.22.1.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kiconthemes-5.22.0.tar.xz";
-      sha256 = "1bh76f7kpha4c5qs3n8z6g1qah0rsk99yqcz8j1dlss4ws65j9j3";
-      name = "kiconthemes-5.22.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kidletime-5.22.0.tar.xz";
-      sha256 = "0dgw0rin6wz31xdspbjpvcs5x1b163ggqkz2zn73zavbr7f5jypc";
-      name = "kidletime-5.22.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kimageformats-5.22.0.tar.xz";
-      sha256 = "0g3f73m3yj5iqivcsn83pm32w4l13zbyzz5azgm3jjfhgnd00c18";
-      name = "kimageformats-5.22.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kinit-5.22.0.tar.xz";
-      sha256 = "1f71y6gf00p4jkqvpzyjlbnwc4gvjl2h4wi61xhpjz8lrmpsb6ac";
-      name = "kinit-5.22.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kio-5.22.0.tar.xz";
-      sha256 = "02knylbs9ymb8qm7fkp3dkdqc9cvgw2dwfl4phzl1iax2fx2zkqy";
-      name = "kio-5.22.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kitemmodels-5.22.0.tar.xz";
-      sha256 = "03gnglfhpzrc67bi0xdcy4xdhankic5cqnpahp9wwsis12ac6i83";
-      name = "kitemmodels-5.22.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kitemviews-5.22.0.tar.xz";
-      sha256 = "0nhwg7bmv1c8p6pnbfsz96mq9wbq339ir9yp7kfnhfrg0wqi44ar";
-      name = "kitemviews-5.22.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kjobwidgets-5.22.0.tar.xz";
-      sha256 = "1inqrb0j64b3519qcr0wk9izd4c1zi4kfjc8wa04s2kwxg6z7j1p";
-      name = "kjobwidgets-5.22.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kjs-5.22.0.tar.xz";
-      sha256 = "0xqlkhm8r021xd5a25nwp9a4r7cbjkpqkc89fjma8qyvq5785qxw";
-      name = "kjs-5.22.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kjsembed-5.22.0.tar.xz";
-      sha256 = "0fcc1lm5l8r0lj35r3niliyn8zxr90by2vjc9krzfm4i7kwij7wb";
-      name = "kjsembed-5.22.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kmediaplayer-5.22.0.tar.xz";
-      sha256 = "1pn3fmaixcxba1wl63hblhnpj7jblrala9j3xrj8z2abhhfl5vzy";
-      name = "kmediaplayer-5.22.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/knewstuff-5.22.0.tar.xz";
-      sha256 = "1gr566k95bg58hpn569kkarmlxk5rp12jcxdp7ksw1j8mp6la7a7";
-      name = "knewstuff-5.22.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/knotifications-5.22.0.tar.xz";
-      sha256 = "0fh6ahfr9pa8643i1ma40h7afnd1jn0m6dw5f9hgndxhwi6h3bps";
-      name = "knotifications-5.22.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/knotifyconfig-5.22.0.tar.xz";
-      sha256 = "0p4g7wv2w6cpjzhlkh7rnzzhwcj86sgz98fl97is1fl65q8f0szr";
-      name = "knotifyconfig-5.22.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kpackage-5.22.0.tar.xz";
-      sha256 = "1nbwjc4n8f2iisdckm5ll3qyls1sq02ia6vmhj4mfm4w44q4s1bk";
-      name = "kpackage-5.22.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kparts-5.22.0.tar.xz";
-      sha256 = "091wm2flhqgpqsffdd8nlwbdffvsj7cyd0c46949d9chm64723cg";
-      name = "kparts-5.22.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kpeople-5.22.0.tar.xz";
-      sha256 = "0rbwxzmyaig92vcd26v1yqd13swk15pp0lpvjp6hdpxbhpxijyf7";
-      name = "kpeople-5.22.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kplotting-5.22.0.tar.xz";
-      sha256 = "0ljiyxa2320v937lkqkxx3jc7sg45z4vjl74lxfybwspgs6y5hqk";
-      name = "kplotting-5.22.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kpty-5.22.0.tar.xz";
-      sha256 = "12lfwv45d06ksx5xc4hgk075mj2ckkqpc8mksx99f700yvcyk1db";
-      name = "kpty-5.22.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/portingAids/kross-5.22.0.tar.xz";
-      sha256 = "1ika9ha06vspjn8hy6mv5vi5n7xj7sj45csmjjxcqwhn2wlcdj4l";
-      name = "kross-5.22.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/krunner-5.22.0.tar.xz";
-      sha256 = "09jhdy48dciqd8hwxmvjyw547fr48mzns5f0yknsnnb8a47yhrd4";
-      name = "krunner-5.22.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kservice-5.22.0.tar.xz";
-      sha256 = "1c5q8cxghbji3imamjbxymcd5cz9a9rapqriy1wmskys3ms3fag9";
-      name = "kservice-5.22.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/ktexteditor-5.22.0.tar.xz";
-      sha256 = "1jsa8cfq0245bsris46i3k8f8g7l0sc5jpj4iwkxrl9m0nk5j1v0";
-      name = "ktexteditor-5.22.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/ktextwidgets-5.22.0.tar.xz";
-      sha256 = "01a2vkdpq06libap5g6a90jrcc0phmfd859kilraqyxhbrp9sw5l";
-      name = "ktextwidgets-5.22.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kunitconversion-5.22.0.tar.xz";
-      sha256 = "1phbqxddp8ks36nr4982n4bwwx7d6yxll629gpb0ddc4yfsjv48p";
-      name = "kunitconversion-5.22.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwallet-5.22.0.tar.xz";
-      sha256 = "1i20kp1gkdiwmwy8vf7vd6r89qx6lpxwr6nib35khp93ci9l3838";
-      name = "kwallet-5.22.0.tar.xz";
-    };
-  };
-  kwayland = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwayland-5.22.0.tar.xz";
-      sha256 = "1jfibqai7vy1vklj19x7z0r4qc0rc7yd5r4wpp98mmdwzpnhlrgy";
-      name = "kwayland-5.22.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwidgetsaddons-5.22.0.tar.xz";
-      sha256 = "1bwmnfa1l3s33nc6b0ryk78gxhrynyd07ffqw7mw211r34pg4c14";
-      name = "kwidgetsaddons-5.22.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kwindowsystem-5.22.0.tar.xz";
-      sha256 = "05jwmjqk03pc2g09rnyb9qh0dfi0c46awbaxgc7i7z4i9swv1k30";
-      name = "kwindowsystem-5.22.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kxmlgui-5.22.0.tar.xz";
-      sha256 = "16q222jvnsd6pj49ih44qpks97lcjsamcpjg5x5ysn4a6w5h4mds";
-      name = "kxmlgui-5.22.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/kxmlrpcclient-5.22.0.tar.xz";
-      sha256 = "00qj4pa7r0ny6pwivq6qqw80v4dsg9lgwd2qdlp9kddi0f8i2p1b";
-      name = "kxmlrpcclient-5.22.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/modemmanager-qt-5.22.0.tar.xz";
-      sha256 = "1b1gx33vrw7qcvy3zlc01x7wlalx5csfl590gfxlf870i3m7dnhf";
-      name = "modemmanager-qt-5.22.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/networkmanager-qt-5.22.0.tar.xz";
-      sha256 = "03b710n4107qw9c3p7wdma9fz9vqixrjydfa02f7vgzw1rixmmqq";
-      name = "networkmanager-qt-5.22.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/oxygen-icons5-5.22.0.tar.xz";
-      sha256 = "1m3f5wrgahqlzzl3jyfymh6n515fsmsi8ckimvma2d8qqpb0dc2l";
-      name = "oxygen-icons5-5.22.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/plasma-framework-5.22.0.tar.xz";
-      sha256 = "1wn7ib030dw8rj5dprl8bzz4c3dv4nlmrfb9wgr6x78w4ac967zc";
-      name = "plasma-framework-5.22.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/solid-5.22.0.tar.xz";
-      sha256 = "04a7z5g2ylhbj2572wa6w51cs98ddn4d7lfirzawxf0f8d2693w2";
-      name = "solid-5.22.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/sonnet-5.22.0.tar.xz";
-      sha256 = "0y8l3mfa65a59vjj424ga87q3bixx8inicp2jp9zi36p4g7xwww8";
-      name = "sonnet-5.22.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.22.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.22/threadweaver-5.22.0.tar.xz";
-      sha256 = "1ax58k6nl8za79j99spa2r76m9xz8ih9iflksgpng40wlnkwlp59";
-      name = "threadweaver-5.22.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/attica.nix b/pkgs/desktops/kde-5/frameworks-5.24/attica.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/attica.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/attica.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.24/baloo.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/baloo.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/baloo.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.24/bluez-qt.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/bluez-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/bluez-qt.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.24/breeze-icons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/breeze-icons.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/breeze-icons.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/default.nix
similarity index 99%
rename from pkgs/desktops/kde-5/frameworks-5.22/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/default.nix
index 4d0567846f8..851c142fe2d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.24/default.nix
@@ -106,6 +106,7 @@ let
     ktextwidgets = callPackage ./ktextwidgets.nix {};
     kunitconversion = callPackage ./kunitconversion.nix {};
     kwallet = callPackage ./kwallet.nix {};
+    kwayland = callPackage ./kwayland.nix {};
     kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
     kwindowsystem = callPackage ./kwindowsystem.nix {};
     kxmlgui = callPackage ./kxmlgui.nix {};
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/nix-lib-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/nix-lib-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/series
rename to pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/extra-cmake-modules/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.24/frameworkintegration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/frameworkintegration.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/frameworkintegration.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks-5.24/kactivities-stats.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kactivities-stats.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kactivities-stats.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.24/kactivities.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kactivities.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kactivities.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.24/kapidox.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kapidox.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kapidox.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.24/karchive.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/karchive.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/karchive.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.24/kauth/cmake-install-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kauth/cmake-install-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kauth/cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kauth/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kauth/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kauth/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kauth/series b/pkgs/desktops/kde-5/frameworks-5.24/kauth/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kauth/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kauth/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.24/kbookmarks.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kbookmarks.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kbookmarks.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.24/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kcmutils/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kcmutils/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kcmutils/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.24/kcodecs.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kcodecs.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kcodecs.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.24/kcompletion.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kcompletion.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kcompletion.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.24/kconfig.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kconfig.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kconfigwidgets/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.24/kcoreaddons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kcoreaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kcoreaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.24/kcrash.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kcrash.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kcrash.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdbusaddons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdbusaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdbusaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdeclarative.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdeclarative.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdeclarative.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kded.nix b/pkgs/desktops/kde-5/frameworks-5.24/kded.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kded.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kded.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/nix-kde-include-dir.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/nix-kde-include-dir.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdelibs4support/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdesignerplugin.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdesignerplugin.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdesignerplugin.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdesu.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdesu.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdesu.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdnssd.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdnssd.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdnssd.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kdoctools/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdoctools/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kdoctools/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.24/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.24/kdoctools/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kdoctools/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.24/kdoctools/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.24/kemoticons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kemoticons.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kemoticons.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/cmake-install-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/cmake-install-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kfilemetadata/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.24/kglobalaccel.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kglobalaccel.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kglobalaccel.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.24/kguiaddons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kguiaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kguiaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.24/khtml.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/khtml.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/khtml.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.24/ki18n.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/ki18n.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/ki18n.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default-theme-breeze.patch
similarity index 91%
rename from pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default-theme-breeze.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default-theme-breeze.patch
index 5b3b15d5d5b..f7cb0ea3aac 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default-theme-breeze.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default-theme-breeze.patch
@@ -6,7 +6,7 @@ Index: kiconthemes-5.17.0/src/kicontheme.cpp
  // static
  QString KIconTheme::defaultThemeName()
  {
--    return QStringLiteral("oxygen");
+-    return QStringLiteral("hicolor");
 +    return QStringLiteral("breeze");
  }
  
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default.nix
similarity index 70%
rename from pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default.nix
index 4e868480636..825b15c8177 100644
--- a/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default.nix
@@ -1,6 +1,6 @@
 { kdeFramework, lib, copyPathsToStore
 , extra-cmake-modules, makeQtWrapper
-, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+, karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
 }:
 
 kdeFramework {
@@ -8,7 +8,7 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  propagatedBuildInputs = [ breeze-icons kconfigwidgets ki18n kitemviews qtsvg ];
+  propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
   postInstall = ''
     wrapQtProgram "$out/bin/kiconfinder5"
   '';
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kiconthemes/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.24/kidletime.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kidletime.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kidletime.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.24/kimageformats.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kimageformats.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kimageformats.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kinit/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kinit/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kinit/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.24/kinit/kinit-libpath.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kinit/kinit-libpath.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kinit/kinit-libpath.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kinit/series b/pkgs/desktops/kde-5/frameworks-5.24/kinit/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kinit/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kinit/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kio/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kio/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kio/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.24/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kio/samba-search-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kio/samba-search-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kio/series b/pkgs/desktops/kde-5/frameworks-5.24/kio/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kio/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kio/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.24/kitemmodels.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kitemmodels.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kitemmodels.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.24/kitemviews.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kitemviews.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kitemviews.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.24/kjobwidgets.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kjobwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kjobwidgets.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.24/kjs.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kjs.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kjs.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.24/kjsembed.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kjsembed.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kjsembed.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.24/kmediaplayer.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kmediaplayer.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kmediaplayer.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.24/knewstuff.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/knewstuff.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/knewstuff.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.24/knotifications.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/knotifications.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/knotifications.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.24/knotifyconfig.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/knotifyconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/knotifyconfig.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.24/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kpackage/allow-external-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kpackage/allow-external-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kpackage/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kpackage/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kpackage/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.24/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.24/kpackage/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kpackage/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kpackage/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.24/kparts.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kparts.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kparts.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.24/kpeople.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kpeople.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kpeople.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.24/kplotting.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kplotting.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kplotting.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.24/kpty.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kpty.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kpty.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kross.nix b/pkgs/desktops/kde-5/frameworks-5.24/kross.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kross.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kross.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.24/krunner.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/krunner.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/krunner.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/kservice/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kservice/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kservice/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kservice/no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.24/kservice/no-canonicalize-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kservice/no-canonicalize-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kservice/no-canonicalize-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kservice/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.24/kservice/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kservice/qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/kservice/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kservice/series b/pkgs/desktops/kde-5/frameworks-5.24/kservice/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kservice/series
rename to pkgs/desktops/kde-5/frameworks-5.24/kservice/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.24/kservice/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kservice/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.24/kservice/setup-hook.sh
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/default.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/no-qcoreapplication.patch
rename to pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/series
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/ktexteditor/series
rename to pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/series
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.24/ktextwidgets.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/ktextwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/ktextwidgets.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.24/kunitconversion.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kunitconversion.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kunitconversion.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.24/kwallet.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kwallet.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kwallet.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kwayland.nix b/pkgs/desktops/kde-5/frameworks-5.24/kwayland.nix
new file mode 100644
index 00000000000..db332841308
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.24/kwayland.nix
@@ -0,0 +1,14 @@
+{ kdeFramework
+, extra-cmake-modules
+, wayland
+}:
+
+kdeFramework {
+  name = "kwayland";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    wayland
+  ];
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.24/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kwidgetsaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kwidgetsaddons.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.24/kwindowsystem.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kwindowsystem.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kwindowsystem.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.24/kxmlgui.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kxmlgui.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kxmlgui.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.24/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/kxmlrpcclient.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/kxmlrpcclient.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.24/modemmanager-qt.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/modemmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/modemmanager-qt.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.24/networkmanager-qt.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/networkmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/networkmanager-qt.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.24/oxygen-icons5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/oxygen-icons5.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/oxygen-icons5.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/plasma-framework.nix b/pkgs/desktops/kde-5/frameworks-5.24/plasma-framework.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/plasma-framework.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/plasma-framework.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/solid.nix b/pkgs/desktops/kde-5/frameworks-5.24/solid.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/solid.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/solid.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.24/sonnet.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/sonnet.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/sonnet.nix
diff --git a/pkgs/desktops/kde-5/frameworks-5.24/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.24/srcs.nix
new file mode 100644
index 00000000000..5c48ece1e99
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.24/srcs.nix
@@ -0,0 +1,581 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/attica-5.24.0.tar.xz";
+      sha256 = "0d368gmds7m7k5pnn625wqsij38cvxk1gkm4zv24phnk9f67v7cw";
+      name = "attica-5.24.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/baloo-5.24.0.tar.xz";
+      sha256 = "1ayfdg6j9lvas17ryjdv4a0kaj6vw3bxfy2x9nadl0gkc9pak4nh";
+      name = "baloo-5.24.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/bluez-qt-5.24.0.tar.xz";
+      sha256 = "0gy0m7lcwwklf021l5i3v7j0cl7qz7cgvzrwpj87ix3kyw5xs80z";
+      name = "bluez-qt-5.24.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/breeze-icons-5.24.0.tar.xz";
+      sha256 = "1dh7bijx99sdb3vn6394wmm5cq0fvvmz8h17sx4hakmbga849cx2";
+      name = "breeze-icons-5.24.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/extra-cmake-modules-5.24.0.tar.xz";
+      sha256 = "01m12ml529pwr2sal951r5z6yb1rwbpid1y4k14nlk3xqgmdakwa";
+      name = "extra-cmake-modules-5.24.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/frameworkintegration-5.24.0.tar.xz";
+      sha256 = "0brqgq05m06d98qqvyh30727f5z7hlzxgqysfhfvqzcf3x7f6yzj";
+      name = "frameworkintegration-5.24.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kactivities-5.24.0.tar.xz";
+      sha256 = "0s8g43zk6h35bq1am1nnhj0qvmhd6kz42gs8l7ybga0367jghzhf";
+      name = "kactivities-5.24.0.tar.xz";
+    };
+  };
+  kactivities-stats = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kactivities-stats-5.24.0.tar.xz";
+      sha256 = "1z3xvpifxbd05b2xaxxyiypcpid7jgjb1qpwiyjj1gnfp4rjmzpc";
+      name = "kactivities-stats-5.24.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kapidox-5.24.0.tar.xz";
+      sha256 = "19a7alvn71nxflsyi7y3hghx1iw04qqc77qy54mcxcpkiyvpsggf";
+      name = "kapidox-5.24.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/karchive-5.24.0.tar.xz";
+      sha256 = "1n5nfhrfvqnrdjgjjy7arqik4fya5bp3dvxa16mlhqr19azkavzq";
+      name = "karchive-5.24.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kauth-5.24.0.tar.xz";
+      sha256 = "14sjjfgl3arqyqcr77w9qhpnd8mrnh53r5rfss6bvlk26bmihs49";
+      name = "kauth-5.24.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kbookmarks-5.24.0.tar.xz";
+      sha256 = "10d8dnhvbrwp0dbmz93cqfdff6ir8iy3yiwaf9ihj6ma124qlyjn";
+      name = "kbookmarks-5.24.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kcmutils-5.24.0.tar.xz";
+      sha256 = "0aws1c76s6wbp0xpr6qv6cfwq8dw82v00pkf9gy84sbxknwjnizk";
+      name = "kcmutils-5.24.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kcodecs-5.24.0.tar.xz";
+      sha256 = "1qpzjh3qc2zz80j2bmlinipbispms14k9bmqw8v61zhi6in9z14c";
+      name = "kcodecs-5.24.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kcompletion-5.24.0.tar.xz";
+      sha256 = "1qln0v31gn86kzwhnkijr1ydf129n32jmiybbckrp4w6hyx6xfxv";
+      name = "kcompletion-5.24.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kconfig-5.24.0.tar.xz";
+      sha256 = "1dc2i6icyigw1j6qxgdza6j2g8afh390qmxsa2a54mwl84fkfmxv";
+      name = "kconfig-5.24.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kconfigwidgets-5.24.0.tar.xz";
+      sha256 = "0v25r50gh5i984lzlv0rradghglcfqf0gsfmnkn23h87b86fm9l2";
+      name = "kconfigwidgets-5.24.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kcoreaddons-5.24.0.tar.xz";
+      sha256 = "06sx7by3nvaridnavj5p0bxv4nh47n708jlacfw8ydaikmd9i03h";
+      name = "kcoreaddons-5.24.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kcrash-5.24.0.tar.xz";
+      sha256 = "1lahgfwlp9b5rsl244kzp7rsl4ybv1q4qlvpv0xxz5ygssk48l0w";
+      name = "kcrash-5.24.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdbusaddons-5.24.0.tar.xz";
+      sha256 = "183nxqrhz4qk4qfp1w4an0scp2dvfqcaqbpg4cgbgk0z590q0pkk";
+      name = "kdbusaddons-5.24.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdeclarative-5.24.0.tar.xz";
+      sha256 = "00ik9q1r6y6g5rkdq96yczgrxmcg85x00lipyljvc3x6xw6bixbz";
+      name = "kdeclarative-5.24.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kded-5.24.0.tar.xz";
+      sha256 = "0ngpxdxb596myn5r4kjxahx195bwklq33yvgjvcbxi2clg2wccaj";
+      name = "kded-5.24.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/portingAids/kdelibs4support-5.24.0.tar.xz";
+      sha256 = "12sis63mq6i372bhx64x8y0pw6czrv64hdhjscx27cx65a4ir451";
+      name = "kdelibs4support-5.24.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdesignerplugin-5.24.0.tar.xz";
+      sha256 = "0i0s8pwwhwh5hyyvkv0cnj0yyv0g5bnm5xw18knv2yagiy4bvb2j";
+      name = "kdesignerplugin-5.24.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdesu-5.24.0.tar.xz";
+      sha256 = "1ivcnhgvq75xvl0w9g7m45qzallz42ijaq0n1ap09lpdfmjbnrxk";
+      name = "kdesu-5.24.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdewebkit-5.24.0.tar.xz";
+      sha256 = "1xq36zv7vnllhqbisl6kcna8z6qzlvy29a47g0hbzgl8rc93qskf";
+      name = "kdewebkit-5.24.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdnssd-5.24.0.tar.xz";
+      sha256 = "01b650g031apxc3vd2m91g2fxqk9l8ap67z6rafniphfwy8i0d5m";
+      name = "kdnssd-5.24.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kdoctools-5.24.0.tar.xz";
+      sha256 = "1r129kpq0d11b9l87cqbal6fm5ycwhsps1g3r1a7jsxz70scz4ri";
+      name = "kdoctools-5.24.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kemoticons-5.24.0.tar.xz";
+      sha256 = "0gmc52k5jb553jvzxwsq79v5y87kgav8i5qqv4bqc9yl7p866zhn";
+      name = "kemoticons-5.24.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kfilemetadata-5.24.0.tar.xz";
+      sha256 = "02n9qhpr0jlwdgdbid0k34abhs3bzhlsa56ybl5dq1aib6izk1sy";
+      name = "kfilemetadata-5.24.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kglobalaccel-5.24.0.tar.xz";
+      sha256 = "123v0ld1q88hbm3d0mqgq6lcivfkqh7pbz4hb4n76ab5v43qc15c";
+      name = "kglobalaccel-5.24.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kguiaddons-5.24.0.tar.xz";
+      sha256 = "0ig96ah20ybg5rwpswj9va2klvkh2q4amwxmgy3z4niwfsm2g3ic";
+      name = "kguiaddons-5.24.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/portingAids/khtml-5.24.0.tar.xz";
+      sha256 = "0f19m8ycaa41p61i0j43gafn364abral8dbiqhr0qcj33nsa4134";
+      name = "khtml-5.24.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/ki18n-5.24.0.tar.xz";
+      sha256 = "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv";
+      name = "ki18n-5.24.0.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kiconthemes-5.24.0.tar.xz";
+      sha256 = "1k5zig2n6wzfyv6pc8dpas2862mxjyxxza00m31myrfw5i1a1h6m";
+      name = "kiconthemes-5.24.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kidletime-5.24.0.tar.xz";
+      sha256 = "09jsj0pj27h93nr8v46savs6b93h8frydinfr7wlijkvpsl02jb4";
+      name = "kidletime-5.24.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kimageformats-5.24.0.tar.xz";
+      sha256 = "12mhgckmhnvcnm8k7mk15mipxrnm7i9ip7ykbjh8nxjiwyk1pmwc";
+      name = "kimageformats-5.24.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kinit-5.24.0.tar.xz";
+      sha256 = "1i7l6gid5hrrfglw1c461gpjg51dwz7cl4lx7ll8vz2ha8mz4d3n";
+      name = "kinit-5.24.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kio-5.24.0.tar.xz";
+      sha256 = "0zncj9yf8zaylazlwvirylpk9vki3j889b1x2s0aav54vvj7vdi5";
+      name = "kio-5.24.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kitemmodels-5.24.0.tar.xz";
+      sha256 = "1s1p4nw1pqdzbdwvjnka17p9avf00wadr437p4f96md1lvh3sh69";
+      name = "kitemmodels-5.24.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kitemviews-5.24.0.tar.xz";
+      sha256 = "0y3fx9hk1x27arrmwfzq783a44cs7p8dpmhxrwzh0di4mwa8jafw";
+      name = "kitemviews-5.24.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kjobwidgets-5.24.0.tar.xz";
+      sha256 = "1mcvrz66xcqjgbp08zpqsf943cm462wbqm5gh719p9s25hx8hwrc";
+      name = "kjobwidgets-5.24.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/portingAids/kjs-5.24.0.tar.xz";
+      sha256 = "1qd5sdfrdg7id0g5mwf3ijwlfvh3g36kwnckw6kwns1nf4q6gwlz";
+      name = "kjs-5.24.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/portingAids/kjsembed-5.24.0.tar.xz";
+      sha256 = "1nx8ch8mzd1jyx8pd46364ij0bsbsclbipbgr6jm9aak3n13b0nw";
+      name = "kjsembed-5.24.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/portingAids/kmediaplayer-5.24.0.tar.xz";
+      sha256 = "147xrffkvkyv3h8ighc1vlwksysfrqc0g55k8zrd72l6r0kjjh0p";
+      name = "kmediaplayer-5.24.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/knewstuff-5.24.0.tar.xz";
+      sha256 = "0xdv3wh3100vzsx8p2zihy1dvh0wzfmrjkjq71v8igwz5d291zsj";
+      name = "knewstuff-5.24.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/knotifications-5.24.0.tar.xz";
+      sha256 = "0qryp41phnpx4r9wa6rfhmnzy7nxl0ijnyrafadf2n2xb53ipkpa";
+      name = "knotifications-5.24.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/knotifyconfig-5.24.0.tar.xz";
+      sha256 = "1dij841fnqia4p44x2wnpdvl8cn3nkj833y0fah50fmipjc8r70b";
+      name = "knotifyconfig-5.24.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kpackage-5.24.0.tar.xz";
+      sha256 = "03aqzkpqz3c1v4qgwfbs3ncdbapiyg7psrkhxqv3z48rklavk1ri";
+      name = "kpackage-5.24.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kparts-5.24.0.tar.xz";
+      sha256 = "0z7qr93aq02i7g7cxgypx2rzlnsvbsx9cjblb0ijmad1nb8w3mix";
+      name = "kparts-5.24.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kpeople-5.24.0.tar.xz";
+      sha256 = "0iknzkj23y927xh24kw5sjxyirhy6pkmfcmmgwzd78rba8a54qp2";
+      name = "kpeople-5.24.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kplotting-5.24.0.tar.xz";
+      sha256 = "0gpypq9kh4b5s6dc7py3m117k3nbxczsfkxgxd9zxvr35kig7ya2";
+      name = "kplotting-5.24.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kpty-5.24.0.tar.xz";
+      sha256 = "1ybvdzqpa53kkki9p5da0ff9x3c63rmksk7865wqwlgy8apzi2fs";
+      name = "kpty-5.24.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/portingAids/kross-5.24.0.tar.xz";
+      sha256 = "0f29dpmfcj173vqnmrbpvdmfmzzbfsds1lbl546qfx9a5acdpf2p";
+      name = "kross-5.24.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/krunner-5.24.0.tar.xz";
+      sha256 = "0ff87ijjd47jxf6zw2ggqgngnbyx1rj59wdfgy5wbi3acws6bafl";
+      name = "krunner-5.24.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kservice-5.24.0.tar.xz";
+      sha256 = "0w0nsg64d6xhgijr2vh0j5p544qi0q55jpqa9v9mv956zrrdssdk";
+      name = "kservice-5.24.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/ktexteditor-5.24.0.tar.xz";
+      sha256 = "1ykj1kvm7k1vxb1w235d5hp2swwdqjyp2y4c3pxbvkn999h9x5q5";
+      name = "ktexteditor-5.24.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/ktextwidgets-5.24.0.tar.xz";
+      sha256 = "1q10xav2gkii6s3m31c9xvxf1988l7k2lpib6pyhgsidflmwjm02";
+      name = "ktextwidgets-5.24.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kunitconversion-5.24.0.tar.xz";
+      sha256 = "03dfjn4lm6sl2zcdrvw0b9irzvkyc2w2j5xixag5j8nw373742h8";
+      name = "kunitconversion-5.24.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kwallet-5.24.0.tar.xz";
+      sha256 = "0zad5h4vsvcl2xv3vxsjwh42b71xbp6x6rj8cvmw8szr2rzz9gsx";
+      name = "kwallet-5.24.0.tar.xz";
+    };
+  };
+  kwayland = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kwayland-5.24.0.tar.xz";
+      sha256 = "1h5anbqrxcl1s8kx1l53vcsfr8ifamcjqd47dk8a7lwr1ga6myq2";
+      name = "kwayland-5.24.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kwidgetsaddons-5.24.0.tar.xz";
+      sha256 = "1kppx0ppfhnb6q6sijs2dffyar86wkkx8miqavsjsgw1l2wiymcx";
+      name = "kwidgetsaddons-5.24.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kwindowsystem-5.24.0.tar.xz";
+      sha256 = "0w5ym8msl80v3q65253pdpj9f1fmb658rnndlbkrgpmm1rv1n6dz";
+      name = "kwindowsystem-5.24.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kxmlgui-5.24.0.tar.xz";
+      sha256 = "1qhixldhhcbklmrpjh67440h1rrzqy70h57hw6ialjdsr3pl6ihp";
+      name = "kxmlgui-5.24.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/kxmlrpcclient-5.24.0.tar.xz";
+      sha256 = "06ap6ipzqimz1rfrcr7z8zc7idy7sg4a97dws7h52i34ms7jqnc8";
+      name = "kxmlrpcclient-5.24.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/modemmanager-qt-5.24.0.tar.xz";
+      sha256 = "0khz5bf84xxa8aqpzwb6x839xx6dbiadwqhyj7cvgha65fh2xinh";
+      name = "modemmanager-qt-5.24.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/networkmanager-qt-5.24.0.tar.xz";
+      sha256 = "11wy0ds0hqbba900ggkcxjfqc9n65xlzc3h1zv9433nn5d75v6fy";
+      name = "networkmanager-qt-5.24.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/oxygen-icons5-5.24.0.tar.xz";
+      sha256 = "1c7spjbzk04725vv0ly7vmyvwa96mfa5ki2pm146ld4888a896wm";
+      name = "oxygen-icons5-5.24.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/plasma-framework-5.24.0.tar.xz";
+      sha256 = "0981vm00541dzihlr1fsax05biwp2ddpwjrmvnfysx5jagdc65cb";
+      name = "plasma-framework-5.24.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/solid-5.24.0.tar.xz";
+      sha256 = "00wvsxcnvhdx7ijzpcz5wny2ypkxr1drdpr4yvawgpwa678l1107";
+      name = "solid-5.24.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/sonnet-5.24.0.tar.xz";
+      sha256 = "152xz7fb1iwhb5w1n4xqvc648iaxi0inrl4kavxcsir61das1xyl";
+      name = "sonnet-5.24.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.24.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.24/threadweaver-5.24.0.tar.xz";
+      sha256 = "02g60zr9cc4bg1p90giich4n0qvqaiakz0y94qrnyj9f7fg0yksl";
+      name = "threadweaver-5.24.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.22/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.24/threadweaver.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.22/threadweaver.nix
rename to pkgs/desktops/kde-5/frameworks-5.24/threadweaver.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae9d92c908e..7cc039b6a94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16142,7 +16142,7 @@ in
 
   kde5 =
     let
-      frameworks = import ../desktops/kde-5/frameworks-5.22 { inherit pkgs; };
+      frameworks = import ../desktops/kde-5/frameworks-5.24 { inherit pkgs; };
       plasma = import ../desktops/kde-5/plasma-5.7 { inherit pkgs; };
       applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; };
       merged = self: