From 814be2c36506773d4a52205e7ca6a019d679ac51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Nov 2022 18:07:07 +0000 Subject: [PATCH 1/2] python310Packages.fastrlock: 0.8 -> 0.8.1 --- pkgs/development/python-modules/fastrlock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 065150e88e2f..907ea3e5df76 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "fastrlock"; - version = "0.8"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - sha256 = "9cc100ed0924b32173d7de705a82fdf1257cdf60af1952a13f64759307b40931"; + sha256 = "sha256-il8vAAIcSscuTauRDcGGPA4Aii5/tchDkzrpvPw9CAI="; }; meta = with lib; { From a408e4c5d34f68e8ae9c33a82e5cfb5cc04ae755 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Nov 2022 21:16:44 +0100 Subject: [PATCH 2/2] python310Packages.fastrlock: disable on older Python releases - add pythonImportsCheck --- .../python-modules/fastrlock/default.nix | 36 ++++++++++++++++--- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 907ea3e5df76..b66ccd155c19 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -1,17 +1,43 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, cython +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: buildPythonPackage rec { pname = "fastrlock"; version = "0.8.1"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-il8vAAIcSscuTauRDcGGPA4Aii5/tchDkzrpvPw9CAI="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "scoder"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-KYJd1wGJo+z34cY0YfsRbpC9IsQY/VJqycGpMmLmaVk="; }; + nativeBuildInputs = [ + cython + ]; + + # Todo: Check why the tests have an import error + doCheck = false; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "fastrlock" + ]; + meta = with lib; { + description = "RLock implementation for CPython"; homepage = "https://github.com/scoder/fastrlock"; - description = "A fast RLock implementation for CPython"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; };