kde plasma: 5.6.5 -> 5.7.0

wip/yesman
Jos van den Oever 8 years ago
parent bdf4c0d21f
commit fd0373c589
  1. 2
      maintainers/scripts/generate-kde-plasma.sh
  2. 10
      pkgs/desktops/kde-5/applications-16.04/ark/0001-fix-start-from-plasma.patch
  3. 3
      pkgs/desktops/kde-5/applications-16.04/ark/default.nix
  4. 2
      pkgs/desktops/kde-5/applications-16.04/default.nix
  5. 18
      pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
  6. 333
      pkgs/desktops/kde-5/plasma-5.6/srcs.nix
  7. 0
      pkgs/desktops/kde-5/plasma-5.7/bluedevil.nix
  8. 0
      pkgs/desktops/kde-5/plasma-5.7/breeze-gtk.nix
  9. 0
      pkgs/desktops/kde-5/plasma-5.7/breeze-qt4.nix
  10. 0
      pkgs/desktops/kde-5/plasma-5.7/breeze-qt5.nix
  11. 2
      pkgs/desktops/kde-5/plasma-5.7/default.nix
  12. 0
      pkgs/desktops/kde-5/plasma-5.7/kactivitymanagerd.nix
  13. 0
      pkgs/desktops/kde-5/plasma-5.7/kde-cli-tools.nix
  14. 0
      pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/0001-follow-symlinks.patch
  15. 0
      pkgs/desktops/kde-5/plasma-5.7/kde-gtk-config/default.nix
  16. 0
      pkgs/desktops/kde-5/plasma-5.7/kdecoration.nix
  17. 0
      pkgs/desktops/kde-5/plasma-5.7/kdeplasma-addons.nix
  18. 0
      pkgs/desktops/kde-5/plasma-5.7/kgamma5.nix
  19. 0
      pkgs/desktops/kde-5/plasma-5.7/khotkeys.nix
  20. 0
      pkgs/desktops/kde-5/plasma-5.7/kinfocenter.nix
  21. 0
      pkgs/desktops/kde-5/plasma-5.7/kmenuedit.nix
  22. 0
      pkgs/desktops/kde-5/plasma-5.7/kscreen.nix
  23. 0
      pkgs/desktops/kde-5/plasma-5.7/kscreenlocker.nix
  24. 0
      pkgs/desktops/kde-5/plasma-5.7/ksshaskpass.nix
  25. 0
      pkgs/desktops/kde-5/plasma-5.7/ksysguard.nix
  26. 8
      pkgs/desktops/kde-5/plasma-5.7/kwayland-integration.nix
  27. 4
      pkgs/desktops/kde-5/plasma-5.7/kwin/0001-qdiriterator-follow-symlinks.patch
  28. 0
      pkgs/desktops/kde-5/plasma-5.7/kwin/default.nix
  29. 0
      pkgs/desktops/kde-5/plasma-5.7/kwrited.nix
  30. 0
      pkgs/desktops/kde-5/plasma-5.7/libkscreen.nix
  31. 0
      pkgs/desktops/kde-5/plasma-5.7/libksysguard/0001-qdiriterator-follow-symlinks.patch
  32. 0
      pkgs/desktops/kde-5/plasma-5.7/libksysguard/default.nix
  33. 0
      pkgs/desktops/kde-5/plasma-5.7/milou.nix
  34. 0
      pkgs/desktops/kde-5/plasma-5.7/oxygen.nix
  35. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
  36. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0002-hwclock.patch
  37. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/0003-tzdir.patch
  38. 10
      pkgs/desktops/kde-5/plasma-5.7/plasma-desktop/default.nix
  39. 4
      pkgs/desktops/kde-5/plasma-5.7/plasma-integration.nix
  40. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-mediacenter.nix
  41. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-nm/0001-mobile-broadband-provider-info-path.patch
  42. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-nm/default.nix
  43. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-pa.nix
  44. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-workspace-wallpapers.nix
  45. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/default.nix
  46. 13
      pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/qml-import-path.patch
  47. 0
      pkgs/desktops/kde-5/plasma-5.7/plasma-workspace/series
  48. 0
      pkgs/desktops/kde-5/plasma-5.7/polkit-kde-agent.nix
  49. 18
      pkgs/desktops/kde-5/plasma-5.7/powerdevil.nix
  50. 325
      pkgs/desktops/kde-5/plasma-5.7/srcs.nix
  51. 0
      pkgs/desktops/kde-5/plasma-5.7/startkde/default.nix
  52. 0
      pkgs/desktops/kde-5/plasma-5.7/startkde/startkde.sh
  53. 0
      pkgs/desktops/kde-5/plasma-5.7/systemsettings.nix
  54. 2
      pkgs/top-level/all-packages.nix

@ -1,3 +1,3 @@
#!/bin/sh
./fetch-kde-qt.sh http://download.kde.org/stable/plasma/5.6.5/ -A '*.tar.xz'
./fetch-kde-qt.sh http://download.kde.org/stable/plasma/5.7.0/ -A '*.tar.xz'

@ -0,0 +1,10 @@
--- a/app/org.kde.ark.desktop.cmake
+++ b/app/org.kde.ark.desktop.cmake
@@ -154,7 +154,6 @@
Terminal=false
X-DBUS-StartupType=Multi
X-DBUS-ServiceName=org.kde.ark
-X-KDE-HasTempFileOption=true
Categories=Qt;KDE;Utility;Archiving;Compression;X-KDE-Utilities-File;
InitialPreference=3
Comment=Work with file archives

@ -35,6 +35,9 @@ kdeApp {
khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
kpty kwidgetsaddons libarchive
];
patches = [
./0001-fix-start-from-plasma.patch
];
postInstall = ''
wrapQtProgram "$out/bin/ark" \
--prefix PATH : "${PATH}"

@ -31,7 +31,7 @@ let
kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
ark = callPackage ./ark.nix {};
ark = callPackage ./ark/default.nix {};
baloo-widgets = callPackage ./baloo-widgets.nix {};
dolphin = callPackage ./dolphin.nix {};
dolphin-plugins = callPackage ./dolphin-plugins.nix {};

@ -1,18 +0,0 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
, kidletime, kio, knotifyconfig, kwayland, libkscreen, plasma-workspace
, qtx11extras, solid, udev
}:
plasmaPackage {
name = "powerdevil";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [
kconfig kdbusaddons knotifyconfig solid udev kactivities kauth
kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
plasma-workspace qtx11extras
];
}

@ -1,333 +0,0 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
bluedevil = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/bluedevil-5.6.5.tar.xz";
sha256 = "0zf9m02m039g2cpzaij56mnnffcq9bqa40xyq30r9sx5ji1wbnhx";
name = "bluedevil-5.6.5.tar.xz";
};
};
breeze = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/breeze-5.6.5.tar.xz";
sha256 = "0wzzixhpij8zb0jq6lsl7h3q22hfzpfz98pddlhnkf27dgmbd7zd";
name = "breeze-5.6.5.tar.xz";
};
};
breeze-grub = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/breeze-grub-5.6.5.tar.xz";
sha256 = "1khr8bqid58jq150snpszg3w1rnjh35y5fi20gwwa60hka556978";
name = "breeze-grub-5.6.5.tar.xz";
};
};
breeze-gtk = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/breeze-gtk-5.6.5.tar.xz";
sha256 = "0k4510jw89i1spb6gckf190mrspasxnwfwqddaxxrjdan4qklcbv";
name = "breeze-gtk-5.6.5.tar.xz";
};
};
breeze-plymouth = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/breeze-plymouth-5.6.5.tar.xz";
sha256 = "05ajv326ylbja9483k0ka6flqpk341knfaxgq056dfqlmiaq2cjp";
name = "breeze-plymouth-5.6.5.tar.xz";
};
};
discover = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/discover-5.6.5.tar.xz";
sha256 = "1k5jlq329k5scljdadj8yny5wxhz14c7jxx5wagazb28fq6yf3vj";
name = "discover-5.6.5.tar.xz";
};
};
kactivitymanagerd = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kactivitymanagerd-5.6.5.tar.xz";
sha256 = "1l0iyh6palbbw59xv6mhjv4y6c3v2xlqqk95rhhfcbpaq0kv0abh";
name = "kactivitymanagerd-5.6.5.tar.xz";
};
};
kde-cli-tools = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kde-cli-tools-5.6.5.tar.xz";
sha256 = "0fmlckjpc202n4ahc69mqjn6iv3xd0z9macvacx5fi2spc1i60kk";
name = "kde-cli-tools-5.6.5.tar.xz";
};
};
kdecoration = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kdecoration-5.6.5.tar.xz";
sha256 = "084a2ip5x15f9sdlh7icnbvbsczkc7h71qd4zzr7z9lmqk1b3sp1";
name = "kdecoration-5.6.5.tar.xz";
};
};
kde-gtk-config = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kde-gtk-config-5.6.5.tar.xz";
sha256 = "06nk5z1aqiwyd3vhpnmfjjpmsq6r32gx6dgij2la3c2y552d3hlx";
name = "kde-gtk-config-5.6.5.tar.xz";
};
};
kdeplasma-addons = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kdeplasma-addons-5.6.5.tar.xz";
sha256 = "19ijpvra2f5dbcjdl0g2lq0rivh6cvmgpryvsyhjyk740ys915kz";
name = "kdeplasma-addons-5.6.5.tar.xz";
};
};
kgamma5 = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kgamma5-5.6.5.tar.xz";
sha256 = "0qic1alkdzl6gxacm3i3m8xb5dxpd1hbixd8ixr1cabbviash1nw";
name = "kgamma5-5.6.5.tar.xz";
};
};
khotkeys = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/khotkeys-5.6.5.tar.xz";
sha256 = "1zsdpdibv2pnm6vgj28d09cpss8nizmacrnxxlilvizhmiyvrpla";
name = "khotkeys-5.6.5.tar.xz";
};
};
kinfocenter = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kinfocenter-5.6.5.tar.xz";
sha256 = "1ci9avkbix6366gvfc3vpwp3r5hwabk1vl29ajl40agrs7kgs9cl";
name = "kinfocenter-5.6.5.tar.xz";
};
};
kmenuedit = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kmenuedit-5.6.5.tar.xz";
sha256 = "1fxnmb07shbpnhwk7aw5lspaih79ldkkx69bwgrv99c2h7gbsbhg";
name = "kmenuedit-5.6.5.tar.xz";
};
};
kscreen = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kscreen-5.6.5.tar.xz";
sha256 = "16cnf0kmvp67jid3y4w2b2dxzidx8k8zld280svp249wwjyh3wzr";
name = "kscreen-5.6.5.tar.xz";
};
};
kscreenlocker = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kscreenlocker-5.6.5.tar.xz";
sha256 = "01hbjvkkhjb63ij3xqyg49s3w8ig68pqrback7r5iv1hsbybxw66";
name = "kscreenlocker-5.6.5.tar.xz";
};
};
ksshaskpass = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/ksshaskpass-5.6.5.tar.xz";
sha256 = "1qaja7alyx9czczkg2cpbc24jdvmsp8f9djsavgb650k6mv5h4va";
name = "ksshaskpass-5.6.5.tar.xz";
};
};
ksysguard = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/ksysguard-5.6.5.tar.xz";
sha256 = "0ji4q8js5g57vrirbq6nah9gwp6bzcn986pjig1l0q5sm7al95jq";
name = "ksysguard-5.6.5.tar.xz";
};
};
kwallet-pam = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kwallet-pam-5.6.5.tar.xz";
sha256 = "0ad2q9kwnaabv6klazg17ilsiy0ckkkcay3q2d51crn1d8kbv3gm";
name = "kwallet-pam-5.6.5.tar.xz";
};
};
kwayland = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kwayland-5.6.5.tar.xz";
sha256 = "1niac5g7jdyl0b840njppnw8lbl08a6g4npyxhplvr6mv744h6b9";
name = "kwayland-5.6.5.tar.xz";
};
};
kwayland-integration = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kwayland-integration-5.6.5.tar.xz";
sha256 = "1sf6d9062q191q5b4bngk9abnfx3ys8fmkgc04xp8pl5zq5f2m7h";
name = "kwayland-integration-5.6.5.tar.xz";
};
};
kwin = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kwin-5.6.5.tar.xz";
sha256 = "113q9m373wmi2dmi2v6im74gd6ava7xrwapkcxq0phyr53w5ihz4";
name = "kwin-5.6.5.tar.xz";
};
};
kwrited = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/kwrited-5.6.5.tar.xz";
sha256 = "19ra2pbr34ap309vxbssrkkykf2vki0829a6bqhgc482yw582k1r";
name = "kwrited-5.6.5.tar.xz";
};
};
libkscreen = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/libkscreen-5.6.5.tar.xz";
sha256 = "1651cj5mkpx7x43na4n9qvvm8r9zadfm3fmpvrv92idf7f3jg4hr";
name = "libkscreen-5.6.5.tar.xz";
};
};
libksysguard = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/libksysguard-5.6.5.tar.xz";
sha256 = "048hfxsjddqmw31w2cdzw72xwxrrnx0v6zzxq9514b5j7ak4f9jc";
name = "libksysguard-5.6.5.tar.xz";
};
};
milou = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/milou-5.6.5.tar.xz";
sha256 = "066k7dpjs5nrimqxfxk1krc8w771nkqjb9dinqqqrl3njn7rwvxf";
name = "milou-5.6.5.tar.xz";
};
};
oxygen = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/oxygen-5.6.5.tar.xz";
sha256 = "12qz947xy6xr8hzm46dy6m5hp8chmzc8ayczyy84xw5239piqa1c";
name = "oxygen-5.6.5.tar.xz";
};
};
plasma-desktop = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-desktop-5.6.5.tar.xz";
sha256 = "1lxvnymiivkrch7z64i5vkck5723jvv5la9hrqdlzjl8qjp2gfk6";
name = "plasma-desktop-5.6.5.tar.xz";
};
};
plasma-integration = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-integration-5.6.5.tar.xz";
sha256 = "1s473jg7xjw4jma7nn770q3cxj01d7bm2kf45fra5lbj6ipp3s20";
name = "plasma-integration-5.6.5.tar.xz";
};
};
plasma-mediacenter = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-mediacenter-5.6.5.tar.xz";
sha256 = "056wzqqhvkc6d53040g0pn22arjz9pcxdgqr8x0bqps5cq7gf846";
name = "plasma-mediacenter-5.6.5.tar.xz";
};
};
plasma-nm = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-nm-5.6.5.tar.xz";
sha256 = "1cmrd06l6mp478ixnwj93brkfz8gaw7081df4r4x6ql4vrga3a80";
name = "plasma-nm-5.6.5.tar.xz";
};
};
plasma-pa = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-pa-5.6.5.tar.xz";
sha256 = "19b43mwjhvvi1wpa68c1g2mk76rqlfg0h8gf51xgd7y3qjv462h0";
name = "plasma-pa-5.6.5.tar.xz";
};
};
plasma-sdk = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-sdk-5.6.5.tar.xz";
sha256 = "0v92b03ff40wkdps88aqkihs1cx4ggwg43x2cm6cdsa3gc84vyn8";
name = "plasma-sdk-5.6.5.tar.xz";
};
};
plasma-workspace = {
version = "5.6.5.1";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-workspace-5.6.5.1.tar.xz";
sha256 = "158lmnvvqbl3k5485yirw22vqb15qxfd1m0gc83p0hsi2lv7v7j5";
name = "plasma-workspace-5.6.5.1.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/plasma-workspace-wallpapers-5.6.5.tar.xz";
sha256 = "1pkyqsaxqah8h9r8ay449g20135sjw5qsbdp0i0ahprzw07wwijr";
name = "plasma-workspace-wallpapers-5.6.5.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/polkit-kde-agent-1-5.6.5.tar.xz";
sha256 = "1f7mzxfr463ac0cfpb653x8civ1ciwhkklndxv7mq37m5ssk4dah";
name = "polkit-kde-agent-1-5.6.5.tar.xz";
};
};
powerdevil = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/powerdevil-5.6.5.tar.xz";
sha256 = "07x0n311qbisycsrjjd9lkcwxcxlira0qkz1akg5xxll9q2a6qb7";
name = "powerdevil-5.6.5.tar.xz";
};
};
sddm-kcm = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/sddm-kcm-5.6.5.tar.xz";
sha256 = "07r20s0373y630x1vjrfgm740sgg8v6qsza4r3my1qbsdj3xwzky";
name = "sddm-kcm-5.6.5.tar.xz";
};
};
systemsettings = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/systemsettings-5.6.5.tar.xz";
sha256 = "01z3q8rp8barb7lyfiwcrwn407pxz17z22y46czxc7j56n4ixgim";
name = "systemsettings-5.6.5.tar.xz";
};
};
user-manager = {
version = "5.6.5";
src = fetchurl {
url = "${mirror}/stable/plasma/5.6.5/user-manager-5.6.5.tar.xz";
sha256 = "1fzfcq2kqrwja7y1ij8s7sbwlybharv6wqh62w7xza7pssz9yr7y";
name = "user-manager-5.6.5.tar.xz";
};
};
}

@ -74,7 +74,7 @@ let
kscreenlocker = callPackage ./kscreenlocker.nix {};
ksshaskpass = callPackage ./ksshaskpass.nix {};
ksysguard = callPackage ./ksysguard.nix {};
kwayland = callPackage ./kwayland.nix {};
kwayland-integration = callPackage ./kwayland-integration.nix {};
kwin = callPackage ./kwin {};
kwrited = callPackage ./kwrited.nix {};
libkscreen = callPackage ./libkscreen.nix {};

@ -1,14 +1,16 @@
{ plasmaPackage
, extra-cmake-modules
, wayland
, kidletime
, kwayland
, kwindowsystem
}:
plasmaPackage {
name = "kwayland";
name = "kwayland-integration";
nativeBuildInputs = [
extra-cmake-modules
];
propagatedBuildInputs = [
wayland
kidletime kwindowsystem kwayland
];
}

@ -9,8 +9,8 @@ Subject: [PATCH] qdiriterator follow symlinks
diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
index 781c960..ad5f420 100644
--- a/clients/aurorae/src/aurorae.cpp
+++ b/clients/aurorae/src/aurorae.cpp
--- 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;

@ -1,6 +1,6 @@
{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils
, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
, attica, baloo, boost, fontconfig, kactivities, kactivities-stats
, kauth, kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
@ -21,9 +21,9 @@ plasmaPackage rec {
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
knotifications knotifyconfig kwallet libcanberra_kde libXcursor
libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth
kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner
kwin plasma-framework plasma-workspace qtdeclarative
xf86inputsynaptics xkeyboard_config xinput baloo kactivities
kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
qtquickcontrols qtx11extras ksysguard
];
patches = [

@ -1,5 +1,5 @@
{ plasmaPackage, extra-cmake-modules
, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
, libXcursor
}:
@ -11,7 +11,7 @@ plasmaPackage {
extra-cmake-modules
];
buildInputs = [
kconfig kconfigwidgets kiconthemes kio kwayland
breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
libXcursor
];
}

@ -89,16 +89,3 @@ Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
MouseEventListener {
id: notificationsApplet
Index: plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
===================================================================
--- plasma-workspace-5.6.3.orig/applets/systemtray/package/contents/ui/main.qml
+++ plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
// import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.private.systemtray 2.0 as SystemTray
-import "Layout.js" as LayoutManager
+import "../code/Layout.js" as LayoutManager
Item {
id: root

@ -0,0 +1,18 @@
{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
, plasma-workspace, qtx11extras, solid, udev
}:
plasmaPackage {
name = "powerdevil";
nativeBuildInputs = [
extra-cmake-modules
kdoctools
];
propagatedBuildInputs = [
kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
networkmanager-qt plasma-workspace qtx11extras
];
}

@ -0,0 +1,325 @@
# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }:
{
bluedevil = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/bluedevil-5.7.0.tar.xz";
sha256 = "10f507hj31asg08kz5c5j5g2qlzmn57x68jrbgx80hdrji6jv6qn";
name = "bluedevil-5.7.0.tar.xz";
};
};
breeze = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/breeze-5.7.0.tar.xz";
sha256 = "1sy400m8lkdqna926fxfq3nmcfsrd877b841an686qf9lb7iga2l";
name = "breeze-5.7.0.tar.xz";
};
};
breeze-grub = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/breeze-grub-5.7.0.tar.xz";
sha256 = "0lgf13kbv1mcl57hwm0al87xslwvc7cgnj4k8f3026fjf78dqzr8";
name = "breeze-grub-5.7.0.tar.xz";
};
};
breeze-gtk = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/breeze-gtk-5.7.0.tar.xz";
sha256 = "1h9hvhln5mwsi4fn7a7csf7gn6qlvx4d6bmxij2qsjm4i14izxhb";
name = "breeze-gtk-5.7.0.tar.xz";
};
};
breeze-plymouth = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/breeze-plymouth-5.7.0.tar.xz";
sha256 = "1kq3ys1dvw2asgda6p9qbb2kkgskpvhjyp0xj4mgi5yaklz0bxgv";
name = "breeze-plymouth-5.7.0.tar.xz";
};
};
discover = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/discover-5.7.0.tar.xz";
sha256 = "0j3339g6lrf44hg3xbvzh01pygcawrrf1c9vhijimrrd197qcqwg";
name = "discover-5.7.0.tar.xz";
};
};
kactivitymanagerd = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kactivitymanagerd-5.7.0.tar.xz";
sha256 = "0j2rf4qlha7cdwgdnvxrhlc90j2m8qacyhii27zdjz9iwv48zyjq";
name = "kactivitymanagerd-5.7.0.tar.xz";
};
};
kde-cli-tools = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kde-cli-tools-5.7.0.tar.xz";
sha256 = "05g4q6lf7mkm8ys39qhwqavy2g2xc17ahsfc037wkcpka47m6i3m";
name = "kde-cli-tools-5.7.0.tar.xz";
};
};
kdecoration = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kdecoration-5.7.0.tar.xz";
sha256 = "1i43b572yd3s0bgfvj97r18p0yk01skwmwqqzripb80pygw9yzvc";
name = "kdecoration-5.7.0.tar.xz";
};
};
kde-gtk-config = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kde-gtk-config-5.7.0.tar.xz";
sha256 = "01y4m3lyrfb0hngbmk6r3xpbak9r534vf1fqgf22956sdfrl5g2p";
name = "kde-gtk-config-5.7.0.tar.xz";
};
};
kdeplasma-addons = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kdeplasma-addons-5.7.0.tar.xz";
sha256 = "0kv0c2yxikbpdkr82n16pw016gsvbpmhp8kgbzdjdaqinicw4p2b";
name = "kdeplasma-addons-5.7.0.tar.xz";
};
};
kgamma5 = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kgamma5-5.7.0.tar.xz";
sha256 = "1scqi61agl8f1pmq29v32fs126x0ddw933q6yjswy1w2a0nn0i02";
name = "kgamma5-5.7.0.tar.xz";
};
};
khotkeys = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/khotkeys-5.7.0.tar.xz";
sha256 = "0l27frmam6amgay42vb4pl98l81pb6xasnwd9ww3069sr9kiq0vi";
name = "khotkeys-5.7.0.tar.xz";
};
};
kinfocenter = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kinfocenter-5.7.0.tar.xz";
sha256 = "1bs3yl916s4dpci481dk81193mmh7kd9vqq535q74w0hx8khcwlf";
name = "kinfocenter-5.7.0.tar.xz";
};
};
kmenuedit = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kmenuedit-5.7.0.tar.xz";
sha256 = "0l7vibvy50v5hqpv6zb2j7c2nf0jbd88vwxhbv6rg150f3qy9awb";
name = "kmenuedit-5.7.0.tar.xz";
};
};
kscreen = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kscreen-5.7.0.tar.xz";
sha256 = "1qiwz220lff8l48ysfasx0zysv9m1mm2dsk60j84rcr3v5jwim6h";
name = "kscreen-5.7.0.tar.xz";
};
};
kscreenlocker = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kscreenlocker-5.7.0.tar.xz";
sha256 = "0yg4k1v31fkqh23myd4lfc59b04qydgiym2hahdz66vnvkkdcvdv";
name = "kscreenlocker-5.7.0.tar.xz";
};
};
ksshaskpass = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/ksshaskpass-5.7.0.tar.xz";
sha256 = "0jv0i1gz36vv690x69isw6v856vjrbkjisy2gwd7z0l3986z54l0";
name = "ksshaskpass-5.7.0.tar.xz";
};
};
ksysguard = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/ksysguard-5.7.0.tar.xz";
sha256 = "093ksjk6gy5j2hgfwlw6vspd22gqnb28aby9x8nvrx9idaxldlrj";
name = "ksysguard-5.7.0.tar.xz";
};
};
kwallet-pam = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kwallet-pam-5.7.0.tar.xz";
sha256 = "0d1aba9mjb52cy8abm8ais5ypcfs3xny62dzjb7fd5ac1mdld0bz";
name = "kwallet-pam-5.7.0.tar.xz";
};
};
kwayland-integration = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kwayland-integration-5.7.0.tar.xz";
sha256 = "1p2l98dd7dl1knshivk27qc2cfpvar26vci4lpxxwhg6psqdsnam";
name = "kwayland-integration-5.7.0.tar.xz";
};
};
kwin = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kwin-5.7.0.tar.xz";
sha256 = "1mpdcr4dva447jigdfxvrhpd2mh67s83w3mzw28f9xb1r7zcfzpm";
name = "kwin-5.7.0.tar.xz";
};
};
kwrited = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/kwrited-5.7.0.tar.xz";
sha256 = "1wz56v9f3an65x17wj8bdg4f27a0j1mrsaz1v9gqks86cbmkkr5k";
name = "kwrited-5.7.0.tar.xz";
};
};
libkscreen = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/libkscreen-5.7.0.tar.xz";
sha256 = "0g5xs8sajzkmn91n0y92mi71zjadpn35k2sxw8b12ilp9r5qzkqc";
name = "libkscreen-5.7.0.tar.xz";
};
};
libksysguard = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/libksysguard-5.7.0.tar.xz";
sha256 = "1i3sl8wnfg1sl5psbfikw57w1d4bac6d61slkga60mp5z0jw4vss";
name = "libksysguard-5.7.0.tar.xz";
};
};
milou = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/milou-5.7.0.tar.xz";
sha256 = "1i778zang4rk3kvd1z7aszrcsxa3l1k2d5xiv2zqf2z6hnranvbd";
name = "milou-5.7.0.tar.xz";
};
};
oxygen = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/oxygen-5.7.0.tar.xz";
sha256 = "05vz4zixg9nfrydd2i7jjkv082vgmhxlv3v109vgkr652dh9kncf";
name = "oxygen-5.7.0.tar.xz";
};
};
plasma-desktop = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-desktop-5.7.0.tar.xz";
sha256 = "0f8pi90g1msrfzd769d7c26lxbq07hf7va5d9mclq3kfhk2wm951";
name = "plasma-desktop-5.7.0.tar.xz";
};
};
plasma-integration = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-integration-5.7.0.tar.xz";
sha256 = "0rhm0p6350jibqflh3f5b7df3rnm9k5p02sgna6p6gm5b2w145ii";
name = "plasma-integration-5.7.0.tar.xz";
};
};
plasma-mediacenter = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-mediacenter-5.7.0.tar.xz";
sha256 = "1xva1lyyafik6kq7f1s9fddvb7n35paz0lmcyzqbaxs149xz6r96";
name = "plasma-mediacenter-5.7.0.tar.xz";
};
};
plasma-nm = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-nm-5.7.0.tar.xz";
sha256 = "1aa8wv4jdmjjwmvn0pd80p0byyys498xi3i4fqy84r8spmb6xb9i";
name = "plasma-nm-5.7.0.tar.xz";
};
};
plasma-pa = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-pa-5.7.0.tar.xz";
sha256 = "15hziwyyvz9mqcyqnjwc49a31v2d2ysa7gaydkb8dizgqfd4pcs8";
name = "plasma-pa-5.7.0.tar.xz";
};
};
plasma-sdk = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-sdk-5.7.0.tar.xz";
sha256 = "0cbjbp9m0l3lik1j0x1czn4whd2h140954dlgqb87k4d55lxpxjh";
name = "plasma-sdk-5.7.0.tar.xz";
};
};
plasma-workspace = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-workspace-5.7.0.tar.xz";
sha256 = "047pqpwi2zgyyp592wbxqxai5j5hvxbnw01s79q4i4wpsq10b2fa";
name = "plasma-workspace-5.7.0.tar.xz";
};
};
plasma-workspace-wallpapers = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/plasma-workspace-wallpapers-5.7.0.tar.xz";
sha256 = "1f2nmnprj8pb6wl3svfmsgivl2565mabpmqyaywwfblhi5ycxj52";
name = "plasma-workspace-wallpapers-5.7.0.tar.xz";
};
};
polkit-kde-agent = {
version = "1-5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/polkit-kde-agent-1-5.7.0.tar.xz";
sha256 = "0cxjgmhrb26ghqlrdj4kksw5g7b90pfhfsz4jia85szk2nssivl3";
name = "polkit-kde-agent-1-5.7.0.tar.xz";
};
};
powerdevil = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/powerdevil-5.7.0.tar.xz";
sha256 = "1wc59vzzjbjr5brwnmlcnibh5hii61001hbc7hma3gngzr7j0b6m";
name = "powerdevil-5.7.0.tar.xz";
};
};
sddm-kcm = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/sddm-kcm-5.7.0.tar.xz";
sha256 = "14jnyv7fs2bscmb0iw3pdxzmk4qyv0czzlpszi1qd1i7k0f2dngy";
name = "sddm-kcm-5.7.0.tar.xz";
};
};
systemsettings = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/systemsettings-5.7.0.tar.xz";
sha256 = "13k325r7vy6l4a6lwrbhgm60bdmn91yjkld7zsd2xyxbw27vis3p";
name = "systemsettings-5.7.0.tar.xz";
};
};
user-manager = {
version = "5.7.0";
src = fetchurl {
url = "${mirror}/stable/plasma/5.7.0/user-manager-5.7.0.tar.xz";
sha256 = "16h7ifwa8dpn0yrg8cisi570dm2wigmb50pgxh9h8smfzgc0vg7k";
name = "user-manager-5.7.0.tar.xz";
};
};
}

@ -16143,7 +16143,7 @@ in
kde5 =
let
frameworks = import ../desktops/kde-5/frameworks-5.22 { inherit pkgs; };
plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; };
plasma = import ../desktops/kde-5/plasma-5.7 { inherit pkgs; };
applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; };
merged = self:
{ plasma = plasma self;

Loading…
Cancel
Save