summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xmaintainers/scripts/generate-kde-plasma.sh2
-rw-r--r--pkgs/desktops/kde-5/applications-16.04/ark/0001-fix-start-from-plasma.patch10
-rw-r--r--pkgs/desktops/kde-5/applications-16.04/ark/default.nix (renamed from pkgs/desktops/kde-5/applications-16.04/ark.nix)3
-rw-r--r--pkgs/desktops/kde-5/applications-16.04/default.nix2
-rw-r--r--pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix18
-rw-r--r--pkgs/desktops/kde-5/plasma-5.6/srcs.nix333
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/bluedevil.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/breeze-gtk.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/breeze-qt4.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/breeze-qt5.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/default.nix)2
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kactivitymanagerd.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kde-cli-tools.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/0001-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kdeplasma-addons.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kgamma5.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/khotkeys.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kinfocenter.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kmenuedit.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kscreen.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kscreen.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kscreenlocker.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/ksshaskpass.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/ksysguard.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kwayland.nix)8
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch)4
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kwin/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/kwrited.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/kwrited.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/libkscreen.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/libksysguard/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/libksysguard/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/milou.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/milou.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/oxygen.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/oxygen.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0002-hwclock.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0003-tzdir.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix)10
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-integration.nix)4
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-mediacenter.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-nm/0001-mobile-broadband-provider-info-path.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-nm/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-pa.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-workspace-wallpapers.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch)13
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/series (renamed from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/polkit-kde-agent.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix18
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/srcs.nix325
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/startkde/default.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix)0
-rwxr-xr-xpkgs/desktops/kde-5/plasma-5.7/startkde/startkde.sh (renamed from pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.7/systemsettings.nix (renamed from pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix2
54 files changed, 374 insertions, 380 deletions
diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh
index fa804758f09b..ad916f3a25bf 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 000000000000..7590e49c498b
--- /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
index 331c8c647ca2..4e68488b323a 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 d66285deb8b3..0db0c72a6f18 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 8f3b354b9478..000000000000
--- 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 8307730a5503..000000000000
--- 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
index 3bfac828084d..3bfac828084d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
+++ b/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
index 179f15dc8763..179f15dc8763 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix
+++ b/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
index f8092bc9d376..f8092bc9d376 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix
+++ b/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
index f641b48c82bc..f641b48c82bc 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
+++ b/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
index d356dd4bd2fc..d0b6ef1f6c97 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
index 282e58ecf9e6..282e58ecf9e6 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix
+++ b/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
index d95db120dec4..d95db120dec4 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
+++ b/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
index 759eda4cc134..759eda4cc134 100644
--- 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
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
index f482f2a6a3f3..f482f2a6a3f3 100644
--- 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
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix
index eb65f7f90afb..eb65f7f90afb 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix
+++ b/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
index 3371e17beaf8..3371e17beaf8 100644
--- a/