libguestfs: 1.38.6 -> 1.40.2 (#67572)

* libguestfs: bump stable 1.38.6 -> 1.40.2
This commit is contained in:
Amar Paul 2019-10-31 16:48:19 -04:00 committed by Renaud
parent b45c5dc0aa
commit ded2b8a669

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
, ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
, gmp, readline, file, numactl, xen, libapparmor , gmp, readline, file, numactl, xen, libapparmor, jansson
, getopt, perlPackages, ocamlPackages , getopt, perlPackages, ocamlPackages
, appliance ? null , appliance ? null
, javaSupport ? false, jdk ? null }: , javaSupport ? false, jdk ? null }:
@ -11,16 +11,16 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libguestfs"; pname = "libguestfs";
version = "1.38.6"; version = "1.40.2";
src = fetchurl { src = fetchurl {
url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; url = "http://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz";
sha256 = "1v2mggx2jlaq4m3p5shc46gzf7vmaayha6r0nwdnyzd7x6q0is7p"; sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ];
buildInputs = [ buildInputs = [
makeWrapper autoreconfHook ncurses cpio gperf ncurses cpio gperf jansson
cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
systemd fuse yajl libvirt gmp readline file hivex systemd fuse yajl libvirt gmp readline file hivex
numactl xen libapparmor getopt perlPackages.ModuleBuild numactl xen libapparmor getopt perlPackages.ModuleBuild
@ -65,6 +65,8 @@ stdenv.mkDerivation rec {
doInstallCheck = appliance != null; doInstallCheck = appliance != null;
installCheckPhase = '' installCheckPhase = ''
runHook preInstallCheck
export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G
@ -77,12 +79,14 @@ stdenv.mkDerivation rec {
mkfs ext2 /dev/sda1 mkfs ext2 /dev/sda1
list-filesystems list-filesystems
EOF EOF
runHook postInstallCheck
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Tools for accessing and modifying virtual machine disk images"; description = "Tools for accessing and modifying virtual machine disk images";
license = licenses.gpl2; license = with licenses; [ gpl2 lgpl21 ];
homepage = http://libguestfs.org/; homepage = "http://libguestfs.org/";
maintainers = with maintainers; [offline]; maintainers = with maintainers; [offline];
platforms = platforms.linux; platforms = platforms.linux;
}; };