JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plasma: 5.10.5 -> 5.11.1

Browse Source
This commit is contained in:
adisbladis 2017-10-11 12:29:30 +08:00
parent 27b7192726
commit 84847258bb
No known key found for this signature in database
GPG Key ID: ED58F95069B004F5
12 changed files with 218 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/desktops/plasma-5/fetch.sh
View File

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.5/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' )

4
pkgs/desktops/plasma-5/kde-cli-tools.nix
View File

@ -1,7 +1,7 @@
{ {
mkDerivation, extra-cmake-modules, kdoctools, mkDerivation, extra-cmake-modules, kdoctools,
kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
qtsvg, qtx11extras, qtsvg, qtx11extras, kactivities
}: }:
mkDerivation { mkDerivation {
@ -9,6 +9,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
qtx11extras qtx11extras kactivities
]; ];
} }

26
pkgs/desktops/plasma-5/plasma-desktop/ibus.patch
View File

@ -1,26 +0,0 @@
Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp
===================================================================
--- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp
+++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp
@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout
bool XkbHelper::preInitialize()
{
- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module
-
- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus"));
- if( ibusExe.isEmpty() ) {
- return 0;
- }
-
- KProcess ibusProcess;
- ibusProcess << ibusExe << QStringLiteral("exit");
- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels);
- int res = ibusProcess.execute();
-
- if( res == 0 ) {
- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped";
- }
-
return 0;
}

27
pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch
View File

@ -1,27 +1,14 @@
Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml
===================================================================
--- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml
+++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
import org.kde.draganddrop 2.0
import org.kde.plasma.private.pager 2.0
-import "utils.js" as Utils
+import "../code/utils.js" as Utils
MouseArea {
id: root
Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
=================================================================== ===================================================================
--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml
+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml
@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas @@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.private.desktopcontainment.folder 0.1 as Folder import org.kde.private.desktopcontainment.folder 0.1 as Folder
-import "FolderTools.js" as FolderTools -import "FolderTools.js" as FolderTools
+import "../code/FolderTools.js" as FolderTools +import "../code/FolderTools.js" as FolderTools
Item { Item {
id: main id: main
Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
@ -29,14 +16,14 @@ Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
--- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml
+++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml
@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 @@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0
import org.kde.private.desktopcontainment.desktop 0.1 as Desktop import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-import "LayoutManager.js" as LayoutManager -import "LayoutManager.js" as LayoutManager
-import "FolderTools.js" as FolderTools -import "FolderTools.js" as FolderTools
+import "../code/LayoutManager.js" as LayoutManager +import "../code/LayoutManager.js" as LayoutManager
+import "../code/FolderTools.js" as FolderTools +import "../code/FolderTools.js" as FolderTools
DragDrop.DropArea { DragDrop.DropArea {
id: root id: root
Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
@ -46,9 +33,9 @@ Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as @@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.draganddrop 2.0 as DragDrop import org.kde.draganddrop 2.0 as DragDrop
-import "LayoutManager.js" as LayoutManager -import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager +import "../code/LayoutManager.js" as LayoutManager
DragDrop.DropArea { DragDrop.DropArea {
id: root id: root

1
pkgs/desktops/plasma-5/plasma-desktop/series
View File

@ -1,4 +1,3 @@
qml-import-paths.patch qml-import-paths.patch
hwclock-path.patch hwclock-path.patch
tzdir.patch tzdir.patch
ibus.patch

4
pkgs/desktops/plasma-5/plasma-integration.nix
View File

@ -2,7 +2,7 @@
mkDerivation, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
kwayland, libXcursor kwayland, libXcursor, qtquickcontrols2
}: }:
# TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
@ -12,6 +12,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
libXcursor libXcursor qtquickcontrols2
]; ];
} }

51
pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch
View File

@ -1,16 +1,3 @@
Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
===================================================================
--- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml
+++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: analogclock
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
=================================================================== ===================================================================
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml --- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
@ -21,35 +8,9 @@ Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/Battery
import org.kde.kcoreaddons 1.0 as KCoreAddons import org.kde.kcoreaddons 1.0 as KCoreAddons
-import "logic.js" as Logic -import "logic.js" as Logic
+import "../code/logic.js" as Logic +import "../code/logic.js" as Logic
Item { Item {
id: batteryItem id: batteryItem
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
===================================================================
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as Components
import org.kde.plasma.workspace.components 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
MouseArea {
id: root
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
===================================================================
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
import org.kde.plasma.components 2.0 as Components
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.kquickcontrolsaddons 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
FocusScope {
id: dialog
Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
=================================================================== ===================================================================
--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml --- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
@ -60,7 +21,7 @@ Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/battery
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
-import "logic.js" as Logic -import "logic.js" as Logic
+import "../code/logic.js" as Logic +import "../code/logic.js" as Logic
Item { Item {
id: batterymonitor id: batterymonitor
Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
@ -73,7 +34,7 @@ Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
-import "data.js" as Data -import "data.js" as Data
+import "../code/data.js" as Data +import "../code/data.js" as Data
Flow { Flow {
id: lockout id: lockout
Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
@ -81,11 +42,11 @@ Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
--- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml --- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml
+++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml +++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
import org.kde.plasma.private.notifications 1.0 import org.kde.plasma.private.notifications 1.0
-import "uiproperties.js" as UiProperties -import "uiproperties.js" as UiProperties
+import "../code/uiproperties.js" as UiProperties +import "../code/uiproperties.js" as UiProperties
MouseEventListener { MouseEventListener {
id: notificationsApplet id: notificationsApplet

352
pkgs/desktops/plasma-5/srcs.nix
View File

@ -3,339 +3,355 @@
{ {
bluedevil = { bluedevil = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz";
sha256 = "01nhfggikkygfzyjbm7zqszhq2x1fhc619wskwjb7hm9p35laj9r"; sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q";
name = "bluedevil-5.10.5.tar.xz"; name = "bluedevil-5.11.1.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/breeze-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz";
sha256 = "0rmc3nn9b63jyij814hqx1zg38iphvd03pg7qybkp61zw40ng90v"; sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp";
name = "breeze-5.10.5.tar.xz"; name = "breeze-5.11.1.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz";
sha256 = "0am1hldqyrsryda907q2qwfc09xcsxrv7bq9v23ig0xmylcsq3if"; sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0";
name = "breeze-grub-5.10.5.tar.xz"; name = "breeze-grub-5.11.1.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz";
sha256 = "0i5ddrq9h1www5362qyfwpqpspn3brr43mbsv7ax7gk30san6w0a"; sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr";
name = "breeze-gtk-5.10.5.tar.xz"; name = "breeze-gtk-5.11.1.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz";
sha256 = "197g84mvh8s3f163zx24y1mmzk26fg3ni19pw21njdj2j813hd35"; sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr";
name = "breeze-plymouth-5.10.5.tar.xz"; name = "breeze-plymouth-5.11.1.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/discover-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz";
sha256 = "085lq0y9a6r12jbx2ik7zqp4r9bjw332ykfh2gbzzz4s7l7rj4xf"; sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c";
name = "discover-5.10.5.tar.xz"; name = "discover-5.11.1.tar.xz";
};
};
drkonqi = {
version = "5.11.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz";
sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35";
name = "drkonqi-5.11.1.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz";
sha256 = "19c297iyaq54vxc6xmvqsa1qlj5vr8071ydmkkfx3fa3lijp34v7"; sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg";
name = "kactivitymanagerd-5.10.5.tar.xz"; name = "kactivitymanagerd-5.11.1.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz";
sha256 = "1i2frbxvzlqlv210w50ccxn8ksqxranc93v0wfjvnhd7f8p9c7vk"; sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c";
name = "kde-cli-tools-5.10.5.tar.xz"; name = "kde-cli-tools-5.11.1.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz";
sha256 = "0g24gisbnp92niff36bcnjk5pp84qc8cwmx283b887fzcn8v4mf3"; sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph";
name = "kdecoration-5.10.5.tar.xz"; name = "kdecoration-5.11.1.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz";
sha256 = "1a5q8skykhvr5mixi59db2w1qsh8nj2dqncw4nmsh5nlh2ldmgm5"; sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al";
name = "kde-gtk-config-5.10.5.tar.xz"; name = "kde-gtk-config-5.11.1.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz";
sha256 = "1xdsa38i60x24p6xiv4x1cqd7f2xijs15c19qsjv594lnmbizbr5"; sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln";
name = "kdeplasma-addons-5.10.5.tar.xz"; name = "kdeplasma-addons-5.11.1.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz";
sha256 = "0rci4v5amhfiwawf2sj5f6cmcyq3lrx68mn8id279bpq35mr23v1"; sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd";
name = "kgamma5-5.10.5.tar.xz"; name = "kgamma5-5.11.1.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz";
sha256 = "1ixxb18nz3f4i2qqr1lvss7b662sgj78kzqjs0gd9mf5ylhqj5is"; sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5";
name = "khotkeys-5.10.5.tar.xz"; name = "khotkeys-5.11.1.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz";
sha256 = "0flfjypp6v2k99h11srigyc0ahy23869wz3ljbqbm3b0pgqs69sm"; sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8";
name = "kinfocenter-5.10.5.tar.xz"; name = "kinfocenter-5.11.1.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz";
sha256 = "0b786l5gm093dq1hvxcn97yg9fr0jmjhfl7sfd0cdn4pkg6almam"; sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6";
name = "kmenuedit-5.10.5.tar.xz"; name = "kmenuedit-5.11.1.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz";
sha256 = "1a8bqa4wqnjav2w0s39dh7hmb3mqxjnhqwsw6mycgaxicl0h37vf"; sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r";
name = "kscreen-5.10.5.tar.xz"; name = "kscreen-5.11.1.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.10.5.1"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz";
sha256 = "03ih0dyyjljv40wl7mpbssfirkkljw8mnpjjhzk357lzadkplzvp"; sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg";
name = "kscreenlocker-5.10.5.1.tar.xz"; name = "kscreenlocker-5.11.1.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz";
sha256 = "194ca18kclwmg7j9kcl02hm01cidy0hh2r68j6gxkafnlmn1cjjw"; sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx";
name = "ksshaskpass-5.10.5.tar.xz"; name = "ksshaskpass-5.11.1.tar.xz";
}; };
}; };
ksysguard = { ksysguard = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz";
sha256 = "0ywz0ax29y0gm7c3lxwdkn5xvzpkd82a313wb3cz4iphqqga3jqn"; sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1";
name = "ksysguard-5.10.5.tar.xz"; name = "ksysguard-5.11.1.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz";
sha256 = "0ws0835a0j3wqia85hcdsgfn48d71v96dmmvc2y5pp45ki648bn4"; sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y";
name = "kwallet-pam-5.10.5.tar.xz"; name = "kwallet-pam-5.11.1.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz";
sha256 = "0s1yhrvjgn455ayi368fkmdpmpyxl97c2pxy8rchfnk3g1ffhmdy"; sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh";
name = "kwayland-integration-5.10.5.tar.xz"; name = "kwayland-integration-5.11.1.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kwin-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz";
sha256 = "1nxyn31a00r9kh0aw5fmvxklw21b2l07y267m0q0n9w6bmn6nzyc"; sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm";
name = "kwin-5.10.5.tar.xz"; name = "kwin-5.11.1.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz";
sha256 = "0wphhb4l6qb7lbklgxh2sc6wgqij4n3iwnhaarv2d17864r7ykc9"; sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0";
name = "kwrited-5.10.5.tar.xz"; name = "kwrited-5.11.1.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz";
sha256 = "0a2lrrp8wp7ndgdvnh48781isin868ndsqw0xr21rn78n90580n6"; sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv";
name = "libkscreen-5.10.5.tar.xz"; name = "libkscreen-5.11.1.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz";
sha256 = "0ldcpjxy10cnwwc82ihy8xqjkavycrmv6wlbn0rwhnfs04n2rryn"; sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm";
name = "libksysguard-5.10.5.tar.xz"; name = "libksysguard-5.11.1.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/milou-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz";
sha256 = "06kq9s9lij66vy5024aps03pzpcz1ixf0b79a7ii1px2h1s7z4gz"; sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp";
name = "milou-5.10.5.tar.xz"; name = "milou-5.11.1.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz";
sha256 = "0p1isrb8v0dkd27jnz6nbq44py7y3zzsjljn9xbv3d02vg802ym9"; sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z";
name = "oxygen-5.10.5.tar.xz"; name = "oxygen-5.11.1.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz";
sha256 = "1sxy2k2p15ag5pcy36lpn83nz8d1jb1iyq2nihf4yrc9jlxx9gqm"; sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps";
name = "plasma-desktop-5.10.5.tar.xz"; name = "plasma-desktop-5.11.1.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz";
sha256 = "15cxwsdp78kx55py0wkwqpv4w8cf130hadmdvdw64lwr4gssvhjn"; sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly";
name = "plasma-integration-5.10.5.tar.xz"; name = "plasma-integration-5.11.1.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz";
sha256 = "004nmkfy74qaba6hslv2cyb52l7q6ihpavi5j5ax8k66n5zx00bi"; sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p";
name = "plasma-nm-5.10.5.tar.xz"; name = "plasma-nm-5.11.1.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz";
sha256 = "0300x3w7mhyb5wpsj47qsfm73fc90iw1vxrgzl9014pxc3h14np1"; sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c";
name = "plasma-pa-5.10.5.tar.xz"; name = "plasma-pa-5.11.1.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz";
sha256 = "0mjndw132rn46sqjw5jdin8hn6lbrx5955h05jawk95sncr3d0yb"; sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n";
name = "plasma-sdk-5.10.5.tar.xz"; name = "plasma-sdk-5.11.1.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-tests-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz";
sha256 = "0mfh35zdc4n52q01jbagxgr51hsvjlyfmnj6x4l2zpif0fpqpxh8"; sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk";
name = "plasma-tests-5.10.5.tar.xz"; name = "plasma-tests-5.11.1.tar.xz";
};
};
plasma-vault = {
version = "5.11.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz";
sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10";
name = "plasma-vault-5.11.1.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz";
sha256 = "1n12vzjnrhndkzki7dh9kzrwrvll5xqq0y02srb9bg3gyjbp54jl"; sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy";
name = "plasma-workspace-5.10.5.tar.xz"; name = "plasma-workspace-5.11.1.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz";
sha256 = "1z7mqk9nxh232dxl5jg20zbc5nkq5srks4f8b02va6wzfjhwhc88"; sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc";
name = "plasma-workspace-wallpapers-5.10.5.tar.xz"; name = "plasma-workspace-wallpapers-5.11.1.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz";
sha256 = "11vfaaqd3mxbnq16rv7xsmfcj33i2cmdljdxib1sg5minybd072y"; sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h";
name = "plymouth-kcm-5.10.5.tar.xz"; name = "plymouth-kcm-5.11.1.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.10.5"; version = "1-5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz";
sha256 = "158lkf76fz65nr0lx14skkcsk2p3xw98nh43z00wvm2c5qqzmnp2"; sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w";
name = "polkit-kde-agent-1-5.10.5.tar.xz"; name = "polkit-kde-agent-1-5.11.1.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz";
sha256 = "0dghlgva8fybvhc09y1avzhgak246n4ad2njjvfnxpazpi2laxv7"; sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq";
name = "powerdevil-5.10.5.tar.xz"; name = "powerdevil-5.11.1.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz";
sha256 = "13hld5bndxhs6j3lja08zrc6czvpl4k385i8lb3g9zvn9vrk29sw"; sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19";
name = "sddm-kcm-5.10.5.tar.xz"; name = "sddm-kcm-5.11.1.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz";
sha256 = "0b3wpmfjj2zmi7ickppz32i63dpn4jja3nnjrxn912yw47z4bri2"; sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw";
name = "systemsettings-5.10.5.tar.xz"; name = "systemsettings-5.11.1.tar.xz";
}; };
}; };
user-manager = { user-manager = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz";
sha256 = "1fiih72jafshxgwfq4q9csv1i62mgj35qr87lh6lyady6aghajnq"; sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm";
name = "user-manager-5.10.5.tar.xz"; name = "user-manager-5.11.1.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.10.5"; version = "5.11.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.10.5/xdg-desktop-portal-kde-5.10.5.tar.xz"; url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz";
sha256 = "0rgv4nqkrwjzvhg8cmkin348n0i6sd4v444bk6j83y4m0lxdi1ba"; sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf";
name = "xdg-desktop-portal-kde-5.10.5.tar.xz"; name = "xdg-desktop-portal-kde-5.11.1.tar.xz";
}; };
}; };
} }

4
pkgs/desktops/plasma-5/systemsettings.nix
View File

@ -1,7 +1,8 @@
{ {
mkDerivation, extra-cmake-modules, kdoctools, mkDerivation, extra-cmake-modules, kdoctools,
kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
kactivities, kactivities-stats, kirigami2
}: }:
mkDerivation { mkDerivation {
@ -10,6 +11,7 @@ mkDerivation {
buildInputs = [ buildInputs = [
kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
kactivities kactivities-stats kirigami2
]; ];
outputs = [ "out" "dev" "bin" ]; outputs = [ "out" "dev" "bin" ];
} }

1
pkgs/development/libraries/kde-frameworks/default.nix
View File

@ -132,6 +132,7 @@ let
sonnet = callPackage ./sonnet.nix {}; sonnet = callPackage ./sonnet.nix {};
syntax-highlighting = callPackage ./syntax-highlighting.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {};
threadweaver = callPackage ./threadweaver.nix {}; threadweaver = callPackage ./threadweaver.nix {};
kirigami2 = callPackage ./kirigami2.nix {};
# TIER 2 # TIER 2
kactivities = callPackage ./kactivities.nix {}; kactivities = callPackage ./kactivities.nix {};

11
pkgs/development/libraries/kde-frameworks/kirigami2.nix Normal file
View File

@ -0,0 +1,11 @@
{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }:
mkDerivation {
name = "kirigami2";
meta = {
broken = builtins.compareVersions qtbase.version "5.7.0" < 0;
};
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase qtquickcontrols2 qttranslations ];
outputs = [ "out" "dev" ];
}

2
pkgs/top-level/all-packages.nix
View File

@ -10313,7 +10313,7 @@ with pkgs;
kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
threadweaver; threadweaver kirigami2;
### KDE PLASMA 5 ### KDE PLASMA 5