From b7a43e0e650d506a26ee6a8850327761a8704270 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Tue, 6 May 2025 17:04:08 +0200 Subject: [PATCH 1/6] carapace-bridge: use rec -> finalAttrs --- pkgs/by-name/ca/carapace-bridge/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index f85cf9bf13ef..6fa22ed8ccd3 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -6,15 +6,15 @@ nix-update-script, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "carapace-bridge"; version = "1.2.7"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; - tag = "v${version}"; hash = "sha256-8i516GwXJFEB4VdvsV1KS0q2U9ZbpRBmZxqzTrzYlPk="; + tag = "v${finalAttrs.version}"; }; # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the @@ -36,9 +36,9 @@ buildGoModule rec { meta = { description = "Multi-shell completion bridge for carapace"; homepage = "https://carapace.sh/"; - changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${version}"; + changelog = "https://github.com/carapace-sh/carapace-bridge/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ famfo ]; license = lib.licenses.mit; mainProgram = "carapace-bridge"; }; -} +}) From 9913737e769149148b593fcd941eb8141af64a84 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Tue, 6 May 2025 17:04:32 +0200 Subject: [PATCH 2/6] carapace-bridge: 1.2.7 -> 1.2.9 --- pkgs/by-name/ca/carapace-bridge/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index 6fa22ed8ccd3..39c2699bc2da 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "carapace-bridge"; - version = "1.2.7"; + version = "1.2.9"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; - hash = "sha256-8i516GwXJFEB4VdvsV1KS0q2U9ZbpRBmZxqzTrzYlPk="; tag = "v${finalAttrs.version}"; + hash = "sha256-Y69byUUDJJ+nJuZ6lcl+McFtJGYb5zgE8+QTbhoZ9Bc="; }; # buildGoModule try to run `go mod vendor` instead of `go work vendor` on the From 51fd4aa214bd89e9d4fcedd4d94c19821b4915ed Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Tue, 6 May 2025 17:06:50 +0200 Subject: [PATCH 3/6] carapace: modernize `rec` -> `finalAttrs` --- pkgs/shells/carapace/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index f5efb7306312..2c0bb79aec22 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -6,14 +6,14 @@ carapace, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "carapace"; version = "1.3.0"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY="; }; @@ -22,7 +22,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.version=${version}" + "-X main.version=${finalAttrs.version}" ]; subPackages = [ "./cmd/carapace" ]; @@ -42,4 +42,4 @@ buildGoModule rec { license = licenses.mit; mainProgram = "carapace"; }; -} +}) From e1c52b118a25411ffdaec21c50adc9f08ce4f790 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Tue, 6 May 2025 17:12:14 +0200 Subject: [PATCH 4/6] carapace: add updateScript --- pkgs/shells/carapace/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 2c0bb79aec22..78bdfb951966 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -4,6 +4,7 @@ fetchFromGitHub, testers, carapace, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -33,6 +34,7 @@ buildGoModule (finalAttrs: { GOOS= GOARCH= go generate ./... ''; + passthru.updateScript = nix-update-script { }; passthru.tests.version = testers.testVersion { package = carapace; }; meta = with lib; { From c92a56dd82131058e17d57157a5d7d9c4c34e025 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Tue, 6 May 2025 17:19:54 +0200 Subject: [PATCH 5/6] carpace: use rev -> tag --- pkgs/shells/carapace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 78bdfb951966..9daab954b896 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY="; }; From e5509c8f67caf9fe007d779a50c029c7c4b25356 Mon Sep 17 00:00:00 2001 From: 1adept <69433209+1adept@users.noreply.github.com> Date: Tue, 6 May 2025 17:12:34 +0200 Subject: [PATCH 6/6] carapace: 1.3.0 -> 1.3.1 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index 9daab954b896..f639bd38ef1f 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-ewZ06HPAS7UXmnRlrOaHegVrfYxwko/jyHqtQV/0JwY="; + hash = "sha256-VKc4JnezPdbgUIiSOnHIkUCLas//4TMIKiYd71EMamk="; }; - vendorHash = "sha256-+jOZ7EhMQZHvu4XToM7L1w2YCKCTOHKzZCOBsulLsH8="; + vendorHash = "sha256-APJBCUdicKb81gY3ukhMHVgapDl+4tsMdNHEwZbarKE="; ldflags = [ "-s"