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

kde/frameworks: 5.93 -> 5.94 #173266

Merged
merged 8 commits into from
May 22, 2022
Merged

kde/frameworks: 5.93 -> 5.94 #173266

merged 8 commits into from
May 22, 2022

Conversation

andrevmatos
Copy link
Member

@andrevmatos andrevmatos commented May 16, 2022

Description of changes

Bump KDE Frameworks to 5.94, released in 13 May 2022

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

cc @NixOS/qt-kde

Copy link
Contributor

@drupol drupol left a comment

Choose a reason for hiding this comment

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

LGTM

pkgs/development/libraries/kde-frameworks/kapidox.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/kde-frameworks/kapidox.nix Outdated Show resolved Hide resolved
@@ -1,9 +1,25 @@
{ mkDerivation, lib, extra-cmake-modules, python3 }:
{ mkDerivation, python3, qtbase }:

mkDerivation {
Copy link
Member

Choose a reason for hiding this comment

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

I would be happier if we used buildPythonApplication.

Copy link
Member Author

Choose a reason for hiding this comment

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

Me too, but not sure how that'd pan out with kde's custom mkDerivation (which merges these attributes with srcs.nix and versions). Would you have a suggestion on how to integrate buildPythonApplication with that?

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Member Author

Choose a reason for hiding this comment

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

Is the trouble worth it? Not like we build several python libraries/applications for all supported python environments/versions, the build is just a couple of setup.py commands, only enough to satisfy this marginally required dependency. Also, I tried it a little, and my Nix knowledge may not be enough, as it may involve passing the whole attrset of pythonPackages as parameters of the derivation, as is done with the libsForQt5 set, but I'm not sure about the safe way to do this with both in the same call.

Copy link
Member

Choose a reason for hiding this comment

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

Alternately, we could just drop this package. It's never been used in Nixpkgs. I'm not even sure it has ever been buildable before.

@ttuegel ttuegel merged commit 9069477 into NixOS:staging May 22, 2022
@andrevmatos andrevmatos deleted the kde/frameworks branch May 22, 2022 20:42
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.

4 participants