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

[staging-24.11] qt6: 6.8.0 -> 6.8.1, reorganize everything #363695

Merged
merged 1 commit into from
Dec 9, 2024

Conversation

K900
Copy link
Contributor

@K900 K900 commented Dec 9, 2024

Manual backport of #361047

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

(cherry picked from commit 2873053)
@K900 K900 merged commit 75e8129 into NixOS:staging-24.11 Dec 9, 2024
5 of 12 checks passed
@yfyf yfyf mentioned this pull request Dec 10, 2024
29 tasks
@vcunat
Copy link
Member

vcunat commented Jan 1, 2025

Incomplete? Patches won't even apply; see e.g.
https://hydra.nixos.org/build/283715161/nixlog/1/tail

EDIT: should be solved now. Thanks :-)

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

Successfully merging this pull request may close these issues.

2 participants