diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh
index ad916f3a25bf..1d93a05512c1 100755
--- a/maintainers/scripts/generate-kde-plasma.sh
+++ b/maintainers/scripts/generate-kde-plasma.sh
@@ -1,3 +1,5 @@
 #!/bin/sh
 
-./fetch-kde-qt.sh http://download.kde.org/stable/plasma/5.7.0/ -A '*.tar.xz'
+./maintainers/scripts/fetch-kde-qt.sh \
+    http://download.kde.org/stable/plasma/5.7.1/ -A '*.tar.xz' \
+    >pkgs/desktops/kde-5/plasma/srcs.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/srcs.nix b/pkgs/desktops/kde-5/plasma-5.7/srcs.nix
deleted file mode 100644
index 2f017f0d52b9..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.7/srcs.nix
+++ /dev/null
@@ -1,325 +0,0 @@
-# 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.7/bluedevil.nix b/pkgs/desktops/kde-5/plasma/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/bluedevil.nix
rename to pkgs/desktops/kde-5/plasma/bluedevil.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/breeze-gtk.nix
rename to pkgs/desktops/kde-5/plasma/breeze-gtk.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/breeze-qt4.nix
rename to pkgs/desktops/kde-5/plasma/breeze-qt4.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/breeze-qt5.nix
rename to pkgs/desktops/kde-5/plasma/breeze-qt5.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
similarity index 89%
rename from pkgs/desktops/kde-5/plasma-5.7/default.nix
rename to pkgs/desktops/kde-5/plasma/default.nix
index d0b6ef1f6c97..f6bbd5c3f51e 100644
--- a/pkgs/desktops/kde-5/plasma-5.7/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -2,14 +2,10 @@
 
 # Updates
 
-Before a major version update, make a copy of this directory. (We like to
-keep the old version around for a short time after major updates.)
-
-1. Update the URL in `maintainers/scripts/generate-kde-plasma.sh`.
-2. From the top of the Nixpkgs tree, run
-   `./maintainers/scripts/generate-kde-plasma.sh > pkgs/desktops/kde-5/plasma-$VERSION/srcs.nix'.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
+1. Update the URL in `maintainers/scripts/generate-kde-plasma.sh` and run
+   that script from the top of the Nixpkgs tree.
+2. Check that the new packages build correctly.
+3. Commit the changes and open a pull request.
 
 */
 
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kactivitymanagerd.nix
rename to pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kde-cli-tools.nix
rename to pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/default.nix
rename to pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix b/pkgs/desktops/kde-5/plasma/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix
rename to pkgs/desktops/kde-5/plasma/kdecoration.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kdeplasma-addons.nix
rename to pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kgamma5.nix b/pkgs/desktops/kde-5/plasma/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kgamma5.nix
rename to pkgs/desktops/kde-5/plasma/kgamma5.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/khotkeys.nix b/pkgs/desktops/kde-5/plasma/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/khotkeys.nix
rename to pkgs/desktops/kde-5/plasma/khotkeys.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kinfocenter.nix b/pkgs/desktops/kde-5/plasma/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kinfocenter.nix
rename to pkgs/desktops/kde-5/plasma/kinfocenter.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kmenuedit.nix b/pkgs/desktops/kde-5/plasma/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kmenuedit.nix
rename to pkgs/desktops/kde-5/plasma/kmenuedit.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kscreen.nix b/pkgs/desktops/kde-5/plasma/kscreen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kscreen.nix
rename to pkgs/desktops/kde-5/plasma/kscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kscreenlocker.nix
rename to pkgs/desktops/kde-5/plasma/kscreenlocker.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/ksshaskpass.nix
rename to pkgs/desktops/kde-5/plasma/ksshaskpass.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/ksysguard.nix b/pkgs/desktops/kde-5/plasma/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/ksysguard.nix
rename to pkgs/desktops/kde-5/plasma/ksysguard.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix b/pkgs/desktops/kde-5/plasma/kwayland-integration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix
rename to pkgs/desktops/kde-5/plasma/kwayland-integration.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kwin/default.nix
rename to pkgs/desktops/kde-5/plasma/kwin/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/kwrited.nix b/pkgs/desktops/kde-5/plasma/kwrited.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/kwrited.nix
rename to pkgs/desktops/kde-5/plasma/kwrited.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/libkscreen.nix b/pkgs/desktops/kde-5/plasma/libkscreen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/libkscreen.nix
rename to pkgs/desktops/kde-5/plasma/libkscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/libksysguard/default.nix
rename to pkgs/desktops/kde-5/plasma/libksysguard/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/milou.nix b/pkgs/desktops/kde-5/plasma/milou.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/milou.nix
rename to pkgs/desktops/kde-5/plasma/milou.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/oxygen.nix b/pkgs/desktops/kde-5/plasma/oxygen.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/oxygen.nix
rename to pkgs/desktops/kde-5/plasma/oxygen.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
rename to pkgs/desktops/kde-5/plasma/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0003-tzdir.patch
rename to pkgs/desktops/kde-5/plasma/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix
rename to pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix b/pkgs/desktops/kde-5/plasma/plasma-integration.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix
rename to pkgs/desktops/kde-5/plasma/plasma-integration.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-mediacenter.nix
rename to pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-nm/default.nix
rename to pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-pa.nix b/pkgs/desktops/kde-5/plasma/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-pa.nix
rename to pkgs/desktops/kde-5/plasma/plasma-pa.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/series b/pkgs/desktops/kde-5/plasma/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/series
rename to pkgs/desktops/kde-5/plasma/plasma-workspace/series
diff --git a/pkgs/desktops/kde-5/plasma-5.7/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/polkit-kde-agent.nix
rename to pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix b/pkgs/desktops/kde-5/plasma/powerdevil.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix
rename to pkgs/desktops/kde-5/plasma/powerdevil.nix
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix
new file mode 100644
index 000000000000..2dbfb6dd04ac
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma/srcs.nix
@@ -0,0 +1,325 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  bluedevil = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/bluedevil-5.7.1.tar.xz";
+      sha256 = "1sz84r27bc4qavb22haqswr1qjv9m47b8j3knvlpzdln4wpxnb81";
+      name = "bluedevil-5.7.1.tar.xz";
+    };
+  };
+  breeze = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/breeze-5.7.1.tar.xz";
+      sha256 = "1sparlwykzr6mjqzv3ghzl59j0xi3yxf0m93sx7d3js92k77rqpk";
+      name = "breeze-5.7.1.tar.xz";
+    };
+  };
+  breeze-grub = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/breeze-grub-5.7.1.tar.xz";
+      sha256 = "0ahpsq429f8cdk2w91h9ji9fiqc7g8m9zlg447pz7r6lxnj9aw3x";
+      name = "breeze-grub-5.7.1.tar.xz";
+    };
+  };
+  breeze-gtk = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/breeze-gtk-5.7.1.tar.xz";
+      sha256 = "1xcznd9m6kxrv8c4j66m4qqgq02h32714dkjwr754k9qfiava2qg";
+      name = "breeze-gtk-5.7.1.tar.xz";
+    };
+  };
+  breeze-plymouth = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/breeze-plymouth-5.7.1.tar.xz";
+      sha256 = "16wx7k18yxf2jhxl2wwxy1dzdrrlfr9qkxbw72m5c21spx734wwb";
+      name = "breeze-plymouth-5.7.1.tar.xz";
+    };
+  };
+  discover = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/discover-5.7.1.tar.xz";
+      sha256 = "1r4g4ajyp6ap1nq2n9ngvsgzifypivrkkzfk14c06mmc4fbqblpd";
+      name = "discover-5.7.1.tar.xz";
+    };
+  };
+  kactivitymanagerd = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kactivitymanagerd-5.7.1.tar.xz";
+      sha256 = "1mc4dxxkvjyrq4khlg1gjhxdhn87xsghwlznp4gnfx4cjgvxi8bq";
+      name = "kactivitymanagerd-5.7.1.tar.xz";
+    };
+  };
+  kde-cli-tools = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kde-cli-tools-5.7.1.tar.xz";
+      sha256 = "0q3j6kd7yfrp10pbld5pdis8w234442va3h460q9j3bp7n7xp8h9";
+      name = "kde-cli-tools-5.7.1.tar.xz";
+    };
+  };
+  kdecoration = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kdecoration-5.7.1.tar.xz";
+      sha256 = "181vay4alcckv93cralbj980c4zxbmca710dh9qrmy4nfk2y0pq7";
+      name = "kdecoration-5.7.1.tar.xz";
+    };
+  };
+  kde-gtk-config = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kde-gtk-config-5.7.1.tar.xz";
+      sha256 = "18xm51j1604gg9sf9cmchqzgfrchwf2may4qhl2glns3c7xnps94";
+      name = "kde-gtk-config-5.7.1.tar.xz";
+    };
+  };
+  kdeplasma-addons = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kdeplasma-addons-5.7.1.tar.xz";
+      sha256 = "13mg01ll9np8av55ilns1dc0k3rv5cix901gp459dl9r05hzhxgp";
+      name = "kdeplasma-addons-5.7.1.tar.xz";
+    };
+  };
+  kgamma5 = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kgamma5-5.7.1.tar.xz";
+      sha256 = "1myxjj99jmp2n58f4jbarphr12jh9rqpjmvk2dpcijb94sxaimsl";
+      name = "kgamma5-5.7.1.tar.xz";
+    };
+  };
+  khotkeys = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/khotkeys-5.7.1.tar.xz";
+      sha256 = "0djnfax9ba1zm3lkxm2hfa4ai399g1p1n0zfpchjfif8639pf6fk";
+      name = "khotkeys-5.7.1.tar.xz";
+    };
+  };
+  kinfocenter = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kinfocenter-5.7.1.tar.xz";
+      sha256 = "0ynm1lb5f2ggc470k805acxrgxbjw00b780psg60m64bh12jn5ws";
+      name = "kinfocenter-5.7.1.tar.xz";
+    };
+  };
+  kmenuedit = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kmenuedit-5.7.1.tar.xz";
+      sha256 = "19188hwidv6vak1qas60jzc7bd6fx1slaqkiwljyx8r6w7l1lx4h";
+      name = "kmenuedit-5.7.1.tar.xz";
+    };
+  };
+  kscreen = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kscreen-5.7.1.tar.xz";
+      sha256 = "0f2zniavlh18ipkn3k6kpzd5nqhlj0pg723dqb3p5zdmxfwddqal";
+      name = "kscreen-5.7.1.tar.xz";
+    };
+  };
+  kscreenlocker = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kscreenlocker-5.7.1.tar.xz";
+      sha256 = "0dpx1cwvjzsnf9aryavqajlw10iqfmg3vjry50wkg03nb8z1rd49";
+      name = "kscreenlocker-5.7.1.tar.xz";
+    };
+  };
+  ksshaskpass = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/ksshaskpass-5.7.1.tar.xz";
+      sha256 = "0blmwnm512lld8r3gj2fi7z0cj2nhcngn6xw3568p54ijb5da6c2";
+      name = "ksshaskpass-5.7.1.tar.xz";
+    };
+  };
+  ksysguard = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/ksysguard-5.7.1.tar.xz";
+      sha256 = "14b9wspfls4q3zl1rxpr6h5kxx9q6dv10x8lbzmxml1fdkid3i5j";
+      name = "ksysguard-5.7.1.tar.xz";
+    };
+  };
+  kwallet-pam = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kwallet-pam-5.7.1.tar.xz";
+      sha256 = "04jxi4a75km9c5gy30aaikqzsd2z2algvh7w6phfqaqq66h5qx8d";
+      name = "kwallet-pam-5.7.1.tar.xz";
+    };
+  };
+  kwayland-integration = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kwayland-integration-5.7.1.tar.xz";
+      sha256 = "0ix30304ggh12xgqnnb9zrniqhklg3a8rkjnp3fad7sr3wa9346s";
+      name = "kwayland-integration-5.7.1.tar.xz";
+    };
+  };
+  kwin = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kwin-5.7.1.tar.xz";
+      sha256 = "0mkvfbsv1ivzs02fphm28km55cn258w6sram9zbqldklk2js7is0";
+      name = "kwin-5.7.1.tar.xz";
+    };
+  };
+  kwrited = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/kwrited-5.7.1.tar.xz";
+      sha256 = "0mmb4hmwpcmxc03nzqhybwxk5nlyqamdswmr0vf8jcbvcqdmp473";
+      name = "kwrited-5.7.1.tar.xz";
+    };
+  };
+  libkscreen = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/libkscreen-5.7.1.tar.xz";
+      sha256 = "1my8k7r7i2qh59g46l79xdyci1km3ykxms1314vwzqf7fyadwjnp";
+      name = "libkscreen-5.7.1.tar.xz";
+    };
+  };
+  libksysguard = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/libksysguard-5.7.1.tar.xz";
+      sha256 = "0249cxgfy6yb9dcc9z2ckxwy7khkbzk0922479v900avaf87l4hj";
+      name = "libksysguard-5.7.1.tar.xz";
+    };
+  };
+  milou = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/milou-5.7.1.tar.xz";
+      sha256 = "0fcrf8q0sxsgjbi9j2h9qcl4g40mvia1zkb98crzir5qb1z6ji1f";
+      name = "milou-5.7.1.tar.xz";
+    };
+  };
+  oxygen = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/oxygen-5.7.1.tar.xz";
+      sha256 = "1pjygznb3fjyyvm84dxxj6smm6hpi5mr0c5077rc1xm2p20g7xn0";
+      name = "oxygen-5.7.1.tar.xz";
+    };
+  };
+  plasma-desktop = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-desktop-5.7.1.tar.xz";
+      sha256 = "1civd76q2lkas8x5pzm57dfjyplmgb91w34avn75lcdkl2p0zq44";
+      name = "plasma-desktop-5.7.1.tar.xz";
+    };
+  };
+  plasma-integration = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-integration-5.7.1.tar.xz";
+      sha256 = "12cjays5y3zr4za7j49p8yrzk6fxmsgvw4n8i8aida390lbnw5c6";
+      name = "plasma-integration-5.7.1.tar.xz";
+    };
+  };
+  plasma-mediacenter = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-mediacenter-5.7.1.tar.xz";
+      sha256 = "135c7vgps9nsna4x5b28p8p2lir7wx2ad6p5m4sg7irf2wr6mivd";
+      name = "plasma-mediacenter-5.7.1.tar.xz";
+    };
+  };
+  plasma-nm = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-nm-5.7.1.tar.xz";
+      sha256 = "0siq0na8cqqp0lqp963miwimsr7w9papj6cpf9k0frw40arqk26h";
+      name = "plasma-nm-5.7.1.tar.xz";
+    };
+  };
+  plasma-pa = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-pa-5.7.1.tar.xz";
+      sha256 = "0g4rgsf39imknxbccl77d7j7404gfyv0nh6r0dmli19alhhiczay";
+      name = "plasma-pa-5.7.1.tar.xz";
+    };
+  };
+  plasma-sdk = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-sdk-5.7.1.tar.xz";
+      sha256 = "1mn54zwq9bcrazv6zh832xyagrd4k1xjdwhdqxqbvq1d139v8shj";
+      name = "plasma-sdk-5.7.1.tar.xz";
+    };
+  };
+  plasma-workspace = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-workspace-5.7.1.tar.xz";
+      sha256 = "0x4ghm385kkj2ax91vy10p4f481c6ikpk0azmhnk2d685r7x03yn";
+      name = "plasma-workspace-5.7.1.tar.xz";
+    };
+  };
+  plasma-workspace-wallpapers = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/plasma-workspace-wallpapers-5.7.1.tar.xz";
+      sha256 = "0nl3bjb57djzgvx81knrjkbdix9y3j5ggxpd1a6lj80nixicg8h7";
+      name = "plasma-workspace-wallpapers-5.7.1.tar.xz";
+    };
+  };
+  polkit-kde-agent = {
+    version = "1-5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/polkit-kde-agent-1-5.7.1.tar.xz";
+      sha256 = "1pcmdplxq0fsa3bdxyl73vpndvhlmsmjbqfc35aa1ds2wkj7ql2q";
+      name = "polkit-kde-agent-1-5.7.1.tar.xz";
+    };
+  };
+  powerdevil = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/powerdevil-5.7.1.tar.xz";
+      sha256 = "0vdrpfgdw2c2gp6cwmrwyrwgfgxfslypa5ls79cf9wqgkrlh3phy";
+      name = "powerdevil-5.7.1.tar.xz";
+    };
+  };
+  sddm-kcm = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/sddm-kcm-5.7.1.tar.xz";
+      sha256 = "0bnfy0ndg5040za73sj41ajskwx7bvfa4x92wrfzv27gda3c7fdg";
+      name = "sddm-kcm-5.7.1.tar.xz";
+    };
+  };
+  systemsettings = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/systemsettings-5.7.1.tar.xz";
+      sha256 = "0arcvhqvcsm59l3fm6brqqcv1084qm8wawj9dj6w5wb194ys41hw";
+      name = "systemsettings-5.7.1.tar.xz";
+    };
+  };
+  user-manager = {
+    version = "5.7.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.7.1/user-manager-5.7.1.tar.xz";
+      sha256 = "1jzwwzixwbb6f92zi09i3jfs4dqsg3kcjis60w1bh2pkm96gq35y";
+      name = "user-manager-5.7.1.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.7/startkde/default.nix b/pkgs/desktops/kde-5/plasma/startkde/default.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/startkde/default.nix
rename to pkgs/desktops/kde-5/plasma/startkde/default.nix
diff --git a/pkgs/desktops/kde-5/plasma-5.7/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/startkde/startkde.sh
rename to pkgs/desktops/kde-5/plasma/startkde/startkde.sh
diff --git a/pkgs/desktops/kde-5/plasma-5.7/systemsettings.nix b/pkgs/desktops/kde-5/plasma/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/kde-5/plasma-5.7/systemsettings.nix
rename to pkgs/desktops/kde-5/plasma/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cedc20c020b1..6f06b05c156f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16181,7 +16181,7 @@ in
   kde5 =
     let
       frameworks = import ../desktops/kde-5/frameworks-5.24 { inherit pkgs; };
-      plasma = import ../desktops/kde-5/plasma-5.7 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma { inherit pkgs; };
       applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; };
       merged = self:
         { plasma = plasma self;