From 0be84182753e6f5b874c2ac9b26d38664257aeee Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Wed, 18 Feb 2015 13:42:14 +1100 Subject: [PATCH] libvirt: update from 1.2.9 to 1.2.12 libvirt-glib: update from 0.1.9 to 0.2.0 pythonPackages.libvirt: update from 1.2.9 to 1.2.12 Potentially fixes CVE-2014-7823 CVE-2015-0236 --- pkgs/development/libraries/libvirt-glib/default.nix | 4 ++-- pkgs/development/libraries/libvirt/default.nix | 10 +++++----- pkgs/top-level/python-packages.nix | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 09d2e9dfc43..ae1f0e41448 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libvirt-glib-0.1.9"; + name = "libvirt-glib-0.2.0"; src = fetchurl { url = "http://libvirt.org/sources/glib/${name}.tar.gz"; - sha256 = "0n59hp0kwn80z9136g2n7pwkrlhlsxksr6gy4w7783d71qk3cfq5"; + sha256 = "02saqkk4wzsimsan7s9yc5bx05xn7j00hnxhq4sczkgr4krf1drh"; }; buildInputs = [ diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 8bd4866cb21..9c9bf40b8e8 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng -, dnsmasq, libnl, libpcap -, pythonPackages +, dnsmasq, libnl, libpcap, libxslt, xhtml1 +, pythonPackages, perlPackages }: -let version = "1.2.9"; in +let version = "1.2.12"; in assert version == pythonPackages.libvirt.version; @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "1i4ggs50dipz1hm0qlk6kak1n3klll8sx9fnffmvjlgla9d1m4wm"; + sha256 = "0sp6xm6iyg5wfjgxiba4rpl527429r22lh241dzxjq25fxzj5xgg"; }; buildInputs = [ pkgconfig libxml2 gnutls devicemapper perl python readline lvm2 utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper - libcap_ng libnl + libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath ]; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d26026a9df..241942d2291 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13024,11 +13024,11 @@ let libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.9"; + version = "1.2.12"; src = pkgs.fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "1vbrkwvsvcfgibdw4drcypg2n6zcpi3zv23zw20nkk5fjfp26w4g"; + sha256 = "17w4mpsp4pxhbzs128ig3gxp12rr0j41mxch8i11dqjrjy7l6bs3"; }; buildInputs = with self; [ python pkgs.pkgconfig pkgs.libvirt lxml ];