Unverified Commit 0fd4b946 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

gvisor: 20251110.0 -> 20260406.0 (#503624)

parents 8cd5fa43 194ff685

pkgs/by-name/gv/gvisor/fix-go-mod-tidy.diff

0 → 100644
+40 −0
Original line number Diff line number Diff line 
diff --git a/go.mod b/go.mod

index 60f4e32..87a9269 100644

--- a/go.mod

+++ b/go.mod

@@ -4,7 +4,6 @@ go 1.25.5

 

 require (

 	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c

-	github.com/bazelbuild/rules_go v0.44.2

 	github.com/cenkalti/backoff v2.2.1+incompatible

 	github.com/cilium/ebpf v0.12.3

 	github.com/containerd/cgroups v1.0.4

@@ -44,7 +43,6 @@ require (

 	github.com/Microsoft/go-winio v0.6.0 // indirect

 	github.com/Microsoft/hcsshim v0.9.12 // indirect

 	github.com/containerd/ttrpc v1.1.2 // indirect

-	github.com/creack/pty v1.1.24 // indirect

 	github.com/davecgh/go-spew v1.1.1 // indirect

 	github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect

 	github.com/docker/go-units v0.4.0 // indirect

@@ -53,7 +51,6 @@ require (

 	github.com/golang/protobuf v1.5.4 // indirect

 	github.com/google/go-cmp v0.7.0 // indirect

 	github.com/google/gofuzz v1.2.0 // indirect

-	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect

 	github.com/googleapis/gnostic v0.5.5 // indirect

 	github.com/hashicorp/errwrap v1.1.0 // indirect

 	github.com/hashicorp/go-multierror v1.1.1 // indirect

@@ -68,11 +65,9 @@ require (

 	go.opencensus.io v0.24.0 // indirect

 	golang.org/x/net v0.44.0 // indirect

 	golang.org/x/oauth2 v0.30.0 // indirect

-	golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect

 	golang.org/x/term v0.35.0 // indirect

 	golang.org/x/text v0.29.0 // indirect

 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

-	google.golang.org/api v0.249.0 // indirect

 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect

 	google.golang.org/grpc v1.75.1 // indirect

 	gopkg.in/inf.v0 v0.9.1 // indirect

pkgs/by-name/gv/gvisor/package.nix

+6 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


buildGoModule {

  pname = "gvisor";

  version = "20251110.0";

  version = "20260406.0";



  # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)

  # that can be used to build gvisor without bazel.
@@ -21,8 +21,8 @@ buildGoModule { 
  src = fetchFromGitHub {

    owner = "google";

    repo = "gvisor";

    rev = "2617196c08506a30764bf6261b79d52797916dda";

    hash = "sha256-qx1uCRTJVotSbTojBf/Nj8LfLdUvsnxMkPuyJjLLadM=";

    rev = "db8d2c9abca39156c61ee2769d52b8a11accbe16";

    hash = "sha256-T0ilLqZTX2KNZdR7wuMnYimnL+G5Tbkd77IULCZE764=";

  };



  # Replace the placeholder with the actual path to ldconfig
@@ -31,7 +31,7 @@ buildGoModule { 
      --replace-fail '"/sbin/ldconfig"' '"${glibc}/bin/ldconfig"'

  '';



  vendorHash = "sha256-Ey4M3NK/+AVkr7r0aA+kAfNk1yVfnDn3Izy7u74HFkE=";

  vendorHash = "sha256-8Zkgt5hegYEHnG1lF+wLgdru6t3l+Z/qKRvJHukZbPo=";



  nativeBuildInputs = [ makeWrapper ];
@@ -60,6 +60,8 @@ buildGoModule { 
    mv $out/bin/shim $out/bin/containerd-shim-runsc-v1

  '';



  patches = [ ./fix-go-mod-tidy.diff ];



  passthru.tests = { inherit (nixosTests) gvisor; };



  meta = {