espanso: 0.7.3 -> 2.1.8

nixos/doc/manual/release-notes/rl-2305.section.md

@@ -341,6 +341,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - The `pict-rs` package was updated from an 0.3 alpha release to 0.3 stable, and related environment variables now require two underscores instead of one.
 
+- `espanso` has been updated to major version 2. Therefore, migration steps may need to be performed. See [the official migration instructions](https://espanso.org/docs/migration/overview/) for how to perform these migrations. Further, `espanso-wayland` can now be used for Wayland support.
+
 ## Other Notable Changes {#sec-release-23.05-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

pkgs/applications/office/espanso/default.nix

@@ -3,52 +3,88 @@
 , rustPlatform
 , pkg-config
 , extra-cmake-modules
+, dbus
 , libX11
 , libXi
 , libXtst
 , libnotify
+, libxkbcommon
 , openssl
 , xclip
 , xdotool
+, setxkbmap
+, wl-clipboard
+, wxGTK32
 , makeWrapper
 , stdenv
 , AppKit
 , Cocoa
 , Foundation
+, IOKit
+, waylandSupport ? false
+, x11Support ? stdenv.isLinux
 }:
-
+# espanso does not support building with both X11 and Wayland support at the same time
+assert stdenv.isLinux -> x11Support != waylandSupport;
+assert stdenv.isDarwin -> !x11Support;
+assert stdenv.isDarwin -> !waylandSupport;
 rustPlatform.buildRustPackage rec {
   pname = "espanso";
-  version = "0.7.3";
+  version = "2.1.8";
 
   src = fetchFromGitHub {
-    owner = "federico-terzi";
-    repo = pname;
+    owner = "espanso";
+    repo = "espanso";
     rev = "v${version}";
-    sha256 = "1q47r43midkq9574gl8gdv3ylvrnbhdc39rrw4y4yk6jbdf5wwkm";
+    hash = "sha256-5TUo5B1UZZARgTHbK2+520e3mGZkZ5tTez1qvZvMnxs=";
   };
 
-  cargoSha256 = "0ba5skn5s6qh0blf6bvivzvqc2l8v488l9n3x98pmf6nygrikfdb";
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "yaml-rust-0.4.6" = "sha256-wXFy0/s4y6wB3UO19jsLwBdzMy7CGX4JoUt5V6cU7LU=";
+    };
+  };
 
   nativeBuildInputs = [
     extra-cmake-modules
     pkg-config
     makeWrapper
+    wxGTK32
+  ];
+
+  # Ref: https://github.com/espanso/espanso/blob/78df1b704fe2cc5ea26f88fdc443b6ae1df8a989/scripts/build_binary.rs#LL49C3-L62C4
+  buildNoDefaultFeatures = true;
+  buildFeatures = [
+    "modulo"
+  ] ++ lib.optionals waylandSupport[
+    "wayland"
+  ] ++ lib.optionals stdenv.isLinux [
+    "vendored-tls"
+  ] ++ lib.optionals stdenv.isDarwin [
+    "native-tls"
   ];
 
   buildInputs = [
-    libX11
-    libXtst
-    libXi
-    libnotify
-    xclip
-    openssl
+    wxGTK32
   ] ++ lib.optionals stdenv.isLinux [
-    xdotool
+    openssl
+    dbus
+    libnotify
+    libxkbcommon
   ] ++ lib.optionals stdenv.isDarwin [
     AppKit
     Cocoa
     Foundation
+    IOKit
+  ] ++ lib.optionals waylandSupport [
+    wl-clipboard
+  ] ++ lib.optionals x11Support [
+    libXi
+    libXtst
+    libX11
+    xclip
+    xdotool
   ];
 
   # Some tests require networking
@@ -56,14 +92,23 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/espanso \
-      --prefix PATH : ${lib.makeBinPath [ libnotify xclip ]}
+      --prefix PATH : ${lib.makeBinPath (
+        lib.optionals stdenv.isLinux [
+          libnotify
+          setxkbmap
+        ] ++ lib.optionals waylandSupport [
+          wl-clipboard
+        ] ++ lib.optionals x11Support [
+          xclip
+        ]
+      )}
   '';
 
   meta = with lib; {
     description = "Cross-platform Text Expander written in Rust";
     homepage = "https://espanso.org";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ kimat ];
+    maintainers = with maintainers; [ kimat thehedgeh0g ];
     platforms = platforms.unix;
 
     longDescription = ''

pkgs/top-level/all-packages.nix

@@ -4765,8 +4765,12 @@ with pkgs;
   eschalot = callPackage ../tools/security/eschalot { };
 
   espanso = callPackage ../applications/office/espanso {
-    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation;
-    openssl = openssl_1_1;
+    inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Foundation IOKit Kernel AVFoundation;
+  };
+  espanso-wayland = espanso.override {
+    x11Support = false;
+    waylandSupport = true;
+    espanso = espanso-wayland;
   };
 
   esphome = callPackage ../tools/misc/esphome { };