From 07c35dccded5c896c20107d18c9822f9d1df0db6 Mon Sep 17 00:00:00 2001
From: lukts30 <llukas21307@gmail.com>
Date: Tue, 5 Aug 2025 19:15:47 +0200
Subject: [PATCH 1/2] virt-v2v: 2.6.0 -> 2.8.1

---
 pkgs/by-name/vi/virt-v2v/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix
index d32f1f818e70..e482a250897f 100644
--- a/pkgs/by-name/vi/virt-v2v/package.nix
+++ b/pkgs/by-name/vi/virt-v2v/package.nix
@@ -16,7 +16,7 @@
   libosinfo,
   pcre2,
   libxml2,
-  jansson,
+  json_c,
   glib,
   libguestfs-with-appliance,
   cdrkit,
@@ -28,17 +28,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "virt-v2v";
-  version = "2.6.0";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "https://download.libguestfs.org/virt-v2v/${lib.versions.majorMinor finalAttrs.version}-stable/virt-v2v-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-W7t/n1QO9UebyH85abtnSY5i7kH/6h8JIAlFQoD1vkU=";
+    sha256 = "sha256-RJPwtI6GHN+W+Pw8jdEAgQMbR42aGqTYW2rPtAYBPYM=";
   };
 
   postPatch = ''
-    substituteInPlace common/mlv2v/uefi.ml \
-        --replace-fail '/usr/share/OVMF/OVMF_CODE.fd' "${OVMF.firmware}" \
-        --replace-fail '/usr/share/OVMF/OVMF_VARS.fd' "${OVMF.variables}"
+    # TODO: allow guest != host CPU ISA
+    substituteInPlace output/output_qemu.ml \
+        --replace-fail '/usr/share/OVMF' ""${OVMF.fd}/FV/" \
+        --replace-fail '/usr/share/AAVMF' ""${OVMF.fd}/FV/"
 
     patchShebangs .
   '';
@@ -61,10 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
   ]);
 
   buildInputs = [
+    json_c
     libosinfo
     pcre2
     libxml2
-    jansson
     glib
   ]
   ++ (with ocamlPackages; [

From aa0a17e8557f78d87f704c35dbc93fbe7b400231 Mon Sep 17 00:00:00 2001
From: lukts30 <llukas21307@gmail.com>
Date: Tue, 5 Aug 2025 19:22:19 +0200
Subject: [PATCH 2/2] virt-v2v: add updateScript

---
 pkgs/by-name/vi/virt-v2v/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/vi/virt-v2v/package.nix b/pkgs/by-name/vi/virt-v2v/package.nix
index e482a250897f..e20eba572589 100644
--- a/pkgs/by-name/vi/virt-v2v/package.nix
+++ b/pkgs/by-name/vi/virt-v2v/package.nix
@@ -24,6 +24,7 @@
   withWindowsGuestSupport ? true,
   pkgsCross, # for rsrvany
   virtio-win,
+  gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -94,6 +95,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/libguestfs/guestfs-tools";
+    rev-prefix = "v";
+    odd-unstable = true;
+  };
+
   meta = {
     homepage = "https://github.com/libguestfs/virt-v2v";
     description = "Convert guests from foreign hypervisors to run on KVM";