diff --git a/pkgs/development/python-modules/raspyrfm-client/default.nix b/pkgs/development/python-modules/raspyrfm-client/default.nix index 25bd389e83f7..5d5a20ff9589 100644 --- a/pkgs/development/python-modules/raspyrfm-client/default.nix +++ b/pkgs/development/python-modules/raspyrfm-client/default.nix @@ -2,51 +2,36 @@ lib, buildPythonPackage, fetchFromGitHub, - setuptools, - rstr, - python, + poetry-core, + pytestCheckHook, + xeger, }: buildPythonPackage rec { pname = "raspyrfm-client"; - version = "1.2.8"; + version = "1.2.9"; pyproject = true; src = fetchFromGitHub { owner = "markusressel"; repo = "raspyrfm-client"; - tag = "v${version}"; - hash = "sha256-WiL69bb4h8xVdMYxAVU0NHEfTWyW2NVR86zigsr5dmk="; + tag = version; + hash = "sha256-+TraMrVoR8GXrjfjJnu1uyyW6KTnu8KrRqAHYU8thFw="; }; - # while we may not actually be on master, the script needs a git branch to function - # and master here is better than beta or pre-alpha - postPatch = '' - substituteInPlace ./setup.py \ - --replace-fail 'subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])' '"master"' \ - --replace-fail 'GIT_BRANCH.decode()' '"master"' \ - --replace-fail 'GIT_BRANCH.rstrip()' '"master"' - ''; - - build-system = [ setuptools ]; + build-system = [ poetry-core ]; pythonImportsCheck = [ "raspyrfm_client" ]; - nativeCheckInputs = [ rstr ]; - - # pytestCheckHook does not auto detect the only test, run manually - checkPhase = '' - runHook preCheck - - ${python.interpreter} tests/automatic_tests.py - - runHook postCheck - ''; + nativeCheckInputs = [ + pytestCheckHook + xeger + ]; meta = { description = "Send rc signals with the RaspyRFM module"; homepage = "https://github.com/markusressel/raspyrfm-client"; - changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/v${version}"; + changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/${src.tag}"; maintainers = with lib.maintainers; [ ethancedwards8 ]; }; } diff --git a/pkgs/development/python-modules/xeger/default.nix b/pkgs/development/python-modules/xeger/default.nix new file mode 100644 index 000000000000..0dc10b852e91 --- /dev/null +++ b/pkgs/development/python-modules/xeger/default.nix @@ -0,0 +1,35 @@ +{ + buildPythonPackage, + fetchFromGitHub, + lib, + pytestCheckHook, + setuptools, +}: + +buildPythonPackage rec { + pname = "xeger"; + version = "0.3.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "crdoconnor"; + repo = "xeger"; + tag = version; + hash = "sha256-XujytGzBwJ59C5VihuFUJUxqhyjOIU4sI60hXUqLQvM="; + }; + + build-system = [ setuptools ]; + + pythonImportsCheck = [ "xeger" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Library to generate random strings from regular expressions"; + homepage = "https://github.com/crdoconnor/xeger"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5e46457699d2..492bcb5b5de1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20376,6 +20376,8 @@ self: super: with self; { xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { }); + xeger = callPackage ../development/python-modules/xeger { }; + xen = toPythonModule (pkgs.xen.override { python3Packages = self; }); xformers = callPackage ../development/python-modules/xformers {