From 6c29394c501982fd213820446b93af712eed3f98 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 18 Jan 2024 04:20:00 +0000 Subject: [PATCH 1/2] gost: use Go 1.20 Go 1.19 has reached EOL on 06 Sep 2023 --- pkgs/tools/networking/gost/default.nix | 12 ++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index f36ee2d3e206..0eb84a73c542 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, buildGoModule }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, fetchpatch }: buildGoModule rec { pname = "gost"; @@ -11,7 +11,15 @@ buildGoModule rec { sha256 = "sha256-UBjrWeBw9+qKQ/+1T1W/3e0vrigp540URIyM2d9iCE8="; }; - vendorHash = "sha256-lA4uW0cc0XqU9pjVEMapFLb3eD20Lea9PbkgL3sjJns="; + patches = [ + # Add go1.20 support. Remove with the next release. + (fetchpatch { + url = "https://github.com/ginuerzh/gost/commit/0f7376bd10c913c7e6b1e7e02dd5fd7769975d78.patch"; + hash = "sha256-pQNCvl7/huNrkM3+XHkGnvLYCzdjbMV6nef1KcMnKEw="; + }) + ]; + + vendorHash = "sha256-wAdNfhSPj9JUcI6Gcja6nRy68bVhV8B4PARR0WS9rjQ="; postPatch = '' substituteInPlace http2_test.go \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ee0abde9bc1..e62e10d4b264 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8806,7 +8806,7 @@ with pkgs; goreplay = callPackage ../tools/networking/goreplay { }; gost = callPackage ../tools/networking/gost { - buildGoModule = buildGo119Module; # go 1.20 build failure + buildGoModule = buildGo120Module; # go 1.21 build failure }; gource = callPackage ../applications/version-management/gource { }; From 155959daf716991e2ce4dcb09100cd1af8839467 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 18 Jan 2024 04:20:00 +0000 Subject: [PATCH 2/2] gost: enable on darwin --- pkgs/tools/networking/gost/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/gost/default.nix b/pkgs/tools/networking/gost/default.nix index 0eb84a73c542..6e7743fb990c 100644 --- a/pkgs/tools/networking/gost/default.nix +++ b/pkgs/tools/networking/gost/default.nix @@ -49,8 +49,9 @@ buildGoModule rec { --replace '{url.UserPassword("AES-256-GCM", "123456"), url.UserPassword("AES-256-GCM", "123456"), true},' "" ''; + __darwinAllowLocalNetworking = true; + meta = with lib; { - broken = stdenv.isDarwin; description = "A simple tunnel written in golang"; homepage = "https://github.com/ginuerzh/gost"; license = licenses.mit;