From 06718493c09b4bdf367367a607fe440e50cd8bef Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 21 Feb 2018 19:31:25 +0000 Subject: [PATCH 1/2] libguestfs: 1.36.3 -> 1.38.0 --- pkgs/development/libraries/libguestfs/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index e659b31d974..7e7f4667358 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -9,16 +9,16 @@ assert javaSupport -> jdk != null; stdenv.mkDerivation rec { name = "libguestfs-${version}"; - version = "1.36.3"; + version = "1.38.0"; appliance = fetchurl { - url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz"; - sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125"; + url = "http://libguestfs.org/download/binaries/appliance/appliance-1.38.0.tar.xz"; + sha256 = "05481qxgidakga871yb5rgpyci2jaxmplmkh6y79anfh5m19nzhy"; }; src = fetchurl { - url = "http://libguestfs.org/download/1.36-stable/libguestfs-${version}.tar.gz"; - sha256 = "0dhb69b7svjgnrmbyvizdz5vsgsrr95ypz0qvp3kz83jyj6sa76m"; + url = "http://libguestfs.org/download/1.38-stable/libguestfs-${version}.tar.gz"; + sha256 = "0cgapiad3x5ggwm097mq62hng3bv91p5gmrikrb6adfaasr1l6m3"; }; nativeBuildInputs = [ pkgconfig ]; From f3b899d3a6ea7d750879b270810823086fb9ad64 Mon Sep 17 00:00:00 2001 From: volth Date: Thu, 22 Feb 2018 00:26:49 +0000 Subject: [PATCH 2/2] libguestfs: fix sandbox build --- pkgs/development/libraries/libguestfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 7e7f4667358..d7d0fbe8094 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # some scripts hardcore /usr/bin/env which is not available in the build env patchShebangs . ''; - configureFlags = [ "--disable-appliance" "--disable-daemon" ] + configureFlags = [ "--disable-appliance" "--disable-daemon" "--with-distro=NixOS" ] ++ stdenv.lib.optionals (!javaSupport) [ "--disable-java" "--without-java" ]; patches = [ ./libguestfs-syms.patch ]; NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";