Skip to content

Commit

Permalink
ah pronto que era só o go empurrando o gvisor demais e quebrando tudo
Browse files Browse the repository at this point in the history
Signed-off-by: lucasew <lucas59356@gmail.com>
  • Loading branch information
lucasew committed Mar 4, 2024
1 parent 3deb85b commit c9c914f
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 5 deletions.
6 changes: 6 additions & 0 deletions deps.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package tsproxy

// explicit deps so go mod tidy dont remove them from go.mod
import (
_ "gvisor.dev/gvisor/pkg/refs"
)
6 changes: 4 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
10 changes: 9 additions & 1 deletion package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
'';
}

0 comments on commit c9c914f

Please sign in to comment.