From 7f84ad5f4c4a2aac98ebb2f4a37a02915e357939 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 25 Feb 2017 13:35:00 -0600 Subject: [PATCH] plasma5: Move to desktops/plasma-5 --- pkgs/desktops/{kde-5/plasma => plasma-5}/bluedevil.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-grub.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-gtk.nix | 0 .../{kde-5/plasma => plasma-5}/breeze-plymouth/default.nix | 0 .../plasma => plasma-5}/breeze-plymouth/install-paths.patch | 0 .../{kde-5/plasma => plasma-5}/breeze-plymouth/series | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt4.nix | 4 ++-- pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt5.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/default.nix | 2 +- pkgs/desktops/{kde-5/plasma => plasma-5}/fetch.sh | 0 .../desktops/{kde-5/plasma => plasma-5}/kactivitymanagerd.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kde-cli-tools.nix | 0 .../kde-gtk-config/0001-follow-symlinks.patch | 0 .../{kde-5/plasma => plasma-5}/kde-gtk-config/default.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kdecoration.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kdeplasma-addons.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kgamma5.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/khotkeys.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kinfocenter.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kmenuedit.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kscreen.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kscreenlocker.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/ksshaskpass.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/ksysguard.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kwallet-pam.nix | 0 .../{kde-5/plasma => plasma-5}/kwayland-integration.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/default.nix | 0 .../{kde-5/plasma => plasma-5}/kwin/follow-symlinks.patch | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/series | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/xwayland.patch | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/kwrited.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/libkscreen.nix | 0 .../libksysguard/0001-qdiriterator-follow-symlinks.patch | 0 .../{kde-5/plasma => plasma-5}/libksysguard/default.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/milou.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/oxygen.nix | 0 .../{kde-5/plasma => plasma-5}/plasma-desktop/default.nix | 0 .../plasma => plasma-5}/plasma-desktop/hwclock-path.patch | 0 .../{kde-5/plasma => plasma-5}/plasma-desktop/ibus.patch | 0 .../plasma => plasma-5}/plasma-desktop/qml-import-paths.patch | 0 .../desktops/{kde-5/plasma => plasma-5}/plasma-desktop/series | 0 .../{kde-5/plasma => plasma-5}/plasma-desktop/tzdir.patch | 0 .../{kde-5/plasma => plasma-5}/plasma-integration.nix | 0 .../plasma-nm/0001-mobile-broadband-provider-info-path.patch | 0 .../desktops/{kde-5/plasma => plasma-5}/plasma-nm/default.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-pa.nix | 0 .../plasma => plasma-5}/plasma-workspace-wallpapers.nix | 0 .../{kde-5/plasma => plasma-5}/plasma-workspace/default.nix | 0 .../plasma-workspace/qml-import-path.patch | 0 .../{kde-5/plasma => plasma-5}/plasma-workspace/series | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/polkit-kde-agent.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/powerdevil.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/srcs.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/default.nix | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/startkde.sh | 0 pkgs/desktops/{kde-5/plasma => plasma-5}/systemsettings.nix | 0 pkgs/top-level/all-packages.nix | 2 +- 57 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/desktops/{kde-5/plasma => plasma-5}/bluedevil.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-grub.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-gtk.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-plymouth/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-plymouth/install-paths.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-plymouth/series (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt4.nix (89%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/breeze-qt5.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/default.nix (97%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/fetch.sh (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kactivitymanagerd.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kde-cli-tools.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kde-gtk-config/0001-follow-symlinks.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kde-gtk-config/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kdecoration.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kdeplasma-addons.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kgamma5.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/khotkeys.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kinfocenter.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kmenuedit.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kscreen.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kscreenlocker.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/ksshaskpass.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/ksysguard.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwallet-pam.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwayland-integration.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/follow-symlinks.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/series (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwin/xwayland.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/kwrited.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/libkscreen.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/libksysguard/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/milou.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/oxygen.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/hwclock-path.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/ibus.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/qml-import-paths.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/series (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-desktop/tzdir.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-integration.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-nm/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-pa.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace-wallpapers.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace/qml-import-path.patch (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/plasma-workspace/series (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/polkit-kde-agent.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/powerdevil.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/srcs.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/default.nix (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/startkde/startkde.sh (100%) rename pkgs/desktops/{kde-5/plasma => plasma-5}/systemsettings.nix (100%) diff --git a/pkgs/desktops/kde-5/plasma/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/bluedevil.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/breeze-grub.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/breeze-gtk.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/breeze-plymouth/series rename to 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 similarity index 89% rename from pkgs/desktops/kde-5/plasma/breeze-qt4.nix rename to pkgs/desktops/plasma-5/breeze-qt4.nix index ad98a41e81d..b97554cd404 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/breeze-qt5.nix rename to pkgs/desktops/plasma-5/breeze-qt5.nix diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/plasma-5/default.nix similarity index 97% rename from pkgs/desktops/kde-5/plasma/default.nix rename to pkgs/desktops/plasma-5/default.nix index e42a543ea23..683154273ae 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/fetch.sh rename to pkgs/desktops/plasma-5/fetch.sh diff --git a/pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kactivitymanagerd.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kde-cli-tools.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kde-gtk-config/0001-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kde-gtk-config/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kdecoration.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kdeplasma-addons.nix rename to pkgs/desktops/plasma-5/kdeplasma-addons.nix diff --git a/pkgs/desktops/kde-5/plasma/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kgamma5.nix rename to pkgs/desktops/plasma-5/kgamma5.nix diff --git a/pkgs/desktops/kde-5/plasma/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/khotkeys.nix rename to pkgs/desktops/plasma-5/khotkeys.nix diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kinfocenter.nix rename to pkgs/desktops/plasma-5/kinfocenter.nix diff --git a/pkgs/desktops/kde-5/plasma/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kmenuedit.nix rename to pkgs/desktops/plasma-5/kmenuedit.nix diff --git a/pkgs/desktops/kde-5/plasma/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kscreen.nix rename to pkgs/desktops/plasma-5/kscreen.nix diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kscreenlocker.nix rename to pkgs/desktops/plasma-5/kscreenlocker.nix diff --git a/pkgs/desktops/kde-5/plasma/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/ksshaskpass.nix rename to pkgs/desktops/plasma-5/ksshaskpass.nix diff --git a/pkgs/desktops/kde-5/plasma/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/ksysguard.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwallet-pam.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwayland-integration.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwin/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwin/series rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwin/xwayland.patch rename to pkgs/desktops/plasma-5/kwin/xwayland.patch diff --git a/pkgs/desktops/kde-5/plasma/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/kwrited.nix rename to pkgs/desktops/plasma-5/kwrited.nix diff --git a/pkgs/desktops/kde-5/plasma/libkscreen.nix b/pkgs/desktops/plasma-5/libkscreen.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/libkscreen.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/libksysguard/0001-qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/libksysguard/default.nix rename to pkgs/desktops/plasma-5/libksysguard/default.nix diff --git a/pkgs/desktops/kde-5/plasma/milou.nix b/pkgs/desktops/plasma-5/milou.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/milou.nix rename to pkgs/desktops/plasma-5/milou.nix diff --git a/pkgs/desktops/kde-5/plasma/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/oxygen.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/hwclock-path.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/ibus.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/qml-import-paths.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/series rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-desktop/tzdir.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-integration.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-nm/0001-mobile-broadband-provider-info-path.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-nm/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-pa.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-workspace-wallpapers.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-workspace/qml-import-path.patch rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/plasma-workspace/series rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/polkit-kde-agent.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/powerdevil.nix rename to pkgs/desktops/plasma-5/powerdevil.nix diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/srcs.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/startkde/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/kde-5/plasma/startkde/startkde.sh rename to pkgs/desktops/plasma-5/startkde/startkde.sh diff --git a/pkgs/desktops/kde-5/plasma/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix similarity index 100% rename from pkgs/desktops/kde-5/plasma/systemsettings.nix rename to pkgs/desktops/plasma-5/systemsettings.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27f6dce1cde..76bca805052 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; };