Merge pull request #238165 from R-VdP/guestfs_1_50_1

libguestfs, guestfs-tools: 1.48.(4/2) -> 1.50.1
This commit is contained in:
Pascal Bach 2023-06-19 20:48:51 +02:00 committed by GitHub
commit 14b7d56b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions

View File

@ -38,17 +38,18 @@
, appliance ? null , appliance ? null
, javaSupport ? false , javaSupport ? false
, jdk , jdk
, zstd
}: }:
assert appliance == null || lib.isDerivation appliance; assert appliance == null || lib.isDerivation appliance;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libguestfs"; pname = "libguestfs";
version = "1.48.4"; version = "1.50.1";
src = fetchurl { src = fetchurl {
url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
sha256 = "sha256-ncIrbFpF8ZwsupEaN7Oo2G9idEUhsQ61PD05B+UIAxI="; sha256 = "sha256-Xmhx6I+C5SHjHUQt5qELZJcCN8t5VumdEXsSO1hWWm8=";
}; };
strictDeps = true; strictDeps = true;
@ -63,6 +64,7 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
pkg-config pkg-config
qemu qemu
zstd
] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ]) ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])
++ (with ocamlPackages; [ ocaml findlib ]); ++ (with ocamlPackages; [ ocaml findlib ]);
buildInputs = [ buildInputs = [

View File

@ -8,10 +8,12 @@
, curl , curl
, flex , flex
, getopt , getopt
, glib
, gnupg , gnupg
, hivex , hivex
, jansson , jansson
, libguestfs-with-appliance , libguestfs-with-appliance
, libosinfo
, libvirt , libvirt
, libxml2 , libxml2
, makeWrapper , makeWrapper
@ -27,11 +29,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "guestfs-tools"; pname = "guestfs-tools";
version = "1.48.2"; version = "1.50.1";
src = fetchurl { src = fetchurl {
url = "https://download.libguestfs.org/guestfs-tools/${lib.versions.majorMinor version}-stable/guestfs-tools-${version}.tar.gz"; 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 = [ nativeBuildInputs = [
@ -61,9 +63,11 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bash-completion bash-completion
glib
hivex hivex
jansson jansson
libguestfs-with-appliance libguestfs-with-appliance
libosinfo
libvirt libvirt
libxml2 libxml2
ncurses ncurses