From 2c47302e0fafc863bb17ce7fe46a969e2be3a715 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:05:17 +0800 Subject: [PATCH 1/5] gost: use finalAttrs --- pkgs/by-name/go/gost/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index d517621fd4ae..5566540650b6 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -6,14 +6,14 @@ versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gost"; version = "3.0.0"; src = fetchFromGitHub { owner = "go-gost"; repo = "gost"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ep3ZjD+eVKl3PuooDuYeur8xDAcyy6ww2I7f3cYG03o="; }; @@ -40,4 +40,4 @@ buildGoModule rec { ]; mainProgram = "gost"; }; -} +}) From f694c03a8612606bd1a97463d8745316dde2778f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:05:49 +0800 Subject: [PATCH 2/5] gost: add updateScript --- pkgs/by-name/go/gost/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index 5566540650b6..c185600f9fca 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, buildGoModule, versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { @@ -30,6 +31,8 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "-V"; + passthru.updateScript = nix-update-script { }; + meta = { description = "Simple tunnel written in golang"; homepage = "https://github.com/go-gost/gost"; From 3c4b384db2275b0ad668f522198ced704c17fc9a Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:06:11 +0800 Subject: [PATCH 3/5] gost: add maintainer moraxyc --- pkgs/by-name/go/gost/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index c185600f9fca..12bfcb8a9b08 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -40,6 +40,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ pmy ramblurr + moraxyc ]; mainProgram = "gost"; }; From 0531dc06867c023eb46c66e20ff38038ead4aa33 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 14:10:50 +0800 Subject: [PATCH 4/5] gost: add missing ldflags --- pkgs/by-name/go/gost/package.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index 12bfcb8a9b08..ee924ca79f9a 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -20,6 +20,12 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-lzyr6Q8yXsuer6dRUlwHEeBewjwGxDslueuvIiZUW70="; + # Based on ldflags in upstream's .goreleaser.yaml + ldflags = [ + "-s" + "-X main.version=v${finalAttrs.version}" + ]; + __darwinAllowLocalNetworking = true; # i/o timeout From 6145dc270801d844c9c4561401532d30e88bd762 Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Wed, 2 Jul 2025 06:11:47 +0000 Subject: [PATCH 5/5] gost: 3.0.0 -> 3.1.0 --- pkgs/by-name/go/gost/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index ee924ca79f9a..8fba34d55f27 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gost"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "go-gost"; repo = "gost"; tag = "v${finalAttrs.version}"; - hash = "sha256-ep3ZjD+eVKl3PuooDuYeur8xDAcyy6ww2I7f3cYG03o="; + hash = "sha256-4ZfGxhXespaZNspvbwZ/Yz2ncqtY3wxJPQsqVILayao="; }; - vendorHash = "sha256-lzyr6Q8yXsuer6dRUlwHEeBewjwGxDslueuvIiZUW70="; + vendorHash = "sha256-lWuLvYF9Sl+k8VnsujvRmj7xb9zst+g//Gkg7VwtWkg="; # Based on ldflags in upstream's .goreleaser.yaml ldflags = [