Skip to content

qt6: 6.8.0 -> 6.8.1, reorganize everything#361047

Merged
K900 merged 2 commits intoNixOS:stagingfrom
K900:qt-6.8.1
Dec 3, 2024
Merged

qt6: 6.8.0 -> 6.8.1, reorganize everything#361047
K900 merged 2 commits intoNixOS:stagingfrom
K900:qt-6.8.1

Conversation

@K900
Copy link
Contributor

@K900 K900 commented Dec 2, 2024

  • move patches to their corresponding modules
  • inline patches list for qtbase into the expression itself
  • don't treat patches as series, as they are not
  • clean up outdated headers from all the patches
  • drop doc tools patch, replace it with setting newly added cmake var in a hook
  • add a new patch to disable SBOM generation that's very broken with split installs

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

- move patches to their corresponding modules
- inline patches list for qtbase into the expression itself
- don't treat patches as series, as they are not
- clean up outdated headers from all the patches
- drop doc tools patch, replace it with setting newly added cmake var in a hook
- add a new patch to disable SBOM generation that's very broken with split installs
@github-actions github-actions bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches. labels Dec 2, 2024
@NickCao
Copy link
Member

NickCao commented Dec 2, 2024

#359559

@FliegendeWurst
Copy link
Member

#359559

Would be good to cherry-pick it on this PR :)

@K900 K900 mentioned this pull request Dec 2, 2024
2 tasks
@K900
Copy link
Contributor Author

K900 commented Dec 2, 2024

Done.

@K900 K900 merged commit 54db69e into NixOS:staging Dec 3, 2024
@NickCao
Copy link
Member

NickCao commented Dec 9, 2024

This should be backported to staging-24.11, it fixes #363604

@K900
Copy link
Contributor Author

K900 commented Dec 9, 2024

It should indeed.

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 9, 2024

Backport failed for staging-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-24.11
git worktree add -d .worktree/backport-361047-to-staging-24.11 origin/staging-24.11
cd .worktree/backport-361047-to-staging-24.11
git switch --create backport-361047-to-staging-24.11
git cherry-pick -x 2873053688b964478727782f2fbc34365bfe93f8 c2d0cf4975e48b0b6c53bd3f3351a4e92e4fddff

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

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 1001-2500 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants