From 2c4ac5f4025701508a66c98bfad4c0cf4304d85b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Mar 2022 21:40:49 +0100 Subject: [PATCH] flexget: relax dependency constrains --- .../networking/flexget/default.nix | 33 +++---------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index aa675268cd56..05ee983765f5 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,41 +1,18 @@ { lib +, python3Packages , fetchFromGitHub -, python3 }: -let - py = python3.override { - packageOverrides = self: super: { - - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - hash = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - doCheck = false; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "flexget"; version = "3.2.18"; - format = "setuptools"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "v${version}"; - sha256 = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; + hash = "sha256-68tD7I7MI/Cp94tp6c4lQx+8xwRnJTKTF/3SWz4Ddgg="; }; postPatch = '' @@ -44,7 +21,7 @@ buildPythonApplication rec { ln -sf requirements.in requirements.txt # remove dependency constraints - sed 's/==\([0-9]\.\?\)\+//' -i requirements.txt + sed 's/[>=]=.*//' -i requirements.txt # "zxcvbn-python" was renamed to "zxcvbn", and we don't have the former in # nixpkgs. See: https://github.com/NixOS/nixpkgs/issues/62110 @@ -54,7 +31,7 @@ buildPythonApplication rec { # ~400 failures doCheck = false; - propagatedBuildInputs = with py.pkgs; [ + propagatedBuildInputs = with python3Packages; [ # See https://github.com/Flexget/Flexget/blob/master/requirements.in APScheduler beautifulsoup4