From e02aed04efe5810d3a6d2730a9e05f7a8b8def79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Nov 2023 08:15:37 -0800 Subject: [PATCH 1/2] Revert "python3Packages.starline: 0.1.5 -> 0.2.0" This reverts commit 437c6150971ff08e0f4b26021e28c1edfafde571 because version 0.2.0 was yanked from PyPI. See https://github.com/Anonym-tsk/starline/issues/4. --- pkgs/development/python-modules/starline/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix index ce7418a88734..4f4ad545f2df 100644 --- a/pkgs/development/python-modules/starline/default.nix +++ b/pkgs/development/python-modules/starline/default.nix @@ -2,21 +2,23 @@ , buildPythonPackage , pythonOlder , fetchPypi +, aiohttp , requests }: buildPythonPackage rec { pname = "starline"; - version = "0.2.0"; + version = "0.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "550b00ab95cf59d933f7708abab40a4e41e5790e62b653471afe86a3af3320e6"; + sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9"; }; propagatedBuildInputs = [ + aiohttp requests ]; From 4bdb4b80496cf5f987db637ff56851fd5ea6703a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 28 Nov 2023 08:25:03 -0800 Subject: [PATCH 2/2] python311Packages.starline: modernize expression --- .../python-modules/starline/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/starline/default.nix b/pkgs/development/python-modules/starline/default.nix index 4f4ad545f2df..cdaca053ee1d 100644 --- a/pkgs/development/python-modules/starline/default.nix +++ b/pkgs/development/python-modules/starline/default.nix @@ -2,7 +2,8 @@ , buildPythonPackage , pythonOlder , fetchPypi -, aiohttp +, fetchpatch +, setuptools , requests }: @@ -12,13 +13,26 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; + pyproject = true; + src = fetchPypi { inherit pname version; - sha256 = "1753f5fcd2a6976aed775afb03f8392159f040c673917cc0c634510d95c13cb9"; + hash = "sha256-F1P1/NKml2rtd1r7A/g5IVnwQMZzkXzAxjRRDZXBPLk="; }; + patches = [ + # https://github.com/Anonym-tsk/starline/pull/5 + (fetchpatch { + url = "https://github.com/Anonym-tsk/starline/commit/4e6cdf8e05c5fb8509ee384e77b39a2495587160.patch"; + hash = "sha256-y9b6ePH3IEgmt3ALHQGwH102rlm4KfmH4oIoIC93cWU="; + }) + ]; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ - aiohttp requests ];