about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Meyer <49727155+katexochen@users.noreply.github.com>2024-04-09 09:28:38 +0200
committerGitHub <noreply@github.com>2024-04-09 09:28:38 +0200
commita2fae8c20e2811f987145ac88f777f2b92288f3b (patch)
tree55a776a32354ccc8dd8625db643e110733d82d1d
parent2c7449f3130db1bee7598d282ba10d28c7d7d193 (diff)
parenta9d1901115b47b532a249a37f33f3141cd952ee7 (diff)
Merge pull request #302429 from msanft/gvisor/20240401.0
gvisor: 20240311.0-unstable-2024-03-25 -> 20240401.0
-rw-r--r--pkgs/by-name/gv/gvisor/package.nix (renamed from pkgs/applications/virtualization/gvisor/default.nix)6
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/by-name/gv/gvisor/package.nix
index 0a1d737b2eed8..ceb122a2c08db 100644
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/by-name/gv/gvisor/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule {
   pname = "gvisor";
-  version = "20240311.0-unstable-2024-03-25";
+  version = "20240401.0";
 
   # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
   # that can be used to build gvisor without bazel.
@@ -19,8 +19,8 @@ buildGoModule {
   src = fetchFromGitHub {
     owner = "google";
     repo = "gvisor";
-    rev = "b1e227737fd6e3bb3b11a403a1a5013bc89b3b60";
-    hash = "sha256-EfXzXkoEgtEerNMacRhbITCRig+t23WlIRya0BlJZcE=";
+    rev = "9d995324d058812a5476f8c06b20167012511e9c";
+    hash = "sha256-idgUEbYAfnm/HphVs12Sj1FwG+jmL2BBr0PJnG9BC3A=";
   };
 
   vendorHash = "sha256-jbMXeNXzvjfJcIfHjvf8I3ePjm6KFTXJ94ia4T2hUs4=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db27b063f6e37..494763899b2c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -31729,8 +31729,6 @@ with pkgs;
 
   gv = callPackage ../applications/misc/gv { };
 
-  gvisor = callPackage ../applications/virtualization/gvisor { };
-
   guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { };
 
   gwc = callPackage ../applications/audio/gwc { };