From 32c502edfebdb2020a32a6e388b2b5e85352ef8a Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 27 Jan 2024 17:43:22 +0400 Subject: [PATCH] python3Packages.stravalib: mark unbroken --- .../python-modules/stravalib/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index f7e527eae146..b6845b5dce4d 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -1,9 +1,9 @@ { lib , arrow , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pint -, pydantic +, pydantic_1 # use pydantic 2 on next release , pythonOlder , pytz , requests @@ -19,11 +19,18 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit pname version; - hash = "sha256-OEdMRg3KjUrXt/CgJgsUqa/sVFAE0JONNZg5MBKtxmY="; + src = fetchFromGitHub { + owner = "stravalib"; + repo = "stravalib"; + rev = "v${version}"; + hash = "sha256-EQcLDU9id/DpUZKMI9prCJC9zEK1CuhOtSB4FAWLg/g="; }; + postPatch = '' + # Remove on next release + sed -i 's/pydantic==1.10.9/pydantic/' pyproject.toml + ''; + nativeBuildInputs = [ setuptools setuptools-scm @@ -32,7 +39,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ arrow pint - pydantic + pydantic_1 pytz requests responses @@ -50,8 +57,6 @@ buildPythonPackage rec { homepage = "https://github.com/stravalib/stravalib"; changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ ]; - # Support for pydantic > 2, https://github.com/stravalib/stravalib/issues/379 - broken = versionAtLeast pydantic.version "2"; + maintainers = with maintainers; [ sikmir ]; }; }