summary refs log tree commit diff
path: root/pkgs/development/libraries/libguestfs
diff options
context:
space:
mode:
authorAmar Paul <amar.paul16@gmail.com>2019-10-31 16:48:19 -0400
committerRenaud <c0bw3b@users.noreply.github.com>2019-10-31 21:48:19 +0100
commitded2b8a669692b9be72b79bde645242d4f3b1136 (patch)
tree620864968a10cc0a183ee40f245fa5e50cbd7877 /pkgs/development/libraries/libguestfs
parentb45c5dc0aa6fb73a9d72db122d7d6d0d61598042 (diff)
downloadnixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.tar
nixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.tar.gz
nixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.tar.bz2
nixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.tar.lz
nixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.tar.xz
nixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.tar.zst
nixpkgs-ded2b8a669692b9be72b79bde645242d4f3b1136.zip
libguestfs: 1.38.6 -> 1.40.2 (#67572)
* libguestfs: bump stable 1.38.6 -> 1.40.2

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