Unverified Commit 14b7d56b authored by Pascal Bach's avatar Pascal Bach Committed by GitHub
Browse files

Merge pull request #238165 from R-VdP/guestfs_1_50_1 

libguestfs, guestfs-tools: 1.48.(4/2) -> 1.50.1
parents 6957b8ed 025d82d4

pkgs/development/libraries/libguestfs/default.nix

+4 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/tools/virtualization/guestfs-tools/default.nix

+6 −2
Original line number Diff line number Diff line
@@ -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