4 files changed, 15 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
index 01b05b5481f5..64d5022c2de8 100644
--- a/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/awsebcli/default.nix
@@ -23,16 +23,21 @@ let
 in
 with localPython.pkgs; buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.20.7";
+  version = "3.20.9";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     rev = "refs/tags/${version}";
-    hash = "sha256-DxjoEkFnY4aSfxVKPpnJLmnjLtZnlM74XXd0K8mcdoY=";
+    hash = "sha256-tnBDEeR+SCHb9UT3pTO7ISm4TVICvVfrV5cfz/60YQY=";
   };
 
+  postPatch = ''
+    # https://github.com/aws/aws-elastic-beanstalk-cli/pull/469
+    substituteInPlace setup.py --replace "scripts=['bin/eb']," ""
+  '';
+
   nativeBuildInputs = [
     pythonRelaxDepsHook
   ];
diff --git a/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix b/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix
index 32ca1ed00355..bb4374b1ec6b 100644
--- a/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/google-guest-oslogin/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "google-guest-oslogin";
-  version = "20230808.00";
+  version = "20230821.01";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "guest-oslogin";
     rev = version;
-    sha256 = "sha256-6CHMnoPrfXFAgTyIoGPsMos9CaW6W0zcbpIG1j7DRqk=";
+    sha256 = "sha256-1/iXn4jN44eZCLRYCDSsEz7WDnTsAwxxB62jvIRjvoU=";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix
index 345e65d04881..8fc5376e4c2c 100644
--- a/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/mkosi/default.nix
@@ -1,6 +1,8 @@
 { lib
 , fetchFromGitHub
 , setuptools
+, setuptools-scm
+, wheel
 , buildPythonApplication
 , pytestCheckHook
 , bubblewrap
@@ -41,9 +43,10 @@ buildPythonApplication rec {
 
   nativeBuildInputs = [
     setuptools
+    setuptools-scm
+    wheel
   ];
 
-
   propagatedBuildInputs = [
     systemdForMkosi
     bubblewrap
diff --git a/nixpkgs/pkgs/tools/virtualization/reg/default.nix b/nixpkgs/pkgs/tools/virtualization/reg/default.nix
index eaa937f6f326..84aecc3ff671 100644
--- a/nixpkgs/pkgs/tools/virtualization/reg/default.nix
+++ b/nixpkgs/pkgs/tools/virtualization/reg/default.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     owner = "genuinetools";
     repo = "reg";
     rev = "v${version}";
-    sha256 = "1jlza1czfssssi3y9zi6kr8k9msfa7vp215ibhwbz4h97av5xw5m";
+    hash = "sha256-tfBetjoJkr84XLEEcfdRTtc0UZ4m/uRH1Fpr91lQn8o=";
   };
 
   patches = [
@@ -29,7 +29,7 @@ buildGoModule rec {
     })
   ];
 
-  vendorSha256 = null;
+  vendorHash = null;
   doCheck = false;
 
   meta = with lib; {