libguestfs: 1.29.5 -> 1.36.3

NixOS · Apr 10, 2017 · 53f80bb · 53f80bb
1 parent 3f00bce
commit 53f80bb
Show file tree

Hide file tree

Showing 2 changed files with 86 additions and 28 deletions.
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
@@ -1,39 +1,98 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper
-, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
-, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex
-, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor }:
+{ stdenv, fetchurl, fetchgit, pkgconfig, autoreconfHook, makeWrapper, dbus, lzma, ocamlPackages
+, bash-completion, ncurses, cpio, gperf, perl, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
+, acl, libcap, libcap_ng, libconfig, fuse, yajl, libvirt, hivex, utillinux, curl
+, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor, which
+, systemd ? null }:
 
-stdenv.mkDerivation rec {
-  name = "libguestfs-${version}";
-  version = "1.29.5";
+let
+  mainVersion = "1.36.3";
+  applianceVersion = "1.36.1";
+
+  olibVirtRev = "3169af3337938e18bf9ecc6ce936d644e14ff3de";
+
+  # version 0.6.1.4 in nixpkgs is too old, but it is the latest official release, so instead
+  # we pull from master
+  # https://www.redhat.com/archives/libguestfs/2015-March/msg00062.html
+  olibvirt = stdenv.lib.overrideDerivation ocamlPackages.ocaml_libvirt (oldAttrs: {
+    name = "ocaml-libvirt-${builtins.substring 0 8 olibVirtRev}";
+    src = fetchgit {
+      url    = "git://git.annexia.org/git/ocaml-libvirt.git";
+      rev    = olibVirtRev;
+      sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
+    };
+    buildInputs = [ autoreconfHook ];
+  });
+
+in stdenv.mkDerivation rec {
+  name = "libguestfs-${mainVersion}";
+  version = mainVersion;
 
   appliance = fetchurl {
-    url = "http://libguestfs.org/download/binaries/appliance/appliance-1.26.0.tar.xz";
-    sha256 = "1kzvgmy845kclvr93y6rdpss2q0p8yfqg14r0i1pi5r4zc68yvj4";
+    url = "http://libguestfs.org/download/binaries/appliance/appliance-${applianceVersion}.tar.xz";
+    sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125";
   };
 
   src = fetchurl {
-    url = "http://libguestfs.org/download/1.29-development/libguestfs-${version}.tar.gz";
-    sha256 = "1il0p3irwcyfdm83935hj4bvxsx0kdfn8dvqmg2lbzap17jvzj8h";
+    url = "http://libguestfs.org/download/${builtins.substring 0 4 mainVersion}-stable/${name}.tar.gz";
+    sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m";
   };
 
+  # I don't know why we need this
+  patches = [ ./libguestfs-syms.patch ];
+
+  binPath = stdenv.lib.makeBinPath [ hivex qemu ];
+
+  # doCheck = true;
+
   buildInputs = [
-    makeWrapper pkgconfig autoreconfHook ncurses cpio gperf perl
-    cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig
-    systemd fuse yajl libvirt gmp readline file hivex libintlperl GetoptLong
-    SysVirt numactl xen libapparmor
+    GetoptLong SysVirt
+    acl augeas bash-completion bison cdrkit cpio dbus file flex fuse gmp
+    gperf hivex libapparmor libcap libcap_ng libconfig libintlperl libvirt
+    libxml2 lzma ncurses numactl pcre perl qemu readline systemd
+    utillinux xen yajl
+  ] ++ (with ocamlPackages; [ ocaml findlib olibvirt ]);
+
+  nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig which ];
+
+  configureFlags = [
+    "--disable-appliance"
+    "--disable-daemon"
   ];
 
-  configureFlags = "--disable-appliance --disable-daemon";
-  patches = [ ./libguestfs-syms.patch ];
-  NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
+  installFlags = [
+    "DESTDIR=/"
+    "REALLY_INSTALL=yes"
+  ];
+
+  preConfigure = ''
+    patchShebangs .
+  '';
+
+  preCheck = ''
+    # these are failing but at least we have tests now, which we didn't before
+    export SKIP_TEST_FUSE_SH=1
+    export SKIP_TEST_GUESTUNMOUNT_NOT_MOUNTED_SH=1
+    export SKIP_TEST_VIRT_BUILDER_LIST_SH=1
+    export SKIP_TEST_VIRT_BUILDER_LIST_SIMPLESTREAMS_SH=1
+
+    # the windows test is looking for an image, that doesn't exist so we create it
+    ${qemu}/bin/qemu-img create -f raw test-data/phony-guests/windows.img 8M
+
+    export PATH=$PATH:$(pwd)/bin:$out/bin
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    make install DESTDIR=$out/
 
-  postInstall = ''
     for bin in $out/bin/*; do
       wrapProgram "$bin" \
-        --prefix "PATH" : "$out/bin:${hivex}/bin:${qemu}/bin" \
-        --prefix "PERL5LIB" : "$PERL5LIB:$out/lib/perl5/site_perl"
+        --prefix PATH     : "$out/bin:${binPath}" \
+        --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/site_perl"
     done
+
+    runHook postInstall
   '';
 
   postFixup = ''
@@ -43,10 +102,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Tools for accessing and modifying virtual machine disk images";
-    license = licenses.gpl2;
-    homepage = http://libguestfs.org/;
-    maintainers = with maintainers; [offline];
-    platforms = platforms.linux;
-    hydraPlatforms = [];
+    license     = licenses.gpl2;
+    homepage    = http://libguestfs.org/;
+    maintainers = with maintainers; [ offline peterhoeg ];
+    platforms   = platforms.linux;
   };
 }
diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
@@ -1,6 +1,6 @@
 diff -rupN libguestfs-1.29.5/src/Makefile.am libguestfs-1.29.5-new/src/Makefile.am
---- libguestfs-1.29.5/src/Makefile.am	2014-11-05 16:43:08.000000000 +0100
-+++ libguestfs-1.29.5-new/src/Makefile.am	2014-11-05 20:07:45.760730596 +0100
+--- libguestfs-1.36.3/lib/Makefile.am	2014-11-05 16:43:08.000000000 +0100
++++ libguestfs-1.36.3-new/lib/Makefile.am	2014-11-05 20:07:45.760730596 +0100
 @@ -167,8 +167,7 @@ libguestfs_la_LIBADD = \
  # Force libtool to name the library 'libguestfs.so.0.$(MAX_PROC_NR).0'.
  # Include the version script to limit which symbols are exported.