diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-01-27 13:19:00 +0100 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2016-01-27 13:19:00 +0100 |
commit | e366168d2237b29f5107b47d628b6d40727337b5 (patch) | |
tree | 9c54681e6c94553c5532a3e6d80e37aa8c174ef1 /pkgs/development/python-modules | |
parent | 94b8871938183c2f150628d29a74feb387285910 (diff) | |
parent | ef4f65293bf859e1105699d204c49b0415a9c0d0 (diff) |
Merge pull request #12552 from NixOS/python-wip
pythonPackages: update setuptools, many updates and fixes
Diffstat (limited to 'pkgs/development/python-modules')
4 files changed, 8 insertions, 31 deletions
diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix index 6777362702907..43f8cca4c8279 100644 --- a/pkgs/development/python-modules/bootstrapped-pip/default.nix +++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix @@ -6,8 +6,8 @@ let sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9"; }; setuptools_source = fetchurl { - url = "https://pypi.python.org/packages/3.4/s/setuptools/setuptools-18.2-py2.py3-none-any.whl"; - sha256 = "0jhafl8wmjc8xigl1ib5hqiq9crmipcz0zcga52riymgqbf2bzh4"; + url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl"; + sha256 = "0801e6d862ca4ce24d918420d62f07ee2fe736dc016e3afa99d2103e7a02e9a6"; }; in stdenv.mkDerivation rec { name = "python-${python.version}-bootstrapped-pip-${version}"; diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 902dd50fbbf8e..dab20b2f7447b 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -112,7 +112,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // postFixup = attrs.postFixup or '' wrapPythonPrograms - # check if we have two packagegs with the same name in closure and fail + # check if we have two packages with the same name in closure and fail # this shouldn't happen, something went wrong with dependencies specs ${python.interpreter} ${./catch_conflicts.py} ''; @@ -135,7 +135,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] // } // meta // { # add extra maintainer(s) to every package maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ]; - # a marker for release utilies to discover python packages + # a marker for release utilities to discover python packages isBuildPythonPackage = python.meta.platforms; }; }) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix deleted file mode 100644 index 09890e8694f7c..0000000000000 --- a/pkgs/development/python-modules/pylint/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, astroid, buildPythonPackage }: - -buildPythonPackage rec { - name = "pylint-1.4.1"; - namePrefix = ""; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz"; - sha256 = "0c7hw1pcp5sqmc0v86zygw21isfgzbsqdmlb1sywncnlxmh30f1y"; - }; - - propagatedBuildInputs = [ astroid ]; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp - cp "elisp/"*.el $out/share/emacs/site-lisp/ - ''; - - meta = { - homepage = http://www.logilab.org/project/pylint; - description = "A bug and style checker for Python"; - }; -} diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 082a16056fd00..74624063ba3c9 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, python, wrapPython }: +{ stdenv, lib, fetchurl, python, wrapPython }: stdenv.mkDerivation rec { shortName = "setuptools-${version}"; name = "${python.executable}-${shortName}"; - version = "18.2"; # 18.4 breaks python34Packages.characteristic and many others + version = "19.4"; # 18.4 and up breaks python34Packages.characteristic and many others src = fetchurl { url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz"; - sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509"; + sha256 = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf"; }; buildInputs = [ python wrapPython ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; homepage = http://pypi.python.org/pypi/setuptools; - license = [ "PSF" "ZPL" ]; + license = with lib.licenses; [ psfl zpt20 ]; platforms = platforms.all; }; } |