From 025d82d45cf50400f68f06c5d07458f54926956e Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sat, 17 Jun 2023 01:11:32 +0200
Subject: [PATCH] libguestfs, guestfs-tools: 1.48.(4/2) -> 1.50.1

---
 pkgs/development/libraries/libguestfs/default.nix   | 6 ++++--
 pkgs/tools/virtualization/guestfs-tools/default.nix | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 745b1a180008..0b2b4278a65a 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -38,17 +38,18 @@
 , appliance ? null
 , javaSupport ? false
 , jdk
+, zstd
 }:
 
 assert appliance == null || lib.isDerivation appliance;
 
 stdenv.mkDerivation rec {
   pname = "libguestfs";
-  version = "1.48.4";
+  version = "1.50.1";
 
   src = fetchurl {
     url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
-    sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI=";
+    sha256 = "sha256-Xmhx6I+C5SHjHUQt5qELZJcCN8t5VumdEXsSO1hWWm8=";
   };
 
   strictDeps = true;
@@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
     makeWrapper
     pkg-config
     qemu
+    zstd
   ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])
   ++ (with ocamlPackages; [ ocaml findlib ]);
   buildInputs = [
diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index 1c213c6b3243..2b7cfb79d870 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -8,10 +8,12 @@
 , curl
 , flex
 , getopt
+, glib
 , gnupg
 , hivex
 , jansson
 , libguestfs-with-appliance
+, libosinfo
 , libvirt
 , libxml2
 , makeWrapper
@@ -27,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "guestfs-tools";
-  version = "1.48.2";
+  version = "1.50.1";
 
   src = fetchurl {
     url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor version}-stable/guestfs-tools-${version}.tar.gz";
-    sha256 = "sha256-G9l5sG5g5kMlSXzg0GX8+Et7M9/k2dRLMBgsMI4MaxA=";
+    sha256 = "sha256-rH/MK9Xid+lb1bKnspCE3gATefBnHDZAQ3NRavhTvLA=";
   };
 
   nativeBuildInputs = [
@@ -61,9 +63,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bash-completion
+    glib
     hivex
     jansson
     libguestfs-with-appliance
+    libosinfo
     libvirt
     libxml2
     ncurses