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

Jump to bottom

espanso: init at 0.6.3 #86495

Merged
merged 1 commit into from Jul 3, 2020
Merged

espanso: init at 0.6.3 #86495

merged 1 commit into from Jul 3, 2020

Conversation

kimat
Copy link
Contributor

@kimat kimat commented May 1, 2020 •
edited

Motivation for this change

Add espanso to nixpkgs

Took this archlinux build script as reference: https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=espanso

To test this without systemd : run ./result/bin/espanso then type :espanso anywhere and that text replaces itself.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cole-h
cole-h requested changes May 9, 2020
View reviewed changes
pkgs/applications/office/espanso/default.nix Show resolved Hide resolved
pkgs/applications/office/espanso/default.nix Outdated
Comment on lines 42 to 43
cargoBuildFlags = [ "--locked" ];

Copy link
Member

Choose a reason for hiding this comment

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

Builds without this just fine for me. Is there a reason this is necessary? Otherwise:

Suggested change
cargoBuildFlags = [ "--locked" ];

Copy link
Contributor Author

Choose a reason for hiding this comment

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

None that I am aware of. I just noticed the aur package had this flag.

I also managed to build and run without this flag.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I thus removed the extra line.

@kimat kimat force-pushed the kimat-espanso-0.5.5 branch 2 times, most recently from 684037a to 61b1921 Compare May 9, 2020 20:51
@kimat
Copy link
Contributor Author

kimat commented May 9, 2020 •
edited

I added a meta longDescription.

@kimat
Copy link
Contributor Author

kimat commented May 21, 2020

I can confirm espanso packages : https://hub.espanso.org/ also work and can be installed like usual.

@kimat kimat requested a review from cole-h May 21, 2020 16:47
cole-h
cole-h approved these changes May 21, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM. Binary displays help. Doesn't support Wayland, so I cannot attest to its functionality.

[4 built, 2 copied (0.6 MiB), 0.1 MiB DL]
https://github.com/NixOS/nixpkgs/pull/86495
1 package built:
espanso

@kimat kimat requested a review from balsoft May 22, 2020 09:04
@numkem
Copy link
Contributor

numkem commented Jun 7, 2020 •
edited

This is working great for me. I've created a module to enable it. Once this is merged I'll open a PR for it.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/177

@bbigras
Copy link
Contributor

bbigras commented Jun 29, 2020

@kimat can you rebase please to fix the conflict? Also maybe update to v0.6.2.

@kimat kimat force-pushed the kimat-espanso-0.5.5 branch 2 times, most recently from a16169a to 8027148 Compare June 29, 2020 21:58
@kimat kimat changed the title espanso: init at 0.5.5 espanso: init at 0.6.3 Jun 29, 2020
@kimat
Copy link
Contributor Author

kimat commented Jun 29, 2020

@bbigras I just rebased, bumped to 0.6.3 and retested the app's behaviour with nixpkgs-review pr 86495 & ./results/espanso/bin/espanso daemon.

@bbigras
Copy link
Contributor

bbigras commented Jun 30, 2020

Reviewed points
  • package path fits guidelines
  • package name fits guidelines
  • package version fits guidelines
  • package build on amd64
  • executables tested on amd64
  • meta.description is set and fits guidelines
  • meta.license fits upstream license
  • meta.platforms is set
  • meta.maintainers is set
  • build time only dependencies are declared in nativeBuildInputs
  • source is fetched using the appropriate function
  • phases are respected
  • patches that are remotely available are fetched with fetchpatch
Possible improvements
Comments

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/178

danieldk
danieldk suggested changes Jul 2, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

Added one small comment, the license does not seem accurate. Feel free to ping me once you have changed this to get it merged.

pkgs/applications/office/espanso/default.nix Outdated
meta = with stdenv.lib; {
description = "Cross-platform Text Expander written in Rust";
homepage = "https://espanso.org";
license = licenses.gpl3;
Copy link
Contributor

@danieldk danieldk Jul 2, 2020 •
edited

Choose a reason for hiding this comment

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

Suggested change
license = licenses.gpl3;
license = licenses.gpl3Plus;

This should probably be gpl3Plus, since the source files have the either version 3 of the License, or (at your option) any later version wording.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Based on similar PR comments, it should yes. I just updated the file accordingly.

Copy link
Contributor

Choose a reason for hiding this comment

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

Awesome, thanks a lot!

@danieldk danieldk self-requested a review July 3, 2020 04:49
danieldk
danieldk approved these changes Jul 3, 2020
View reviewed changes
Copy link
Contributor

@danieldk danieldk left a comment

Choose a reason for hiding this comment

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

LGTM

Result of nixpkgs-review pr 86495 1

1 package built:
- espanso

espanso command runs as expected.

@danieldk danieldk merged commit ceb5d5a into NixOS:master Jul 3, 2020
kimat added a commit to kimat/espanso that referenced this pull request Jul 3, 2020
@kimat
espanso was added to nixpkgs ...
f640240 
with NixOS/nixpkgs#86495
@bbigras
Copy link
Contributor

bbigras commented Jul 14, 2020

@numkem are you still planning to do that module PR?

@numkem numkem mentioned this pull request Jul 19, 2020
Merged
10 tasks
@numkem
Copy link
Contributor

numkem commented Jul 19, 2020

@bbigras done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bbigras bbigras bbigras approved these changes

@danieldk danieldk danieldk approved these changes

@balsoft balsoft balsoft approved these changes

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@kimat @numkem @nixos-discourse @bbigras @danieldk @balsoft @cole-h