From 94753af68ce76e0a8991d711ad54c927b6f891ed Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Fri, 31 Mar 2017 02:19:02 +0000
Subject: [PATCH] libguestfs: 1.34.4 -> 1.34.6
---
pkgs/development/libraries/libguestfs/default.nix | 8 ++++----
pkgs/development/ocaml-modules/ocaml-libvirt/default.nix | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 3f7542254cd7..0b7e889a631b 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -6,16 +6,16 @@
stdenv.mkDerivation rec {
name = "libguestfs-${version}";
- version = "1.34.4";
+ version = "1.34.6";
appliance = fetchurl {
- url = "http://libguestfs.org/download/binaries/appliance/appliance-1.34.0.tar.xz";
- sha256 = "0d7kg6ck9hwsqrxch69fhn49sbsjc8c40fr4753c35cq49f7xp6d";
+ url = "http://libguestfs.org/download/binaries/appliance/appliance-1.36.1.tar.xz";
+ sha256 = "1klvr13gpg615hgjvviwpxlj839lbwwsrq7x100qg5zmmjfhl125";
};
src = fetchurl {
url = "http://libguestfs.org/download/1.34-stable/libguestfs-${version}.tar.gz";
- sha256 = "1ca9i9d03pnfm7qqixvl48d7n0hn4ldmzlh2wcws45441prdxw3z";
+ sha256 = "1bdn6jsxm7krl4bpzwx47lg1xlhp5wfzizy03vspkgcppgp2q36s";
};
buildInputs = [
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 01b761e4e4ad..0ad5d09d687c 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -2,12 +2,13 @@
stdenv.mkDerivation rec {
name = "ocaml-libvirt-${version}";
- 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
+ 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 = fetchgit {
url = "git://git.annexia.org/git/ocaml-libvirt.git";
- rev = "8853f5a49587f00a7d2a5c8c7e52480a16bbdb02";
- sha256 = "1lnsvyb6dll58blacc629nz1lzc20p7ayqn9pag1rrx5i54q9v24";
+ rev = rev;
+ sha256 = "0z8p6q6k42rdrvy248siq922m1yszny1hfklf6djynvk2viyqdbg";
};
propagatedBuildInputs = [ libvirt ];
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
createFindlibDestdir = true;
preConfigure = ''
- substituteInPlace configure.ac --replace 0.6.1.4 0.6.1.5
autoconf
'';