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

espanso: 2.1.8 -> 2.2-unstable-2024-05-14 #311724

Merged
merged 4 commits into from
May 23, 2024
Merged

Conversation

malt3
Copy link
Contributor

@malt3 malt3 commented May 14, 2024

Description of changes

Upgrade espanso to a pre-release version to fix rendering issue on wayland.
This PR is on the dev branch, but not yet in a release: espanso/espanso#1901
Without it, the tool is broken under wayland.

I am unable to test this under darwin.

Closes #286384, closes #291484.

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@malt3 malt3 mentioned this pull request May 14, 2024
13 tasks
@n8henrie
Copy link
Contributor

I would really love to get my Darwin changes integrated as well, outlined in #291484

I can make them as a separate PR.

Most importantly, I think this pre-release should contain espanso/espanso@471c284 which fixes a runtime crash-on-launch for aarch64-Darwin (I can confirm soon).

@malt3 malt3 changed the title espanso: 2.1.8 -> 2.2.2-pre espanso: 2.1.8 -> 2.2-unstable-2024-05-14 May 14, 2024
@malt3
Copy link
Contributor Author

malt3 commented May 14, 2024

I would really love to get my Darwin changes integrated as well, outlined in #291484

I tried to incorporate your changes here. Please tell me if this is correct!

Copy link
Contributor

@n8henrie n8henrie left a comment

Choose a reason for hiding this comment

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

Runs ans works great, looks to have incorporated all the changes I was interested in. Thank you!

@malt3 malt3 requested a review from katexochen May 17, 2024 06:49
@ofborg ofborg bot requested a review from n8henrie May 17, 2024 07:15
@malt3 malt3 force-pushed the espanso-2-2-1 branch 2 times, most recently from 86cd254 to 5822e09 Compare May 18, 2024 15:20
malt3 and others added 2 commits May 20, 2024 11:21
This commit also removes patches that seem no longer necessary, removes
`--replace` calls that were not working, and uses `--replace-fail` going
forward in keeping with the deprecation of `--replace`.

Co-authored-by: Nathan Henrie <[email protected]>
@malt3 malt3 requested a review from eclairevoyant May 21, 2024 19:10
@msanft
Copy link
Contributor

msanft commented May 22, 2024

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

2 packages built:
  • espanso
  • espanso-wayland

Copy link
Contributor

@msanft msanft left a comment

Choose a reason for hiding this comment

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

Lovely, thanks

@katexochen katexochen added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 22, 2024
@katexochen katexochen merged commit 2237603 into NixOS:master May 23, 2024
25 checks passed
@katexochen katexochen deleted the espanso-2-2-1 branch May 23, 2024 06:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants