b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

python-blivet: Move into python-modules/blivet.

Browse source 
This is in preparation for adding overridable function attributes.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2013-07-02 17:00:39 +02:00
parent 5d06f7aa5a
commit 231b182c36
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
2 changed files with 48 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
pkgs/development/python-modules/blivet/default.nix Normal file
View file

@ -0,0 +1,46 @@
{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
, libselinux, cryptsetup, multipath_tools, lsof, utillinux, udev
}:
let
pyenable = { enablePython = true; };
selinuxWithPython = libselinux.override pyenable;
cryptsetupWithPython = cryptsetup.override pyenable;
in buildPythonPackage rec {
name = "blivet-${version}";
version = "0.17-1";
src = fetchurl {
url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
+ "${name}.tar.bz2";
sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
};
postPatch = ''
sed -i -e '/find_library/,/find_library/ {
c libudev = "${udev}/lib/libudev.so.1"
}' blivet/pyudev.py
sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
blivet/devicelibs/mpath.py blivet/devices.py
sed -i -e '/"wipefs"/ {
s|wipefs|${utillinux}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
'';
propagatedBuildInputs = [
pykickstart pyparted pyblock udev selinuxWithPython cryptsetupWithPython
];
# tests are currently _heavily_ broken upstream
doCheck = false;
meta = {
homepage = "https://fedoraproject.org/wiki/Blivet";
description = "Module for management of a system's storage configuration";
license = [ "GPLv2+" "LGPLv2.1+" ];
};
}

47
pkgs/top-level/python-packages.nix
View file

@ -50,6 +50,8 @@ pythonPackages = python.modules // rec {
# packages defined elsewhere
blivet = callPackage ../development/python-modules/blivet { };
ipython = import ../shells/ipython {
inherit (pkgs) stdenv fetchurl sip pyqt4;
inherit buildPythonPackage pythonPackages;
@ -476,51 +478,6 @@ pythonPackages = python.modules // rec {
};
blivet = buildPythonPackage rec {
name = "blivet-${version}";
version = "0.17-1";
src = fetchurl {
url = "https://git.fedorahosted.org/cgit/blivet.git/snapshot/"
+ "${name}.tar.bz2";
sha256 = "0b28q539657mqif0mn5dfqcpqv7gbyszg83gf2fv6z7q6206rnx5";
};
postPatch = ''
sed -i -e '/find_library/,/find_library/ {
c libudev = "${pkgs.udev}/lib/libudev.so.1"
}' blivet/pyudev.py
sed -i -e 's|"multipath"|"${pkgs.multipath_tools}/sbin/multipath"|' \
blivet/devicelibs/mpath.py blivet/devices.py
sed -i -e '/"wipefs"/ {
s|wipefs|${pkgs.utillinux}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${pkgs.lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${pkgs.utillinux}/bin/\1"|' blivet/util.py
sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
'';
propagatedBuildInputs = let
pyenable = { enablePython = true; };
selinuxWithPython = pkgs.libselinux.override pyenable;
cryptsetupWithPython = pkgs.cryptsetup.override pyenable;
in [
pykickstart pyparted pkgs.udev pyblock
selinuxWithPython cryptsetupWithPython
];
# tests are currently _heavily_ broken upstream
doCheck = false;
meta = {
homepage = "https://fedoraproject.org/wiki/Blivet";
description = "Module for management of a system's storage configuration";
license = [ "GPLv2+" "LGPLv2.1+" ];
};
};
# euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work.
boto_1_9 = buildPythonPackage (rec {
name = "boto-1.9b";