diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-09-18 23:18:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-18 23:18:52 +0200 |
commit | 384b64426e8eb89d865276bdc7e2d1a31d81f2a0 (patch) | |
tree | 591fb39d0e36c5b2f2ed3bd59cde3de917f85910 | |
parent | 406c7a073120fe442bb613f2bc9926c9bb08bcb4 (diff) | |
parent | dce4276d5eedbcfe34deef5a17405b856e9758d5 (diff) |
Merge pull request #29486 from disassembler/logilab
logilab_common: 0.63.2 -> 1.4.1
-rw-r--r-- | pkgs/development/python-modules/logilab/common.nix | 24 | ||||
-rw-r--r-- | pkgs/development/python-modules/logilab/constraint.nix | 23 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 31 |
3 files changed, 49 insertions, 29 deletions
diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix new file mode 100644 index 0000000000000..71a383f132e82 --- /dev/null +++ b/pkgs/development/python-modules/logilab/common.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi, unittest2, six }: + +buildPythonPackage rec { + pname = "logilab-common"; + version = "1.4.1"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "02in5555iak50gzn35bnnha9s85idmh0wwxaxz13v81z5krn077d"; + }; + + propagatedBuildInputs = [ unittest2 six ]; + + # package supports 3.x but tests require egenix-mx-base which is python 2.x only + # and is not currently in nixos + doCheck = false; + + meta = with stdenv.lib; { + description = "Python packages and modules used by Logilab "; + homepage = https://www.logilab.org/project/logilab-common; + license = licenses.lgpl; + }; +} diff --git a/pkgs/development/python-modules/logilab/constraint.nix b/pkgs/development/python-modules/logilab/constraint.nix new file mode 100644 index 0000000000000..952cc03e454ea --- /dev/null +++ b/pkgs/development/python-modules/logilab/constraint.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, logilab_common, six }: + +buildPythonPackage rec { + pname = "logilab-constraint"; + version = "0.6.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg"; + }; + + propagatedBuildInputs = [ + logilab_common six + ]; + + + meta = with stdenv.lib; { + description = "logilab-database provides some classes to make unified access to different"; + homepage = "http://www.logilab.org/project/logilab-database"; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bfa98967b448f..4726edf6038fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11346,36 +11346,9 @@ in { }; }; - logilab_common = buildPythonPackage rec { - name = "logilab-common-0.63.2"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/logilab-common/${name}.tar.gz"; - sha256 = "1rr81zlmlgdma3s75i5c1l8q2m25v4ac41i9pniik4mhkc6a0fv0"; - }; - - propagatedBuildInputs = with self; [ unittest2 six ]; - }; - - logilab-constraint = buildPythonPackage rec { - name = "logilab-constraint-${version}"; - version = "0.6.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/l/logilab-constraint/${name}.tar.gz"; - sha256 = "1n0xim4ij1n4yvyqqvyc0wllhjs22szglsd5av0j8k2qmck4njcg"; - }; - - propagatedBuildInputs = with self; [ - logilab_common six - ]; - - meta = with stdenv.lib; { - description = "logilab-database provides some classes to make unified access to different"; - homepage = "http://www.logilab.org/project/logilab-database"; - }; - }; + logilab_common = callPackage ../development/python-modules/logilab/common.nix {}; + logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; lxml = buildPythonPackage ( rec { name = "lxml-3.8.0"; |