Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport KDE 5.8.2 upgrades to release-16.09 #19706

Closed
wants to merge 5 commits into from
Closed

Backport KDE 5.8.2 upgrades to release-16.09 #19706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0eae1fa
kde5.plasma: 5.7.4 -> 5.7.5
ttuegel Oct 2, 2016
bd77b9d
kde5.plasma: 5.7.5 -> 5.8.0
ttuegel Oct 5, 2016
13a1592
kde5.plasma: 5.8.0 -> 5.8.1
ttuegel Oct 11, 2016
ac4f208
kde5.plasma: 5.8.1 -> 5.8.2
ttuegel Oct 19, 2016
2c16efe
kde5.frameworks: 5.24 -> 5.26
ttuegel Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkgs/desktops/kde-5/plasma/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ let
plasma-desktop = callPackage ./plasma-desktop {};
plasma-integration = callPackage ./plasma-integration.nix {};
plasma-nm = callPackage ./plasma-nm {};
plasma-pa = callPackage ./plasma-pa.nix {};
plasma-pa = callPackage ./plasma-pa.nix {
inherit (pkgs.gnome3) gconf;
};
plasma-workspace = callPackage ./plasma-workspace {};
plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
Expand Down
2 changes: 1 addition & 1 deletion pkgs/desktops/kde-5/plasma/fetch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/plasma/5.7.4/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.2/ -A '*.tar.xz' )
15 changes: 8 additions & 7 deletions pkgs/desktops/kde-5/plasma/plasma-pa.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{ plasmaPackage, ecm, glib, kdoctools, kconfigwidgets
, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
, plasma-framework
{
plasmaPackage,
ecm,
gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
}:

plasmaPackage {
name = "plasma-pa";
nativeBuildInputs = [
ecm
kdoctools
ecm kdoctools
];
propagatedBuildInputs = [
glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel
ki18n plasma-framework
gconf glib kconfigwidgets kcoreaddons kdeclarative
kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
];
}
12 changes: 6 additions & 6 deletions pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland,
kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, phonon,
plasma-framework, qtquickcontrols, qtscript, qtx11extras, solid, isocodes,
libdbusmenu, libSM, libXcursor, pam, wayland
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
}:

plasmaPackage {
Expand All @@ -20,8 +20,8 @@ plasmaPackage {
kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
plasma-framework qtquickcontrols qtscript qtx11extras solid
isocodes libdbusmenu libSM libXcursor pam wayland
plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras
solid isocodes libdbusmenu libSM libXcursor pam wayland
];

patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
Expand Down
Loading