From 012e588480eb0bf9ac51991afda957a1a8bfbf27 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 22 Oct 2024 13:51:37 +0000
Subject: [PATCH 1/4] guestfs-tools: fix build

OCaml was unpinned in #349339, but gettext is only available for OCaml < 5.0.
---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index fab60f9832b7..f10f837c11c8 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -55,9 +55,7 @@ stdenv.mkDerivation rec {
   ]) ++
   (with ocamlPackages; [
     findlib
-    gettext-stub
     ocaml
-    ocaml_gettext
     ounit2
   ]);
 

From 5c471113283319ceda315ecba1667c88abb35b96 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 22 Oct 2024 13:51:38 +0000
Subject: [PATCH 2/4] guestfs-tools: refactor

---
 .../virtualization/guestfs-tools/default.nix      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index f10f837c11c8..d4dc23b93340 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -27,13 +27,13 @@
 , xz
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "guestfs-tools";
   version = "1.52.0";
 
   src = fetchurl {
-    url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor version}-stable/guestfs-tools-${version}.tar.gz";
-    sha256 = "sha256-Iv0TIpcEX5CmdAbw/w7uDyoBBqXxyNz8XDlqYl/3g3Y=";
+    url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor finalAttrs.version}-stable/guestfs-tools-${finalAttrs.version}.tar.gz";
+    hash = "sha256-Iv0TIpcEX5CmdAbw/w7uDyoBBqXxyNz8XDlqYl/3g3Y=";
   };
 
   nativeBuildInputs = [
@@ -105,11 +105,12 @@ stdenv.mkDerivation rec {
       --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extra tools for accessing and modifying virtual machine disk images";
-    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    license = with lib.licenses; [ gpl2Plus lgpl21Plus ];
     homepage = "https://libguestfs.org/";
+    changelog = "https://www.libguestfs.org/guestfs-tools-release-notes-${lib.versions.majorMinor finalAttrs.version}.1.html";
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})

From ad3f44d15ccab7eabd2b12e3d3e6b2438440d1f0 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 22 Oct 2024 13:51:38 +0000
Subject: [PATCH 3/4] guestfs-tools: add updateScript

---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index d4dc23b93340..ad39b4ec8414 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -25,6 +25,7 @@
 , pkg-config
 , qemu
 , xz
+, gitUpdater
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -105,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix PERL5LIB : ${with perlPackages; makeFullPerlPath [ hivex libintl-perl libguestfs-with-appliance ]}
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/libguestfs/guestfs-tools";
+    rev-prefix = "v";
+    odd-unstable = true;
+  };
+
   meta = {
     description = "Extra tools for accessing and modifying virtual machine disk images";
     license = with lib.licenses; [ gpl2Plus lgpl21Plus ];

From 1d1707456a0fd8608db730ebbdf564dc60121dda Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 22 Oct 2024 13:51:38 +0000
Subject: [PATCH 4/4] guestfs-tools: 1.52.0 -> 1.52.2

https://github.com/libguestfs/guestfs-tools/compare/refs/tags/v1.52.0...refs/tags/v1.52.2
---
 pkgs/tools/virtualization/guestfs-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/guestfs-tools/default.nix b/pkgs/tools/virtualization/guestfs-tools/default.nix
index ad39b4ec8414..fddaa22a2dbf 100644
--- a/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/pkgs/tools/virtualization/guestfs-tools/default.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guestfs-tools";
-  version = "1.52.0";
+  version = "1.52.2";
 
   src = fetchurl {
     url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor finalAttrs.version}-stable/guestfs-tools-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Iv0TIpcEX5CmdAbw/w7uDyoBBqXxyNz8XDlqYl/3g3Y=";
+    hash = "sha256-02khDS2NLG1QOSqswtDoqBX2Mg6sE/OiUoP9JFs4vTU=";
   };
 
   nativeBuildInputs = [