Merge pull request #269895 from xrelkd/update/clipcat

clipcat: 0.5.1 -> 0.6.2

pkgs/applications/misc/clipcat/default.nix

@@ -1,57 +1,50 @@
 { lib
 , fetchFromGitHub
-, installShellFiles
 , rustPlatform
-, rustfmt
-, xorg
-, pkg-config
 , protobuf
-, python3
+, xvfb-run
+, installShellFiles
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "clipcat";
-  version = "0.5.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "xrelkd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-dV17xP6xG6Nyi6m0CdH8Mk4Y0giDtsv/QiM23jF58q0=";
+    sha256 = "sha256-sofP+zyyakB4w1R3wS/FNDTOWwNeDJyB5CBtR3yZsmE=";
   };
 
-  cargoLock = {
+  cargoHash = "sha256-aOXAjxmk5uqBOw/l1CW/LbeBucr7p4iudbVY6d7yEjg=";
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "x11-clipboard-0.6.0" = "sha256-dKx2kda5JC79juksP2qiO9yfeFCWymcYhGPSygQ0mrg=";
-    };
-  };
-
-  # needed for internal protobuf c wrapper library
-  PROTOC = "${protobuf}/bin/protoc";
-  PROTOC_INCLUDE = "${protobuf}/include";
 
   nativeBuildInputs = [
-    pkg-config
-
-    rustPlatform.bindgenHook
-
-    rustfmt
     protobuf
-
-    python3
-
     installShellFiles
   ];
 
-  buildInputs = [ xorg.libxcb ];
+  nativeCheckInputs = [
+    xvfb-run
+  ];
 
-  buildFeatures = [ "all" ];
+  useNextest = true;
+
+  # cargo-nextest help us retry the failed test cases
+  NEXTEST_RETRIES = 5;
+
+  # Some test cases need to interactive with X11, we use xvfb-run here
+  checkPhase = ''
+    xvfb-run --auto-servernum cargo nextest run --release --workspace --no-fail-fast --no-capture
+  '';
 
   postInstall = ''
-    installShellCompletion --bash completions/bash-completion/completions/*
+    for cmd in clipcatd clipcatctl clipcat-menu clipcat-notify; do
-    installShellCompletion --fish completions/fish/completions/*
+      installShellCompletion --cmd $cmd \
-    installShellCompletion --zsh  completions/zsh/site-functions/*
+        --bash <($out/bin/$cmd completions bash) \
+        --fish <($out/bin/$cmd completions fish) \
+        --zsh  <($out/bin/$cmd completions zsh)
+    done
   '';
 
   meta = with lib; {