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.

Sign up for GitHub

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

Jump to bottom

[Backport release-24.11] electron-bin: copy over fixes from electron-source, remove no longer needed version conditionals #384314

Merged
merged 2 commits into from
Feb 22, 2025
Merged

[Backport release-24.11] electron-bin: copy over fixes from electron-source, remove no longer needed version conditionals #384314

merged 2 commits into from
Feb 22, 2025

Conversation

emilylange
Copy link
Member

Manual backport #383706 due to mesa (stable) vs libgbm (unstable) conflict.

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.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Feb 22, 2025
@nix-owners nix-owners bot requested review from teutat3s and yayayayaka February 22, 2025 19:22
@emilylange emilylange merged commit c3ef43a into NixOS:release-24.11 Feb 22, 2025
24 of 28 checks passed
@emilylange emilylange deleted the backport-383706-to-release-24.11 branch February 22, 2025 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teutat3s teutat3s Awaiting requested review from teutat3s

@yayayayaka yayayayaka Awaiting requested review from yayayayaka

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@emilylange