diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-28 16:47:39 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-07-28 16:56:33 +0200 |
commit | 1e605e654f7a02b6d954b51401784992664e8582 (patch) | |
tree | 9deea1312a8fa5c24a16492461f16d518fb90365 | |
parent | 451ac7bc3fb789a8b16c572a4c89efcd6b5e8eed (diff) |
python.pkgs.tornado: 4.4.2 -> 4.5.1
-rw-r--r-- | pkgs/development/python-modules/tornado/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 18 |
2 files changed, 29 insertions, 17 deletions
diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix new file mode 100644 index 0000000000000..11078eb856237 --- /dev/null +++ b/pkgs/development/python-modules/tornado/default.nix @@ -0,0 +1,28 @@ +{ lib +, python +, buildPythonPackage +, fetchPypi +, backports_abc +, backports_ssl_match_hostname +, certifi +, singledispatch +}: + +buildPythonPackage rec { + pname = "tornado"; + version = "4.5.1"; + name = "${pname}-${version}"; + + propagatedBuildInputs = [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; + + # We specify the name of the test files to prevent + # https://github.com/NixOS/nixpkgs/issues/14634 + checkPhase = '' + ${python.interpreter} -m unittest discover *_test.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "db0904a28253cfe53e7dedc765c71596f3c53bb8a866ae50123320ec1a7b73fd"; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f66e2b24cf72..48ced46476f93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25537,23 +25537,7 @@ EOF }; }; - tornado = buildPythonPackage rec { - name = "tornado-${version}"; - version = "4.4.2"; - - propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; - - # We specify the name of the test files to prevent - # https://github.com/NixOS/nixpkgs/issues/14634 - checkPhase = '' - ${python.interpreter} -m unittest discover *_test.py - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "1k7d90afm5pivam90a37nqiz9wlmakvnsfymp3p43kcqz29gk618"; - }; - }; + tornado = callPackage ../development/python-modules/tornado { }; tokenlib = buildPythonPackage rec { name = "tokenlib-${version}"; |