qt6: 6.8.0 -> 6.8.1, reorganize everything#361047
Merged
K900 merged 2 commits intoNixOS:stagingfrom Dec 3, 2024
Merged
Conversation
- 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
NickCao
reviewed
Dec 2, 2024
Member
Member
|
Would be good to cherry-pick it on this PR :) |
Contributor
Author
|
Done. |
13 tasks
Member
|
This should be backported to staging-24.11, it fixes #363604 |
Contributor
Author
|
It should indeed. |
Contributor
|
Backport failed for 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 |
13 tasks
vcunat
pushed a commit
that referenced
this pull request
Jan 6, 2025
(cherry picked from commit 0852cf6 from PR #363854) This is apparently needed after update of qt6 in PR #361047 https://hydra.nixos.org/build/283916989/nixlog/4/tail
1 task
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.