Merge pull request #84542 from petabyteboy/feature/plasma-5-18

plasma5: 5.17.5 -> 5.18.5
This commit is contained in:
Thomas Tuegel 2020-09-01 20:17:29 -05:00 committed by GitHub
commit 1c47df2617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 315 additions and 439 deletions

View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ )
WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ )

View file

@ -0,0 +1,21 @@
diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp
index 5303636..199c4d5 100644
--- a/kded/gtkconfig.cpp
+++ b/kded/gtkconfig.cpp
@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) :
kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))),
kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc"))))
{
+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
+ // Normally this would be done by wrapGAppsHook, but this plugin
+ // (shared object) cannot be wrapped.
+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
+ if (!xdgdata.isEmpty()) {
+ xdgdata.push_front(":");
+ }
+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
+ qputenv("XDG_DATA_DIRS", xdgdata);
+
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerService(QStringLiteral("org.kde.GtkConfig"));
dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots);

View file

@ -2,7 +2,7 @@
mkDerivation,
extra-cmake-modules, wrapGAppsHook,
glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
knewstuff, gsettings-desktop-schemas
knewstuff, gsettings-desktop-schemas, xsettingsd
}:
mkDerivation {
@ -11,14 +11,16 @@ mkDerivation {
dontWrapGApps = true; # There is nothing to wrap
buildInputs = [
ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
knewstuff gsettings-desktop-schemas
knewstuff gsettings-desktop-schemas xsettingsd
];
patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ];
cmakeFlags = [
"-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
"-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
"-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/"
];
# The gtkconfig KDED module will crash the daemon if the GSettings schemas
# aren't found.
patches = [ ./0001-gsettings-schemas-path.patch ];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\""
'';

View file

@ -1,49 +0,0 @@
From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 27 Oct 2015 18:07:54 -0500
Subject: [PATCH] follow symlinks
---
src/appearancegtk2.cpp | 2 +-
src/iconthemesmodel.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp
===================================================================
--- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp
+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp
@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile(
QStringList themes=installedThemes();
themes=themes.filter(QRegExp("/"+themeName+"/?$"));
if(themes.size()==1) {
- QDirIterator it(themes.first(), QDirIterator::Subdirectories);
+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
while(it.hasNext()) {
it.next();
if(it.fileName()=="gtkrc") {
Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
===================================================================
--- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp
+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp
@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh
foreach(const QString& dir, dirs) {
QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);
Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
===================================================================
--- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp
+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp
@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed
foreach(const QString& dir, dirs) {
QDir userIconsDir(dir);
- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
while(it.hasNext()) {
QString currentPath = it.next();
QDir dir(currentPath);

View file

@ -1,21 +0,0 @@
diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp
index 7b82d50..96831d8 100644
--- a/src/gtkconfigkcmodule.cpp
+++ b/src/gtkconfigkcmodule.cpp
@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args )
iconsProxyModel->sort(0);
ui->cb_icon->setModel(iconsProxyModel);
ui->cb_icon_fallback->setModel(iconsProxyModel);
+
+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS.
+ // Normally this would be done by wrapGAppsHook, but this plugin
+ // (shared object) cannot be wrapped.
+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS");
+ if (!xdgdata.isEmpty()) {
+ xdgdata.push_front(":");
+ }
+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH));
+ qputenv("XDG_DATA_DIRS", xdgdata);
m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0";
m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini";

View file

@ -1,2 +0,0 @@
follow-symlinks.patch
gsettings.patch

View file

@ -1,17 +1,18 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio,
knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays
kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kholidays,
kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard,
kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative,
qtwebengine, qtx11extras
}:
mkDerivation {
name = "kdeplasma-addons";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
kross krunner kservice ksysguard kunitconversion ibus plasma-framework
plasma-workspace qtdeclarative qtx11extras kholidays
kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kholidays kio
knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus
plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras
];
}

View file

@ -2,8 +2,9 @@
mkDerivation,
extra-cmake-modules, kdoctools,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage,
kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils,
solid
}:
mkDerivation {
@ -11,7 +12,7 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid
kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage
kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid
];
}

View file

@ -1,76 +0,0 @@
https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff
https://bugs.kde.org/show_bug.cgi?id=417316
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200
@@ -24,8 +24,8 @@
KCM.SimpleKCM {
id: root
- implicitWidth: units.gridUnit * 30
- implicitHeight: units.gridUnit * 38
+ implicitWidth: Kirigami.Units.gridUnit * 32
+ implicitHeight: Kirigami.Units.gridUnit * 38
property int selectedOutput: 0
@@ -113,7 +113,7 @@
id: screen
Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26)
+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26)
Layout.topMargin: Kirigami.Units.smallSpacing
Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200
@@ -19,6 +19,7 @@
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.3 as Controls
import QtGraphicalEffects 1.0
+import org.kde.kirigami 2.4 as Kirigami
Rectangle {
id: output
@@ -77,7 +78,7 @@
Controls.Label {
Layout.fillWidth: true
- Layout.margins: units.smallSpacing
+ Layout.margins: Kirigami.Units.smallSpacing
text: model.display
wrapMode: Text.Wrap
@@ -87,7 +88,7 @@
Controls.Label {
Layout.fillWidth: true
- Layout.bottomMargin: units.smallSpacing
+ Layout.bottomMargin: Kirigami.Units.smallSpacing
text: "(" + model.size.width + "x" + model.size.height + ")"
horizontalAlignment: Text.AlignHCenter
diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml
--- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100
+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200
@@ -45,7 +45,7 @@
property int xOffset: (width - totalSize.width / relativeFactor) / 2;
property int yOffset: (height - totalSize.height / relativeFactor) / 2;
- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13)
+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13)
Component.onCompleted: background.visible = true;
@@ -54,7 +54,7 @@
anchors {
bottom: parent.bottom
horizontalCenter: parent.horizontalCenter
- margins: units.smallSpacing
+ margins: Kirigami.Units.smallSpacing
}
spacing: units.smallSpacing
Controls.Button {

View file

@ -2,17 +2,16 @@
mkDerivation,
extra-cmake-modules,
kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects,
kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
kwindowsystem, kdeclarative, plasma-framework
}:
mkDerivation {
name = "kscreen";
patches = [ ./kscreen-417316.patch ];
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [
kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects
kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
kwindowsystem kdeclarative plasma-framework
];
}

View file

@ -1,7 +1,7 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
lm_sensors,
libcap, libpcap, lm_sensors,
kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
knewstuff, libksysguard
}:
@ -11,6 +11,6 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
kdelibs4support ki18n lm_sensors
kdelibs4support ki18n libcap libpcap lm_sensors
];
}

View file

@ -5,13 +5,14 @@
epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
xwayland,
qtdeclarative, qtmultimedia, qtscript, qtx11extras,
qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
qtvirtualkeyboard, qtx11extras,
breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
plasma-framework, qtsensors, libcap, libdrm, mesa
plasma-framework, libcap, libdrm, mesa
}:
# TODO (ttuegel): investigate qmlplugindump failure
@ -23,7 +24,8 @@ mkDerivation {
epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
xwayland
qtdeclarative qtmultimedia qtscript qtx11extras qtsensors
qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
qtvirtualkeyboard qtx11extras
breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes

View file

@ -12,7 +12,7 @@
kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
plasma-workspace, xf86inputlibinput
plasma-workspace, qqc2-desktop-style, xf86inputlibinput
}:
mkDerivation {
@ -27,7 +27,7 @@ mkDerivation {
attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons
kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels
knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker
ksysguard kwallet kwin plasma-framework plasma-workspace
ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style
];
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

View file

@ -17,7 +17,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
void ClockHelper::toHwclock()
{
- QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':')));
+ QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
if (!hwclock.isEmpty()) {
KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));

View file

@ -1,15 +1,20 @@
{
mkDerivation,
extra-cmake-modules, kdoctools,
gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem
kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
qtdeclarative,
gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
}:
mkDerivation {
name = "plasma-pa";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem
gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop
kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
kwindowsystem
qtdeclarative
];
}

View file

@ -1,4 +1,4 @@
From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001
From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 28 Jan 2020 05:00:53 -0600
Subject: [PATCH 1/2] startkde
@ -6,11 +6,11 @@ Subject: [PATCH 1/2] startkde
---
startkde/startplasma-waylandsession.cpp | 2 +-
startkde/startplasma-x11.cpp | 2 +-
startkde/startplasma.cpp | 32 ++++++++-----------------
3 files changed, 12 insertions(+), 24 deletions(-)
startkde/startplasma.cpp | 24 ++++++++++--------------
3 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
index 87c71c6..5fc5314 100644
index 87c71c6b3..5fc53140e 100644
--- a/startkde/startplasma-waylandsession.cpp
+++ b/startkde/startplasma-waylandsession.cpp
@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
@ -23,7 +23,7 @@ index 87c71c6..5fc5314 100644
cleanupX11();
out << "startplasma-waylandsession: Done.\n";
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
index 3314b62..14cbe29 100644
index 3314b6283..14cbe29fa 100644
--- a/startkde/startplasma-x11.cpp
+++ b/startkde/startplasma-x11.cpp
@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
@ -36,7 +36,7 @@ index 3314b62..14cbe29 100644
cleanupPlasmaEnvironment();
cleanupX11();
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
index e0f7004..8ac41fd 100644
index 4c9f5cef6..5ea4c2cf1 100644
--- a/startkde/startplasma.cpp
+++ b/startkde/startplasma.cpp
@@ -34,7 +34,7 @@ QTextStream out(stderr);
@ -48,22 +48,7 @@ index e0f7004..8ac41fd 100644
}
QStringList allServices(const QLatin1String& prefix)
@@ -184,14 +184,6 @@ void runEnvironmentScripts()
}
}
sourceFiles(scripts);
-
- // 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 (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share");
- }
}
@@ -240,15 +232,15 @@ void setupX11()
@@ -242,15 +242,15 @@ void setupX11()
// If the user has overwritten fonts, the cursor font may be different now
// so don't move this up.
@ -84,7 +69,7 @@ index e0f7004..8ac41fd 100644
}
// TODO: Check if Necessary
@@ -265,11 +257,7 @@ bool syncDBusEnvironment()
@@ -267,11 +267,7 @@ bool syncDBusEnvironment()
{
int exitCode;
// At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
@ -97,7 +82,7 @@ index e0f7004..8ac41fd 100644
return exitCode == 0;
}
@@ -285,7 +273,7 @@ void setupFontDpi()
@@ -287,7 +283,7 @@ void setupFontDpi()
//TODO port to c++?
const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
QProcess p;
@ -106,7 +91,7 @@ index e0f7004..8ac41fd 100644
p.setProcessChannelMode(QProcess::ForwardedChannels);
p.write(input);
p.closeWriteChannel();
@@ -307,7 +295,7 @@ QProcess* setupKSplash()
@@ -309,7 +305,7 @@ QProcess* setupKSplash()
KConfigGroup ksplashCfg = cfg.group("KSplash");
if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
p = new QProcess;
@ -115,7 +100,7 @@ index e0f7004..8ac41fd 100644
}
}
return p;
@@ -329,7 +317,7 @@ bool startKDEInit()
@@ -331,7 +327,7 @@ bool startKDEInit()
{
// We set LD_BIND_NOW to increase the efficiency of kdeinit.
// kdeinit unsets this variable before loading applications.
@ -125,5 +110,5 @@ index e0f7004..8ac41fd 100644
messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation."));
return false;
--
2.23.1
2.25.1

View file

@ -1,4 +1,4 @@
From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001
From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 5 Feb 2020 05:03:11 -0600
Subject: [PATCH 2/2] absolute-wallpaper-install-dir
@ -8,15 +8,16 @@ Subject: [PATCH 2/2] absolute-wallpaper-install-dir
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
index ea9a943..c8458ba 100644
index 8494a5c8a..f723c1e1b 100644
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
@@ -2,4 +2,4 @@
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image
color=#1d99f3
fontSize=10
-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
needsFullUserModel=false
--
2.23.1
2.25.1

View file

@ -11,7 +11,8 @@
kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner,
kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
phonon, plasma-framework, prison, solid, kholidays,
phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
appstream-qt,
qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
qtwayland, qtx11extras,
@ -31,7 +32,7 @@ mkDerivation {
knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
libqalculate networkmanager-qt phonon plasma-framework prison solid
kholidays
kholidays kquickcharts appstream-qt
qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
];
@ -47,7 +48,6 @@ mkDerivation {
./0002-absolute-wallpaper-install-dir.patch
];
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''

View file

@ -21,16 +21,16 @@ mkDerivation {
patches = [
# This fixes an issue where 'DDCA_Feature_List*' cannot be converted to
# 'DDCA_Feature_List'.
# This can be dropped with the next release.
# https://bugs.kde.org/show_bug.cgi?id=423605
(fetchpatch {
url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch";
sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s";
})
# This is a backport of
# https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch,
# which doesn't apply cleanly to 5.17.5. It should make it into 5.20, so
# this patch can be removed when we upgrade to 5.20.
./patches/0001-Add-a-logging-category-config-file.patch
# Reduce log message spam by setting the default log level to Warning.
(fetchpatch {
url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch";
sha256 = "0vj70mhx6qhvbh4vn9qk9ir5w4s2m76hw2lsxmh3ibgsydz4yilz";
})
];
}

View file

@ -1,374 +1,390 @@
# DO NOT EDIT! This file is generated automatically.
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5
{ fetchurl, mirror }:
{
bluedevil = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz";
sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09";
name = "bluedevil-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz";
sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66";
name = "bluedevil-5.18.5.tar.xz";
};
};
breeze = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz";
sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7";
name = "breeze-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz";
sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563";
name = "breeze-5.18.5.tar.xz";
};
};
breeze-grub = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz";
sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba";
name = "breeze-grub-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz";
sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1";
name = "breeze-grub-5.18.5.tar.xz";
};
};
breeze-gtk = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz";
sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66";
name = "breeze-gtk-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz";
sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9";
name = "breeze-gtk-5.18.5.tar.xz";
};
};
breeze-plymouth = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz";
sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0";
name = "breeze-plymouth-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz";
sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281";
name = "breeze-plymouth-5.18.5.tar.xz";
};
};
discover = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz";
sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f";
name = "discover-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz";
sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6";
name = "discover-5.18.5.tar.xz";
};
};
drkonqi = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz";
sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457";
name = "drkonqi-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz";
sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1";
name = "drkonqi-5.18.5.tar.xz";
};
};
kactivitymanagerd = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz";
sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4";
name = "kactivitymanagerd-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz";
sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7";
name = "kactivitymanagerd-5.18.5.tar.xz";
};
};
kde-cli-tools = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz";
sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f";
name = "kde-cli-tools-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz";
sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8";
name = "kde-cli-tools-5.18.5.tar.xz";
};
};
kdecoration = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz";
sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9";
name = "kdecoration-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz";
sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8";
name = "kdecoration-5.18.5.tar.xz";
};
};
kde-gtk-config = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz";
sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010";
name = "kde-gtk-config-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz";
sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab";
name = "kde-gtk-config-5.18.5.tar.xz";
};
};
kdeplasma-addons = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz";
sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8";
name = "kdeplasma-addons-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz";
sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f";
name = "kdeplasma-addons-5.18.5.tar.xz";
};
};
kgamma5 = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz";
sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9";
name = "kgamma5-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz";
sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f";
name = "kgamma5-5.18.5.tar.xz";
};
};
khotkeys = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz";
sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56";
name = "khotkeys-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz";
sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766";
name = "khotkeys-5.18.5.tar.xz";
};
};
kinfocenter = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz";
sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a";
name = "kinfocenter-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz";
sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5";
name = "kinfocenter-5.18.5.tar.xz";
};
};
kmenuedit = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz";
sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de";
name = "kmenuedit-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz";
sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6";
name = "kmenuedit-5.18.5.tar.xz";
};
};
kscreen = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz";
sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0";
name = "kscreen-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz";
sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2";
name = "kscreen-5.18.5.tar.xz";
};
};
kscreenlocker = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz";
sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f";
name = "kscreenlocker-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz";
sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2";
name = "kscreenlocker-5.18.5.tar.xz";
};
};
ksshaskpass = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz";
sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27";
name = "ksshaskpass-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz";
sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5";
name = "ksshaskpass-5.18.5.tar.xz";
};
};
ksysguard = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz";
sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82";
name = "ksysguard-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz";
sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f";
name = "ksysguard-5.18.5.tar.xz";
};
};
kwallet-pam = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz";
sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9";
name = "kwallet-pam-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz";
sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a";
name = "kwallet-pam-5.18.5.tar.xz";
};
};
kwayland-integration = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz";
sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb";
name = "kwayland-integration-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz";
sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5";
name = "kwayland-integration-5.18.5.tar.xz";
};
};
kwin = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz";
sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc";
name = "kwin-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz";
sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8";
name = "kwin-5.18.5.tar.xz";
};
};
kwrited = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz";
sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823";
name = "kwrited-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz";
sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe";
name = "kwrited-5.18.5.tar.xz";
};
};
libkscreen = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz";
sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94";
name = "libkscreen-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz";
sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c";
name = "libkscreen-5.18.5.tar.xz";
};
};
libksysguard = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz";
sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14";
name = "libksysguard-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz";
sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b";
name = "libksysguard-5.18.5.tar.xz";
};
};
milou = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz";
sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf";
name = "milou-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz";
sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2";
name = "milou-5.18.5.tar.xz";
};
};
oxygen = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz";
sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be";
name = "oxygen-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz";
sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8";
name = "oxygen-5.18.5.tar.xz";
};
};
plasma-browser-integration = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz";
sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d";
name = "plasma-browser-integration-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz";
sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383";
name = "plasma-browser-integration-5.18.5.tar.xz";
};
};
plasma-desktop = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz";
sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04";
name = "plasma-desktop-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz";
sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f";
name = "plasma-desktop-5.18.5.tar.xz";
};
};
plasma-integration = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz";
sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959";
name = "plasma-integration-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz";
sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870";
name = "plasma-integration-5.18.5.tar.xz";
};
};
plasma-nano = {
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz";
sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341";
name = "plasma-nano-5.18.5.tar.xz";
};
};
plasma-nm = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz";
sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255";
name = "plasma-nm-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz";
sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa";
name = "plasma-nm-5.18.5.tar.xz";
};
};
plasma-pa = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz";
sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23";
name = "plasma-pa-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz";
sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209";
name = "plasma-pa-5.18.5.tar.xz";
};
};
plasma-phone-components = {
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz";
sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070";
name = "plasma-phone-components-5.18.5.tar.xz";
};
};
plasma-sdk = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz";
sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314";
name = "plasma-sdk-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz";
sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5";
name = "plasma-sdk-5.18.5.tar.xz";
};
};
plasma-tests = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz";
sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982";
name = "plasma-tests-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz";
sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a";
name = "plasma-tests-5.18.5.tar.xz";
};
};
plasma-thunderbolt = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz";
sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382";
name = "plasma-thunderbolt-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz";
sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1";
name = "plasma-thunderbolt-5.18.5.tar.xz";
};
};
plasma-vault = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz";
sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71";
name = "plasma-vault-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz";
sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41";
name = "plasma-vault-5.18.5.tar.xz";
};
};
plasma-workspace = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz";
sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88";
name = "plasma-workspace-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz";
sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354";
name = "plasma-workspace-5.18.5.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz";
sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9";
name = "plasma-workspace-wallpapers-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz";
sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d";
name = "plasma-workspace-wallpapers-5.18.5.tar.xz";
};
};
plymouth-kcm = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz";
sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528";
name = "plymouth-kcm-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz";
sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3";
name = "plymouth-kcm-5.18.5.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.17.5";
version = "1-5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz";
sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d";
name = "polkit-kde-agent-1-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz";
sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91";
name = "polkit-kde-agent-1-5.18.5.tar.xz";
};
};
powerdevil = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz";
sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82";
name = "powerdevil-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz";
sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548";
name = "powerdevil-5.18.5.tar.xz";
};
};
sddm-kcm = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz";
sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b";
name = "sddm-kcm-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz";
sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b";
name = "sddm-kcm-5.18.5.tar.xz";
};
};
systemsettings = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz";
sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf";
name = "systemsettings-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz";
sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b";
name = "systemsettings-5.18.5.tar.xz";
};
};
user-manager = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz";
sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d";
name = "user-manager-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz";
sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484";
name = "user-manager-5.18.5.tar.xz";
};
};
xdg-desktop-portal-kde = {
version = "5.17.5";
version = "5.18.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz";
sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6";
name = "xdg-desktop-portal-kde-5.17.5.tar.xz";
url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz";
sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224";
name = "xdg-desktop-portal-kde-5.18.5.tar.xz";
};
};
}

View file

@ -1,15 +1,18 @@
{
mkDerivation,
extra-cmake-modules, gettext, kdoctools, python,
cups, epoxy, mesa, pcre, pipewire,
kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
cups, pcre, pipewire, kio
kirigami2, kdeclarative, plasma-framework, kio
}:
mkDerivation {
name = "xdg-desktop-portal-kde";
nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ];
buildInputs = [
cups pcre pipewire kio
kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
cups epoxy mesa pcre pipewire
kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
kirigami2 kdeclarative plasma-framework
];
}

View file

@ -112,6 +112,7 @@ let
kitemmodels = callPackage ./kitemmodels.nix {};
kitemviews = callPackage ./kitemviews.nix {};
kplotting = callPackage ./kplotting.nix {};
kquickcharts = callPackage ./kquickcharts.nix {};
kwayland = callPackage ./kwayland.nix {};
kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
kwindowsystem = callPackage ./kwindowsystem {};

View file

@ -0,0 +1,15 @@
{
mkDerivation, lib,
extra-cmake-modules,
qtquickcontrols2,
}:
mkDerivation {
name = "kquickcharts";
meta = {
maintainers = [ lib.maintainers.ttuegel ];
};
nativeBuildInputs = [ extra-cmake-modules ];
propagatedBuildInputs = [ qtquickcontrols2 ];
outputs = [ "out" "dev" ];
}

View file

@ -1,28 +0,0 @@
{ stdenv, fetchFromGitHub, mkDerivation
, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }:
mkDerivation {
name = "kdecoration-viewer-2018-07-24";
src = fetchFromGitHub {
owner = "KDE";
repo = "kdecoration-viewer";
rev = "6e50b39c651bbf92fd7e7116d43bf57288254288";
sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj";
};
nativeBuildInputs = [ cmake extra-cmake-modules ];
buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ];
meta = with stdenv.lib; {
description = "Allows to preview a KDecoration plugin";
longDescription = ''
kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under
$QT_PLUGIN_PATH/org.kde.kdecoration2 to preview.
'';
homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/";
license = licenses.gpl2;
maintainers = [ maintainers.gnidorah ];
platforms = platforms.linux;
};
}

View file

@ -218,6 +218,7 @@ mapAliases ({
jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream";
joseki = apache-jena-fuseki; # added 2016-02-28
json_glib = json-glib; # added 2018-02-25
kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
kdiff3-qt5 = kdiff3; # added 2017-02-18
keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02
keepassx-community = keepassxc; # added 2017-11

View file

@ -14859,8 +14859,9 @@ in
knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner
kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting
syndication threadweaver kirigami2 kholidays kpurpose kcontacts;
networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet
syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose
kcontacts kquickcharts;
### KDE PLASMA 5
@ -21264,8 +21265,6 @@ in
kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { };
inherit (kdeFrameworks) kdesu;
kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };