diff options
Diffstat (limited to 'pkgs/desktops')
-rw-r--r-- | pkgs/desktops/plasma-5/fetch.sh | 2 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/kwin/default.nix | 11 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-desktop/default.nix | 7 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/plasma-workspace/default.nix | 9 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/srcs.nix | 320 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/startkde/default.nix | 6 | ||||
-rw-r--r-- | pkgs/desktops/plasma-5/systemsettings.nix | 4 |
7 files changed, 181 insertions, 178 deletions
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 7d127211956b..acf7f54f0ed8 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.6/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.3/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 3555cf91e005..01f90664276e 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -5,8 +5,9 @@ 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 + kxmlgui, libICE, libSM, libinput, libxkbcommon, plasma-framework, + qtdeclarative, qtmultimedia, qtscript, qtx11extras, udev, wayland, + xcb-util-cursor, xwayland }: plasmaPackage { @@ -19,9 +20,9 @@ plasmaPackage { 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 xwayland + kwayland kwidgetsaddons kwindowsystem kxmlgui libICE libSM libxkbcommon + libinput plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras + udev wayland xcb-util-cursor xwayland ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 1ac257057309..1c152500b6a0 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -6,8 +6,9 @@ kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft, libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework, - plasma-workspace, qtdeclarative, qtquickcontrols, qtsvg, qtx11extras, - xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver, + plasma-workspace, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, + qtx11extras, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config, + xorgserver, utillinux }: @@ -21,7 +22,7 @@ plasmaPackage rec { 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 + qtquickcontrols qtquickcontrols2 qtx11extras ksysguard ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 19d530da1a60..5463e017d23c 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -7,8 +7,9 @@ kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, - phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, qtscript, - qtx11extras, solid, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland + phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, + qtquickcontrols2, qtscript, qtx11extras, solid, isocodes, libdbusmenu, libSM, + libXcursor, pam, wayland }: plasmaPackage { @@ -20,8 +21,8 @@ plasmaPackage { kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon - plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras - solid isocodes libdbusmenu libSM libXcursor pam wayland + plasma-framework qtgraphicaleffects qtquickcontrols qtquickcontrols2 + qtscript qtx11extras solid isocodes libdbusmenu libSM libXcursor pam wayland ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index aaaea8708ae6..eff7a816a09a 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,323 +3,323 @@ { bluedevil = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/bluedevil-5.8.6.tar.xz"; - sha256 = "0qz9v5wrx72s3r1shi3m77931kl7sx7p89dk3h9w1hy61bx0azlj"; - name = "bluedevil-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/bluedevil-5.9.3.tar.xz"; + sha256 = "0cfk0khcd62ficsmpxhiqwfdgwzv771ndlf0s7b8ghqqyckq6bld"; + name = "bluedevil-5.9.3.tar.xz"; }; }; breeze = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-5.8.6.tar.xz"; - sha256 = "16wxrmnlk359kapa6zj8hfcjjdffvmqc7ibzdxdd8xpdva01p7sm"; - name = "breeze-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/breeze-5.9.3.tar.xz"; + sha256 = "0f1h7ky9chsnbm8r85lwipc1sh7kb32jdaj3wl9qd7k0q4j115x0"; + name = "breeze-5.9.3.tar.xz"; }; }; breeze-grub = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-grub-5.8.6.tar.xz"; - sha256 = "1ywlczid32a8z4rrjxc6c3b8q3l02a3b7scbxyljgfv7xzggj1fm"; - name = "breeze-grub-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/breeze-grub-5.9.3.tar.xz"; + sha256 = "1hbvmyj1f5f8v0pc70w93ck27xw25m4x70vnbhgqi91y5dd1gh49"; + name = "breeze-grub-5.9.3.tar.xz"; }; }; breeze-gtk = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-gtk-5.8.6.tar.xz"; - sha256 = "1ppxsf868d2v9kmdz18hnbdwwqbs0xhpn7pc3bdxxj4gk87dpxpl"; - name = "breeze-gtk-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/breeze-gtk-5.9.3.tar.xz"; + sha256 = "12qa4wllgr52ycdprlxq0h4pgykbbs0vbmmmiardpzlrplm0an26"; + name = "breeze-gtk-5.9.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/breeze-plymouth-5.8.6.tar.xz"; - sha256 = "0cdrl0ri4b5zbld8wb3hkmsncac6qn3mswvb7zp63br3jiqfg7v8"; - name = "breeze-plymouth-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/breeze-plymouth-5.9.3.tar.xz"; + sha256 = "0vz0hgx3hl03h4rkfrcaydaddljam3jbg6gd7n600a068p74s2mm"; + name = "breeze-plymouth-5.9.3.tar.xz"; }; }; discover = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/discover-5.8.6.tar.xz"; - sha256 = "04smq3n0prs2bjq6sn5kd5mp4aay58nr2fg10yq39sgyp2qkls0r"; - name = "discover-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/discover-5.9.3.tar.xz"; + sha256 = "0xkf08k4jz5ym406bpnjf3xsx0il9wka4jp2k38bkl3sxh2s900f"; + name = "discover-5.9.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kactivitymanagerd-5.8.6.tar.xz"; - sha256 = "0cxpf3aj22ap6m24gm1ybjykwv10ryqhpd4bv6wr748ckj5zsgh4"; - name = "kactivitymanagerd-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kactivitymanagerd-5.9.3.tar.xz"; + sha256 = "0ywby3ijq4hjljy5qwd7rybpk2x4scairjffiy5n1jg7lq6sm44r"; + name = "kactivitymanagerd-5.9.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kde-cli-tools-5.8.6.tar.xz"; - sha256 = "08j6mpn6g4mrdwiljfm5rqvyfjgd3wd4kpwmpmvrprqrd755m0cs"; - name = "kde-cli-tools-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kde-cli-tools-5.9.3.tar.xz"; + sha256 = "1p9zjp9jmknyh82d6av3xhy461fsdppjxrxbmrlm9z6nsjyp0m0a"; + name = "kde-cli-tools-5.9.3.tar.xz"; }; }; kdecoration = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kdecoration-5.8.6.tar.xz"; - sha256 = "0nbh0phgfzc5j1l1adnq3gn5fkazgk2pg2iiqjkfbax6a7r9wwny"; - name = "kdecoration-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kdecoration-5.9.3.tar.xz"; + sha256 = "1z37llaqf9mrb4aif75dfvbhr51rrgfpncv70v916jddcf90q4i9"; + name = "kdecoration-5.9.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kde-gtk-config-5.8.6.tar.xz"; - sha256 = "07in78awn7kqg47zbypj5lb2i9yibrmpzkljjy67wwcwax5zlm2d"; - name = "kde-gtk-config-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kde-gtk-config-5.9.3.tar.xz"; + sha256 = "1wxk3brwq105258ndx5l98n78q2h2idigkpp5s2xzmzw05m3gg6r"; + name = "kde-gtk-config-5.9.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kdeplasma-addons-5.8.6.tar.xz"; - sha256 = "0yvh2n736apbfzqc5kdf3b0a9jyvlzcaamall1paa8jb8cg706px"; - name = "kdeplasma-addons-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kdeplasma-addons-5.9.3.tar.xz"; + sha256 = "1k3fsrafrd72qymyi2ij36al7k92mnssz90kmmh830pszif16js3"; + name = "kdeplasma-addons-5.9.3.tar.xz"; }; }; kgamma5 = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kgamma5-5.8.6.tar.xz"; - sha256 = "1kk9bygihnggm4kmgxf1bbd0wc92ijmzvm9k5cmkm3v0pc975viz"; - name = "kgamma5-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kgamma5-5.9.3.tar.xz"; + sha256 = "02s3j1c5gjcv7b79448sizs6hdw91jysq9prkzznprw6jbb615v1"; + name = "kgamma5-5.9.3.tar.xz"; }; }; khotkeys = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/khotkeys-5.8.6.tar.xz"; - sha256 = "0x6z025vzpccz0yql7nafcarq6rpw3p7d7wjffdck3lym8vkalxj"; - name = "khotkeys-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/khotkeys-5.9.3.tar.xz"; + sha256 = "0jv77rpx01cl15qf9vzndpks2q2lgq8dhjq4pg34zh8khr03snlf"; + name = "khotkeys-5.9.3.tar.xz"; }; }; kinfocenter = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kinfocenter-5.8.6.tar.xz"; - sha256 = "1d8h5h01dy7s1yaapamcz4dzf0pjdykf7jn8y34hc0djxww29k4b"; - name = "kinfocenter-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kinfocenter-5.9.3.tar.xz"; + sha256 = "14zaqrjf77008dc5c071hw75vd4dwvvmgkyz74vhs94i7bspzy6a"; + name = "kinfocenter-5.9.3.tar.xz"; }; }; kmenuedit = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kmenuedit-5.8.6.tar.xz"; - sha256 = "0zvircfmggc4vwz6520i67s1yfv34zkx8ydj1vfhaabpsn7nqn1w"; - name = "kmenuedit-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kmenuedit-5.9.3.tar.xz"; + sha256 = "1m7naiy6jq031psdx4jsxq7vsldn9j4girq820m24inh2ky105zk"; + name = "kmenuedit-5.9.3.tar.xz"; }; }; kscreen = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kscreen-5.8.6.tar.xz"; - sha256 = "15k8pm1k2ylxqb3x4b75zi68firsxq56qfn39xddxnzncbsqp54r"; - name = "kscreen-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kscreen-5.9.3.tar.xz"; + sha256 = "1z3cihgjqrkg5h4y4gm1ah60r0vfpxrngry10fcc6343arbyk1bb"; + name = "kscreen-5.9.3.tar.xz"; }; }; kscreenlocker = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kscreenlocker-5.8.6.tar.xz"; - sha256 = "1cql5wq4zh8sdwlgwibnyyx169g79948nhdqslw08ddw61f9llgd"; - name = "kscreenlocker-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kscreenlocker-5.9.3.tar.xz"; + sha256 = "0ccpgfp1gz07yiw98sqjlc097cac4z9qdcrwxm65bvqjj777by1a"; + name = "kscreenlocker-5.9.3.tar.xz"; }; }; ksshaskpass = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/ksshaskpass-5.8.6.tar.xz"; - sha256 = "0y912dcvdx6gih0brnxnd3cysw0rj5pw7684xswaqz5i8iimw68g"; - name = "ksshaskpass-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/ksshaskpass-5.9.3.tar.xz"; + sha256 = "0jk6k5bn2aqjjl3li5qpmihk57d5hc197cpqjaj61a0bapab42hw"; + name = "ksshaskpass-5.9.3.tar.xz"; }; }; ksysguard = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/ksysguard-5.8.6.tar.xz"; - sha256 = "0c0bxv5m0kziyqzwr6x46g4x2kahmq6n95kgcbihv74yvnn6v049"; - name = "ksysguard-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/ksysguard-5.9.3.tar.xz"; + sha256 = "0paypcwah41p2ygmfwzhw8mdfh47a6x0190yngxn8j0jhzfyllca"; + name = "ksysguard-5.9.3.tar.xz"; }; }; kwallet-pam = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwallet-pam-5.8.6.tar.xz"; - sha256 = "1ii1035w8xqvkbm0ckj5iq4qq7fnbix7vyvwmdjm8m4xm0rr7g33"; - name = "kwallet-pam-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kwallet-pam-5.9.3.tar.xz"; + sha256 = "1pmsfp6pn1r3crg5z5v7sz413v9qvn0j4n9l88zbw538lz2scpna"; + name = "kwallet-pam-5.9.3.tar.xz"; }; }; kwayland-integration = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwayland-integration-5.8.6.tar.xz"; - sha256 = "0bd8hnqr6sqlzk0qrymk6jdxnl2niamb1a08m8d27qdybm0ga56v"; - name = "kwayland-integration-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kwayland-integration-5.9.3.tar.xz"; + sha256 = "1r3cryv10lkvl1nrpq21w4kj9jd270m3p3dw07d888b891rgmzb7"; + name = "kwayland-integration-5.9.3.tar.xz"; }; }; kwin = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwin-5.8.6.tar.xz"; - sha256 = "1p9dgh6d25h41bgnx9jiyb9qg7jyc61kbzh9j9vy9j5kd97dsjg5"; - name = "kwin-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kwin-5.9.3.tar.xz"; + sha256 = "119cy472x5ssrr54v14pbs85gfrsjhz99ms8flb1xp38jb14xxhk"; + name = "kwin-5.9.3.tar.xz"; }; }; kwrited = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/kwrited-5.8.6.tar.xz"; - sha256 = "08frbgzfzqhi4si3v024lx4dypxvm60mdz2xzyyx482iqjny97d5"; - name = "kwrited-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/kwrited-5.9.3.tar.xz"; + sha256 = "0liqspd4m6xly48vv85abnaxfvsjcbgg58843j9fpnzkk9nlj98q"; + name = "kwrited-5.9.3.tar.xz"; }; }; libkscreen = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/libkscreen-5.8.6.tar.xz"; - sha256 = "0210lyvsk9wm7svj3bkaa9j0n57lfzs56jplasdqdia1450n7dmf"; - name = "libkscreen-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/libkscreen-5.9.3.tar.xz"; + sha256 = "1nxhbxmr0kmyp745bf3vd21xcjpv7jac9bdagraiqfcmwj4f86gb"; + name = "libkscreen-5.9.3.tar.xz"; }; }; libksysguard = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/libksysguard-5.8.6.tar.xz"; - sha256 = "0i325hzl9zsknkr1dcdg64r4msrnvbb4b9rmjysygnpyll6n9bm8"; - name = "libksysguard-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/libksysguard-5.9.3.tar.xz"; + sha256 = "0fj7rycawarg7iydml0xw20nkyxlwa2nl5chxbbcs5mnmvpfv6ig"; + name = "libksysguard-5.9.3.tar.xz"; }; }; milou = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/milou-5.8.6.tar.xz"; - sha256 = "00svi7f9pa1m6gxkkf8vngyf4jzv7k88pbcnlvik38zws17j4vbs"; - name = "milou-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/milou-5.9.3.tar.xz"; + sha256 = "1pmk9czmpz0mfqmkv7gl9wdlj8b7wwixv1zb43q24a471qby2xf3"; + name = "milou-5.9.3.tar.xz"; }; }; oxygen = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/oxygen-5.8.6.tar.xz"; - sha256 = "1dspmzjmymnnv6blz2sfw0ynpqbw6cqzvhlnmzakf3xq8jd99k0m"; - name = "oxygen-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/oxygen-5.9.3.tar.xz"; + sha256 = "1v529wp9ll1hzb48xswigzf2r23k84f4cd7am2fnj73p3a0rg5ia"; + name = "oxygen-5.9.3.tar.xz"; }; }; plasma-desktop = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-desktop-5.8.6.tar.xz"; - sha256 = "10qz1r777wr8wdr5lb7fph8ny8sxbm9vlq6njpn9rxxwr0nhlp6y"; - name = "plasma-desktop-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-desktop-5.9.3.tar.xz"; + sha256 = "0582n21nd15834mxc54pq1nx9a5z8ds3yz0x0lc5m35ps7abh7im"; + name = "plasma-desktop-5.9.3.tar.xz"; }; }; plasma-integration = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-integration-5.8.6.tar.xz"; - sha256 = "0v07i95xxv5rp0lis2xm0p66qicbigqjlx3sxyvcj3llf73jpcnc"; - name = "plasma-integration-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-integration-5.9.3.tar.xz"; + sha256 = "1yq3i0sqsn0m2y62npyad1nv17hgc0fm35cfq5fdjd96sr356znl"; + name = "plasma-integration-5.9.3.tar.xz"; }; }; plasma-nm = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-nm-5.8.6.tar.xz"; - sha256 = "162756r2rif415w8x6x67h8bwjvvmfv56s84p7a4k5zisyr1j678"; - name = "plasma-nm-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-nm-5.9.3.tar.xz"; + sha256 = "1i5djnbimkwcbjh6bi0cdw98qskli4jd1c8a8dbwqqh5pyqbrf66"; + name = "plasma-nm-5.9.3.tar.xz"; }; }; plasma-pa = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-pa-5.8.6.tar.xz"; - sha256 = "173w2ks2nm4sp96vj3pkax1d8asshd9y39m5cwq8mgzgpz6ldjp8"; - name = "plasma-pa-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-pa-5.9.3.tar.xz"; + sha256 = "0br83bnm6g7lzw4hwkppk8l6scbzblr3m3mi64a852lnxxvdwn01"; + name = "plasma-pa-5.9.3.tar.xz"; }; }; plasma-sdk = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-sdk-5.8.6.tar.xz"; - sha256 = "1vadfwv23r33f5byaf3zj8m12a84r4qk24ak7qyq869m9gznyw8r"; - name = "plasma-sdk-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-sdk-5.9.3.tar.xz"; + sha256 = "104rhybchdjqnglzp3bpjv8052n2gi44bn58nyb6wz6gkzg3xzrb"; + name = "plasma-sdk-5.9.3.tar.xz"; }; }; plasma-tests = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-tests-5.8.6.tar.xz"; - sha256 = "0baqfn861jy7kmaqka79k6nkr7vivzymk8jy3glkh21rm4yl8gvh"; - name = "plasma-tests-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-tests-5.9.3.tar.xz"; + sha256 = "1wpbfna9yjvzc5fhgnw2hwnq04vzb3qfy42zrwbijy8sl6csgzzp"; + name = "plasma-tests-5.9.3.tar.xz"; }; }; plasma-workspace = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-5.8.6.tar.xz"; - sha256 = "14h1lmyyb4rxnww7vyn9wnsi56v9ydhpbwmk9sv3zj1k9igqpasi"; - name = "plasma-workspace-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-5.9.3.tar.xz"; + sha256 = "0lnb36qnkw5z7w1y5ykiz6xfhc4h21dzlbhddipvd97bxycad6vg"; + name = "plasma-workspace-5.9.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/plasma-workspace-wallpapers-5.8.6.tar.xz"; - sha256 = "11s2sc37xni78fyb0yvnhlkw6ahhx4pkynqr06bmd9vq6c3133id"; - name = "plasma-workspace-wallpapers-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/plasma-workspace-wallpapers-5.9.3.tar.xz"; + sha256 = "1ikjj41nn5hn9r3glfhqsizawhkpw3cvybqq0ym4zky9lvbxzxb0"; + name = "plasma-workspace-wallpapers-5.9.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.8.6"; + version = "1-5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/polkit-kde-agent-1-5.8.6.tar.xz"; - sha256 = "10bglbr7svm9bfl4a5kfyvj5zpyk46hsyh2rq9z9qy9ds76fh9w2"; - name = "polkit-kde-agent-1-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/polkit-kde-agent-1-5.9.3.tar.xz"; + sha256 = "0kfafag3bqp03aaa5dn7f8mkc174s80mwn98linl1dn12np2wv2q"; + name = "polkit-kde-agent-1-5.9.3.tar.xz"; }; }; powerdevil = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/powerdevil-5.8.6.tar.xz"; - sha256 = "0cmyx267z917qqpndpzqzlgzx1hf54430644rhr7cf9iqqilvnv4"; - name = "powerdevil-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/powerdevil-5.9.3.tar.xz"; + sha256 = "1sphmngckfns5sx0n95njf39m02fg3q7bdafwrw8i4lv2svb1axj"; + name = "powerdevil-5.9.3.tar.xz"; }; }; sddm-kcm = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/sddm-kcm-5.8.6.tar.xz"; - sha256 = "0xd8137pb0409vfiwv5n1vzzwa1vcvf3rgc36fid5hnlrdc15ilc"; - name = "sddm-kcm-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/sddm-kcm-5.9.3.tar.xz"; + sha256 = "142na2cnx5v459798fq6gx30k9v0i10myfyvgv562n1x79nbkyl0"; + name = "sddm-kcm-5.9.3.tar.xz"; }; }; systemsettings = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/systemsettings-5.8.6.tar.xz"; - sha256 = "1zy037pb8w9xbzg316hbqfmfm39aylqngb5v08yn5hcnvxcll71v"; - name = "systemsettings-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/systemsettings-5.9.3.tar.xz"; + sha256 = "15ihvbkp91dz1z1z5dqgqyziiklzq2zkl3ns8dqzs3pbpki7jbqc"; + name = "systemsettings-5.9.3.tar.xz"; }; }; user-manager = { - version = "5.8.6"; + version = "5.9.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.8.6/user-manager-5.8.6.tar.xz"; - sha256 = "1z0aj5cvl5rxikbbvrvg0dq6y68jxm34ssf3gvhkd0jqlyqdl7ip"; - name = "user-manager-5.8.6.tar.xz"; + url = "${mirror}/stable/plasma/5.9.3/user-manager-5.9.3.tar.xz"; + sha256 = "1s91zgh1rcqrpyh9fiklwqj2m78ify5fv83kh9zvyl4bapgyb0gn"; + name = "user-manager-5.9.3.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix index 516d651cec25..87c72fdc5995 100644 --- a/pkgs/desktops/plasma-5/startkde/default.nix +++ b/pkgs/desktops/plasma-5/startkde/default.nix @@ -1,8 +1,8 @@ { stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig, kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase, - qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtscript, qtsvg, - qtx11extras, qtxmlpatterns + qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, + qtscript, qtsvg, qtx11extras, qtxmlpatterns }: let @@ -19,7 +19,7 @@ let ]; libs = builtins.map (pkg: pkg.out or pkg) [ - qtbase qtdeclarative qtgraphicaleffects qtquickcontrols + qtbase qtdeclarative qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtsvg qtx11extras qtxmlpatterns ]; }; diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index 32ea83d9d507..4146e34c2f73 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,7 +1,7 @@ { plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 }: plasmaPackage { @@ -9,6 +9,6 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; propagatedBuildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice - kwindowsystem kxmlgui qtquickcontrols + kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 ]; } |