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

[24.05] feishin: backports #337949

Merged
merged 3 commits into from
Aug 29, 2024
Merged

[24.05] feishin: backports #337949

merged 3 commits into from
Aug 29, 2024

Conversation

emilazy
Copy link
Member

@emilazy emilazy commented Aug 28, 2024

Description of changes

See #337776.

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.

jlbribeiro and others added 3 commits August 28, 2024 15:25
@jlbribeiro @emilazy
feishin: upgrade electron to v30
3a204ea 
Addresses NixOS#319252: v27 has been EOL since 2024/04/16.

(cherry picked from commit 5e4fd0a)
@pbsds @emilazy
feishin: change ${pname} to string literal
21a75e0 
(cherry picked from commit 3a83109)
@jlbribeiro @emilazy
feishin: use electron_31
5a1c3f5 
As originally mentioned in NixOS#331868, feishin now [1] depends on Electron v31,
which was not packaged at the time (NixOS#325428).
It has since been fixed (by NixOS#333907).

[1]: https://github.com/jeffvli/feishin/blob/f2beeef/package.json#L234

(cherry picked from commit 3d15951)
@emilazy emilazy mentioned this pull request Aug 28, 2024
Merged
13 tasks
@ofborg ofborg bot requested review from jlbribeiro and onny August 28, 2024 15:18
jlbribeiro
jlbribeiro approved these changes Aug 29, 2024
View reviewed changes
Copy link
Member

@jlbribeiro jlbribeiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested the basics on x86_64-linux and x86_64-darwin, LGTM! 👍

--
Result of nixpkgs-review pr 337949 run on x86_64-linux 1

1 package built:
  • feishin

--
Result of nixpkgs-review pr 337949 run on x86_64-darwin 1

1 package built:
  • feishin

@emilazy emilazy merged commit 1605373 into NixOS:release-24.05 Aug 29, 2024
27 of 29 checks passed
@emilazy emilazy deleted the push-mxtptmotlwnt branch August 29, 2024 00:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jlbribeiro jlbribeiro jlbribeiro approved these changes

@onny onny Awaiting requested review from onny

Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@emilazy @jlbribeiro @pbsds