From a9d1901115b47b532a249a37f33f3141cd952ee7 Mon Sep 17 00:00:00 2001 From: Moritz Sanft <58110325+msanft@users.noreply.github.com> Date: Sun, 7 Apr 2024 23:14:54 +0200 Subject: [PATCH] gvisor: 20240311.0-unstable-2024-03-25 -> 20240401.0 --- .../gvisor/default.nix => by-name/gv/gvisor/package.nix} | 6 +++--- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) rename pkgs/{applications/virtualization/gvisor/default.nix => by-name/gv/gvisor/package.nix} (87%) diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/by-name/gv/gvisor/package.nix similarity index 87% rename from pkgs/applications/virtualization/gvisor/default.nix rename to pkgs/by-name/gv/gvisor/package.nix index 0a1d737b2eed..ceb122a2c08d 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 5fea92ed7f74..f5a2ceb9981d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31747,8 +31747,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 { };