diff options
author | Chris Ostrouchov <chris.ostrouchov@gmail.com> | 2018-10-25 22:15:22 -0400 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-10-27 09:07:19 +0200 |
commit | 3f830d85c670264e2215d4ee9c3f6c9af673e782 (patch) | |
tree | 05bf63a2bf0fa3f70c67b5b36bab059a6ce18799 /pkgs | |
parent | f65a963c505e47938ba6481de8379a8aae964a86 (diff) |
pythonPackages.pyblock: refactor move to python-modules
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/pyblock/default.nix | 38 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 30 |
2 files changed, 39 insertions, 29 deletions
diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix new file mode 100644 index 0000000000000..1be0ad1d4c733 --- /dev/null +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -0,0 +1,38 @@ +{ stdenv +, fetchurl +, python +, pkgs +, isPy3k +}: + +stdenv.mkDerivation rec { + name = "pyblock-${version}"; + version = "0.53"; + md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; + + src = pkgs.fetchurl rec { + url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/" + + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; + sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; + }; + + postPatch = '' + sed -i -e 's|/usr/include/python|${python}/include/python|' \ + -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile + ''; + + buildInputs = [ python pkgs.lvm2 pkgs.dmraid ]; + + makeFlags = [ + "USESELINUX=0" + "SITELIB=$(out)/${python.sitePackages}" + ]; + + meta = with stdenv.lib; { + homepage = https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html; + description = "Interface for working with block devices"; + license = licenses.gpl2Plus; + broken = isPy3k; # doesn't build on python 3, 2018-04-11 + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a1a35239a6e8..92ff9255635a1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3273,35 +3273,7 @@ in { pybfd = callPackage ../development/python-modules/pybfd { }; - pyblock = stdenv.mkDerivation rec { - name = "pyblock-${version}"; - version = "0.53"; - md5_path = "f6d33a8362dee358517d0a9e2ebdd044"; - - src = pkgs.fetchurl rec { - url = "http://src.fedoraproject.org/repo/pkgs/python-pyblock/" - + "${name}.tar.bz2/${md5_path}/${name}.tar.bz2"; - sha256 = "f6cef88969300a6564498557eeea1d8da58acceae238077852ff261a2cb1d815"; - }; - - postPatch = '' - sed -i -e 's|/usr/include/python|${python}/include/python|' \ - -e 's/-Werror *//' -e 's|/usr/|'"$out"'/|' Makefile - ''; - - buildInputs = with self; [ python pkgs.lvm2 pkgs.dmraid ]; - - makeFlags = [ - "USESELINUX=0" - "SITELIB=$(out)/${python.sitePackages}" - ]; - - meta = { - description = "Interface for working with block devices"; - license = licenses.gpl2Plus; - broken = isPy3k; # doesn't build on python 3, 2018-04-11 - }; - }; + pyblock = callPackage ../development/python-modules/pyblock { }; pybcrypt = buildPythonPackage rec { pname = "pybcrypt"; |