diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh index e9b551f86b9..7ccb8e3a2e2 100755 --- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh +++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/unstable/plasma/5.4.95/" +RELEASE_URL="http://download.kde.org/stable/plasma/5.5.0/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/plasma-5.5/kscreen.nix index 64fcab343e4..113c2565d07 100644 --- a/pkgs/desktops/plasma-5.5/kscreen.nix +++ b/pkgs/desktops/plasma-5.5/kscreen.nix @@ -10,9 +10,21 @@ plasmaPackage { makeQtWrapper ]; buildInputs = [ - kconfig kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui + kconfig + kconfigwidgets + kdbusaddons + kwidgetsaddons + kxmlgui + ]; + propagatedBuildInputs = [ + kglobalaccel + ki18n + libkscreen + qtdeclarative + ]; + propagatedUserEnvPkgs = [ + libkscreen # D-Bus service ]; - propagatedBuildInputs = [ kglobalaccel ki18n libkscreen qtdeclarative ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" ''; diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix index 843a7c03c43..a73060ad1af 100644 --- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix @@ -18,16 +18,46 @@ plasmaPackage rec { makeQtWrapper ]; buildInputs = [ - attica boost fontconfig kcmutils kdbusaddons kded kitemmodels - knewstuff knotifications knotifyconfig kwallet libcanberra_kde - libXcursor libpulseaudio libXft libxkbfile phonon - qtsvg xf86inputevdev xf86inputsynaptics - xkeyboard_config xinput + attica + boost + fontconfig + kcmutils + kdbusaddons + kded + kitemmodels + knewstuff + knotifications + knotifyconfig + kwallet + libcanberra_kde + libXcursor + libpulseaudio + libXft + libxkbfile + phonon + qtsvg + xf86inputevdev + xf86inputsynaptics + xkeyboard_config + xinput ]; propagatedBuildInputs = [ - baloo kactivities kauth kdeclarative kdelibs4support kemoticons - kglobalaccel ki18n kpeople krunner kwin plasma-framework - plasma-workspace qtdeclarative qtquick1 qtquickcontrols + baloo + kactivities + kauth + kdeclarative + kdelibs4support + kemoticons + kglobalaccel + ki18n + kpeople + krunner + kwin + plasma-framework + plasma-workspace + qtdeclarative + qtquick1 + qtquickcontrols qtx11extras ]; # All propagatedBuildInputs should be present in the profile because diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch index 251e1260e66..fd0d596243b 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0001-qt-5.5-QML-import-paths.patch @@ -1,4 +1,4 @@ -From 1b95c8c95fb8ea097bb5236b19962c7feff9f333 Mon Sep 17 00:00:00 2001 +From ec91088ec46358f39a0374b910cd776993c63acf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Oct 2015 18:55:36 -0500 Subject: [PATCH 1/2] qt-5.5 QML import paths @@ -80,7 +80,7 @@ index a086581..6e1e8be 100755 Item { id: batterymonitor diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml -index d32e7b7..828c5fb 100644 +index 80e7e53..0083cf0 100644 --- a/applets/lock_logout/contents/ui/lockout.qml +++ b/applets/lock_logout/contents/ui/lockout.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch index d8f3e669bc7..4b458580633 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/0002-startkde-NixOS-patches.patch @@ -1,6 +1,6 @@ -From 8e5cf662d55415a838ce8c53f854202257e9feb4 Mon Sep 17 00:00:00 2001 +From e5c11a5efc4f8e8ba4e89e0172220da921df38c6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel -Date: Sun, 22 Nov 2015 08:31:42 -0600 +Date: Wed, 9 Dec 2015 13:20:02 -0600 Subject: [PATCH 2/2] startkde NixOS patches --- @@ -8,7 +8,7 @@ Subject: [PATCH 2/2] startkde NixOS patches 1 file changed, 89 insertions(+), 122 deletions(-) diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index 41a8975..130578e 100644 +index 37ab5cd..130578e 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,8 +1,31 @@ @@ -121,7 +121,7 @@ index 41a8975..130578e 100644 - } - - oxygenDir=$fontsDir/oxygen -- prefixDir="@@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" +- prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen" - - # if the oxygen dir doesn't exist, create a symlink to be sure that the - # Oxygen font is available to the user diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix index bf8b0304a41..78db6e51511 100644 --- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix @@ -49,7 +49,6 @@ plasmaPackage rec { wrapQtProgram "$out/bin/kcheckrunning" wrapQtProgram "$out/bin/systemmonitor" wrapQtProgram "$out/bin/kstartupconfig5" - wrapQtProgram "$out/bin/startplasmacompositor" wrapQtProgram "$out/bin/kdostartupconfig5" wrapQtProgram "$out/bin/klipper" wrapQtProgram "$out/bin/kuiserver5" @@ -57,6 +56,9 @@ plasmaPackage rec { wrapQtProgram "$out/bin/plasmashell" wrapQtProgram "$out/lib/libexec/drkonqi" + + rm "$out/bin/startplasmacompositor" rm "$out/lib/libexec/startplasma" + rm -r "$out/share/wayland-sessions" ''; } diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix index f8ff0be3f85..488f4de17ff 100644 --- a/pkgs/desktops/plasma-5.5/srcs.nix +++ b/pkgs/desktops/plasma-5.5/srcs.nix @@ -3,307 +3,307 @@ { bluedevil = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/bluedevil-5.4.95.tar.xz"; - sha256 = "0ffd6vw3g0psysc4qwac55r9p32rl7jwvmwc468rpp9xvh52lx4p"; - name = "bluedevil-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz"; + sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk"; + name = "bluedevil-5.5.0.tar.xz"; }; }; breeze = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/breeze-5.4.95.tar.xz"; - sha256 = "1xvxykmzp6i2qh6zgdwh1hj6pcfll7y3b63ypivnggi96crynxyr"; - name = "breeze-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz"; + sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p"; + name = "breeze-5.5.0.tar.xz"; }; }; breeze-gtk = { - version = "5.4.95"; + version = "5.5.0.1"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/breeze-gtk-5.4.95.tar.xz"; - sha256 = "1f8qfnm6qyxkar0kw0ryls8z19hk14vlkk1zvm19h0i2fhihgnqg"; - name = "breeze-gtk-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz"; + sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n"; + name = "breeze-gtk-5.5.0.1.tar.xz"; }; }; discover = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/discover-5.4.95.tar.xz"; - sha256 = "1sj2b7sg23ahjix7xnwx3yja1iz8373c3dirgzr0ggwvqb5q5miz"; - name = "discover-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz"; + sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4"; + name = "discover-5.5.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kde-cli-tools-5.4.95.tar.xz"; - sha256 = "0mh0bjjjji00nrsqr3988qh43jj7i4h7z2lpp2h1i0ykjczjmpj3"; - name = "kde-cli-tools-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz"; + sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv"; + name = "kde-cli-tools-5.5.0.tar.xz"; }; }; kdecoration = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kdecoration-5.4.95.tar.xz"; - sha256 = "1hbdr9nc50438lrrkdij7mdlg8sclaww1ky4rs0c067gnjgqlff3"; - name = "kdecoration-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz"; + sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra"; + name = "kdecoration-5.5.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kde-gtk-config-5.4.95.tar.xz"; - sha256 = "17l9ypm5b4s8580zi2maxlszh890svcrh1jq3czz10izlmhd1zih"; - name = "kde-gtk-config-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz"; + sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a"; + name = "kde-gtk-config-5.5.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kdeplasma-addons-5.4.95.tar.xz"; - sha256 = "1a3d96pii6ljvr1sv4v1n5zqmpp0iv1la8jd44bj12d2xhrng7zq"; - name = "kdeplasma-addons-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz"; + sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz"; + name = "kdeplasma-addons-5.5.0.tar.xz"; }; }; kgamma5 = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kgamma5-5.4.95.tar.xz"; - sha256 = "0jpbd4342k8327ibwxwaam99gxc0h4bz3w0xk3chjv8jj2b3znnk"; - name = "kgamma5-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz"; + sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f"; + name = "kgamma5-5.5.0.tar.xz"; }; }; khelpcenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/khelpcenter-5.4.95.tar.xz"; - sha256 = "09vrqjysz20pwcrkk2713jin062prz75h6hsc2swhz873ks3krb4"; - name = "khelpcenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz"; + sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09"; + name = "khelpcenter-5.5.0.tar.xz"; }; }; khotkeys = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/khotkeys-5.4.95.tar.xz"; - sha256 = "1haxxvs6nbva2x4i3ydx01hci2sfldqf9jdapl311hlliv7055bv"; - name = "khotkeys-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz"; + sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl"; + name = "khotkeys-5.5.0.tar.xz"; }; }; kinfocenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kinfocenter-5.4.95.tar.xz"; - sha256 = "1xz7k8xqzhk8y652h1gixi6bkbz041k0b3di0c5a1wpa78pzxwjb"; - name = "kinfocenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz"; + sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy"; + name = "kinfocenter-5.5.0.tar.xz"; }; }; kmenuedit = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kmenuedit-5.4.95.tar.xz"; - sha256 = "1p3agzz2zp1jbdd820kql5064my9lzbk3b8yzli0242gc36sjagq"; - name = "kmenuedit-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz"; + sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n"; + name = "kmenuedit-5.5.0.tar.xz"; }; }; kscreen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kscreen-5.4.95.tar.xz"; - sha256 = "1viwy2ia681nkw89n796r4irlf0za1fbhspmnsjw52i9c6ccard5"; - name = "kscreen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz"; + sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6"; + name = "kscreen-5.5.0.tar.xz"; }; }; kscreenlocker = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kscreenlocker-5.4.95.tar.xz"; - sha256 = "08q2d39yfzfx69b6q0qsh3wlcqp6sh80jxaml2m1l8ksn354ldrg"; - name = "kscreenlocker-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz"; + sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9"; + name = "kscreenlocker-5.5.0.tar.xz"; }; }; ksshaskpass = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/ksshaskpass-5.4.95.tar.xz"; - sha256 = "18k4200ji1k6xb6n5x3s76yx3izqaisb3m7q3icycyzxfq7y50b4"; - name = "ksshaskpass-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz"; + sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh"; + name = "ksshaskpass-5.5.0.tar.xz"; }; }; ksysguard = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/ksysguard-5.4.95.tar.xz"; - sha256 = "1bjrap38zpvnxgvm6xnzvwjqdnbj6ygmgv2qpyl12nkv5r12rr73"; - name = "ksysguard-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz"; + sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv"; + name = "ksysguard-5.5.0.tar.xz"; }; }; kwallet-pam = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwallet-pam-5.4.95.tar.xz"; - sha256 = "0vvhx582bk8hvfw3r7518g7vw104az31w6hpah7ki8kvfh35nh65"; - name = "kwallet-pam-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz"; + sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g"; + name = "kwallet-pam-5.5.0.tar.xz"; }; }; kwayland = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwayland-5.4.95.tar.xz"; - sha256 = "0w4d2abxkmxgqfg1xg49x04av85lybkr6ymbpirrkfv5wwhgcnqy"; - name = "kwayland-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz"; + sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9"; + name = "kwayland-5.5.0.tar.xz"; }; }; kwayland-integration = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwayland-integration-5.4.95.tar.xz"; - sha256 = "1c52hfshnw9b6qi0xb1vrwg39akd57q7mjc7a5wh3kn873v23jj6"; - name = "kwayland-integration-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz"; + sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4"; + name = "kwayland-integration-5.5.0.tar.xz"; }; }; kwin = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwin-5.4.95.tar.xz"; - sha256 = "09dw1vpcf20as8s172vf0mfxq1lrdmwl9m19b1pnpdi71fmmabhy"; - name = "kwin-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz"; + sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l"; + name = "kwin-5.5.0.tar.xz"; }; }; kwrited = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/kwrited-5.4.95.tar.xz"; - sha256 = "1bzhx8yzwcx78mqkr24pcf9vdh9dbb0rd18pwhyw3xaib2gwiry2"; - name = "kwrited-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz"; + sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8"; + name = "kwrited-5.5.0.tar.xz"; }; }; libkscreen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/libkscreen-5.4.95.tar.xz"; - sha256 = "1hpjylkhlfd2h9rc13widyayfgvmwy2dqkc59m1lkf8qgdq6h0sa"; - name = "libkscreen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz"; + sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3"; + name = "libkscreen-5.5.0.tar.xz"; }; }; libksysguard = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/libksysguard-5.4.95.tar.xz"; - sha256 = "0kcxl1pjakk1l27hnc819r0319gpxzrhvq31mzhdfm3lcskjngzi"; - name = "libksysguard-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz"; + sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8"; + name = "libksysguard-5.5.0.tar.xz"; }; }; milou = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/milou-5.4.95.tar.xz"; - sha256 = "09dz4jjb6adsgwx5qwdzzhwaianlfzs2hwx4qc366yj3hxrch13d"; - name = "milou-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz"; + sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm"; + name = "milou-5.5.0.tar.xz"; }; }; oxygen = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/oxygen-5.4.95.tar.xz"; - sha256 = "0j94yabkwlgnl2zq0wrcwrh6d9j193mf68b310nz2dfskq5wgvr5"; - name = "oxygen-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz"; + sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x"; + name = "oxygen-5.5.0.tar.xz"; }; }; plasma-desktop = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-desktop-5.4.95.tar.xz"; - sha256 = "0rar2ms65jks0knkv9x0gb5f1gp0yhghpskzcpm4m0gj981vbgyp"; - name = "plasma-desktop-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz"; + sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4"; + name = "plasma-desktop-5.5.0.tar.xz"; }; }; plasma-mediacenter = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-mediacenter-5.4.95.tar.xz"; - sha256 = "0kzghc8whc87v1ljlxva2k3sx7c2zmvgmp3i2z2lnp7h882a1hak"; - name = "plasma-mediacenter-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz"; + sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52"; + name = "plasma-mediacenter-5.5.0.tar.xz"; }; }; plasma-nm = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-nm-5.4.95.tar.xz"; - sha256 = "0cwc72lklv97yahh1672bqamlhil12b4wpjy2diqmq75xmajzjds"; - name = "plasma-nm-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz"; + sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4"; + name = "plasma-nm-5.5.0.tar.xz"; }; }; plasma-pa = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-pa-5.4.95.tar.xz"; - sha256 = "0mvxidlzl9nw52sl9r5z180c683iz1a7rr0yh0v88gl30brrqnmw"; - name = "plasma-pa-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz"; + sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km"; + name = "plasma-pa-5.5.0.tar.xz"; }; }; plasma-sdk = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-sdk-5.4.95.tar.xz"; - sha256 = "1lis04qmbca8n2ly2g58xhi3znca14dmib81rfshjqp9rldc2z6k"; - name = "plasma-sdk-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz"; + sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v"; + name = "plasma-sdk-5.5.0.tar.xz"; }; }; plasma-workspace = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-5.4.95.tar.xz"; - sha256 = "1af2qx5q5pbxyv32fjiwn7cwf5z1xrgj5n22fprsfn1pyjnz4anv"; - name = "plasma-workspace-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz"; + sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13"; + name = "plasma-workspace-5.5.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-wallpapers-5.4.95.tar.xz"; - sha256 = "0bz0hk6bnm14ppnglwjd82w9gyjm5smv7cpicj25cfwlvz3qjizz"; - name = "plasma-workspace-wallpapers-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz"; + sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz"; + name = "plasma-workspace-wallpapers-5.5.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.4.95"; + version = "1-5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/polkit-kde-agent-1-5.4.95.tar.xz"; - sha256 = "0hc4a36fxn5bw77hldpklj5dwxxx3c67pni9q8d9bpdk52d89wcg"; - name = "polkit-kde-agent-1-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/polkit-kde-agent-1-5.5.0.tar.xz"; + sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c"; + name = "polkit-kde-agent-1-5.5.0.tar.xz"; }; }; powerdevil = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/powerdevil-5.4.95.tar.xz"; - sha256 = "0q3a3d654f3k4qjwq8avk2n0ppila3p8l9kkayd5hcasvvhcihq7"; - name = "powerdevil-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz"; + sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f"; + name = "powerdevil-5.5.0.tar.xz"; }; }; sddm-kcm = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/sddm-kcm-5.4.95.tar.xz"; - sha256 = "06i24nqn80j563cw2rsfficyd577j3v7qj83cvn6jwrkhbhc6v45"; - name = "sddm-kcm-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz"; + sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0"; + name = "sddm-kcm-5.5.0.tar.xz"; }; }; systemsettings = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/systemsettings-5.4.95.tar.xz"; - sha256 = "0zr7chjk43mqbb74p4n5n4ny783j8bnmwa4cr86i21bcbkqgp6sq"; - name = "systemsettings-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz"; + sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1"; + name = "systemsettings-5.5.0.tar.xz"; }; }; user-manager = { - version = "5.4.95"; + version = "5.5.0"; src = fetchurl { - url = "${mirror}/unstable/plasma/5.4.95/user-manager-5.4.95.tar.xz"; - sha256 = "1dbfqb0w3cgkhimw195gwh9cnnx83qacqdc8j5dpvrjybv3ihv3z"; - name = "user-manager-5.4.95.tar.xz"; + url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz"; + sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729"; + name = "user-manager-5.5.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix index 43c21bb51ef..f3a1db7bd48 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kcoreaddons.nix @@ -1,12 +1,15 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , shared_mime_info }: kdeFramework { name = "kcoreaddons"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ shared_mime_info ]; + postInstall = '' + wrapQtProgram "$out/bin/desktoptojson" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix index 28df2415320..cbc114ccca0 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kdesignerplugin.nix @@ -1,4 +1,4 @@ -{ kdeFramework, lib +{ kdeFramework, lib, makeQtWrapper , extra-cmake-modules , kcompletion , kconfig @@ -18,13 +18,16 @@ kdeFramework { name = "kdesignerplugin"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; buildInputs = [ kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui ]; propagatedBuildInputs = [ kio sonnet ]; + postInstall = '' + wrapQtProgram "$out/bin/kgendesignerplugin" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix index 02b516afedc..eb24403169d 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kiconthemes.nix @@ -1,12 +1,16 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n +{ kdeFramework, lib, makeQtWrapper +, extra-cmake-modules, kconfigwidgets, ki18n , kitemviews, qtsvg }: kdeFramework { name = "kiconthemes"; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ]; propagatedBuildInputs = [ ki18n ]; + postInstall = '' + wrapQtProgram "$out/bin/kiconfinder5" + ''; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix index 0789828d812..199565e2418 100644 --- a/pkgs/development/libraries/kde-frameworks-5.16/kio.nix +++ b/pkgs/development/libraries/kde-frameworks-5.16/kio.nix @@ -23,6 +23,7 @@ kdeFramework { wrapQtProgram "$out/bin/ktelnetservice5" wrapQtProgram "$out/bin/ktrash5" wrapQtProgram "$out/bin/kmailservice5" + wrapQtProgram "$out/bin/protocoltojson" ''; meta = { maintainers = [ lib.maintainers.ttuegel ];