-
-
Notifications
You must be signed in to change notification settings - Fork 14.3k
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: 0.7.3 -> 2.1.8 #208949
espanso: 0.7.3 -> 2.1.8 #208949
Conversation
Can you please write about how to test this package? Is this supposed to work on Wayland as well? |
It is supposed to work on wayland. If you use flakes, I would suggest pulling the branch in as an input and making an overlay or just pulling the package out of the set. Then you could have a small config in your $CONFIG/espanso folder, which would be picked up by the service. This should also be able to build on MacOS, though I have not been able to test it. |
5a552ca
to
58f0450
Compare
As part of #210452, would you like to also remove the openssl_1_1 pin in all-packages.nix? |
58f0450
to
85a72e7
Compare
6ae3aa0
to
7a6265f
Compare
7a6265f
to
1aeffd0
Compare
Ok, I'm currently running into some problems where This is the log I have from the build |
Would adding |
@theHedgehog0 any update on this? |
postInstall = '' | ||
wrapProgram $out/bin/espanso \ | ||
--prefix PATH : ${lib.makeBinPath [ libnotify xclip ]} | ||
--prefix PATH : ${lib.makeBinPath [ libnotify xclip wl-clipboard setxkbmap ]} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure but I think you should verify waylandSupport for wl-clipboard
And !waylandSupport for xclip
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think when waylandSupport
is enabled, it should still be compatible with X11? So that means xclip should always be available? (not sure, correct me if i'm wrong)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not wayland user, maybe @AndersonTorres knows.
]; | ||
|
||
NO_X11 = lib.optionals waylandSupport "true"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be
NO_X11 = lib.optionals waylandSupport "true"; | |
env.NO_X11 = lib.boolToString waylandSupport; |
?
|
||
nativeBuildInputs = [ | ||
extra-cmake-modules | ||
pkg-config | ||
makeWrapper | ||
cargo-make | ||
wxGTK32 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this a nativeBuildInput?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've tried building without wxGTK32 as a nativeBuildInput, but the build failed.
> error: failed to run custom build command for `espanso-modulo v0.1.0 (/build/source/espanso-modulo)`
>
> Caused by:
> process didn't exit successfully: `/build/source/target/release/build/espanso-modulo-8653a240257a137b/build-script-build` (exit status: 101)
> --- stderr
> thread 'main' panicked at 'wxWidgets is not installed, as `wx-config` cannot be executed', espanso-modulo/build.rs:467:5
> note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
> warning: build failed, waiting for other jobs to finish...
For full logs, run 'nix log /nix/store/dnn037vxl868icgfyimfwfcb604x1zfy-espanso-2.1.8.drv'.
That said, removing it from buildInputs still worked. I'm unsure why it only works in nativeBuildInputs
It seems
This branch works perfectly for me. This is what I did to test it. Note that I don't have much experience with espanso, as this was the first time I wanted to give it a try (but got stuck due to the build errors in 0.7.3).
I was able to add matches to This is all under X11. I have not tested this on Wayland. I've rebased the branch on nixpkgs-unstable and incorporated the suggestions. You can find the branch here: https://github.com/bobvanderlinden/nixpkgs/tree/espanso-update-2.1.8 |
Espanso 0.7.3 is failing and it is part of #230712. The changes in this PR are at least an improvement over a failed build, so I'd vouch for merging. https://github.com/bobvanderlinden/nixpkgs/tree/espanso-update-2.1.8 handles a number of the feedback. Even if the package hasn't been fully worked out with all conventions, it at least fixes the problem of a failing build on master. |
The conflicts are trivial to solve. See bobvanderlinden@8ca5e19 for an up-to-date commit of this pr. Edit: alternatively I can create a new PR with those changes. |
Please do it, preferably linking this PR too. |
Hey, very sorry about not updating this in a while, I've been very busy, and FOSS just can't be my priority at the moment. I'm glad someone else is working on this, but I'll close this. I'd still like to be added to the maintainers list for the package, if that would be possible! |
Not a problem! I've created a new one #231062 and kept most of your commit intact. The feedback is incorporated and I've rebase it on nixpkgs-unstable and resolved the conflicts / incompatibilities that popped up (Cargo.lock needed to be added to the PR). Anyone up for a review? |
Description of changes
This is a major update of espanso, with breaking(but fixable) changes.
Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes