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.

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

plasma5: 5.21.5 -> 5.22 #127389

Merged
merged 22 commits into from
Aug 5, 2021
Merged

plasma5: 5.21.5 -> 5.22 #127389

merged 22 commits into from
Aug 5, 2021

Conversation

CertainLach
Copy link
Member

@CertainLach CertainLach commented Jun 18, 2021

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@r-rmcgibbo
Copy link

r-rmcgibbo commented Jun 18, 2021

Result of nixpkgs-review pr 127389 at 4f0a6948 run on x86_64-linux 1

34 packages failed to build:
997 packages skipped due to time constraints:
  • ajour
  • amarok (amarok-kf5)
  • angelfish
  • antimicroX
  • bcompare
  • beauty-line-icon-theme
  • calamares
  • calligra
  • colord-kde
  • corectrl
  • ...
51 packages built successfully:
  • extra-cmake-modules (libsForQt5.extra-cmake-modules ,libsForQt515.extra-cmake-modules ,plasma5Packages.extra-cmake-modules)
  • libsForQt5.breeze-grub (libsForQt515.breeze-grub ,plasma5Packages.breeze-grub)
  • libsForQt5.breeze-icons (libsForQt515.breeze-icons ,plasma5Packages.breeze-icons)
  • libsForQt5.breeze-plymouth (libsForQt515.breeze-plymouth ,plasma5Packages.breeze-plymouth)
  • libsForQt5.karchive (libsForQt515.karchive ,plasma5Packages.karchive)
  • libsForQt5.kauth (libsForQt515.kauth ,plasma5Packages.kauth)
  • libsForQt5.kcodecs (libsForQt515.kcodecs ,plasma5Packages.kcodecs)
  • libsForQt5.kconfig (libsForQt515.kconfig ,plasma5Packages.kconfig)
  • libsForQt5.kconfigwidgets (libsForQt515.kconfigwidgets ,plasma5Packages.kconfigwidgets)
  • libsForQt5.kcoreaddons (libsForQt515.kcoreaddons ,plasma5Packages.kcoreaddons)
  • libsForQt5.kcrash (libsForQt515.kcrash ,plasma5Packages.kcrash)
  • libsForQt5.kdbusaddons (libsForQt515.kdbusaddons ,plasma5Packages.kdbusaddons)
  • libsForQt5.kdecoration (libsForQt515.kdecoration ,plasma5Packages.kdecoration)
  • libsForQt5.kdoctools (libsForQt515.kdoctools ,plasma5Packages.kdoctools)
  • libsForQt5.kgamma5 (libsForQt515.kgamma5 ,plasma5Packages.kgamma5)
  • libsForQt5.kguiaddons (libsForQt515.kguiaddons ,plasma5Packages.kguiaddons)
  • libsForQt5.ki18n (libsForQt515.ki18n ,plasma5Packages.ki18n)
  • libsForQt5.kiconthemes (libsForQt515.kiconthemes ,plasma5Packages.kiconthemes)
  • libsForQt5.kidletime (libsForQt515.kidletime ,plasma5Packages.kidletime)
  • libsForQt5.kirigami2 (libsForQt515.kirigami2 ,plasma5Packages.kirigami2)
  • libsForQt5.kitemviews (libsForQt515.kitemviews ,plasma5Packages.kitemviews)
  • libsForQt5.knotifications (libsForQt515.knotifications ,plasma5Packages.knotifications)
  • libsForQt5.kpty (libsForQt515.kpty ,plasma5Packages.kpty)
  • libsForQt5.kservice (libsForQt515.kservice ,plasma5Packages.kservice)
  • libsForQt5.ksshaskpass (libsForQt515.ksshaskpass ,plasma5Packages.ksshaskpass)
  • libsForQt5.kwallet (libsForQt515.kwallet ,plasma5Packages.kwallet)
  • libsForQt5.kwallet-pam (libsForQt515.kwallet-pam ,plasma5Packages.kwallet-pam)
  • libsForQt5.kwayland (libsForQt515.kwayland ,plasma5Packages.kwayland)
  • libsForQt5.kwayland-integration (libsForQt515.kwayland-integration ,plasma5Packages.kwayland-integration)
  • libsForQt5.kwidgetsaddons (libsForQt515.kwidgetsaddons ,plasma5Packages.kwidgetsaddons)
  • libsForQt5.kwindowsystem (libsForQt515.kwindowsystem ,plasma5Packages.kwindowsystem)
  • libsForQt5.kwrited (libsForQt515.kwrited ,plasma5Packages.kwrited)
  • libsForQt5.layer-shell-qt (libsForQt515.layer-shell-qt ,plasma5Packages.layer-shell-qt)
  • libsForQt5.libkscreen (libsForQt515.libkscreen ,plasma5Packages.libkscreen)
  • libsForQt5.phonon (libsForQt515.phonon ,plasma5Packages.phonon)
  • libsForQt5.plasma-wayland-protocols (libsForQt515.plasma-wayland-protocols ,plasma5Packages.plasma-wayland-protocols)
  • libsForQt5.plasma-workspace-wallpapers (libsForQt515.plasma-workspace-wallpapers ,plasma5Packages.plasma-workspace-wallpapers)
  • libsForQt5.polkit-kde-agent (libsForQt515.polkit-kde-agent ,plasma5Packages.polkit-kde-agent)
  • libsForQt5.qqc2-breeze-style (libsForQt515.qqc2-breeze-style ,plasma5Packages.qqc2-breeze-style)
  • libsForQt512.breeze-grub
  • libsForQt512.breeze-plymouth
  • libsForQt512.extra-cmake-modules
  • libsForQt512.plasma-wayland-protocols
  • libsForQt512.plasma-workspace-wallpapers
  • libsForQt514.breeze-grub
  • libsForQt514.breeze-icons
  • libsForQt514.breeze-plymouth
  • libsForQt514.extra-cmake-modules
  • libsForQt514.phonon
  • libsForQt514.plasma-wayland-protocols
  • libsForQt514.plasma-workspace-wallpapers
2 suggestions:
  • warning: build-tools-in-build-inputs

    util-linux is a build tool so it likely goes to nativeBuildInputs, not buildInputs.

    Near pkgs/desktops/plasma-5/discover.nix:37:3:

       |
    37 |   buildInputs = [
       |   ^
    
  • warning: unclear-gpl

    fdl12 is a deprecated license, please check if project uses fdl12Plus or fdl12Only and change meta.license accordingly.

    Near pkgs/desktops/plasma-5/default.nix:95:17:

       |
    95 |                 license = meta.license or license;
       |                 ^
    

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.


Result of nixpkgs-review pr 127389 at 9abd643e run on aarch64-linux 1

42 packages failed to build:
928 packages skipped due to time constraints:
  • ajour
  • antimicroX
  • beauty-line-icon-theme
  • calamares
  • calligra
  • corectrl
  • crow-translate
  • dfilemanager
  • digikam
  • drawpile
  • ...
64 packages built successfully:
  • extra-cmake-modules (libsForQt5.extra-cmake-modules ,libsForQt515.extra-cmake-modules ,plasma5Packages.extra-cmake-modules)
  • kaidan
  • libsForQt5.breeze-grub (libsForQt515.breeze-grub ,plasma5Packages.breeze-grub)
  • libsForQt5.breeze-icons (libsForQt515.breeze-icons ,plasma5Packages.breeze-icons)
  • libsForQt5.breeze-plymouth (libsForQt515.breeze-plymouth ,plasma5Packages.breeze-plymouth)
  • libsForQt5.kapidox (libsForQt515.kapidox ,plasma5Packages.kapidox)
  • libsForQt5.karchive (libsForQt515.karchive ,plasma5Packages.karchive)
  • libsForQt5.kauth (libsForQt515.kauth ,plasma5Packages.kauth)
  • libsForQt5.kcodecs (libsForQt515.kcodecs ,plasma5Packages.kcodecs)
  • libsForQt5.kcompletion (libsForQt515.kcompletion ,plasma5Packages.kcompletion)
  • libsForQt5.kconfig (libsForQt515.kconfig ,plasma5Packages.kconfig)
  • libsForQt5.kconfigwidgets (libsForQt515.kconfigwidgets ,plasma5Packages.kconfigwidgets)
  • libsForQt5.kcoreaddons (libsForQt515.kcoreaddons ,plasma5Packages.kcoreaddons)
  • libsForQt5.kcrash (libsForQt515.kcrash ,plasma5Packages.kcrash)
  • libsForQt5.kdbusaddons (libsForQt515.kdbusaddons ,plasma5Packages.kdbusaddons)
  • libsForQt5.kdecoration (libsForQt515.kdecoration ,plasma5Packages.kdecoration)
  • libsForQt5.kdesu (libsForQt515.kdesu ,plasma5Packages.kdesu)
  • libsForQt5.kdnssd (libsForQt515.kdnssd ,plasma5Packages.kdnssd)
  • libsForQt5.kdoctools (libsForQt515.kdoctools ,plasma5Packages.kdoctools)
  • libsForQt5.kemoticons (libsForQt515.kemoticons ,plasma5Packages.kemoticons)
  • libsForQt5.kgamma5 (libsForQt515.kgamma5 ,plasma5Packages.kgamma5)
  • libsForQt5.kguiaddons (libsForQt515.kguiaddons ,plasma5Packages.kguiaddons)
  • libsForQt5.kholidays (libsForQt515.kholidays ,plasma5Packages.kholidays)
  • libsForQt5.ki18n (libsForQt515.ki18n ,plasma5Packages.ki18n)
  • libsForQt5.kiconthemes (libsForQt515.kiconthemes ,plasma5Packages.kiconthemes)
  • libsForQt5.kidletime (libsForQt515.kidletime ,plasma5Packages.kidletime)
  • libsForQt5.kirigami2 (libsForQt515.kirigami2 ,plasma5Packages.kirigami2)
  • libsForQt5.kitemmodels (libsForQt515.kitemmodels ,plasma5Packages.kitemmodels)
  • libsForQt5.kitemviews (libsForQt515.kitemviews ,plasma5Packages.kitemviews)
  • libsForQt5.kjobwidgets (libsForQt515.kjobwidgets ,plasma5Packages.kjobwidgets)
  • libsForQt5.knotifications (libsForQt515.knotifications ,plasma5Packages.knotifications)
  • libsForQt5.kpackage (libsForQt515.kpackage ,plasma5Packages.kpackage)
  • libsForQt5.kplotting (libsForQt515.kplotting ,plasma5Packages.kplotting)
  • libsForQt5.kpty (libsForQt515.kpty ,plasma5Packages.kpty)
  • libsForQt5.kservice (libsForQt515.kservice ,plasma5Packages.kservice)
  • libsForQt5.ksshaskpass (libsForQt515.ksshaskpass ,plasma5Packages.ksshaskpass)
  • libsForQt5.ktextwidgets (libsForQt515.ktextwidgets ,plasma5Packages.ktextwidgets)
  • libsForQt5.kunitconversion (libsForQt515.kunitconversion ,plasma5Packages.kunitconversion)
  • libsForQt5.kwallet (libsForQt515.kwallet ,plasma5Packages.kwallet)
  • libsForQt5.kwallet-pam (libsForQt515.kwallet-pam ,plasma5Packages.kwallet-pam)
  • libsForQt5.kwidgetsaddons (libsForQt515.kwidgetsaddons ,plasma5Packages.kwidgetsaddons)
  • libsForQt5.kwindowsystem (libsForQt515.kwindowsystem ,plasma5Packages.kwindowsystem)
  • libsForQt5.kwrited (libsForQt515.kwrited ,plasma5Packages.kwrited)
  • libsForQt5.oxygen-icons5 (libsForQt515.oxygen-icons5 ,plasma5Packages.oxygen-icons5)
  • libsForQt5.phonon (libsForQt515.phonon ,plasma5Packages.phonon)
  • libsForQt5.plasma-wayland-protocols (libsForQt515.plasma-wayland-protocols ,plasma5Packages.plasma-wayland-protocols)
  • libsForQt5.plasma-workspace-wallpapers (libsForQt515.plasma-workspace-wallpapers ,plasma5Packages.plasma-workspace-wallpapers)
  • libsForQt5.polkit-kde-agent (libsForQt515.polkit-kde-agent ,plasma5Packages.polkit-kde-agent)
  • libsForQt5.prison (libsForQt515.prison ,plasma5Packages.prison)
  • libsForQt5.qqc2-breeze-style (libsForQt515.qqc2-breeze-style ,plasma5Packages.qqc2-breeze-style)
  • libsForQt5.qqc2-desktop-style (libsForQt515.qqc2-desktop-style ,plasma5Packages.qqc2-desktop-style)
  • libsForQt5.sonnet (libsForQt515.sonnet ,plasma5Packages.sonnet)
  • libsForQt512.breeze-grub
  • libsForQt512.breeze-plymouth
  • libsForQt512.extra-cmake-modules
  • libsForQt512.kapidox
  • libsForQt512.plasma-wayland-protocols
  • libsForQt512.plasma-workspace-wallpapers
  • libsForQt514.breeze-grub
  • libsForQt514.breeze-plymouth
  • libsForQt514.extra-cmake-modules
  • libsForQt514.kapidox
  • libsForQt514.plasma-wayland-protocols
  • libsForQt514.plasma-workspace-wallpapers
3 suggestions:
  • warning: unclear-gpl

    fdl12 is a deprecated license, please check if project uses fdl12Plus or fdl12Only and change meta.license accordingly.

    Near pkgs/desktops/plasma-5/default.nix:95:17:

       |
    95 |                 license = meta.license or license;
       |                 ^
    
  • warning: name-and-version

    Did you mean to pass pname instead of name to mkDerivation?

    Near pkgs/development/libraries/kde-frameworks/default.nix:93:13:

       |
    93 |             name = "${name}-${version}";
       |             ^
    

    Near pkgs/development/libraries/kde-frameworks/default.nix:94:20:

       |
    94 |             inherit meta outputs setupHook src version;
       |                    ^
    
  • warning: unclear-gpl

    fdl12 is a deprecated license, please check if project uses fdl12Plus or fdl12Only and change meta.license accordingly.

    Near pkgs/development/libraries/kde-frameworks/default.nix:86:17:

       |
    86 |                 license = meta.license or license;
       |                 ^
    

Note that build failures may predate this PR, and could be nondeterministic or hardware dependent.
Please exercise your independent judgement. Does something look off? Please file an issue or reach out on IRC.

@ofborg ofborg bot requested review from bkchr, ebzzry, Phreedom and zraexy June 19, 2021 03:09
@andrevmatos
Copy link
Member

andrevmatos commented Jun 19, 2021

Plasma 5.22.1 5.22.2 is already out; any chance of upgrading directly to it, since it should be just bugfixes?

@jansol
Copy link
Contributor

jansol commented Jun 21, 2021

Is KSysGuard completely gone from upstream? If not I'd prefer to keep the package for now and just mark it as deprecated with a note pointing to the new system monitor package so people who for one reason or another insist on still using it can do so for the time being.

@andrevmatos
Copy link
Member

I'm running this PR now with bump to plasma 5.22.1. So far, an issue I'm seeing is that neither the new System Monitor, nor the previous monitoring widgets I had, can show any meters for CPU, memory, etc... It seems they still depend on maybe some kind of libksysguard which apparently was provided by the old ksysguard package (at build/runtime?), and since it got completely removed, those remain blank on the current state of this PR.

@CertainLach
Copy link
Member Author

CertainLach commented Jun 22, 2021

ksysguard is missing from srcs, it was completely removed from upstream (You can see it at https://download.kde.org/stable/plasma/5.21.5/, but not at https://download.kde.org/stable/plasma/5.22.0/).
libksysguard is still present, it is provided as a different package

@andrevmatos
Copy link
Member

Yes, I know, but since ksysguard was removed from buildInputs, system-monitor app and resources monitoring widgets stopped working, maybe some lib which was provided or pulled by ksysguard package either at build or runtime made these functionality stop working

@CertainLach
Copy link
Member Author

Seems like those widgets depends on new system-monitor app, and i didn't enabled it instead of ksysguard

@andrevmatos
Copy link
Member

I have SystemMonitor itself installed explicity (plasma-systemmonitor package), but it's also not working, so I think the functionality is broken despite the widgets.

@CertainLach
Copy link
Member Author

Have you installed it as environment.systemPackages, or via nix-env?

@andrevmatos
Copy link
Member

systemPackages

@andrevmatos

This comment has been minimized.

@andrevmatos
Copy link
Member

I think the issue is that plasma has a new package: ksystemstats, which replaces ksysguard also as dependency of some of the others (e.g. plasma-systemmonitor, plasma-workspace, etc) to provide resources monitoring integration. I'm trying to build it locally, but there're some weird make errors. So far, libksysguard, libnl and lm_sensors are in its buildInputs.

@CertainLach

This comment has been minimized.

@andrevmatos
Copy link
Member

It's working fine here now! Both plasma-systemmonitor and monitoring widgets.
I wouldn't use it, but it seems old ksysguard is still available on plasma 5.22, not sure why its source didn't get picked up:
https://github.com/archlinux/svntogit-packages/blob/packages/ksysguard/trunk/PKGBUILD

@CertainLach
Copy link
Member Author

Because it was moved out of plasma subdirectory

Copy link
Member

@andrevmatos andrevmatos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been testing it for a couple of days now, and everything has been working great so far. Even wayland with nvidia reverse prime works out-of-the-box! It'd be good if ksysguard is provided as a package outside of the main plasma5 group. I'm no maintainer, so approving only to provide my experience with the patchset.

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
As ksysguard was replaced, and it was installed by default

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
@ttuegel
Copy link
Member

ttuegel commented Jul 26, 2021

This broke some of my global shortcut keys. I'm investigating, to see if we can give a smooth user experience with the update.

@ttuegel
Copy link
Member

ttuegel commented Jul 26, 2021

This broke some of my global shortcut keys.

This was just for KRunner, and it was due to some stale entries in ~/.config/kglobalshortcutsrc. It was quick to fix from System Settings by deleting the stale entries, but I don't know how we would avoid it in the first place.

@pasqui23
Copy link
Contributor

@ttuegel Plasma upgrades often broke my config completely, and if only a few shortcuts are broken then it's fine for me

@pasqui23
Copy link
Contributor

Although lately there where no breakages on plasma upgrades, so kudos to the plasma team

@ofborg ofborg bot requested a review from ttuegel July 28, 2021 14:57
@greydot
Copy link
Contributor

greydot commented Jul 28, 2021

Meanwhile, Plasma 5.22.4 is out. Can we have that release included here?

https://kde.org/announcements/plasma/5/5.22.4/

P.S. I'm running 5.22.4 right now, built from this PR + version update. All is good 👍

@jansol
Copy link
Contributor

jansol commented Aug 4, 2021

Another week has passed... This isn't exactly encouraging for people considering contributing to the packaging efforts...

I'd be fine with either updating this PR to 5.22.4 or just merging it as is and having another PR for that version bump. The diff should be much smaller and faster to review.

@acowley
Copy link
Contributor

acowley commented Aug 4, 2021

Might be worth pointing to the issue on the discourse to see if that can attract the attention of someone with commit permissions. I guess the list of potential reviewers is just out of date.

@InternetUnexplorer
Copy link
Contributor

It is a bit discouraging, yeah… :(

Off the top of my head, it might be worth posting in one or both of these two:

There's also https://discourse.nixos.org/t/prs-ready-for-review/3032, but I don't think it's the right place since it seems like this has already been reviewed?

Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

diff LGTM

@happysalada happysalada merged commit 7781962 into NixOS:master Aug 5, 2021
@happysalada
Copy link
Contributor

Would anyone be interested in applying for commit rights ?
I think it's clear that the commiters team can't keep up with all the good contributions. Not to mention that lots of contributions require specific knowledge.
This is the issue where commit rights can be requested.
#50105

If anything doesn't make sense, feel free to ask.

@greydot greydot mentioned this pull request Aug 5, 2021
11 tasks
@CertainLach CertainLach deleted the plasma-5.22 branch September 12, 2021 12:48
@drupol
Copy link
Contributor

drupol commented Oct 7, 2021

Should we backport this to release-21.05 ?

@peterhoeg
Copy link
Member

peterhoeg commented Oct 7, 2021 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.