diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index 76836b69d2a8..eced02fd33e3 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "hivex-${version}"; - version = "1.3.11"; + version = "1.3.14"; src = fetchurl { url = "http://libguestfs.org/download/hivex/${name}.tar.gz"; - sha256 = "0y3nqykwy58divxkv7gmsb067dasyfz3apbp437hl57rgrndyfn6"; + sha256 = "0aqv28prjcmc66znw0wgaxjijg5mjm44bgn1iil8a4dlbsgv4p7b"; }; patches = [ ./hivex-syms.patch ]; diff --git a/pkgs/development/libraries/hivex/hivex-syms.patch b/pkgs/development/libraries/hivex/hivex-syms.patch index 2280ade59a62..bacd34e8515d 100644 --- a/pkgs/development/libraries/hivex/hivex-syms.patch +++ b/pkgs/development/libraries/hivex/hivex-syms.patch @@ -1,6 +1,6 @@ -diff -rupN hivex-1.3.11/lib/Makefile.am hivex-1.3.11-new/lib/Makefile.am ---- hivex-1.3.11/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 -+++ hivex-1.3.11-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 +diff -rupN hivex-1.3.14/lib/Makefile.am hivex-1.3.14-new/lib/Makefile.am +--- hivex-1.3.14/lib/Makefile.am 2013-09-10 13:04:12.000000000 +0200 ++++ hivex-1.3.14-new/lib/Makefile.am 2014-11-06 01:31:05.956106861 +0100 @@ -40,8 +40,7 @@ libhivex_la_SOURCES = \ libhivex_la_LIBADD = ../gnulib/lib/libgnu.la $(LTLIBOBJS) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 02e75788d01e..3f7542254cd7 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,32 +1,45 @@ { 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 }: +, gmp, readline, file, libintlperl, GetoptLong, SysVirt, numactl, xen, libapparmor +, getopt, perlPackages, ocamlPackages }: stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.29.5"; + version = "1.34.4"; 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-1.34.0.tar.xz"; + sha256 = "0d7kg6ck9hwsqrxch69fhn49sbsjc8c40fr4753c35cq49f7xp6d"; }; src = fetchurl { - url = "http://libguestfs.org/download/1.29-development/libguestfs-${version}.tar.gz"; - sha256 = "1il0p3irwcyfdm83935hj4bvxsx0kdfn8dvqmg2lbzap17jvzj8h"; + url = "http://libguestfs.org/download/1.34-stable/libguestfs-${version}.tar.gz"; + sha256 = "1ca9i9d03pnfm7qqixvl48d7n0hn4ldmzlh2wcws45441prdxw3z"; }; 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 - ]; + SysVirt numactl xen libapparmor getopt perlPackages.ModuleBuild + ] ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]); + prePatch = '' + # build-time scripts + substituteInPlace run.in --replace '#!/bin/bash' '#!/bin/sh' + substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!/bin/sh' + + # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml" + substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + substituteInPlace ocaml/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + substituteInPlace v2v/test-harness/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + substituteInPlace v2v/test-harness/Makefile.in --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' + ''; configureFlags = "--disable-appliance --disable-daemon"; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; + installFlags = "REALLY_INSTALL=yes"; postInstall = '' for bin in $out/bin/*; do diff --git a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch index 44cdc4e69b2e..88c9ec0e4309 100644 --- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch +++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch @@ -1,7 +1,7 @@ -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 -@@ -167,8 +167,7 @@ libguestfs_la_LIBADD = \ +diff -rupN libguestfs-1.34.4/src/Makefile.am libguestfs-1.34.4-new/src/Makefile.am +--- libguestfs-1.34.4/src/Makefile.am 2017-02-22 07:49:07.322357165 +0000 ++++ libguestfs-1.34.4-new/src/Makefile.am 2017-02-22 07:50:03.437454422 +0000 +@@ -172,8 +172,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. libguestfs_la_LDFLAGS = \ diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 439beaa24ffc..01b761e4e4ad 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -1,20 +1,28 @@ -{ stdenv, fetchurl, libvirt, ocaml, findlib }: +{ stdenv, fetchgit, libvirt, autoconf, ocaml, findlib }: stdenv.mkDerivation rec { name = "ocaml-libvirt-${version}"; - version = "0.6.1.4"; + version = "0.6.1.5"; # FIXME: libguestfs depends on not yet released 0.6.1.5, so the latest post-0.6.1.4 master from git is used - src = fetchurl { - url = "http://libvirt.org/sources/ocaml/ocaml-libvirt-${version}.tar.gz"; - sha256 = "06q2y36ckb34n179bwczxkl82y3wrba65xb2acg8i04jpiyxadjd"; + src = fetchgit { + url = "git://git.annexia.org/git/ocaml-libvirt.git"; + rev = "8853f5a49587f00a7d2a5c8c7e52480a16bbdb02"; + sha256 = "1lnsvyb6dll58blacc629nz1lzc20p7ayqn9pag1rrx5i54q9v24"; }; propagatedBuildInputs = [ libvirt ]; - buildInputs = [ ocaml findlib ]; + nativeBuildInputs = [ autoconf findlib ]; + + buildInputs = [ ocaml ]; createFindlibDestdir = true; + preConfigure = '' + substituteInPlace configure.ac --replace 0.6.1.4 0.6.1.5 + autoconf + ''; + buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; installPhase = "make install-opt";