From bf903ddb3f8c0edf918250ebd180770bff3a119e Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 29 Jan 2021 11:39:06 -0500 Subject: [PATCH] luigi: remove dependency override on tornado_5 When building luigi on python3, upstream supports the latest tornado --- .../networking/cluster/luigi/default.nix | 13 +++---------- 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 e0a6cd48d6ea..ef85494bd140 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 3beae2869624..dc67599a59fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7772,7 +7772,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; };