From 1c607fa638fcc306377edd4ee65cd79402b97470 Mon Sep 17 00:00:00 2001 From: Casey Link Date: Wed, 4 Jun 2025 11:43:24 +0200 Subject: [PATCH] gost: 2.12.0 -> 3.0.0 - The project has changed from the author's personal profile on github to the go-gost github org - I've added myself as maintainer since pmy hasn't been active since 2022 --- pkgs/by-name/go/gost/package.nix | 43 +++++++------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix index 80a622fdea1f..d517621fd4ae 100644 --- a/pkgs/by-name/go/gost/package.nix +++ b/pkgs/by-name/go/gost/package.nix @@ -8,44 +8,16 @@ buildGoModule rec { pname = "gost"; - version = "2.12.0"; + version = "3.0.0"; src = fetchFromGitHub { - owner = "ginuerzh"; + owner = "go-gost"; repo = "gost"; tag = "v${version}"; - hash = "sha256-kNhWJiPF6DlxxVZvW7HJkvzSuGsrozZBhiVaw+a7mYs="; + hash = "sha256-ep3ZjD+eVKl3PuooDuYeur8xDAcyy6ww2I7f3cYG03o="; }; - vendorHash = "sha256-7Wmd82sSMVAo1cGUi1EIig8h5drgy85D9FmSNtIBRqY="; - - postPatch = '' - substituteInPlace http2_test.go \ - --replace-fail "TestH2CForwardTunnel" "SkipH2CForwardTunnel" \ - --replace-fail "TestH2ForwardTunnel" "SkipH2ForwardTunnel" - - substituteInPlace resolver_test.go \ - --replace-fail '{NameServer{Addr: "1.1.1.1"}, "github", true},' "" \ - --replace-fail '{NameServer{Addr: "1.1.1.1"}, "github.com", true},' "" \ - --replace-fail '{NameServer{Addr: "1.1.1.1:53"}, "github.com", true},' "" \ - --replace-fail '{NameServer{Addr: "1.1.1.1:53", Protocol: "tcp"}, "github.com", true},' "" \ - --replace-fail '{NameServer{Addr: "1.1.1.1:853", Protocol: "tls"}, "github.com", true},' "" \ - --replace-fail '{NameServer{Addr: "1.1.1.1:853", Protocol: "tls", Hostname: "cloudflare-dns.com"}, "github.com", true},' "" \ - --replace-fail '{NameServer{Addr: "https://cloudflare-dns.com/dns-query", Protocol: "https"}, "github.com", true},' "" \ - --replace-fail '{NameServer{Addr: "https://1.0.0.1/dns-query", Protocol: "https"}, "github.com", true},' "" - - # Skip TestShadowTCP, TestShadowUDP: #70 #71 #72 #78 #83 #85 #86 #87 #93 - substituteInPlace ss_test.go \ - --replace-fail '{url.User("xchacha20"), url.UserPassword("xchacha20", "123456"), false},' "" \ - --replace-fail '{url.UserPassword("xchacha20", "123456"), url.User("xchacha20"), false},' "" \ - --replace-fail '{url.UserPassword("xchacha20", "123456"), url.UserPassword("xchacha20", "abc"), false},' "" \ - --replace-fail '{url.UserPassword("CHACHA20-IETF-POLY1305", "123456"), url.UserPassword("CHACHA20-IETF-POLY1305", "123456"), true},' "" \ - --replace-fail '{url.UserPassword("AES-128-GCM", "123456"), url.UserPassword("AES-128-GCM", "123456"), true},' "" \ - --replace-fail '{url.User("AES-192-GCM"), url.UserPassword("AES-192-GCM", "123456"), false},' "" \ - --replace-fail '{url.UserPassword("AES-192-GCM", "123456"), url.User("AES-192-GCM"), false},' "" \ - --replace-fail '{url.UserPassword("AES-192-GCM", "123456"), url.UserPassword("AES-192-GCM", "abc"), false},' "" \ - --replace-fail '{url.UserPassword("AES-256-GCM", "123456"), url.UserPassword("AES-256-GCM", "123456"), true},' "" - ''; + vendorHash = "sha256-lzyr6Q8yXsuer6dRUlwHEeBewjwGxDslueuvIiZUW70="; __darwinAllowLocalNetworking = true; @@ -60,9 +32,12 @@ buildGoModule rec { meta = { description = "Simple tunnel written in golang"; - homepage = "https://github.com/ginuerzh/gost"; + homepage = "https://github.com/go-gost/gost"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ pmy ]; + maintainers = with lib.maintainers; [ + pmy + ramblurr + ]; mainProgram = "gost"; }; }