plasma5: Move to desktops/plasma-5

57 files changed, 4 insertions, 4 deletions

diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 1deef241a62fe..1deef241a62fe 100644
--- a/pkgs/desktops/kde-5/plasma/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
index da0fb6f73ad78..da0fb6f73ad78 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-grub.nix
+++ b/pkgs/desktops/plasma-5/breeze-grub.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 57de2fa2d474a..57de2fa2d474a 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 0de1ca1f6802c..0de1ca1f6802c 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
index 5d5856d122ddb..5d5856d122ddb 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/install-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/plasma-5/breeze-plymouth/series
index 8920e7ca51891..8920e7ca51891 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/series
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
index ad98a41e81dd3..b97554cd40441 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -1,7 +1,7 @@
 {
   stdenv, lib, src, version,
   automoc4, cmake, perl, pkgconfig,
-  kdelibs, qt4, xproto
+  kdelibs4, qt4, xproto
 }:
 
 stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     homepage = "http://www.kde.org";
   };
   inherit src;
-  buildInputs = [ kdelibs qt4 xproto ];
+  buildInputs = [ kdelibs4 qt4 xproto ];
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
   cmakeFlags = [
     "-DUSE_KDE4=ON"
diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index ea2776a13c598..ea2776a13c598 100644
--- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/plasma-5/default.nix
index e42a543ea23db..683154273ae6b 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -17,7 +17,7 @@ existing packages here and modify it as necessary.
 # Updates
 
 1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/plasma`
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
    from the top of the Nixpkgs tree.
 3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 76f05bad0a778..76f05bad0a778 100644
--- a/pkgs/desktops/kde-5/plasma/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
diff --git a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index bb90fd6d3ab05..bb90fd6d3ab05 100644
--- a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
diff --git a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 33a7340cb85f0..33a7340cb85f0 100644
--- a/pkgs/desktops/kde-5/plasma/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
index d610d19eedd22..d610d19eedd22 100644
--- a/pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 10e55f0d69804..10e55f0d69804 100644
--- a/pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index a0f9d93e60b01..a0f9d93e60b01 100644
--- a/pkgs/desktops/kde-5/plasma/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
diff --git a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index a2805f5d804b2..a2805f5d804b2 100644
--- a/pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/kde-5/plasma/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index 70d7cc17a1cae..70d7cc17a1cae 100644
--- a/pkgs/desktops/kde-5/plasma/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index f23a17e5479e9..f23a17e5479e9 100644
--- a/pkgs/desktops/kde-5/plasma/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index 939e4fa62a9c2..939e4fa62a9c2 100644
--- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index f10bf6bb3cdda..f10bf6bb3cdda 100644
--- a/pkgs/desktops/kde-5/plasma/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index ecbd88c2146dc..ecbd88c2146dc 100644
--- a/pkgs/desktops/kde-5/plasma/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 3c5d7b374724a..3c5d7b374724a 100644
--- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index 80b529a666854..80b529a666854 100644
--- a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index f7e5cced708a7..f7e5cced708a7 100644
--- a/pkgs/desktops/kde-5/plasma/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 86ba52292f9eb..86ba52292f9eb 100644
--- a/pkgs/desktops/kde-5/plasma/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index 376e8ed7cbda4..376e8ed7cbda4 100644
--- a/pkgs/desktops/kde-5/plasma/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 73e40cdb114c0..73e40cdb114c0 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
index 60b8f5ef541f3..60b8f5ef541f3 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/kwin/follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwin/series b/pkgs/desktops/plasma-5/kwin/series
index 9dbc88f499752..9dbc88f499752 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/series
+++ b/pkgs/desktops/plasma-5/kwin/series
diff --git a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 5fde01d08bf32..5fde01d08bf32 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch
diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 8dd814f783d09..8dd814f783d09 100644
--- a/pkgs/desktops/kde-5/plasma/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
diff --git a/pkgs/desktops/kde-5/plasma/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix
index 838ab6ef0e5c3..838ab6ef0e5c3 100644
--- a/pkgs/desktops/kde-5/plasma/libkscreen.nix
+++ b/pkgs/desktops/plasma-5/libkscreen.nix
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
index fbbb11ae7556b..fbbb11ae7556b 100644
--- a/pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index 2d81d061f4c77..2d81d061f4c77 100644
--- a/pkgs/desktops/kde-5/plasma/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index dbf9d0b9e5378..dbf9d0b9e5378 100644
--- a/pkgs/desktops/kde-5/plasma/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index ca63c8d7a3771..ca63c8d7a3771 100644
--- a/pkgs/desktops/kde-5/plasma/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 21ceec25d53f5..21ceec25d53f5 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index 5623de84668f8..5623de84668f8 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
index d5ac4b2508758..d5ac4b2508758 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
index def5b577b972a..def5b577b972a 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series
index 36778cd1c5608..36778cd1c5608 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/series
+++ b/pkgs/desktops/plasma-5/plasma-desktop/series
diff --git a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch b/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
index 97504b330fed4..97504b330fed4 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/tzdir.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index e8680fea930a0..e8680fea930a0 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
index 79b5cfb437e26..79b5cfb437e26 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index b6d18dbf91d98..b6d18dbf91d98 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 7bf97d745fe47..7bf97d745fe47 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index 6ffdb17cbeab4..6ffdb17cbeab4 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 1e38c0c74dd4a..1e38c0c74dd4a 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
index 12eb65caa7171..12eb65caa7171 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/series b/pkgs/desktops/plasma-5/plasma-workspace/series
index b9081298bd693..b9081298bd693 100644
--- a/pkgs/desktops/kde-5/plasma/plasma-workspace/series
+++ b/pkgs/desktops/plasma-5/plasma-workspace/series
diff --git a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 002c2bb10ff30..002c2bb10ff30 100644
--- a/pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/kde-5/plasma/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index c0c18a6eae6cc..c0c18a6eae6cc 100644
--- a/pkgs/desktops/kde-5/plasma/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 03ee867453b62..03ee867453b62 100644
--- a/pkgs/desktops/kde-5/plasma/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
diff --git a/pkgs/desktops/kde-5/plasma/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
index 516d651cec25c..516d651cec25c 100644
--- a/pkgs/desktops/kde-5/plasma/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
index a403e8e05e6ee..a403e8e05e6ee 100755
--- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 407d0e916264b..407d0e916264b 100644
--- a/pkgs/desktops/kde-5/plasma/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27f6dce1cde1d..76bca80505251 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16815,7 +16815,7 @@ with pkgs;
     pantheon-terminal = callPackage ../desktops/pantheon/apps/pantheon-terminal { };
   };
 
-  plasma5 = import ../desktops/kde-5/plasma {
+  plasma5 = import ../desktops/plasma-5 {
     inherit stdenv lib libsForQt5 makeSetupHook symlinkJoin fetchurl;
     inherit (gnome3) gconf;
   };