Skip to content

kdePackages: fix under strictDeps#329977

Merged
K900 merged 1 commit intoNixOS:stagingfrom
K900:kdepackages-strictdeps
Jul 26, 2024
Merged

kdePackages: fix under strictDeps#329977
K900 merged 1 commit intoNixOS:stagingfrom
K900:kdepackages-strictdeps

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Jul 25, 2024

Description of changes

Supersedes #329822, includes #318226 and #324951 so should be merged after those. Everything builds except Qt5 stuff (expected) and possibly Kalzium (blocked by openbabel Python 3.12 breakage)

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 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.

Add a 👍 reaction to pull requests you find important.

@K900 K900 mentioned this pull request Jul 25, 2024
13 tasks
@paparodeo paparodeo mentioned this pull request Jul 25, 2024
13 tasks
@ofborg ofborg bot added 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 25, 2024
@paparodeo
Copy link
Contributor

Supersedes #329822, includes #318226 and #324951 so should be merged after those.

thanks for fixing! could #318226 and #324951 get dropped from the change set and then this just merged into staging? the changes you made should be fine with or without the fixed cmake. i've made some modifications to #318226 in the interface into cmake which probably will cause conflicts with this PR when merged

@K900 K900 force-pushed the kdepackages-strictdeps branch from ad36a2d to 6149730 Compare July 26, 2024 05:45
@K900 K900 marked this pull request as ready for review July 26, 2024 05:45
@K900
Copy link
Contributor Author

K900 commented Jul 26, 2024

Yeah, let's do that.

@K900 K900 merged commit 9f80e31 into NixOS:staging Jul 26, 2024
@K900 K900 deleted the kdepackages-strictdeps branch July 27, 2025 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants