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: 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 commented May 1, 2020

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.
cargoBuildFlags = [ "--locked" ];

Comment on lines 42 to 43

This comment has been minimized.

Copy link
@cole-h

cole-h May 9, 2020

Member

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

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

This comment has been minimized.

Copy link
@kimat

kimat May 9, 2020

Author Contributor

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.

This comment has been minimized.

Copy link
@kimat

kimat May 9, 2020

Author Contributor

I thus removed the extra line.

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

kimat commented May 9, 2020

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
@cole-h
cole-h approved these changes May 21, 2020
Copy link
Member

cole-h left a comment

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
@numkem
Copy link
Contributor

numkem commented Jun 7, 2020

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

nixos-discourse commented Jun 29, 2020

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:kimat-espanso-0.5.5 branch 2 times, most recently from a16169a to 8027148 Jun 29, 2020
@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

nixos-discourse commented Jul 1, 2020

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

Copy link
Member

danieldk left a comment

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

meta = with stdenv.lib; {
description = "Cross-platform Text Expander written in Rust";
homepage = "https://espanso.org";
license = licenses.gpl3;

This comment has been minimized.

Copy link
@danieldk

danieldk Jul 2, 2020

Member
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.

This comment has been minimized.

Copy link
@kimat

kimat Jul 2, 2020

Author Contributor

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

This comment has been minimized.

Copy link
@danieldk

danieldk Jul 3, 2020

Member

Awesome, thanks a lot!

@kimat kimat force-pushed the kimat:kimat-espanso-0.5.5 branch from 8027148 to 6f460a7 Jul 2, 2020
@danieldk danieldk self-requested a review Jul 3, 2020
Copy link
Member

danieldk left a comment

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
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
espanso, espanso.passthru.tests on aarch64-linux Success
Details
espanso, espanso.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="6f460a7"; rev="6f460a74a175e5f1176262a36dc8d9fe86bc3f99"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
kimat added a commit to kimat/espanso that referenced this pull request Jul 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.