Skip to content

[Backport release-25.05] quicksynergy: drop#418300

Merged
Aleksanaa merged 1 commit intoNixOS:release-25.05from
mdaniels5757:backport-418001-to-release-25.05
Jun 22, 2025
Merged

[Backport release-25.05] quicksynergy: drop#418300
Aleksanaa merged 1 commit intoNixOS:release-25.05from
mdaniels5757:backport-418001-to-release-25.05

Conversation

@mdaniels5757
Copy link
Member

Backport of #418001 to release-25.05. Fixes Hydra build.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-committer, if you find that it is not acceptable, leave a comment.

@mdaniels5757 mdaniels5757 requested a review from pbsds June 20, 2025 01:00
github-actions[bot]

This comment was marked as resolved.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. 4.workflow: backport This targets a stable branch labels Jun 20, 2025
@mdaniels5757
Copy link
Member Author

mdaniels5757 commented Jun 20, 2025

This warning is actually correct -- the qv2ray removal has not been backported. Fixing.

Does not build with gcc 14, upstream no longer available.

(cherry picked from commit 67c9f3c)
@mdaniels5757 mdaniels5757 force-pushed the backport-418001-to-release-25.05 branch from 05df759 to 876fa54 Compare June 20, 2025 01:11
@github-actions github-actions bot dismissed their stale review June 20, 2025 01:16

All cherry-picks are good now, thank you!

@Aleksanaa Aleksanaa merged commit f8307b8 into NixOS:release-25.05 Jun 22, 2025
25 of 26 checks passed
@mdaniels5757 mdaniels5757 deleted the backport-418001-to-release-25.05 branch June 22, 2025 03:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4.workflow: backport This targets a stable branch 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants