aw-watcher-window-wayland: 6108ad3df8e157965a43566fa35cdaf144b1c51b -> unstable-2024-10-08; switch to fetchCargoVendor (#358396)

pkgs/by-name/aw/aw-watcher-window-wayland/package.nix

@@ -1,43 +1,43 @@
 {
-  lib,
   fetchFromGitHub,
-  rustPlatform,
+  lib,
-  pkg-config,
   openssl,
+  pkg-config,
+  rustPlatform,
+  unstableGitUpdater,
+  wayland,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "aw-watcher-window-wayland";
-  version = "6108ad3df8e157965a43566fa35cdaf144b1c51b";
+  version = "0-unstable-2024-10-08";
 
   src = fetchFromGitHub {
     owner = "ActivityWatch";
-    repo = pname;
+    repo = "aw-watcher-window-wayland";
-    rev = version;
+    rev = "58bf86a6984cb01fa750c84ce468c7ccb167f796";
-    hash = "sha256-xl9+k6xJp5/t1QPOYfnBLyYprhhrzjzByDKkT3dtVVQ=";
+    hash = "sha256-SnlShM44jnQiZGg5mjreZg1bsjFLNYMjC/krR1TXTE4=";
   };
 
-  cargoPatches = [ ./rustc-serialize-fix.patch ];
+  cargoHash = "sha256-WWT8tOrHPf5x3bXsVPt32VKut4qK+K8gickBfEc0zmk=";
+  useFetchCargoVendor = true;
+
+  passthru.updateScript = unstableGitUpdater { };
 
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "aw-client-rust-0.1.0" = "sha256-9tlVesnBeTlazKE2UAq6dzivjo42DT7p7XMuWXHHlnU=";
-    };
-  };
   nativeBuildInputs = [
     pkg-config
   ];
 
   buildInputs = [
     openssl
+    wayland
   ];
 
-  meta = with lib; {
+  meta = {
-    description = "WIP window and afk watcher for wayland";
+    description = "WIP window and afk watcher for some Wayland compositors";
     homepage = "https://github.com/ActivityWatch/aw-watcher-window-wayland";
-    license = licenses.mpl20;
+    license = lib.licenses.mpl20;
-    maintainers = with maintainers; [ esau79p ];
+    maintainers = with lib.maintainers; [ esau79p ];
     mainProgram = "aw-watcher-window-wayland";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 }

pkgs/by-name/aw/aw-watcher-window-wayland/rustc-serialize-fix.patch

@@ -1,16 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index b1cc23695b30..ffdeb1c90618 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -996,9 +996,9 @@ dependencies = [
- 
- [[package]]
- name = "rustc-serialize"
--version = "0.3.24"
-+version = "0.3.25"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-+checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
- 
- [[package]]
- name = "rustix"