public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libvirt: switch who makes assertions about whose version

Browse Source 
Previously, the native libvirt package was making an assertion that
the dependent Python package had a compatible version. This commit
switches that so that the Python package makes the assertion, since
it makes more sense to me to have a child package making an
assertion about its parent than vice versa.
This commit is contained in:
Dan Peebles 2015-12-24 19:59:44 +00:00
parent c26062884b
commit 8c42b26fa2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libvirt/default.nix
View File

@ -1,16 +1,12 @@
{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext , iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages
, pythonPackages, perlPackages
}: }:
let version = "1.2.19"; in
assert version == pythonPackages.libvirt.version;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libvirt-${version}"; name = "libvirt-${version}";
version = "1.2.19";
src = fetchurl { src = fetchurl {
url = "http://libvirt.org/sources/${name}.tar.gz"; url = "http://libvirt.org/sources/${name}.tar.gz";

5
pkgs/top-level/python-packages.nix
View File

@ -21724,9 +21724,10 @@ in modules // {
}; };
}; };
libvirt = pkgs.stdenv.mkDerivation rec { libvirt = let
version = "1.2.18";
in assert version == pkgs.libvirt.version; pkgs.stdenv.mkDerivation rec {
name = "libvirt-python-${version}"; name = "libvirt-python-${version}";
version = "1.2.19";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://libvirt.org/sources/python/${name}.tar.gz"; url = "http://libvirt.org/sources/python/${name}.tar.gz";