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

Merge pull request #40893 from bkchr/plasma_5_13

Browse Source 
plasma5: 5.12 -> 5.13
This commit is contained in:
Yegor Timoshenko 2018-06-15 12:50:28 +00:00 committed by GitHub
commit 47066f0776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 253 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/networking/browsers/firefox/wrapper.nix
View File

@ -7,7 +7,7 @@
, trezor-bridge, bluejeans, djview4, adobe-reader , trezor-bridge, bluejeans, djview4, adobe-reader
, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/
, esteidfirefoxplugin , esteidfirefoxplugin
, browserpass, chrome-gnome-shell, uget-integrator , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration
, libudev , libudev
, kerberos , kerberos
}: }:
@ -63,6 +63,7 @@ let
++ lib.optional (cfg.enableBrowserpass or false) browserpass ++ lib.optional (cfg.enableBrowserpass or false) browserpass
++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell
++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator
++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration
++ extraNativeMessagingHosts ++ extraNativeMessagingHosts
); );
libs = lib.optional ffmpegSupport ffmpeg libs = lib.optional ffmpegSupport ffmpeg

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

@ -11,8 +11,4 @@ mkDerivation {
bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
kdbusaddons kded kiconthemes knotifications kwidgetsaddons kdbusaddons kded kiconthemes knotifications kwidgetsaddons
]; ];
postInstall = ''
# Fix the location of logic.js for the plasmoid
ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
'';
} }

1
pkgs/desktops/plasma-5/default.nix
View File

@ -124,6 +124,7 @@ let
libksysguard = callPackage ./libksysguard {}; libksysguard = callPackage ./libksysguard {};
milou = callPackage ./milou.nix {}; milou = callPackage ./milou.nix {};
oxygen = callPackage ./oxygen.nix {}; oxygen = callPackage ./oxygen.nix {};
plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
plasma-desktop = callPackage ./plasma-desktop {}; plasma-desktop = callPackage ./plasma-desktop {};
plasma-integration = callPackage ./plasma-integration {}; plasma-integration = callPackage ./plasma-integration {};
plasma-nm = callPackage ./plasma-nm {}; plasma-nm = callPackage ./plasma-nm {};

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

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

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

@ -2,7 +2,7 @@
mkDerivation, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
kwindowsystem, kxmlgui kwindowsystem, kxmlgui, kcrash
}: }:
mkDerivation { mkDerivation {
@ -10,6 +10,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
kxmlgui kxmlgui kcrash
]; ];
} }

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, kactivities qtsvg, qtx11extras, kactivities, plasma-workspace
}: }:
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 kactivities qtx11extras kactivities plasma-workspace
]; ];
} }

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

@ -1,8 +1,8 @@
{ mkDerivation, extra-cmake-modules, qtbase }: { mkDerivation, extra-cmake-modules, qtbase, ki18n }:
mkDerivation { mkDerivation {
name = "kdecoration"; name = "kdecoration";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ qtbase ]; buildInputs = [ qtbase ki18n ];
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
} }

4
pkgs/desktops/plasma-5/kdeplasma-addons.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
}: }:
mkDerivation { mkDerivation {
@ -12,6 +12,6 @@ mkDerivation {
buildInputs = [ buildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
kross krunner kservice ksysguard kunitconversion ibus plasma-framework kross krunner kservice ksysguard kunitconversion ibus plasma-framework
plasma-workspace qtdeclarative qtx11extras plasma-workspace qtdeclarative qtx11extras kholidays
]; ];
} }

6
pkgs/desktops/plasma-5/kscreen.nix
View File

@ -2,7 +2,8 @@
mkDerivation, mkDerivation,
extra-cmake-modules, extra-cmake-modules,
kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwindowsystem,
kdeclarative, plasma-framework
}: }:
mkDerivation { mkDerivation {
@ -10,6 +11,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ buildInputs = [
kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
libkscreen qtdeclarative qtgraphicaleffects libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative
plasma-framework
]; ];
} }

8
pkgs/desktops/plasma-5/kwin/default.nix
View File

@ -30,13 +30,7 @@ mkDerivation {
libcap libcap
]; ];
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [ patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
# This patch should be removed in 5.12.2
(fetchpatch {
url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch";
sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x";
})
];
CXXFLAGS = [ CXXFLAGS = [
''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
]; ];

11
pkgs/desktops/plasma-5/plasma-browser-integration.nix Normal file
View File

@ -0,0 +1,11 @@
{ mkDerivation, extra-cmake-modules, qtbase, kio, ki18n, kconfig
, kdbusaddons, knotifications, krunner, kwindowsystem, kactivities
}:
mkDerivation {
name = "plasma-browser-integration";
nativeBuildInputs = [
extra-cmake-modules qtbase kio ki18n kconfig kdbusaddons
knotifications krunner kwindowsystem kactivities
];
}

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

@ -1,41 +0,0 @@
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/containments/desktop/package/contents/ui/FolderView.qml
@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas
import org.kde.kquickcontrolsaddons 2.0
import org.kde.private.desktopcontainment.folder 0.1 as Folder
-import "FolderTools.js" as FolderTools
+import "../code/FolderTools.js" as FolderTools
Item {
id: main
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/containments/desktop/package/contents/ui/main.qml
@@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0
import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
-import "LayoutManager.js" as LayoutManager
-import "FolderTools.js" as FolderTools
+import "../code/LayoutManager.js" as LayoutManager
+import "../code/FolderTools.js" as FolderTools
DragDrop.DropArea {
id: root
Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
===================================================================
--- plasma-desktop-5.8.5.orig/containments/panel/contents/ui/main.qml
+++ plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as
import org.kde.kquickcontrolsaddons 2.0
import org.kde.draganddrop 2.0 as DragDrop
-import "LayoutManager.js" as LayoutManager
+import "../code/LayoutManager.js" as LayoutManager
DragDrop.DropArea {
id: root

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

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

2
pkgs/desktops/plasma-5/plasma-vault/default.nix
View File

@ -5,6 +5,7 @@
kactivities, kactivities,
plasma-framework, plasma-framework,
kwindowsystem, kwindowsystem,
networkmanager-qt,
libksysguard, libksysguard,
encfs, encfs,
@ -24,6 +25,7 @@ mkDerivation {
buildInputs = [ buildInputs = [
kactivities plasma-framework kwindowsystem libksysguard kactivities plasma-framework kwindowsystem libksysguard
networkmanager-qt
]; ];
CXXFLAGS = [ CXXFLAGS = [

10
pkgs/desktops/plasma-5/plasma-workspace/default.nix
View File

@ -9,8 +9,9 @@
baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff, kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff,
knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets, knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate,
networkmanager-qt, phonon, plasma-framework, prison, solid, networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays,
breeze-qt5,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras, qtwayland, qtx11extras,
@ -28,8 +29,8 @@ mkDerivation {
baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate
networkmanager-qt phonon plasma-framework prison solid networkmanager-qt phonon plasma-framework prison solid kholidays
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
]; ];
@ -51,6 +52,7 @@ mkDerivation {
"-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep" "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep"
"-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown" "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown"
"-DNIXPKGS_SED=${getBin gnused}/bin/sed" "-DNIXPKGS_SED=${getBin gnused}/bin/sed"
"-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/"
]; ];
# To regenerate ./plasma-workspace.patch, # To regenerate ./plasma-workspace.patch,

157
pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
View File

@ -1,76 +1,15 @@
diff --git a/applets/batterymonitor/package/contents/ui/BatteryItem.qml b/applets/batterymonitor/package/contents/ui/BatteryItem.qml diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index 7e2d975..40a5797 100644 index 69d30705..52e91028 100644
--- a/applets/batterymonitor/package/contents/ui/BatteryItem.qml --- a/sddm-theme/theme.conf.cmake
+++ b/applets/batterymonitor/package/contents/ui/BatteryItem.qml +++ b/sddm-theme/theme.conf.cmake
@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.workspace.components 2.0
import org.kde.kcoreaddons 1.0 as KCoreAddons
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: batteryItem
diff --git a/applets/batterymonitor/package/contents/ui/batterymonitor.qml b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
index 50deee5..45b6b37 100644
--- a/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+++ b/applets/batterymonitor/package/contents/ui/batterymonitor.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.kcoreaddons 1.0 as KCoreAddons
import org.kde.kquickcontrolsaddons 2.0
-import "logic.js" as Logic
+import "../code/logic.js" as Logic
Item {
id: batterymonitor
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml
index 80e7e53..0083cf0 100644
--- a/applets/lock_logout/contents/ui/lockout.qml
+++ b/applets/lock_logout/contents/ui/lockout.qml
@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0
import org.kde.kquickcontrolsaddons 2.0
-import "data.js" as Data
+import "../code/data.js" as Data
Flow {
id: lockout
diff --git a/applets/notifications/package/contents/ui/main.qml b/applets/notifications/package/contents/ui/main.qml
index cb15cfa..a6976ba 100644
--- a/applets/notifications/package/contents/ui/main.qml
+++ b/applets/notifications/package/contents/ui/main.qml
@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.plasma.private.notifications 1.0
-import "uiproperties.js" as UiProperties
+import "../code/uiproperties.js" as UiProperties
MouseEventListener {
id: notificationsApplet
diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in
index 8571521..294eab0 100644
--- a/krunner/dbus/org.kde.krunner.service.in
+++ b/krunner/dbus/org.kde.krunner.service.in
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
[D-BUS Service] [General]
Name=org.kde.krunner type=image
-Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner color=#1d99f3
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/krunner -background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png
diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in
index 7a86d07..5b3030c 100644
--- a/kuiserver/org.kde.kuiserver.service.in
+++ b/kuiserver/org.kde.kuiserver.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.kde.kuiserver
-Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver5
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/kuiserver5
diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt
index fe29f57..247db95 100644 index cb75aeca..247db953 100644
--- a/startkde/CMakeLists.txt --- a/startkde/CMakeLists.txt
+++ b/startkde/CMakeLists.txt +++ b/startkde/CMakeLists.txt
@@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig) @@ -3,11 +3,6 @@ add_subdirectory(kstartupconfig)
@ -79,14 +18,14 @@ index fe29f57..247db95 100644
-#FIXME: reconsider, looks fishy -#FIXME: reconsider, looks fishy
-if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr") -if(NOT CMAKE_INSTALL_PREFIX STREQUAL "/usr")
- set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${CMAKE_INSTALL_PREFIX}/share/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH") - set(EXPORT_XCURSOR_PATH "XCURSOR_PATH=${KDE_INSTALL_FULL_DATAROOTDIR}/icons:$XCURSOR_PATH\":~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons\"; export XCURSOR_PATH")
-endif() -endif()
- -
configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY) configure_file(startkde.cmake ${CMAKE_CURRENT_BINARY_DIR}/startkde @ONLY)
configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY) configure_file(startplasmacompositor.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasmacompositor @ONLY)
configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY) configure_file(startplasma.cmake ${CMAKE_CURRENT_BINARY_DIR}/startplasma @ONLY)
diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp diff --git a/startkde/kstartupconfig/kstartupconfig.cpp b/startkde/kstartupconfig/kstartupconfig.cpp
index c992785..bd506ce 100644 index 493218ea..d507aa55 100644
--- a/startkde/kstartupconfig/kstartupconfig.cpp --- a/startkde/kstartupconfig/kstartupconfig.cpp
+++ b/startkde/kstartupconfig/kstartupconfig.cpp +++ b/startkde/kstartupconfig/kstartupconfig.cpp
@@ -147,5 +147,5 @@ int main() @@ -147,5 +147,5 @@ int main()
@ -97,7 +36,7 @@ index c992785..bd506ce 100644
+ return system( NIXPKGS_KDOSTARTUPCONFIG5 ); + return system( NIXPKGS_KDOSTARTUPCONFIG5 );
} }
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index b3117b4..e70110e 100644 index f9e2e429..0a4267a9 100644
--- a/startkde/startkde.cmake --- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake +++ b/startkde/startkde.cmake
@@ -1,22 +1,31 @@ @@ -1,22 +1,31 @@
@ -436,37 +375,7 @@ index b3117b4..e70110e 100644
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard # Set a left cursor instead of the standard X11 "X" cursor, since I've heard
# from some users that they're confused and don't know what to do. This is # from some users that they're confused and don't know what to do. This is
# especially necessary on slow machines, where starting KDE takes one or two # especially necessary on slow machines, where starting KDE takes one or two
@@ -211,28 +236,10 @@ xset fp rehash @@ -257,44 +282,65 @@ export XDG_DATA_DIRS
# If the user has overwritten fonts, the cursor font may be different now
# so don't move this up.
#
-xsetroot -cursor_name left_ptr
-
-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
-if test -n "$GS_LIB" ; then
- GS_LIB=$usr_fdir:$GS_LIB
- export GS_LIB
-else
- GS_LIB=$usr_fdir
- export GS_LIB
-fi
+@NIXPKGS_XSETROOT@ -cursor_name left_ptr
echo 'startkde: Starting up...' 1>&2
-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
-# /usr/local.
-if test -z "$XDG_DATA_DIRS"; then
- XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
-fi
-export XDG_DATA_DIRS
-
# Mark that full KDE session is running (e.g. Konqueror preloading works only
# with full KDE running). The KDE_FULL_SESSION property can be detected by
# any X client connected to the same X session, even if not launched
@@ -257,44 +264,65 @@ export XDG_DATA_DIRS
# #
KDE_FULL_SESSION=true KDE_FULL_SESSION=true
export KDE_FULL_SESSION export KDE_FULL_SESSION
@ -545,7 +454,7 @@ index b3117b4..e70110e 100644
# finally, give the session control to the session manager # finally, give the session control to the session manager
# see kdebase/ksmserver for the description of the rest of the startup sequence # see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -306,34 +334,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & @@ -306,34 +352,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit &
# We only check for 255 which means that the ksmserver process could not be # We only check for 255 which means that the ksmserver process could not be
# started, any problems thereafter, e.g. ksmserver failing to initialize, # started, any problems thereafter, e.g. ksmserver failing to initialize,
# will remain undetected. # will remain undetected.
@ -594,7 +503,7 @@ index b3117b4..e70110e 100644
done done
break break
fi fi
@@ -342,15 +373,17 @@ fi @@ -342,15 +391,17 @@ fi
echo 'startkde: Shutting down...' 1>&2 echo 'startkde: Shutting down...' 1>&2
# just in case # just in case
@ -617,7 +526,7 @@ index b3117b4..e70110e 100644
echo 'startkde: Done.' 1>&2 echo 'startkde: Done.' 1>&2
diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake
index a5d09fa..d42c284 100644 index a5d09fa7..d42c284b 100644
--- a/startkde/startplasma.cmake --- a/startkde/startplasma.cmake
+++ b/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
@ -809,7 +718,7 @@ index a5d09fa..d42c284 100644
echo 'startplasma: Done.' 1>&2 echo 'startplasma: Done.' 1>&2
diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake diff --git a/startkde/startplasmacompositor.cmake b/startkde/startplasmacompositor.cmake
index 8ac47aa..49970ef 100644 index dd9e304d..49d456e9 100644
--- a/startkde/startplasmacompositor.cmake --- a/startkde/startplasmacompositor.cmake
+++ b/startkde/startplasmacompositor.cmake +++ b/startkde/startplasmacompositor.cmake
@@ -1,118 +1,165 @@ @@ -1,118 +1,165 @@
@ -1013,27 +922,26 @@ index 8ac47aa..49970ef 100644
#otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output #otherwise apps that manually opt in for high DPI get auto scaled by the developer AND scaled by the wl_output
export QT_AUTO_SCREEN_SCALE_FACTOR=0 export QT_AUTO_SCREEN_SCALE_FACTOR=0
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
+XCURSOR_PATH=~/.icons +XCURSOR_PATH=~/.icons
+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS" +IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
+for xdgDir in "${xdgDirs[@]}"; do +for xdgDir in "${xdgDirs[@]}"; do
+ XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons" + XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
+done +done
+export XCURSOR_PATH +export XCURSOR_PATH
+
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
- @EXPORT_XCURSOR_PATH@
-
- # TODO: is kapplymousetheme a core app? - # TODO: is kapplymousetheme a core app?
- #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" +# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
#kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
- if test $? -eq 10; then - if test $? -eq 10; then
- XCURSOR_THEME=breeze_cursors - XCURSOR_THEME=breeze_cursors
- export XCURSOR_THEME - export XCURSOR_THEME
- elif test -n "$kcminputrc_mouse_cursortheme"; then - elif test -n "$kcminputrc_mouse_cursortheme"; then
- XCURSOR_THEME="$kcminputrc_mouse_cursortheme" - XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
- export XCURSOR_THEME - export XCURSOR_THEME
+if [ -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ]; then
+ #kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+ if [ $? -eq 10 ]; then + if [ $? -eq 10 ]; then
+ export XCURSOR_THEME=breeze_cursors + export XCURSOR_THEME=breeze_cursors
+ elif [ -n "$kcminputrc_mouse_cursortheme" ]; then + elif [ -n "$kcminputrc_mouse_cursortheme" ]; then
@ -1110,7 +1018,7 @@ index 8ac47aa..49970ef 100644
: # ok : # ok
else else
echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2 echo 'startplasmacompositor: Could not start D-Bus. Can you call qdbus?' 1>&2
@@ -212,7 +228,7 @@ export KDE_FULL_SESSION @@ -212,26 +228,47 @@ export KDE_FULL_SESSION
KDE_SESSION_VERSION=5 KDE_SESSION_VERSION=5
export KDE_SESSION_VERSION export KDE_SESSION_VERSION
@ -1119,9 +1027,7 @@ index 8ac47aa..49970ef 100644
export KDE_SESSION_UID export KDE_SESSION_UID
XDG_CURRENT_DESKTOP=KDE XDG_CURRENT_DESKTOP=KDE
@@ -222,20 +238,41 @@ export XDG_CURRENT_DESKTOP export XDG_CURRENT_DESKTOP
QT_QPA_PLATFORM=wayland
export QT_QPA_PLATFORM
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh +# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration +# (where <config locations> correspond to the system and user's configuration
@ -1171,12 +1077,3 @@ index 8ac47aa..49970ef 100644
echo 'startplasmacompositor: Shutting down...' 1>&2 echo 'startplasmacompositor: Shutting down...' 1>&2
diff --git a/startkde/waitforname/org.kde.plasma.Notifications.service.in b/startkde/waitforname/org.kde.plasma.Notifications.service.in
index 0a51b84..f48b5d8 100644
--- a/startkde/waitforname/org.kde.plasma.Notifications.service.in
+++ b/startkde/waitforname/org.kde.plasma.Notifications.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Notifications
-Exec=@CMAKE_INSTALL_PREFIX@/bin/plasma_waitforname org.freedesktop.Notifications
+Exec=@CMAKE_INSTALL_FULL_BINDIR@/plasma_waitforname org.freedesktop.Notifications

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

@ -3,355 +3,363 @@
{ {
bluedevil = { bluedevil = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/bluedevil-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/bluedevil-5.13.0.tar.xz";
sha256 = "0rjxvvg64g4panri4f09fgm571igdijfh92jp616pcqw8v1xqp2a"; sha256 = "1aikg2nlhkzasliiyqa0ijk78mpa1lrpgl7gqh3lva3dvq7w9v3m";
name = "bluedevil-5.12.5.tar.xz"; name = "bluedevil-5.13.0.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/breeze-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/breeze-5.13.0.tar.xz";
sha256 = "1xxgyq3lhliv6p54akgpclficbcs2xdv15a92jkl8a2s9wbisk3n"; sha256 = "0aaih84h8bh6ljcw6fk7nl4wpvcnk6vqz65s0b1qb8y7q6xr6cd0";
name = "breeze-5.12.5.tar.xz"; name = "breeze-5.13.0.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/breeze-grub-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/breeze-grub-5.13.0.tar.xz";
sha256 = "1w9f2xm4abqcqk2pdb7hi7d4hd1krkhrs9j3zlncxahfvf67ljad"; sha256 = "0q0a8ijg7npw5nl20xnna26jvrqdvmil1z7jmc8awdy3bhyi47n6";
name = "breeze-grub-5.12.5.tar.xz"; name = "breeze-grub-5.13.0.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/breeze-gtk-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/breeze-gtk-5.13.0.tar.xz";
sha256 = "0040z43r69kk8l90mvkk8xxzhaw35xm7z2w097sp8xd053y3pdqd"; sha256 = "131fknmj1aiixzv2vqk2vza1swxcvm5haj3v9h6j3xp1l9q8rr7l";
name = "breeze-gtk-5.12.5.tar.xz"; name = "breeze-gtk-5.13.0.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/breeze-plymouth-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/breeze-plymouth-5.13.0.tar.xz";
sha256 = "15204zqk81rwmdq07jzaiv2aninbbgqmg76dhzcz43lckjfhczq9"; sha256 = "13g4dpx094x4hmhhv5ghbdf59kzlgdxb9b7dpak8bliq3npdh1ri";
name = "breeze-plymouth-5.12.5.tar.xz"; name = "breeze-plymouth-5.13.0.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/discover-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/discover-5.13.0.tar.xz";
sha256 = "02fjs016825l35gc173mblii2x9ys5cisqw8niyyvllsls4rp27m"; sha256 = "1xg0n1za12ib70iqyxs0kcqrixxfhghi96qqs0l24cmwfca6g4km";
name = "discover-5.12.5.tar.xz"; name = "discover-5.13.0.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/drkonqi-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/drkonqi-5.13.0.tar.xz";
sha256 = "0av0rqgc5a9c8lvpdphp3ifw56qc10qkbjhajlslagxswys73cfq"; sha256 = "0mm9bssz87camwi7zkgf0ajrnd1pb3gs044k19vgcj85g6knf1bk";
name = "drkonqi-5.12.5.tar.xz"; name = "drkonqi-5.13.0.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kactivitymanagerd-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kactivitymanagerd-5.13.0.tar.xz";
sha256 = "1mpldy47fklm9d91wjj734yw3j3pkfrj377b9c5d8l07agwnk2j1"; sha256 = "10sqzc4mhbbrzsf9bgmlssk836ylxdqvz8k8wzjsqi7r1iiqmcq6";
name = "kactivitymanagerd-5.12.5.tar.xz"; name = "kactivitymanagerd-5.13.0.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kde-cli-tools-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kde-cli-tools-5.13.0.tar.xz";
sha256 = "0gs0d9p2x3q6pvjj6l7f9xq741rfqgzhbxwvz1s3cx385b85lplh"; sha256 = "0qjjchdnib28728b0mbkbwq99zr5h9xzljqkskj1npbj723z2bzs";
name = "kde-cli-tools-5.12.5.tar.xz"; name = "kde-cli-tools-5.13.0.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kdecoration-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kdecoration-5.13.0.tar.xz";
sha256 = "0qd5pqm3s1wcmy49mry2plzivg6dhmdp521yahx0mmlk2bssxc3d"; sha256 = "1fgv73wyahk7q2kvs6vzjnxj0h2g7g137xlczc7wjwxpyrlchavm";
name = "kdecoration-5.12.5.tar.xz"; name = "kdecoration-5.13.0.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kde-gtk-config-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kde-gtk-config-5.13.0.tar.xz";
sha256 = "1p5vpk85v50dkm787ljf77xa7f25lamxf5jn2qc31r8dnlc25dnh"; sha256 = "1l6zjnjwb8yiy00xnkcaljw0c6mcwd93c2qyc3p23aaxw31jnhyg";
name = "kde-gtk-config-5.12.5.tar.xz"; name = "kde-gtk-config-5.13.0.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kdeplasma-addons-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kdeplasma-addons-5.13.0.tar.xz";
sha256 = "1339sapqi0b6pzbsdyhpfssrvfg9sfc3amlfijxsn63swkjvbw2s"; sha256 = "034qnphk2biz6jqc494bwzqv3sqr63hvqadiywnhy53n0l9crf3i";
name = "kdeplasma-addons-5.12.5.tar.xz"; name = "kdeplasma-addons-5.13.0.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kgamma5-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kgamma5-5.13.0.tar.xz";
sha256 = "0p4x8vzjngw7xxnnviiqw89lzs23nrq007211dprnfzgay9c571c"; sha256 = "0yg89p87kx7s2mzhz02rbav07cqb5s3689x3d7r60ppmmf43ylv9";
name = "kgamma5-5.12.5.tar.xz"; name = "kgamma5-5.13.0.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/khotkeys-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/khotkeys-5.13.0.tar.xz";
sha256 = "1yivh10g66h9dmnabnxx1i26rpg8wf9ibpmc7jcmh7j4h5q0lkzg"; sha256 = "1x79cn5wi917d3bvy0sfiaqyziziajcgpc9d74var5g9fqg6kali";
name = "khotkeys-5.12.5.tar.xz"; name = "khotkeys-5.13.0.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kinfocenter-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kinfocenter-5.13.0.tar.xz";
sha256 = "1g42hk49fjg4rvgvy5phshk8mna3idh55gn4cy1w0q2rl8f0y6b5"; sha256 = "15g16455m7csi07llfks58yry7bmv14avs15lb67nadba3clb5mx";
name = "kinfocenter-5.12.5.tar.xz"; name = "kinfocenter-5.13.0.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kmenuedit-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kmenuedit-5.13.0.tar.xz";
sha256 = "0vbq2s1ibqna19njw421ai4qwq4apww74qcfgk7gwd6p75k37lkw"; sha256 = "12k8y1mw5frg24i6bp39sax9mjv4q9p996rvma9nmwqfxp6br1bf";
name = "kmenuedit-5.12.5.tar.xz"; name = "kmenuedit-5.13.0.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kscreen-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kscreen-5.13.0.tar.xz";
sha256 = "1cscy7vimznwy29qr0x11wqxlxcwxvybdhw703mj44bq1szw8s0l"; sha256 = "12hgynpbdj22fg896js9nw9rqddk4j5a8dl6iyr7rwixgv1nw8y5";
name = "kscreen-5.12.5.tar.xz"; name = "kscreen-5.13.0.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kscreenlocker-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kscreenlocker-5.13.0.tar.xz";
sha256 = "08l8knfvhrd3h8z70xq1jiq02bg56jdddxx0ml6jbd8ja9r1svdq"; sha256 = "12jar9dh0c221v3zlpzcrlpzfrxk39gxqxz3bvb16k6ws5307psh";
name = "kscreenlocker-5.12.5.tar.xz"; name = "kscreenlocker-5.13.0.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/ksshaskpass-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/ksshaskpass-5.13.0.tar.xz";
sha256 = "0vgqp09cfdlf22xxi0pdzdv0i4hrgvbfj3yrxrfqhfh9zlc3q6y4"; sha256 = "09id83az5pxn56xqnkilmha0ada86mysxlvvhy6rnm10c340rc0j";
name = "ksshaskpass-5.12.5.tar.xz"; name = "ksshaskpass-5.13.0.tar.xz";
}; };
}; };
ksysguard = { ksysguard = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/ksysguard-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/ksysguard-5.13.0.tar.xz";
sha256 = "11wh4skx3vjjrdfaa85a8ijdvsw3fnk02s1n9g6yv0c8h74q2nqv"; sha256 = "0sz7k0vkpji448pnqpc7q9plsxrf2q5fq3kly2bwh2isd44lxram";
name = "ksysguard-5.12.5.tar.xz"; name = "ksysguard-5.13.0.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kwallet-pam-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kwallet-pam-5.13.0.tar.xz";
sha256 = "18pbsmc44pqbdylczqsx6cargzkkp4vcd44yk7mwjhniw8pi6x33"; sha256 = "1sbh771z84k9gmy9mkbiwp1mz5rhlb7jb0mbpac6s7gm47axl3za";
name = "kwallet-pam-5.12.5.tar.xz"; name = "kwallet-pam-5.13.0.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kwayland-integration-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kwayland-integration-5.13.0.tar.xz";
sha256 = "05qcsqyw2n1hpdsiqjvg98i77kwgcdpsr0096nqr62pzf36bsqz3"; sha256 = "0hwyhw9y446ycjzshkdf159awlmkz2sziijabnnblkc75j7qhhzf";
name = "kwayland-integration-5.12.5.tar.xz"; name = "kwayland-integration-5.13.0.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kwin-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kwin-5.13.0.tar.xz";
sha256 = "1mkmh90pl4pz1bb3n9zl6x6lxvr8xkj7r795qj70s9jxavl40fj3"; sha256 = "12ymycrh6ryrpkz96mhha38bgpfaxchf9ilwpiafmms5h6s8d3zh";
name = "kwin-5.12.5.tar.xz"; name = "kwin-5.13.0.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/kwrited-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/kwrited-5.13.0.tar.xz";
sha256 = "0vvlkr4w4vwgkl9sili63cwlp0lsxlnzwfwmhpa5nrwcjgbyfbmz"; sha256 = "0vpmcd9l4jl440wqh691rjk1zxbs7vaknfrbar8n5fj41w8bri24";
name = "kwrited-5.12.5.tar.xz"; name = "kwrited-5.13.0.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/libkscreen-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/libkscreen-5.13.0.tar.xz";
sha256 = "0hzdchkxlv5l3zx7lxzj0x44kn3086gxnhmas9w1n9b6qrf0sjb4"; sha256 = "1fmffdw9hg4wcr78nmdryaam1dc890fcpwiq5v5n6plp78v99hv9";
name = "libkscreen-5.12.5.tar.xz"; name = "libkscreen-5.13.0.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/libksysguard-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/libksysguard-5.13.0.tar.xz";
sha256 = "0dbf3xx52xqyzaxvybmjra0z1lc3qcbb0aqmsga8rjj77bmj3kx9"; sha256 = "11b82rma2mqrjnzjpdij6316xbynr7ca9vizp3zqps7xvgq2hva1";
name = "libksysguard-5.12.5.tar.xz"; name = "libksysguard-5.13.0.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/milou-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/milou-5.13.0.tar.xz";
sha256 = "0v0zkwmh7rzqbgw1ypqz18bd3gn3x8iag0q9lrk6zzpd66j2r1fc"; sha256 = "12azqm4ck4mlz5cnglp6b99lj229dk25c2r9dy1v2k1c0sa9wqk5";
name = "milou-5.12.5.tar.xz"; name = "milou-5.13.0.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/oxygen-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/oxygen-5.13.0.tar.xz";
sha256 = "0336bkvn8mqrbswnhg87ah7k3w7i99c8rfpfvhw5qq3mm6jvbi4l"; sha256 = "15zxldc828vppswrqfkgmzpxx6fpx8i20qm0smljkx08yd280zry";
name = "oxygen-5.12.5.tar.xz"; name = "oxygen-5.13.0.tar.xz";
};
};
plasma-browser-integration = {
version = "5.13.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.13.0/plasma-browser-integration-5.13.0.tar.xz";
sha256 = "1pnzi02lfm33c47l3znzj9p2ksrc4mn9wvglj6ffnxfhcsdv1xqc";
name = "plasma-browser-integration-5.13.0.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-desktop-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-desktop-5.13.0.tar.xz";
sha256 = "0rm7j8n3yflzl6wpivmjsgrhc5arrnmzfg81arfs06gjdnvwnmd6"; sha256 = "0bj6zkgqjc83yp0q3srpdvvppi2jh9gajr65bli370n52z86rmnn";
name = "plasma-desktop-5.12.5.tar.xz"; name = "plasma-desktop-5.13.0.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-integration-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-integration-5.13.0.tar.xz";
sha256 = "14iciz6zjxrvig58hpqa51cj5r949xq9xgqvs8glzldzg34928sm"; sha256 = "1xl9zlc9z747zy2lzj3azbypljxv3gn03ssn5703dg8ab32kr0p4";
name = "plasma-integration-5.12.5.tar.xz"; name = "plasma-integration-5.13.0.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-nm-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-nm-5.13.0.tar.xz";
sha256 = "1awnd9gdciwrwyl2xs9h778fizhnbw8wm8ddbqr8050v7fkc7fs6"; sha256 = "02680npqafrqq2yvc96x03i3kiq6kwybvg6378718bwpdmrwfv1k";
name = "plasma-nm-5.12.5.tar.xz"; name = "plasma-nm-5.13.0.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-pa-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-pa-5.13.0.tar.xz";
sha256 = "13z9shlnprbjgqy1w8lf3brjcvmh76fpl0xv3q2r7kvcgm1ndjdd"; sha256 = "0m2gss12rqzv4ba554mijqm9qf25c5ghjb8v785si5amm012dkfr";
name = "plasma-pa-5.12.5.tar.xz"; name = "plasma-pa-5.13.0.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-sdk-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-sdk-5.13.0.tar.xz";
sha256 = "0rrwis63khq1b6shxrp5cj6dgz9lhrccs7752f7j73pi5fpmbz0g"; sha256 = "1zaxr8c9nybbap27jsgdb95sn22z0vfyxai969mkmdajxijcy8md";
name = "plasma-sdk-5.12.5.tar.xz"; name = "plasma-sdk-5.13.0.tar.xz";
}; };
}; };
plasma-tests = { plasma-tests = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-tests-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-tests-5.13.0.tar.xz";
sha256 = "1rq8li7y3qf1ipyhy869lw3znmssf5grbh522qla4sn08d1lhxij"; sha256 = "1cclf6cp19y4ylsgqlrq7rjvgpy59dxz91cq14d2fi93h1dcyrra";
name = "plasma-tests-5.12.5.tar.xz"; name = "plasma-tests-5.13.0.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-vault-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-vault-5.13.0.tar.xz";
sha256 = "0zrwsqcpkssrfhy2xgg4y2k2w6l7vyn7mqani9lw18i13vp2fh1d"; sha256 = "1wx0jibn5fmp2ddy28azls9wb23mhpnwkvg8gihq16im62pb499i";
name = "plasma-vault-5.12.5.tar.xz"; name = "plasma-vault-5.13.0.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-workspace-5.13.0.tar.xz";
sha256 = "1vy5p22y6jckhm09171pjacdrndl7vak6grwvzg8bmhqk1ahzdwk"; sha256 = "071za67v4d6kn4qn68r88lgwp9mchb2wh26p2mf0rmqxz3c56ihf";
name = "plasma-workspace-5.12.5.tar.xz"; name = "plasma-workspace-5.13.0.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plasma-workspace-wallpapers-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plasma-workspace-wallpapers-5.13.0.tar.xz";
sha256 = "1p6kcakdw020pjwdfdhh1v8bha8r6j9934nid7vv7ldp388mq6a7"; sha256 = "1xnssczasr855fl5yaffs6a5dlvivrh7dvzhinfws1pk960vndyb";
name = "plasma-workspace-wallpapers-5.12.5.tar.xz"; name = "plasma-workspace-wallpapers-5.13.0.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/plymouth-kcm-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/plymouth-kcm-5.13.0.tar.xz";
sha256 = "1fv2b792d7bg5vdix823fks8capgbnda94fc8z91nsffa894p0i9"; sha256 = "1j7gaqypd5ijrvp4s4ry57q1lix8gfff8pxbwb7n6bnfka6hk8i6";
name = "plymouth-kcm-5.12.5.tar.xz"; name = "plymouth-kcm-5.13.0.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.12.5"; version = "1-5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/polkit-kde-agent-1-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/polkit-kde-agent-1-5.13.0.tar.xz";
sha256 = "01plpzhj2fc2i3hjqb75skmyiy9dg3mw2h1sxsl7hxmbvm9fv9if"; sha256 = "0sab09glz9b8i1ricww8lrvp9ivnfzh4g1nijks7f1wg8nk1vpcm";
name = "polkit-kde-agent-1-5.12.5.tar.xz"; name = "polkit-kde-agent-1-5.13.0.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/powerdevil-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/powerdevil-5.13.0.tar.xz";
sha256 = "07f3kqvfqgqpz50fk8dwyr5z1hylli0k4ndlcp5mkybiraz1rdjk"; sha256 = "0w0x0lgi8xdifz811j749xbgkvqixvrpzamwv0iqn3zgg1m5b5vy";
name = "powerdevil-5.12.5.tar.xz"; name = "powerdevil-5.13.0.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/sddm-kcm-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/sddm-kcm-5.13.0.tar.xz";
sha256 = "13qqyvq7rk7h65krjaqgil2rxjj7073arxp4bij5g534ckpwkz3h"; sha256 = "13mkd1b4c7ihp0s3n80snq70v76vs2gzvfx7f0s2pjq44q07bv5f";
name = "sddm-kcm-5.12.5.tar.xz"; name = "sddm-kcm-5.13.0.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/systemsettings-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/systemsettings-5.13.0.tar.xz";
sha256 = "0ackzdyfmssq6lh9dranc8nv6bhk633zq1mixibqhswl3pz8n4h8"; sha256 = "1imnry86jz2rwwgz470h7pji2hajnj337hvxmrrlr0giijf1amlc";
name = "systemsettings-5.12.5.tar.xz"; name = "systemsettings-5.13.0.tar.xz";
}; };
}; };
user-manager = { user-manager = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/user-manager-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/user-manager-5.13.0.tar.xz";
sha256 = "1566scbw6f02gskwdc2kk6xcbbf7hq6jkz3ka1avkwmyi3xhh010"; sha256 = "10w5wr3pxlybqx192xiljni9nbqai33v5j2nvcs032i0ms7fbxpf";
name = "user-manager-5.12.5.tar.xz"; name = "user-manager-5.13.0.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.12.5"; version = "5.13.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.12.5/xdg-desktop-portal-kde-5.12.5.tar.xz"; url = "${mirror}/stable/plasma/5.13.0/xdg-desktop-portal-kde-5.13.0.tar.xz";
sha256 = "1rmjwjx7x481607vp0pjxsabbjhm7qfqa0ax4ciqqlv676hcr5cv"; sha256 = "13pnj7mpnv30fqwzpnjrfwmjx4isbkhlznpr6hpvsh0f178zhfz4";
name = "xdg-desktop-portal-kde-5.12.5.tar.xz"; name = "xdg-desktop-portal-kde-5.13.0.tar.xz";
}; };
}; };
} }

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

@ -2,7 +2,7 @@
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, kcrash kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace
}: }:
mkDerivation { mkDerivation {
@ -11,7 +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 kcrash kactivities kactivities-stats kirigami2 kcrash plasma-workspace
]; ];
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
} }

4
pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
View File

@ -1,13 +1,13 @@
{ {
mkDerivation, mkDerivation,
extra-cmake-modules, gettext, kdoctools, python, extra-cmake-modules, gettext, kdoctools, python,
kcoreaddons, knotifications kcoreaddons, knotifications, kwayland, kwidgetsaddons
}: }:
mkDerivation { mkDerivation {
name = "xdg-desktop-portal-kde"; name = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [ buildInputs = [
kcoreaddons knotifications kcoreaddons knotifications kwayland kwidgetsaddons
]; ];
} }

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

@ -19974,8 +19974,8 @@ with pkgs;
bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth
kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration
plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace
plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm
systemsettings user-manager xdg-desktop-portal-kde; systemsettings user-manager xdg-desktop-portal-kde;