JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #23073 from volth/libguestfs-1.34

Browse Source 
libguestfs: 1.29.5 -> 1.36.3
This commit is contained in:
Jaka Hudoklin 2017-04-19 02:01:54 +02:00 committed by GitHub
commit e0b0a07a74
5 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/hivex/default.nix
View File

@ -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 ];

6
pkgs/development/libraries/hivex/hivex-syms.patch
View File

@ -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)

29
pkgs/development/libraries/libguestfs/default.nix
View File

@ -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.36.3";
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.36.1.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/1.36-stable/libguestfs-${version}.tar.gz";
sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m";
};
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

8
pkgs/development/libraries/libguestfs/libguestfs-syms.patch
View File

@ -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 --git a/lib/Makefile.am b/lib/Makefile.am
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -168,8 +168,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 = \

20
pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
View File

@ -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";
rev = "3169af3";
version = "0.6.1.4-rev.${rev}"; # libguestfs-1.34 needs ocaml-libvirt newer than the latest release 0.6.1.4
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 = rev;
sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
};
propagatedBuildInputs = [ libvirt ];
buildInputs = [ ocaml findlib ];
nativeBuildInputs = [ autoconf findlib ];
buildInputs = [ ocaml ];
createFindlibDestdir = true;
preConfigure = ''
autoconf
'';
buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt";
installPhase = "make install-opt";