virt-v2v: 2.6.0 -> 2.8.1 (#431230)

authored by Austin Horstman and committed by GitHub ded2d32f 9efea132

+15 -7
+15 -7
pkgs/by-name/vi/virt-v2v/package.nix
··· 16 16 libosinfo, 17 17 pcre2, 18 18 libxml2, 19 - jansson, 19 + json_c, 20 20 glib, 21 21 libguestfs-with-appliance, 22 22 cdrkit, ··· 24 24 withWindowsGuestSupport ? true, 25 25 pkgsCross, # for rsrvany 26 26 virtio-win, 27 + gitUpdater, 27 28 }: 28 29 29 30 stdenv.mkDerivation (finalAttrs: { 30 31 pname = "virt-v2v"; 31 - version = "2.6.0"; 32 + version = "2.8.1"; 32 33 33 34 src = fetchurl { 34 35 url = "https://download.libguestfs.org/virt-v2v/${lib.versions.majorMinor finalAttrs.version}-stable/virt-v2v-${finalAttrs.version}.tar.gz"; 35 - sha256 = "sha256-W7t/n1QO9UebyH85abtnSY5i7kH/6h8JIAlFQoD1vkU="; 36 + sha256 = "sha256-RJPwtI6GHN+W+Pw8jdEAgQMbR42aGqTYW2rPtAYBPYM="; 36 37 }; 37 38 38 39 postPatch = '' 39 - substituteInPlace common/mlv2v/uefi.ml \ 40 - --replace-fail '/usr/share/OVMF/OVMF_CODE.fd' "${OVMF.firmware}" \ 41 - --replace-fail '/usr/share/OVMF/OVMF_VARS.fd' "${OVMF.variables}" 40 + # TODO: allow guest != host CPU ISA 41 + substituteInPlace output/output_qemu.ml \ 42 + --replace-fail '/usr/share/OVMF' ""${OVMF.fd}/FV/" \ 43 + --replace-fail '/usr/share/AAVMF' ""${OVMF.fd}/FV/" 42 44 43 45 patchShebangs . 44 46 ''; ··· 61 63 ]); 62 64 63 65 buildInputs = [ 66 + json_c 64 67 libosinfo 65 68 pcre2 66 69 libxml2 67 - jansson 68 70 glib 69 71 ] 70 72 ++ (with ocamlPackages; [ ··· 92 94 PKG_CONFIG_BASH_COMPLETION_COMPLETIONSDIR = "${placeholder "out"}/share/bash-completion/completions"; 93 95 94 96 passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; 97 + 98 + passthru.updateScript = gitUpdater { 99 + url = "https://github.com/libguestfs/guestfs-tools"; 100 + rev-prefix = "v"; 101 + odd-unstable = true; 102 + }; 95 103 96 104 meta = { 97 105 homepage = "https://github.com/libguestfs/virt-v2v";