diff options
| author | Guillaume Girol <symphorien@users.noreply.github.com> | 2021-01-30 18:18:20 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-30 18:18:20 +0000 |
| commit | e20fa5f1fb6cc01b1b20eb1c22b83910d6d89a43 (patch) | |
| tree | c97a6d76c9d7948fc5fe87c7d80f81855d46018b /pkgs | |
| parent | eae2b60b9c55ec7a80d43b24856dbd7fb923022c (diff) | |
| parent | bf903ddb3f8c0edf918250ebd180770bff3a119e (diff) | |
Merge pull request #111173 from bhipple/u/luigi
luigi: remove dependency override on tornado_5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/cluster/luigi/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index e0a6cd48d6eae..ef85494bd140c 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,22 +1,15 @@ { lib, python3 }: -let - python = python3.override { - self = python; - packageOverrides = self: super: { - tornado = super.tornado_5; - }; - }; -in with python.pkgs; buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "luigi"; version = "3.0.2"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "b4b1ccf086586d041d7e91e68515d495c550f30e4d179d63863fea9ccdbb78eb"; }; - propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; + propagatedBuildInputs = with python3.pkgs; [ dateutil tornado python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc05cd506896a..23efec76c1f46 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7780,7 +7780,7 @@ in { # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - # Used by luigi, 2020-08-29 + # Used by streamlit, graphite_beacon, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; |