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

[Backport release-24.11] sunshine: 0.23.1 -> 2025.118.151840 #375532

Merged

Conversation

niklaskorz
Copy link
Contributor

@niklaskorz niklaskorz commented Jan 21, 2025

Backport of #375153 to address GHSA-3hrw-xv8h-9499

Manual backport as the update PR depends on changes from fix #364438 which was not backported to 24.11 yet

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.

devusb and others added 5 commits January 21, 2025 14:04
(cherry picked from commit aaf03d7)
- change text in `wait_for_console_text` to prevent sending curl with
pairing response before moonlight can accept it
- remove "close moonlight" step as next window stays on top in
fullscreen, previous window with pairing result does not interfere
with test. Otherwise it needs OCR or some other way to only do
`send_key("kp_enter")` after "Pairing complete" window is visible.
- add different ways to increase chances of successfull OCR: hide icewm
panel, gxmessage window takes full screen without titlebar or buttons,
black background, white foreground, consolas font,"ABC" text
- add `wait_for_console_text` to only run OCR after window is visible

(cherry picked from commit 46abca2)
(cherry picked from commit d1431a5)
(cherry picked from commit bbc4555)
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 21, 2025
@niklaskorz niklaskorz added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jan 21, 2025
@niklaskorz
Copy link
Contributor Author

niklaskorz commented Jan 21, 2025

FYI, cherry-pick-check fails because I had to add the boost = boost186; override to all-packages.nix as NixOS 24.11 defaults to Boost 1.81 and sunshine 2025.118.151840 only supports Boost 1.86.

Also, the interim Boost 1.86 compatibility commit was left-out as it only cherry-picked a commit patch already included in 2025.118.151840. The patch was removed by the original update PR.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jan 21, 2025
@niklaskorz niklaskorz requested a review from devusb January 21, 2025 13:38
@devusb
Copy link
Contributor

devusb commented Jan 21, 2025

Thanks!

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jan 22, 2025
@vcunat vcunat merged commit 9ca84cb into NixOS:release-24.11 Jan 27, 2025
43 of 46 checks passed
@niklaskorz niklaskorz deleted the backport-375153-to-release-24.11 branch February 20, 2025 17:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants