From 826f4980861734ac84f89485072927e4874f3ef0 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 20:18:22 +0800 Subject: [PATCH 1/6] watchexec: 2.3.1 -> 2.3.2 --- pkgs/by-name/wa/watchexec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index 37a8fcb6c891..c8cc24bc4cde 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "watchexec"; repo = "watchexec"; rev = "v${version}"; - hash = "sha256-ldxB1/WgOe1uGfKXkMEtGHIlWiKJgnZz6j/7eCOGD8s="; + hash = "sha256-BJRvz3rFLaOCNhOsEo0rSOgB9BCJ2LMB9XEw8RBWXXs="; }; useFetchCargoVendor = true; - cargoHash = "sha256-LdjJlf4HPN+kZOQKPNSdbYApGBD4Z6tKV9Y0FFKpAf0="; + cargoHash = "sha256-VtSRC4lyjMo2O9dNbVllcDEx08zQWJMQmQ/2bNMup6U="; nativeBuildInputs = [ installShellFiles ]; From 5320ab9f9e6c0dcafd7eba984c1154b5bbc8b502 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 20:27:26 +0800 Subject: [PATCH 2/6] watchexec: use finalAttrs --- pkgs/by-name/wa/watchexec/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index c8cc24bc4cde..b2785f3d8655 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -6,14 +6,14 @@ installShellFiles, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "watchexec"; version = "2.3.2"; src = fetchFromGitHub { owner = "watchexec"; repo = "watchexec"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-BJRvz3rFLaOCNhOsEo0rSOgB9BCJ2LMB9XEw8RBWXXs="; }; @@ -45,4 +45,4 @@ rustPlatform.buildRustPackage rec { maintainers = [ maintainers.michalrus ]; mainProgram = "watchexec"; }; -} +}) From 548afb3c372a67114a8b1bcd6ff18db07652b823 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 20:32:41 +0800 Subject: [PATCH 3/6] watchexec: avoid with lib; --- pkgs/by-name/wa/watchexec/package.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index b2785f3d8655..f53c82d7a630 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -38,11 +38,13 @@ rustPlatform.buildRustPackage (finalAttrs: { installShellCompletion --zsh --name _watchexec completions/zsh ''; - meta = with lib; { + meta = { description = "Executes commands in response to file modifications"; homepage = "https://watchexec.github.io/"; - license = with licenses; [ asl20 ]; - maintainers = [ maintainers.michalrus ]; + license = with lib.licenses; [ asl20 ]; + maintainers = with lib.maintainers; [ + michalrus + ]; mainProgram = "watchexec"; }; }) From 7719f944cf0b0902130003fdb3b12caeac6f9077 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 20:33:15 +0800 Subject: [PATCH 4/6] watchexec: add prince213 to maintainers --- pkgs/by-name/wa/watchexec/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index f53c82d7a630..14ce21826dd5 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -44,6 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ michalrus + prince213 ]; mainProgram = "watchexec"; }; From 9a5165bf547cd6d2361f4ce106b1baabcea48a9a Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 20:37:14 +0800 Subject: [PATCH 5/6] watchexec: install bash and fish completions --- pkgs/by-name/wa/watchexec/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index 14ce21826dd5..c6adc8d680dc 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -35,7 +35,10 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' installManPage doc/watchexec.1 - installShellCompletion --zsh --name _watchexec completions/zsh + installShellCompletion --cmd watchexec \ + --bash completions/bash \ + --fish completions/fish \ + --zsh completions/zsh ''; meta = { From cbf54c37a34b302da2b3d3caad2a983a6ffb04b0 Mon Sep 17 00:00:00 2001 From: Sizhe Zhao Date: Sun, 18 May 2025 20:39:04 +0800 Subject: [PATCH 6/6] watchexec: add passthru.updateScript --- pkgs/by-name/wa/watchexec/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/wa/watchexec/package.nix b/pkgs/by-name/wa/watchexec/package.nix index c6adc8d680dc..539390db5167 100644 --- a/pkgs/by-name/wa/watchexec/package.nix +++ b/pkgs/by-name/wa/watchexec/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, installShellFiles, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -41,6 +42,8 @@ rustPlatform.buildRustPackage (finalAttrs: { --zsh completions/zsh ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Executes commands in response to file modifications"; homepage = "https://watchexec.github.io/";