diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh index 2e2373be36d..24760e7ac08 100755 --- a/maintainers/scripts/generate-kde-plasma.sh +++ b/maintainers/scripts/generate-kde-plasma.sh @@ -1,5 +1,5 @@ #!/bin/sh ./maintainers/scripts/fetch-kde-qt.sh \ - http://download.kde.org/stable/plasma/5.7.2/ -A '*.tar.xz' \ + http://download.kde.org/stable/plasma/5.7.3/ -A '*.tar.xz' \ >pkgs/desktops/kde-5/plasma/srcs.nix diff --git a/pkgs/desktops/kde-5/plasma/breeze-grub.nix b/pkgs/desktops/kde-5/plasma/breeze-grub.nix new file mode 100644 index 00000000000..da0fb6f73ad --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-grub.nix @@ -0,0 +1,16 @@ +{ + plasmaPackage +}: + +plasmaPackage { + name = "breeze-grub"; + outputs = [ "out" ]; + installPhase = '' + runHook preInstall + + mkdir -p "$out/grub/themes" + mv breeze "$out/grub/themes" + + runHook postInstall + ''; +} diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix new file mode 100644 index 00000000000..0de1ca1f680 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/default.nix @@ -0,0 +1,16 @@ +{ + plasmaPackage, lib, copyPathsToStore, + ecm, + plymouth +}: + +plasmaPackage { + name = "breeze-plymouth"; + nativeBuildInputs = [ ecm ]; + buildInputs = [ plymouth ]; + outputs = [ "out" ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postPatch = '' + substituteInPlace cmake/FindPlymouth.cmake --subst-var out + ''; +} diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch new file mode 100644 index 00000000000..5d5856d122d --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/install-paths.patch @@ -0,0 +1,19 @@ +Index: breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +=================================================================== +--- breeze-plymouth-5.7.3.orig/cmake/FindPlymouth.cmake ++++ breeze-plymouth-5.7.3/cmake/FindPlymouth.cmake +@@ -24,12 +24,8 @@ + include(FindPkgConfig) + + pkg_check_modules(Plymouth ply-boot-client ply-splash-core) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=pluginsdir +- OUTPUT_VARIABLE Plymouth_PLUGINSDIR) +-exec_program(${PKG_CONFIG_EXECUTABLE} +- ARGS ply-splash-core --variable=themesdir +- OUTPUT_VARIABLE Plymouth_THEMESDIR) ++set(Plymouth_PLUGINSDIR "@out@/lib/plymouth") ++set(Plymouth_THEMESDIR "@out@/share/plymouth/themes") + + find_package_handle_standard_args(Plymouth + FOUND_VAR diff --git a/pkgs/desktops/kde-5/plasma/breeze-plymouth/series b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series new file mode 100644 index 00000000000..8920e7ca518 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/breeze-plymouth/series @@ -0,0 +1 @@ +install-paths.patch diff --git a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix index a909e5067f4..ea2776a13c5 100644 --- a/pkgs/desktops/kde-5/plasma/breeze-qt5.nix +++ b/pkgs/desktops/kde-5/plasma/breeze-qt5.nix @@ -1,21 +1,17 @@ -{ plasmaPackage, ecm, frameworkintegration -, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons -, ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras +{ + plasmaPackage, + ecm, + frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, + kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras }: plasmaPackage { name = "breeze-qt5"; sname = "breeze"; - nativeBuildInputs = [ - ecm - makeQtWrapper - ]; + nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons + frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration + kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; - postInstall = '' - wrapQtProgram "$out/bin/breeze-settings5" - ''; } diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 7aff229b4c1..853faa7040b 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -52,6 +52,8 @@ let name = "breeze-${version}"; paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; }; + breeze-grub = callPackage ./breeze-grub.nix {}; + breeze-plymouth = callPackage ./breeze-plymouth {}; kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {}; diff --git a/pkgs/desktops/kde-5/plasma/kinfocenter.nix b/pkgs/desktops/kde-5/plasma/kinfocenter.nix index dd9bdbd31bd..939e4fa62a9 100644 --- a/pkgs/desktops/kde-5/plasma/kinfocenter.nix +++ b/pkgs/desktops/kde-5/plasma/kinfocenter.nix @@ -1,16 +1,17 @@ -{ plasmaPackage, ecm, kdoctools, kcmutils -, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons -, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage -, kservice, kwidgetsaddons, kxmlgui, libraw1394 -, pciutils, solid +{ + plasmaPackage, + ecm, kdoctools, + kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, + kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, + kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid }: plasmaPackage { name = "kinfocenter"; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice - kwidgetsaddons kxmlgui libraw1394 pciutils solid + kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons + kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice + kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid ]; } diff --git a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix index 8fb5d9e708b..3c5d7b37472 100644 --- a/pkgs/desktops/kde-5/plasma/kscreenlocker.nix +++ b/pkgs/desktops/kde-5/plasma/kscreenlocker.nix @@ -1,13 +1,15 @@ -{ plasmaPackage, ecm, kcmutils, kcrash, kdeclarative -, kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland -, libXcursor, pam, plasma-framework, qtdeclarative, wayland +{ + plasmaPackage, + ecm, kdoctools, + kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, + kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland }: plasmaPackage { name = "kscreenlocker"; nativeBuildInputs = [ ecm kdoctools ]; propagatedBuildInputs = [ - kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support - kglobalaccel kidletime kwayland libXcursor pam wayland + kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland + libXcursor pam plasma-framework qtdeclarative wayland ]; } diff --git a/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 7a70fec0d2d..00000000000 --- a/pkgs/desktops/kde-5/plasma/kwin/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 07:05:22 -0500 -Subject: [PATCH] qdiriterator follow symlinks - ---- - clients/aurorae/src/aurorae.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp -index 781c960..ad5f420 100644 ---- a/plugins/kdecorations/aurorae/src/aurorae.cpp -+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp -@@ -211,7 +211,7 @@ void Helper::init() - // so let's try to locate our plugin: - QString pluginPath; - for (const QString &path : m_engine->importPathList()) { -- QDirIterator it(path, QDirIterator::Subdirectories); -+ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - it.next(); - QFileInfo fileInfo = it.fileInfo(); --- -2.5.2 - diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix index d121ba84dd0..7af947bcfe8 100644 --- a/pkgs/desktops/kde-5/plasma/kwin/default.nix +++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix @@ -1,11 +1,12 @@ -{ plasmaPackage, ecm, kdoctools, epoxy -, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets -, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel -, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications -, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem -, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative -, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor -, makeQtWrapper +{ + plasmaPackage, lib, copyPathsToStore, + ecm, kdoctools, + breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig, + kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, + ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, + kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, + kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative, + qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland }: plasmaPackage { @@ -15,13 +16,17 @@ plasmaPackage { kdoctools ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem - plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion - kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes - kidletime kinit knewstuff knotifications kpackage kservice kwayland - kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland - xcb-util-cursor + breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets + kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes + kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice + kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM + plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev + wayland xcb-util-cursor ]; - patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + postPatch = '' + substituteInPlace main_wayland.cpp \ + --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland + ''; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch b/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch new file mode 100644 index 00000000000..60b8f5ef541 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/kwin/follow-symlinks.patch @@ -0,0 +1,13 @@ +Index: kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp +=================================================================== +--- kwin-5.7.3.orig/plugins/kdecorations/aurorae/src/aurorae.cpp ++++ kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp +@@ -211,7 +211,7 @@ void Helper::init() + // so let's try to locate our plugin: + QString pluginPath; + for (const QString &path : m_engine->importPathList()) { +- QDirIterator it(path, QDirIterator::Subdirectories); ++ QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + QFileInfo fileInfo = it.fileInfo(); diff --git a/pkgs/desktops/kde-5/plasma/kwin/series b/pkgs/desktops/kde-5/plasma/kwin/series new file mode 100644 index 00000000000..9dbc88f4997 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/kwin/series @@ -0,0 +1,2 @@ +follow-symlinks.patch +xwayland.patch diff --git a/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch b/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch new file mode 100644 index 00000000000..5fde01d08bf --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/kwin/xwayland.patch @@ -0,0 +1,13 @@ +Index: kwin-5.7.3/main_wayland.cpp +=================================================================== +--- kwin-5.7.3.orig/main_wayland.cpp ++++ kwin-5.7.3/main_wayland.cpp +@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe + + m_xwaylandProcess = new Process(kwinApp()); + m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); +- m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); ++ m_xwaylandProcess->setProgram(QStringLiteral("@xwayland@")); + QProcessEnvironment env = m_environment; + env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); + m_xwaylandProcess->setProcessEnvironment(env); diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 15048dc9da2..2e401796cf4 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/bluedevil-5.7.2.tar.xz"; - sha256 = "0lw7yf38vdxl5q8fyqp7xnhppv0r6ayr7wd3m73f1w7fqpkjd9v6"; - name = "bluedevil-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/bluedevil-5.7.3.tar.xz"; + sha256 = "0485lm4d18qv1w0qgb46g318xbb3cd6d5j42j0s95snrg7rlp717"; + name = "bluedevil-5.7.3.tar.xz"; }; }; breeze = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-5.7.2.tar.xz"; - sha256 = "150lpy6jd2asbx8s5mznyagja31q5xwhhqqisrlnxapln2qj6xay"; - name = "breeze-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-5.7.3.tar.xz"; + sha256 = "1wyj13sw4xrpb155p00wpn2hvvkpjrpf14b15sk3dpbhlzc8m77p"; + name = "breeze-5.7.3.tar.xz"; }; }; breeze-grub = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-grub-5.7.2.tar.xz"; - sha256 = "1qhgqb3wa8mciddwa0v4kw3vs17annib0qy2jpy5qdfjc4yblq5q"; - name = "breeze-grub-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-grub-5.7.3.tar.xz"; + sha256 = "0xlxpg1z67mjn3mf698b2jrls7fyb19i3carmr56c0f45r628lpf"; + name = "breeze-grub-5.7.3.tar.xz"; }; }; breeze-gtk = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-gtk-5.7.2.tar.xz"; - sha256 = "08jfvxfmzbnk4jjzljlp9wr37b7rmxcwnmi866x5v01x9iqfbcgw"; - name = "breeze-gtk-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-gtk-5.7.3.tar.xz"; + sha256 = "0bw9hj0ca99kfvfw621l19wm9x81p8pyc19yrlhbr527mhw65i65"; + name = "breeze-gtk-5.7.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/breeze-plymouth-5.7.2.tar.xz"; - sha256 = "16dwqiq26xxpff0fni7aiq919k7jfmi35sj8xvvafb30wm4y3jix"; - name = "breeze-plymouth-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/breeze-plymouth-5.7.3.tar.xz"; + sha256 = "0hiscvdqrnig594w9b0b69wzbqgcrc56p9r0z52pj2zw4df5m3za"; + name = "breeze-plymouth-5.7.3.tar.xz"; }; }; discover = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/discover-5.7.2.tar.xz"; - sha256 = "0kp3d7d21zxc8ag6f075r8mvfqd5mmk258aix5pyqc1njzb6rgg0"; - name = "discover-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/discover-5.7.3.tar.xz"; + sha256 = "1ylq2mfzqjibfx7g6xd1b83sg9a8s60jjnxzgf808kxqzrb7b6bg"; + name = "discover-5.7.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kactivitymanagerd-5.7.2.tar.xz"; - sha256 = "0asp3jzl1vaqxs0nvkfxx5d8hnnsvcygbjgc4i63l7fjs64a789r"; - name = "kactivitymanagerd-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kactivitymanagerd-5.7.3.tar.xz"; + sha256 = "0ajm5d15qglb7k8js7626mcxi19g0vsgvs7y3ggqngvklpnpgqr0"; + name = "kactivitymanagerd-5.7.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kde-cli-tools-5.7.2.tar.xz"; - sha256 = "0y2pwshsiqgcxvj3yc6vyyhg8fkb5ddslnf1f86r92sy66gbjw0s"; - name = "kde-cli-tools-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kde-cli-tools-5.7.3.tar.xz"; + sha256 = "1pg6zabll61q8krw3h5i8z0bj6zxm7g21dza5jgvb0vbirr4zgz6"; + name = "kde-cli-tools-5.7.3.tar.xz"; }; }; kdecoration = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kdecoration-5.7.2.tar.xz"; - sha256 = "1wpb1kivy570ggrd7ip8n3zllyslzk6qlqc02i8g4rbavw0fxscx"; - name = "kdecoration-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kdecoration-5.7.3.tar.xz"; + sha256 = "1k20x7ndp8rv8ihphkz68g4m7r73gvswcnxi1ahipqnw5mnywl9c"; + name = "kdecoration-5.7.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kde-gtk-config-5.7.2.tar.xz"; - sha256 = "08giv5w4055rd70nb28lwapdcfnywx2whgzpc1gdvsbgl6ap742n"; - name = "kde-gtk-config-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kde-gtk-config-5.7.3.tar.xz"; + sha256 = "0ynpk4p4yx2wy0jm1bk9v8rk27w5fb1ra1d2w6gfz33ijp7iah92"; + name = "kde-gtk-config-5.7.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kdeplasma-addons-5.7.2.tar.xz"; - sha256 = "1qlr3fgp7gqyjyncn1qjajhbvb45sdbp9aqhz6ccnv3smwm74mp7"; - name = "kdeplasma-addons-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kdeplasma-addons-5.7.3.tar.xz"; + sha256 = "0jdc2avjjy0p4rib7k7wd3ns02pyi57dyfqgja606gbipdvw1fwn"; + name = "kdeplasma-addons-5.7.3.tar.xz"; }; }; kgamma5 = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kgamma5-5.7.2.tar.xz"; - sha256 = "0jkk0lz4qaxsmgii3i698anpp0a9q0nakpb5h0kxffx5j01s5s25"; - name = "kgamma5-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kgamma5-5.7.3.tar.xz"; + sha256 = "1zzig2iw5wjhvym35vbljqa4ma7jyprqvqxbcw3aqj1hp5z9g35k"; + name = "kgamma5-5.7.3.tar.xz"; }; }; khotkeys = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/khotkeys-5.7.2.tar.xz"; - sha256 = "02v0q8j65fbc39krc2gcs42yyx3g056w156zg6d59j6srwci5ksm"; - name = "khotkeys-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/khotkeys-5.7.3.tar.xz"; + sha256 = "1xq70j2wfxxbhzn3darjx75120j641v8rd20wjcn5bmr1xlr5fb7"; + name = "khotkeys-5.7.3.tar.xz"; }; }; kinfocenter = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kinfocenter-5.7.2.tar.xz"; - sha256 = "1xpyi05y9qxv51j8gazk0qlhy2yscz8lgzgh3lw7lp21jv1frxg4"; - name = "kinfocenter-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kinfocenter-5.7.3.tar.xz"; + sha256 = "1s66400kh49wzfsgahdya6w1j2a4f5w47lllpy2i6w1xl3pag219"; + name = "kinfocenter-5.7.3.tar.xz"; }; }; kmenuedit = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kmenuedit-5.7.2.tar.xz"; - sha256 = "0bavsxh3lsnk5h70l81317vqgmms5r0lr7ph2vdlcfrb708xp0xp"; - name = "kmenuedit-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kmenuedit-5.7.3.tar.xz"; + sha256 = "0j0qk1p9j25kk8jysx41jnh52yflb2xf2xg64p7x72i6ci8axyaa"; + name = "kmenuedit-5.7.3.tar.xz"; }; }; kscreen = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kscreen-5.7.2.tar.xz"; - sha256 = "1d23i6mw1di01386icdq5p64a3gmq6n6cg73v6wfw3vvgl0lls6w"; - name = "kscreen-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kscreen-5.7.3.tar.xz"; + sha256 = "1z48sycq6i618ypba78hm5vh8m3c9c0k44jl4lrxvx524axhg11w"; + name = "kscreen-5.7.3.tar.xz"; }; }; kscreenlocker = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kscreenlocker-5.7.2.tar.xz"; - sha256 = "1c4afc7s5b2q5yc53xpp8q2k0w8lxmvg8rrqb6qnrqz1xrxil3ld"; - name = "kscreenlocker-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kscreenlocker-5.7.3.tar.xz"; + sha256 = "1xnzca0mli25mmg0x4pqa1gfhvw4f3m7cqn1ml92z7fnh8rbqw5k"; + name = "kscreenlocker-5.7.3.tar.xz"; }; }; ksshaskpass = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/ksshaskpass-5.7.2.tar.xz"; - sha256 = "07annxlr46h7x6dq5vfs6rzgm11x8bv1n1icgji2wabdj3zsy2pa"; - name = "ksshaskpass-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/ksshaskpass-5.7.3.tar.xz"; + sha256 = "1ihhavb87xzgb649lxc2z9hcxrc37pgx52f13hbswbzl1086nfqh"; + name = "ksshaskpass-5.7.3.tar.xz"; }; }; ksysguard = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/ksysguard-5.7.2.tar.xz"; - sha256 = "08y9vsdzsq18hgfrk52hk3hmv23x6xv4j73dji97g38z26slvbp6"; - name = "ksysguard-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/ksysguard-5.7.3.tar.xz"; + sha256 = "1rkhjjxcp6d0ybpnyjkadx3hyv2r9c1xgby4x042ac0kycvkxdiz"; + name = "ksysguard-5.7.3.tar.xz"; }; }; kwallet-pam = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwallet-pam-5.7.2.tar.xz"; - sha256 = "1701abpwp90vsi5v4n675848gnp17psiagd5hv9yypc2a7g82sf2"; - name = "kwallet-pam-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwallet-pam-5.7.3.tar.xz"; + sha256 = "1nfphzlcwx0l6wa4kl7akwmf8wb1pr1acyaxchivj463wbnbygy4"; + name = "kwallet-pam-5.7.3.tar.xz"; }; }; kwayland-integration = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwayland-integration-5.7.2.tar.xz"; - sha256 = "0jd9cv8ivn71h90xjr53nanx02z95ylsn5pkwx03wjvx4bdwwvpv"; - name = "kwayland-integration-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwayland-integration-5.7.3.tar.xz"; + sha256 = "1wlimrd33fa3wkvw5kdg3y73s6x33rd2i70prb4svr15bb82pfin"; + name = "kwayland-integration-5.7.3.tar.xz"; }; }; kwin = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwin-5.7.2.tar.xz"; - sha256 = "00f9chy1qg24r6rqpqfhc4jjx6j1nw18gxzpd1m16shkqf5il15h"; - name = "kwin-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwin-5.7.3.tar.xz"; + sha256 = "0rh4mjv9cspv21y5a81cfdi3p3mvybmwvcbyx68svpzpfj6mvpca"; + name = "kwin-5.7.3.tar.xz"; }; }; kwrited = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/kwrited-5.7.2.tar.xz"; - sha256 = "06j18395pkyiph9mzvmfjjdm623ggijgkalggsz4a7kllk1v964q"; - name = "kwrited-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/kwrited-5.7.3.tar.xz"; + sha256 = "1qx67gv75n9m777g4a6hj75nsbv7wqqb2bb7fm7bm5110lv1j3gl"; + name = "kwrited-5.7.3.tar.xz"; }; }; libkscreen = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/libkscreen-5.7.2.tar.xz"; - sha256 = "0ympads0iylpsv0idmbgwc8gzc3xskqcgv1bn4mbpfrp360ibmia"; - name = "libkscreen-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/libkscreen-5.7.3.tar.xz"; + sha256 = "1zmzhqb2fb6mxilqfyxhgnflqwcf0cx006h3psx3mf634qqh1ixi"; + name = "libkscreen-5.7.3.tar.xz"; }; }; libksysguard = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/libksysguard-5.7.2.tar.xz"; - sha256 = "0qk14ca9hfbm4ba840yjrar1kqh3dsl2hywqf45lrv42r47k19ak"; - name = "libksysguard-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/libksysguard-5.7.3.tar.xz"; + sha256 = "1gcrwlksvv1br03j11v2bhgikkwwhh0ynv2z3g9lbyvbjg8jmwya"; + name = "libksysguard-5.7.3.tar.xz"; }; }; milou = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/milou-5.7.2.tar.xz"; - sha256 = "13w9fn1icxaxslk04a3gb41yb6hw705xj0xkmv5wy198m8f9m84a"; - name = "milou-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/milou-5.7.3.tar.xz"; + sha256 = "172qvnkniqbhxdzm1inl6adjxfy13a9hnimqfwdgf1f7ss5dmsp7"; + name = "milou-5.7.3.tar.xz"; }; }; oxygen = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/oxygen-5.7.2.tar.xz"; - sha256 = "0156v7b9capc1j5kv099fy00dzcqiygvmvs9nsy6m3ly7v9av428"; - name = "oxygen-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/oxygen-5.7.3.tar.xz"; + sha256 = "0y3jf5y21dzpyv9vz44qb7kqr1afmad9yvq45kwpjwlnabz75y3r"; + name = "oxygen-5.7.3.tar.xz"; }; }; plasma-desktop = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-desktop-5.7.2.tar.xz"; - sha256 = "0kkw4h1vn32qdpzd16334s2m38wcckc06bx1bs99jj6hpmgh6597"; - name = "plasma-desktop-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-desktop-5.7.3.tar.xz"; + sha256 = "1plfrfzczzz2x2pp8f3vkphds9hfp28qmcyaf2c63snjcply0vjg"; + name = "plasma-desktop-5.7.3.tar.xz"; }; }; plasma-integration = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-integration-5.7.2.tar.xz"; - sha256 = "1j8a0c0dxdl7kyj6hm1r5lq7ykg9xhn51s90gyhr6rqs0hla7n6g"; - name = "plasma-integration-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-integration-5.7.3.tar.xz"; + sha256 = "1wlwmjf4m6f4bps8vbk8f1ixjmd3krm5h1mc27mls35r783kh3hl"; + name = "plasma-integration-5.7.3.tar.xz"; }; }; plasma-mediacenter = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-mediacenter-5.7.2.tar.xz"; - sha256 = "1vgb7mlqqlh338p0mqfc613qcdz1c3kwgg9m7yb5fk8kzh9v1fwn"; - name = "plasma-mediacenter-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-mediacenter-5.7.3.tar.xz"; + sha256 = "0p5pip14y2rfv9gsk40jqbv2hg2m7wg8cvycbc774gi19zr19ajr"; + name = "plasma-mediacenter-5.7.3.tar.xz"; }; }; plasma-nm = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-nm-5.7.2.tar.xz"; - sha256 = "1aqf2jzljzc1wwswxq9gn74p0169sqq9yrm7ngz1ns11b0q8m1bm"; - name = "plasma-nm-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-nm-5.7.3.tar.xz"; + sha256 = "0xap1mjj1lg9nvys1ld9d4bvx5vi3qi2gc4gvdh7h4i1phyzfqwz"; + name = "plasma-nm-5.7.3.tar.xz"; }; }; plasma-pa = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-pa-5.7.2.tar.xz"; - sha256 = "0w201rrxjds5i1hc6mn4mpqn6kvpz175r0id9rxqfdzyrqcgknpv"; - name = "plasma-pa-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-pa-5.7.3.tar.xz"; + sha256 = "11dwm848ylm7fx2fgmjxsknqd5vq0832h8d3ak0f0a2gbrqpvgis"; + name = "plasma-pa-5.7.3.tar.xz"; }; }; plasma-sdk = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-sdk-5.7.2.tar.xz"; - sha256 = "0zsbrlmv5kgaa53a906ky071vj38i58kz0wqrr2dy2b47pnx77pl"; - name = "plasma-sdk-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-sdk-5.7.3.tar.xz"; + sha256 = "1xi4gyrcwll8m0ilmqrpaa8anx7bravz25f7j613zmr7c59372cb"; + name = "plasma-sdk-5.7.3.tar.xz"; }; }; plasma-workspace = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-5.7.2.tar.xz"; - sha256 = "1k03g6scbgrsrk1dmfaw6s5sahlck81rka7kpzx60rdas6vfw60y"; - name = "plasma-workspace-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-5.7.3.tar.xz"; + sha256 = "0hlh7qvll48hnpmjkhf53fxx91yx8sdhsyc9y77mfzwavd72354q"; + name = "plasma-workspace-5.7.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/plasma-workspace-wallpapers-5.7.2.tar.xz"; - sha256 = "1wzhrix2nafzlszanh05fbcs746c391wp27i24fvh3rhpg5j57zx"; - name = "plasma-workspace-wallpapers-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-wallpapers-5.7.3.tar.xz"; + sha256 = "0452k2ic16cf385l057chh2a3wh4hjxxlpnlapfyxsmxhz29ymgz"; + name = "plasma-workspace-wallpapers-5.7.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.7.2"; + version = "1-5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/polkit-kde-agent-1-5.7.2.tar.xz"; - sha256 = "0kx021xjgsp1gpv2s9kigxf1srabkly2l61hf5wpj0hml79dwrc5"; - name = "polkit-kde-agent-1-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/polkit-kde-agent-1-5.7.3.tar.xz"; + sha256 = "1j1724dffrpv06xzmgqvm4xbdscflkcx31bshwh2mizcxknb2bbq"; + name = "polkit-kde-agent-1-5.7.3.tar.xz"; }; }; powerdevil = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/powerdevil-5.7.2.tar.xz"; - sha256 = "132k18dqm487f8v2irxlxhs1ljvcyyig9lkb36isajsw7k6949vb"; - name = "powerdevil-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/powerdevil-5.7.3.tar.xz"; + sha256 = "1npbdwhic2bkdzxggkvyl1bqpfb7ihcpa8rds3c6bf6smbkhwiqi"; + name = "powerdevil-5.7.3.tar.xz"; }; }; sddm-kcm = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/sddm-kcm-5.7.2.tar.xz"; - sha256 = "19bxbpz80pr66gd9mycwfcw8sagkpzbffm98bzikpdjcll6a6ysh"; - name = "sddm-kcm-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/sddm-kcm-5.7.3.tar.xz"; + sha256 = "1s80j6hjjz8n079k8867xbb1q20n7mxrcjlfm44m2p0qz8nv4kjk"; + name = "sddm-kcm-5.7.3.tar.xz"; }; }; systemsettings = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/systemsettings-5.7.2.tar.xz"; - sha256 = "0f2q0mfhmn0nf4mx76hp3lxciwiivsqq3ayv15s1hzxpi24vsini"; - name = "systemsettings-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/systemsettings-5.7.3.tar.xz"; + sha256 = "0776vqnwvpf1x52lz8wpl3y43r5zq6l3wviw0fpbj4fcg8jmryr3"; + name = "systemsettings-5.7.3.tar.xz"; }; }; user-manager = { - version = "5.7.2"; + version = "5.7.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.2/user-manager-5.7.2.tar.xz"; - sha256 = "0faf4wnbkcx6wlg92cd8mskp1xhqm0crj886y22ycjiaqhbnc43p"; - name = "user-manager-5.7.2.tar.xz"; + url = "${mirror}/stable/plasma/5.7.3/user-manager-5.7.3.tar.xz"; + sha256 = "172gl6p6ai0gi2m10b0rpcg69xqf4127cf6gbvv0r22cprhxw1cb"; + name = "user-manager-5.7.3.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index 18cf08081c4..c0d5f6dbf59 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -71,11 +71,14 @@ fi configDir=$(qtpaths --writable-path GenericConfigLocation) mkdir -p "$configDir" +THEME=org.kde.breeze #This is basically setting defaults so we can use them with kstartupconfig5 +#We cannot set the equivilant of THEME here as it will generate an +#invalid variable name (with dots) cat >$configDir/startupconfigkeys <