diff options
author | Alexandre Iooss <erdnaxe@crans.org> | 2021-08-27 14:00:59 +0200 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-08-28 10:53:44 +0000 |
commit | 07c3195664eaf0d927965ef75e850bcdb0b550db (patch) | |
tree | d655b40881d86ea10b8390a271a903202544a36e /pkgs/development/libraries/libguestfs | |
parent | 137147c82600f911d9106dc3281e77bd74e81372 (diff) | |
download | nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.tar nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.tar.gz nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.tar.bz2 nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.tar.lz nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.tar.xz nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.tar.zst nixpkgs-07c3195664eaf0d927965ef75e850bcdb0b550db.zip |
libguestfs: 1.40.2 -> 1.44.1
Diffstat (limited to 'pkgs/development/libraries/libguestfs')
-rw-r--r-- | pkgs/development/libraries/libguestfs/default.nix | 29 | ||||
-rw-r--r-- | pkgs/development/libraries/libguestfs/ocaml-4.12.patch | 11 |
2 files changed, 19 insertions, 21 deletions
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 47f6ffe2c52..e17d0fd3363 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, autoreconfHook, makeWrapper +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, libapparmor, jansson @@ -12,11 +12,11 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { pname = "libguestfs"; - version = "1.40.2"; + version = "1.44.1"; src = fetchurl { - url = "https://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz"; - sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; + url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz"; + sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; @@ -33,20 +33,29 @@ stdenv.mkDerivation rec { prePatch = '' # build-time scripts substituteInPlace run.in --replace '#!/bin/bash' '#!${stdenv.shell}' - substituteInPlace ocaml-link.sh --replace '#!/bin/bash' '#!${stdenv.shell}' + substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}' # $(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' # some scripts hardcore /usr/bin/env which is not available in the build env patchShebangs . ''; - configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] - ++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; - patches = [ ./libguestfs-syms.patch ./ocaml-4.12.patch ]; + configureFlags = [ + "--disable-appliance" + "--disable-daemon" + "--with-distro=NixOS" + "--with-guestfs-path=${placeholder "out"}/lib/guestfs" + ] ++ lib.optionals (!javaSupport) [ "--without-java" ]; + patches = [ + ./libguestfs-syms.patch + # Set HAVE_RPM, HAVE_DPKG, HAVE_PACMAN + (fetchpatch { + url = "https://github.com/libguestfs/libguestfs/commit/210959cc344d6a4a1e3afa26d276b130651def74.patch"; + sha256 = "121l58mk2mwhhqc3rcisdw3di7y729b30hyffc8a50mq5k7fvsdb"; + }) + ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/"; installFlags = [ "REALLY_INSTALL=yes" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libguestfs/ocaml-4.12.patch b/pkgs/development/libraries/libguestfs/ocaml-4.12.patch deleted file mode 100644 index 032527d5713..00000000000 --- a/pkgs/development/libraries/libguestfs/ocaml-4.12.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/common/mlstdutils/std_utils.ml 2019-02-07 15:45:56.516955598 +0100 -+++ b/common/mlstdutils/std_utils.ml 2019-02-07 15:45:56.516955598 +0100 -@@ -305,7 +305,7 @@ - | x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs - | _ -> invalid_arg "combine3" - -- let rec assoc_lbl ?(cmp = compare) ~default x = function -+ let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function - | [] -> default - | (y, y') :: _ when cmp x y = 0 -> y' - | _ :: ys -> assoc_lbl ~cmp ~default x ys |