From 3534cdcc84b01e40cc5bd0d2687b364e7273951c Mon Sep 17 00:00:00 2001 From: lucasew Date: Mon, 4 Mar 2024 12:47:45 -0300 Subject: [PATCH] =?UTF-8?q?ah=20pronto=20que=20era=20s=C3=B3=20o=20go=20em?= =?UTF-8?q?purrando=20o=20gvisor=20demais=20e=20quebrando=20tudo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ty @bradfitz from https://github.com/tailscale/tailscale/issues/7596#issuecomment-1474907674 Signed-off-by: lucasew --- deps.go | 6 ++++++ go.mod | 6 ++++-- go.sum | 4 ++-- package.nix | 10 +++++++++- 4 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 deps.go diff --git a/deps.go b/deps.go new file mode 100644 index 0000000..17f9b19 --- /dev/null +++ b/deps.go @@ -0,0 +1,6 @@ +package tsproxy + +// explicit deps so go mod tidy dont remove them from go.mod +import ( + _ "gvisor.dev/gvisor/pkg/refs" +) diff --git a/go.mod b/go.mod index 52aaf86..127739e 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,10 @@ module github.com/lucasew/ts-proxy go 1.22.0 -require tailscale.com v1.60.1 +require ( + gvisor.dev/gvisor v0.0.0-20240119233241-c9c1d4f9b186 + tailscale.com v1.60.1 +) require ( filippo.io/edwards25519 v1.1.0 // indirect @@ -79,7 +82,6 @@ require ( golang.org/x/tools v0.18.0 // indirect golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect golang.zx2c4.com/wireguard/windows v0.5.3 // indirect - gvisor.dev/gvisor v0.0.0-20240303223114-40b74cc60b23 // indirect inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect nhooyr.io/websocket v1.8.10 // indirect ) diff --git a/go.sum b/go.sum index ae658c0..88fbaf0 100644 --- a/go.sum +++ b/go.sum @@ -218,8 +218,8 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gvisor.dev/gvisor v0.0.0-20240303223114-40b74cc60b23 h1:6VsOeO0Zi/sKYeNMPm3hAL4732URJHCRKIAeIQl3aeE= -gvisor.dev/gvisor v0.0.0-20240303223114-40b74cc60b23/go.mod h1:NQHVAzMwvZ+Qe3ElSiHmq9RUm1MdNHpUZ52fiEqvn+0= +gvisor.dev/gvisor v0.0.0-20240119233241-c9c1d4f9b186 h1:VWRSJX9ghfqsRSZGMAILL6QpYRKWnHcYPi24SCubQRs= +gvisor.dev/gvisor v0.0.0-20240119233241-c9c1d4f9b186/go.mod h1:10sU+Uh5KKNv1+2x2A0Gvzt8FjD3ASIhorV3YsauXhk= honnef.co/go/tools v0.4.6 h1:oFEHCKeID7to/3autwsWfnuv69j3NsfcXbvJKuIcep8= honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= howett.net/plist v1.0.0 h1:7CrbWYbPPO/PyNy38b2EB/+gYbjCe2DXBxgtOOZbSQM= diff --git a/package.nix b/package.nix index 1e61afb..e8695be 100644 --- a/package.nix +++ b/package.nix @@ -6,5 +6,13 @@ buildGo122Module { src = ./.; - vendorHash = "sha256-DmmEXXXi+19+OcW6DTQ2bCbebIldDdkMRjvm6Dp3Df0="; + # vendorHash = "sha256:${lib.fakeSha256}"; + vendorHash = "sha256-N8/n/FTZf59bQ1FZ1jf1RaUwsjmg8pwYKkJPleoy8fU="; + + postConfigure = '' + # chmod -R +w vendor/gvisor.dev/gvisor #/pkg/refs/refs_template.go + # rm vendor/gvisor.dev/gvisor/pkg/refs/refs_template.go + # substituteInPlace vendor/gvisor.dev/gvisor/pkg/refs/refs_template.go \ + # --replace refs_template refs + ''; }