Merge branch 'plasma-5.5'

This commit is contained in:
Thomas Tuegel 2015-12-09 17:16:13 -06:00
commit 3a390c494a
11 changed files with 231 additions and 176 deletions

View File

@ -4,7 +4,7 @@
set -x set -x
# The trailing slash at the end is necessary! # 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' EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp mkdir tmp; cd tmp

View File

@ -10,9 +10,21 @@ plasmaPackage {
makeQtWrapper makeQtWrapper
]; ];
buildInputs = [ 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 = '' postInstall = ''
wrapQtProgram "$out/bin/kscreen-console" wrapQtProgram "$out/bin/kscreen-console"
''; '';

View File

@ -18,16 +18,46 @@ plasmaPackage rec {
makeQtWrapper makeQtWrapper
]; ];
buildInputs = [ buildInputs = [
attica boost fontconfig kcmutils kdbusaddons kded kitemmodels attica
knewstuff knotifications knotifyconfig kwallet libcanberra_kde boost
libXcursor libpulseaudio libXft libxkbfile phonon fontconfig
qtsvg xf86inputevdev xf86inputsynaptics kcmutils
xkeyboard_config xinput kdbusaddons
kded
kitemmodels
knewstuff
knotifications
knotifyconfig
kwallet
libcanberra_kde
libXcursor
libpulseaudio
libXft
libxkbfile
phonon
qtsvg
xf86inputevdev
xf86inputsynaptics
xkeyboard_config
xinput
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
baloo kactivities kauth kdeclarative kdelibs4support kemoticons baloo
kglobalaccel ki18n kpeople krunner kwin plasma-framework kactivities
plasma-workspace qtdeclarative qtquick1 qtquickcontrols kauth
kdeclarative
kdelibs4support
kemoticons
kglobalaccel
ki18n
kpeople
krunner
kwin
plasma-framework
plasma-workspace
qtdeclarative
qtquick1
qtquickcontrols
qtx11extras qtx11extras
]; ];
# All propagatedBuildInputs should be present in the profile because # All propagatedBuildInputs should be present in the profile because

View File

@ -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 <ttuegel@gmail.com> From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 19 Oct 2015 18:55:36 -0500 Date: Mon, 19 Oct 2015 18:55:36 -0500
Subject: [PATCH 1/2] qt-5.5 QML import paths Subject: [PATCH 1/2] qt-5.5 QML import paths
@ -80,7 +80,7 @@ index a086581..6e1e8be 100755
Item { Item {
id: batterymonitor id: batterymonitor
diff --git a/applets/lock_logout/contents/ui/lockout.qml b/applets/lock_logout/contents/ui/lockout.qml 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 --- a/applets/lock_logout/contents/ui/lockout.qml
+++ b/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 @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0

View File

@ -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 <ttuegel@gmail.com> From: Thomas Tuegel <ttuegel@gmail.com>
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 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(-) 1 file changed, 89 insertions(+), 122 deletions(-)
diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake
index 41a8975..130578e 100644 index 37ab5cd..130578e 100644
--- a/startkde/startkde.cmake --- a/startkde/startkde.cmake
+++ b/startkde/startkde.cmake +++ b/startkde/startkde.cmake
@@ -1,8 +1,31 @@ @@ -1,8 +1,31 @@
@ -121,7 +121,7 @@ index 41a8975..130578e 100644
- } - }
- -
- oxygenDir=$fontsDir/oxygen - 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 - # if the oxygen dir doesn't exist, create a symlink to be sure that the
- # Oxygen font is available to the user - # Oxygen font is available to the user

View File

@ -49,7 +49,6 @@ plasmaPackage rec {
wrapQtProgram "$out/bin/kcheckrunning" wrapQtProgram "$out/bin/kcheckrunning"
wrapQtProgram "$out/bin/systemmonitor" wrapQtProgram "$out/bin/systemmonitor"
wrapQtProgram "$out/bin/kstartupconfig5" wrapQtProgram "$out/bin/kstartupconfig5"
wrapQtProgram "$out/bin/startplasmacompositor"
wrapQtProgram "$out/bin/kdostartupconfig5" wrapQtProgram "$out/bin/kdostartupconfig5"
wrapQtProgram "$out/bin/klipper" wrapQtProgram "$out/bin/klipper"
wrapQtProgram "$out/bin/kuiserver5" wrapQtProgram "$out/bin/kuiserver5"
@ -57,6 +56,9 @@ plasmaPackage rec {
wrapQtProgram "$out/bin/plasmashell" wrapQtProgram "$out/bin/plasmashell"
wrapQtProgram "$out/lib/libexec/drkonqi" wrapQtProgram "$out/lib/libexec/drkonqi"
rm "$out/bin/startplasmacompositor"
rm "$out/lib/libexec/startplasma" rm "$out/lib/libexec/startplasma"
rm -r "$out/share/wayland-sessions"
''; '';
} }

View File

@ -3,307 +3,307 @@
{ {
bluedevil = { bluedevil = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/bluedevil-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/bluedevil-5.5.0.tar.xz";
sha256 = "0ffd6vw3g0psysc4qwac55r9p32rl7jwvmwc468rpp9xvh52lx4p"; sha256 = "0h0i6npmi2llrma4d0k7jaibfjkwvi7qm003i73prza5b2lm9qgk";
name = "bluedevil-5.4.95.tar.xz"; name = "bluedevil-5.5.0.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/breeze-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/breeze-5.5.0.tar.xz";
sha256 = "1xvxykmzp6i2qh6zgdwh1hj6pcfll7y3b63ypivnggi96crynxyr"; sha256 = "0jaw8ir5vd3ari4hx52mrnl5mrq9njdci8caq37b3k1p4irxba3p";
name = "breeze-5.4.95.tar.xz"; name = "breeze-5.5.0.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.4.95"; version = "5.5.0.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/breeze-gtk-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/breeze-gtk-5.5.0.1.tar.xz";
sha256 = "1f8qfnm6qyxkar0kw0ryls8z19hk14vlkk1zvm19h0i2fhihgnqg"; sha256 = "04jjb81022k7xfzhzmdani057inmly2r7ksc1wvbg5adi7m0xn4n";
name = "breeze-gtk-5.4.95.tar.xz"; name = "breeze-gtk-5.5.0.1.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/discover-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/discover-5.5.0.tar.xz";
sha256 = "1sj2b7sg23ahjix7xnwx3yja1iz8373c3dirgzr0ggwvqb5q5miz"; sha256 = "0ngxdgkr4ikqmi2x8dgbf6xbpvhwqcv79b7ir2jgmcjjl93958f4";
name = "discover-5.4.95.tar.xz"; name = "discover-5.5.0.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kde-cli-tools-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kde-cli-tools-5.5.0.tar.xz";
sha256 = "0mh0bjjjji00nrsqr3988qh43jj7i4h7z2lpp2h1i0ykjczjmpj3"; sha256 = "0l45hx1w1pyfbsg60lwdma9pgzdffprvrz12rqq6ylnjsz1askwv";
name = "kde-cli-tools-5.4.95.tar.xz"; name = "kde-cli-tools-5.5.0.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kdecoration-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kdecoration-5.5.0.tar.xz";
sha256 = "1hbdr9nc50438lrrkdij7mdlg8sclaww1ky4rs0c067gnjgqlff3"; sha256 = "1wdwnj3dridk745mgmi9xnyd7dy0n0444nvq1mggn2mj4ca6q9ra";
name = "kdecoration-5.4.95.tar.xz"; name = "kdecoration-5.5.0.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kde-gtk-config-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kde-gtk-config-5.5.0.tar.xz";
sha256 = "17l9ypm5b4s8580zi2maxlszh890svcrh1jq3czz10izlmhd1zih"; sha256 = "1bi6dr7bv42rn5jf212qrr5bik8xglvaabz5srqwhs2n4z35913a";
name = "kde-gtk-config-5.4.95.tar.xz"; name = "kde-gtk-config-5.5.0.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kdeplasma-addons-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kdeplasma-addons-5.5.0.tar.xz";
sha256 = "1a3d96pii6ljvr1sv4v1n5zqmpp0iv1la8jd44bj12d2xhrng7zq"; sha256 = "1y3w97pbg24d2mzp2x882a43ljn5wqs74q6ry594a6mip2zzvlrz";
name = "kdeplasma-addons-5.4.95.tar.xz"; name = "kdeplasma-addons-5.5.0.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kgamma5-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kgamma5-5.5.0.tar.xz";
sha256 = "0jpbd4342k8327ibwxwaam99gxc0h4bz3w0xk3chjv8jj2b3znnk"; sha256 = "1i6c0m0dr23z09r1rdfcna168bmnaysqxwxmp55ix3jad9ilfa8f";
name = "kgamma5-5.4.95.tar.xz"; name = "kgamma5-5.5.0.tar.xz";
}; };
}; };
khelpcenter = { khelpcenter = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/khelpcenter-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/khelpcenter-5.5.0.tar.xz";
sha256 = "09vrqjysz20pwcrkk2713jin062prz75h6hsc2swhz873ks3krb4"; sha256 = "0piwsa446ja6fmkxc8shzxqmbq7hcbydpc4xsc6bsjbzbskz8c09";
name = "khelpcenter-5.4.95.tar.xz"; name = "khelpcenter-5.5.0.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/khotkeys-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/khotkeys-5.5.0.tar.xz";
sha256 = "1haxxvs6nbva2x4i3ydx01hci2sfldqf9jdapl311hlliv7055bv"; sha256 = "197fhzm1rcm65k8idf0wlzsnfxpimdzg516syjzkwah5smg1qshl";
name = "khotkeys-5.4.95.tar.xz"; name = "khotkeys-5.5.0.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kinfocenter-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kinfocenter-5.5.0.tar.xz";
sha256 = "1xz7k8xqzhk8y652h1gixi6bkbz041k0b3di0c5a1wpa78pzxwjb"; sha256 = "1xr9l8wg20n0fyg5x9rgyhbimgwmlf97cf2v3yi8aff5mx348avy";
name = "kinfocenter-5.4.95.tar.xz"; name = "kinfocenter-5.5.0.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kmenuedit-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kmenuedit-5.5.0.tar.xz";
sha256 = "1p3agzz2zp1jbdd820kql5064my9lzbk3b8yzli0242gc36sjagq"; sha256 = "1hbifshppw64zmsybvcnm4sjy14zjq9rg2jxb36blfnvw08i9z4n";
name = "kmenuedit-5.4.95.tar.xz"; name = "kmenuedit-5.5.0.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kscreen-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kscreen-5.5.0.tar.xz";
sha256 = "1viwy2ia681nkw89n796r4irlf0za1fbhspmnsjw52i9c6ccard5"; sha256 = "0mznp9lb9z65vfqb752iw7scz0hs3if3bmk9nq1i6ns3c520gcx6";
name = "kscreen-5.4.95.tar.xz"; name = "kscreen-5.5.0.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kscreenlocker-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kscreenlocker-5.5.0.tar.xz";
sha256 = "08q2d39yfzfx69b6q0qsh3wlcqp6sh80jxaml2m1l8ksn354ldrg"; sha256 = "1myx3ykcq4p9f04bp2w7anqnr9f6b2rjajhkvxbwa9rvxjhwf3n9";
name = "kscreenlocker-5.4.95.tar.xz"; name = "kscreenlocker-5.5.0.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/ksshaskpass-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/ksshaskpass-5.5.0.tar.xz";
sha256 = "18k4200ji1k6xb6n5x3s76yx3izqaisb3m7q3icycyzxfq7y50b4"; sha256 = "12m88cvgvsnfvzvpyaji7x4pcb4b2xw977x5w50b73mbznxw9hhh";
name = "ksshaskpass-5.4.95.tar.xz"; name = "ksshaskpass-5.5.0.tar.xz";
}; };
}; };
ksysguard = { ksysguard = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/ksysguard-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/ksysguard-5.5.0.tar.xz";
sha256 = "1bjrap38zpvnxgvm6xnzvwjqdnbj6ygmgv2qpyl12nkv5r12rr73"; sha256 = "1paj03yccnym83l5585scn6mhd82xpzz5pqwqc4gz45cfq6ix3bv";
name = "ksysguard-5.4.95.tar.xz"; name = "ksysguard-5.5.0.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwallet-pam-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kwallet-pam-5.5.0.tar.xz";
sha256 = "0vvhx582bk8hvfw3r7518g7vw104az31w6hpah7ki8kvfh35nh65"; sha256 = "084yyrm00i2yaikbl9sqzp2im56zb987cfqxqlrdgkkwf8p4g60g";
name = "kwallet-pam-5.4.95.tar.xz"; name = "kwallet-pam-5.5.0.tar.xz";
}; };
}; };
kwayland = { kwayland = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwayland-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kwayland-5.5.0.tar.xz";
sha256 = "0w4d2abxkmxgqfg1xg49x04av85lybkr6ymbpirrkfv5wwhgcnqy"; sha256 = "1dxa3xkqg96jw3gmc2jya3wym910pdzljhcdspk3n88045wn8hs9";
name = "kwayland-5.4.95.tar.xz"; name = "kwayland-5.5.0.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwayland-integration-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kwayland-integration-5.5.0.tar.xz";
sha256 = "1c52hfshnw9b6qi0xb1vrwg39akd57q7mjc7a5wh3kn873v23jj6"; sha256 = "0x2kqy89nzswx06n0diskjs14bjcsi0wyydbcx57553r1dkhkhn4";
name = "kwayland-integration-5.4.95.tar.xz"; name = "kwayland-integration-5.5.0.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwin-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kwin-5.5.0.tar.xz";
sha256 = "09dw1vpcf20as8s172vf0mfxq1lrdmwl9m19b1pnpdi71fmmabhy"; sha256 = "0f7km0kj1wvm4knpskm3fa82f1nqbv8y8l7mj3nr00zm3rd2zc1l";
name = "kwin-5.4.95.tar.xz"; name = "kwin-5.5.0.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/kwrited-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/kwrited-5.5.0.tar.xz";
sha256 = "1bzhx8yzwcx78mqkr24pcf9vdh9dbb0rd18pwhyw3xaib2gwiry2"; sha256 = "1f0zkm0xd3cff947nprcxf45cyk6jkcglv1b7dzn727afm456js8";
name = "kwrited-5.4.95.tar.xz"; name = "kwrited-5.5.0.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/libkscreen-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/libkscreen-5.5.0.tar.xz";
sha256 = "1hpjylkhlfd2h9rc13widyayfgvmwy2dqkc59m1lkf8qgdq6h0sa"; sha256 = "0w03fjcqazx60zzp4sx77fpz53i38hzgn400jqajiwbb6d3mrxw3";
name = "libkscreen-5.4.95.tar.xz"; name = "libkscreen-5.5.0.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/libksysguard-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/libksysguard-5.5.0.tar.xz";
sha256 = "0kcxl1pjakk1l27hnc819r0319gpxzrhvq31mzhdfm3lcskjngzi"; sha256 = "1p2nhf9wnw8jf4sinkk6rq7b1daymb16lmhd22lji34ayv1fh9i8";
name = "libksysguard-5.4.95.tar.xz"; name = "libksysguard-5.5.0.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/milou-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/milou-5.5.0.tar.xz";
sha256 = "09dz4jjb6adsgwx5qwdzzhwaianlfzs2hwx4qc366yj3hxrch13d"; sha256 = "0xh5fbf6j896dj7krd8fcapn5b10swgg0dmcv3sa8hzkpaw36gfm";
name = "milou-5.4.95.tar.xz"; name = "milou-5.5.0.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/oxygen-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/oxygen-5.5.0.tar.xz";
sha256 = "0j94yabkwlgnl2zq0wrcwrh6d9j193mf68b310nz2dfskq5wgvr5"; sha256 = "12l0m2b5d970grpi5mxd6rl3g8ry50mfr1pjv4ar7jhic6w4zi7x";
name = "oxygen-5.4.95.tar.xz"; name = "oxygen-5.5.0.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-desktop-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-desktop-5.5.0.tar.xz";
sha256 = "0rar2ms65jks0knkv9x0gb5f1gp0yhghpskzcpm4m0gj981vbgyp"; sha256 = "1iak4j4jiigm0sm8f1w2g4w52v2q1rja6s5sy5247j9wyyfc6vw4";
name = "plasma-desktop-5.4.95.tar.xz"; name = "plasma-desktop-5.5.0.tar.xz";
}; };
}; };
plasma-mediacenter = { plasma-mediacenter = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-mediacenter-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-mediacenter-5.5.0.tar.xz";
sha256 = "0kzghc8whc87v1ljlxva2k3sx7c2zmvgmp3i2z2lnp7h882a1hak"; sha256 = "10jrbs3mrf3vwnw6a0rsipryfr4pd0jp5s89srcqk10p25pimq52";
name = "plasma-mediacenter-5.4.95.tar.xz"; name = "plasma-mediacenter-5.5.0.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-nm-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-nm-5.5.0.tar.xz";
sha256 = "0cwc72lklv97yahh1672bqamlhil12b4wpjy2diqmq75xmajzjds"; sha256 = "1clzmrj78g1gs2d6qbnwk3snlz5rhipfrrzm5rsimjqxv111jfd4";
name = "plasma-nm-5.4.95.tar.xz"; name = "plasma-nm-5.5.0.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-pa-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-pa-5.5.0.tar.xz";
sha256 = "0mvxidlzl9nw52sl9r5z180c683iz1a7rr0yh0v88gl30brrqnmw"; sha256 = "0yi0snf6xndvwwzlylgyzpv90b9nsknrm3lsk4gvm49q8cvzy8km";
name = "plasma-pa-5.4.95.tar.xz"; name = "plasma-pa-5.5.0.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-sdk-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-sdk-5.5.0.tar.xz";
sha256 = "1lis04qmbca8n2ly2g58xhi3znca14dmib81rfshjqp9rldc2z6k"; sha256 = "196lna5zbqa8py082c96xl5d3c2l9p4rcnb06fyd91x3z1csq54v";
name = "plasma-sdk-5.4.95.tar.xz"; name = "plasma-sdk-5.5.0.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-5.5.0.tar.xz";
sha256 = "1af2qx5q5pbxyv32fjiwn7cwf5z1xrgj5n22fprsfn1pyjnz4anv"; sha256 = "013z03s0iy3aw9ks703wif7m6mlxx0vrxj98zvscmiaiasryhf13";
name = "plasma-workspace-5.4.95.tar.xz"; name = "plasma-workspace-5.5.0.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/plasma-workspace-wallpapers-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/plasma-workspace-wallpapers-5.5.0.tar.xz";
sha256 = "0bz0hk6bnm14ppnglwjd82w9gyjm5smv7cpicj25cfwlvz3qjizz"; sha256 = "0qs547zy8qdmypa6cd60ksian94fykaysnjn7di00gjf2jpfy4dz";
name = "plasma-workspace-wallpapers-5.4.95.tar.xz"; name = "plasma-workspace-wallpapers-5.5.0.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.4.95"; version = "1-5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/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 = "0hc4a36fxn5bw77hldpklj5dwxxx3c67pni9q8d9bpdk52d89wcg"; sha256 = "0ahv82zyj42r1sp4mwp7s8iw44dw9rjx5yqvy7jvdmrvsa9n4f1c";
name = "polkit-kde-agent-1-5.4.95.tar.xz"; name = "polkit-kde-agent-1-5.5.0.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/powerdevil-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/powerdevil-5.5.0.tar.xz";
sha256 = "0q3a3d654f3k4qjwq8avk2n0ppila3p8l9kkayd5hcasvvhcihq7"; sha256 = "03gayczhaxql54had50f0jf4vfcckhdxfndv1k33kf16ldyg3w4f";
name = "powerdevil-5.4.95.tar.xz"; name = "powerdevil-5.5.0.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/sddm-kcm-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/sddm-kcm-5.5.0.tar.xz";
sha256 = "06i24nqn80j563cw2rsfficyd577j3v7qj83cvn6jwrkhbhc6v45"; sha256 = "1wvxi4z3bxzj1wgq5n76zlq7d7pydfllx7ghghkdqhl6g4vf6nk0";
name = "sddm-kcm-5.4.95.tar.xz"; name = "sddm-kcm-5.5.0.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/systemsettings-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/systemsettings-5.5.0.tar.xz";
sha256 = "0zr7chjk43mqbb74p4n5n4ny783j8bnmwa4cr86i21bcbkqgp6sq"; sha256 = "1azq8zq214p2lhyq28saw3m07ngi3z4bgx4rx0pflzswqfb6fxr1";
name = "systemsettings-5.4.95.tar.xz"; name = "systemsettings-5.5.0.tar.xz";
}; };
}; };
user-manager = { user-manager = {
version = "5.4.95"; version = "5.5.0";
src = fetchurl { src = fetchurl {
url = "${mirror}/unstable/plasma/5.4.95/user-manager-5.4.95.tar.xz"; url = "${mirror}/stable/plasma/5.5.0/user-manager-5.5.0.tar.xz";
sha256 = "1dbfqb0w3cgkhimw195gwh9cnnx83qacqdc8j5dpvrjybv3ihv3z"; sha256 = "08v49rwfpq8is829z4zb04qhj49wa2d2c9l2h0di06k1km6vs729";
name = "user-manager-5.4.95.tar.xz"; name = "user-manager-5.5.0.tar.xz";
}; };
}; };
} }

View File

@ -1,12 +1,15 @@
{ kdeFramework, lib { kdeFramework, lib, makeQtWrapper
, extra-cmake-modules , extra-cmake-modules
, shared_mime_info , shared_mime_info
}: }:
kdeFramework { kdeFramework {
name = "kcoreaddons"; name = "kcoreaddons";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [ shared_mime_info ]; buildInputs = [ shared_mime_info ];
postInstall = ''
wrapQtProgram "$out/bin/desktoptojson"
'';
meta = { meta = {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };

View File

@ -1,4 +1,4 @@
{ kdeFramework, lib { kdeFramework, lib, makeQtWrapper
, extra-cmake-modules , extra-cmake-modules
, kcompletion , kcompletion
, kconfig , kconfig
@ -18,13 +18,16 @@
kdeFramework { kdeFramework {
name = "kdesignerplugin"; name = "kdesignerplugin";
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
buildInputs = [ buildInputs = [
kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
kxmlgui kxmlgui
]; ];
propagatedBuildInputs = [ kio sonnet ]; propagatedBuildInputs = [ kio sonnet ];
postInstall = ''
wrapQtProgram "$out/bin/kgendesignerplugin"
'';
meta = { meta = {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };

View File

@ -1,12 +1,16 @@
{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets, ki18n { kdeFramework, lib, makeQtWrapper
, extra-cmake-modules, kconfigwidgets, ki18n
, kitemviews, qtsvg , kitemviews, qtsvg
}: }:
kdeFramework { kdeFramework {
name = "kiconthemes"; name = "kiconthemes";
nativeBuildInputs = [ extra-cmake-modules ]; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
buildInputs = [ kconfigwidgets kitemviews qtsvg ]; buildInputs = [ kconfigwidgets kitemviews qtsvg ];
propagatedBuildInputs = [ ki18n ]; propagatedBuildInputs = [ ki18n ];
postInstall = ''
wrapQtProgram "$out/bin/kiconfinder5"
'';
meta = { meta = {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];
}; };

View File

@ -23,6 +23,7 @@ kdeFramework {
wrapQtProgram "$out/bin/ktelnetservice5" wrapQtProgram "$out/bin/ktelnetservice5"
wrapQtProgram "$out/bin/ktrash5" wrapQtProgram "$out/bin/ktrash5"
wrapQtProgram "$out/bin/kmailservice5" wrapQtProgram "$out/bin/kmailservice5"
wrapQtProgram "$out/bin/protocoltojson"
''; '';
meta = { meta = {
maintainers = [ lib.maintainers.ttuegel ]; maintainers = [ lib.maintainers.ttuegel ];