nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 17:03:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

libguestfs: 1.40.2 -> 1.44.1

Browse Source
This commit is contained in:
Alexandre Iooss 2021-08-27 14:00:59 +02:00 committed by Alyssa Ross
parent 137147c826
commit 07c3195664
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2
, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db
, gmp, readline, file, numactl, libapparmor, jansson , gmp, readline, file, numactl, libapparmor, jansson
@ -12,11 +12,11 @@ assert javaSupport -> jdk != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libguestfs"; pname = "libguestfs";
version = "1.40.2"; version = "1.44.1";
src = fetchurl { src = fetchurl {
url = "https://libguestfs.org/download/1.40-stable/${pname}-${version}.tar.gz"; url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
sha256 = "ad6562c48c38e922a314cb45a90996843d81045595c4917f66b02a6c2dfe8058"; sha256 = "09dhmlbfdwirlmkasa28x69vqs5xndq0lnng6b4if76s6bfxrdvj";
}; };
nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ]; nativeBuildInputs = [ autoreconfHook makeWrapper pkg-config ];
@ -33,20 +33,29 @@ stdenv.mkDerivation rec {
prePatch = '' prePatch = ''
# build-time scripts # build-time scripts
substituteInPlace run.in --replace '#!/bin/bash' '#!${stdenv.shell}' 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" # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml"
substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml' substituteInPlace ocaml/Makefile.am --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
substituteInPlace ocaml/Makefile.in --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 # some scripts hardcore /usr/bin/env which is not available in the build env
patchShebangs . patchShebangs .
''; '';
configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] configureFlags = [
++ lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; "--disable-appliance"
patches = [ ./libguestfs-syms.patch ./ocaml-4.12.patch ]; "--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/"; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
installFlags = [ "REALLY_INSTALL=yes" ]; installFlags = [ "REALLY_INSTALL=yes" ];
enableParallelBuilding = true; enableParallelBuilding = true;

11
pkgs/development/libraries/libguestfs/ocaml-4.12.patch
View File

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