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

zeal: fix build against Qt 6.7.2 #335763

Merged
merged 1 commit into from
Aug 20, 2024
Merged

Conversation

Scrumplex
Copy link
Member

Description of changes

Hydra failure:https://hydra.nixos.org/build/268549937/nixlog/1

Upstream PR: zealdocs/zeal#1644

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.

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@Scrumplex Scrumplex added backport release-24.05 Backport PR automatically 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Aug 19, 2024
@NickCao NickCao merged commit 9caabb5 into NixOS:master Aug 20, 2024
28 of 30 checks passed
Copy link
Contributor

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

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

git fetch origin release-24.05
git worktree add -d .worktree/backport-335763-to-release-24.05 origin/release-24.05
cd .worktree/backport-335763-to-release-24.05
git switch --create backport-335763-to-release-24.05
git cherry-pick -x 66c27851b83f1bfa553f003324722d0ede0b8127

@Scrumplex Scrumplex deleted the pkgs/zeal/fix-build branch September 29, 2024 09:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person backport release-24.05 Backport PR automatically
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants