diff --git a/pkgs/by-name/ev/evil-winrm-py/package.nix b/pkgs/by-name/ev/evil-winrm-py/package.nix index e5a9696b7b6c..2283ff4a7a90 100644 --- a/pkgs/by-name/ev/evil-winrm-py/package.nix +++ b/pkgs/by-name/ev/evil-winrm-py/package.nix @@ -20,6 +20,8 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-IACFPPlkgyJh78p6Jy740CQqcySkMTV/8VVPSRJKTPI="; }; + pythonRelaxDeps = [ "pypsrp" ]; + # Removes the additional binary ewp postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/development/python-modules/pypsrp/default.nix b/pkgs/development/python-modules/pypsrp/default.nix index 6fab5a3852ac..f3e6a2cfa541 100644 --- a/pkgs/development/python-modules/pypsrp/default.nix +++ b/pkgs/development/python-modules/pypsrp/default.nix @@ -14,22 +14,25 @@ pyyaml, requests, requests-credssp, + setuptools, xmldiff, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pypsrp"; - version = "0.8.1"; + version = "0.9.0"; pyproject = true; src = fetchFromGitHub { owner = "jborean93"; repo = "pypsrp"; - tag = "v${version}"; - hash = "sha256-Pwfc9e39sYPdcHN1cZtxxGEglEYzPp4yOYLD5/4SSiU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-EFe587tLTlNEzxhACtlbB0FspDOUvfF3ly0DRtAomuY="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ cryptography httpcore httpx @@ -38,13 +41,6 @@ buildPythonPackage rec { requests ]; - nativeCheckInputs = [ - pytest-mock - pytestCheckHook - pyyaml - xmldiff - ]; - optional-dependencies = { credssp = [ requests-credssp ]; kerberos = pyspnego.optional-dependencies.kerberos; @@ -52,6 +48,13 @@ buildPythonPackage rec { ssh = [ asyncssh ]; }; + nativeCheckInputs = [ + pytest-mock + pytestCheckHook + pyyaml + xmldiff + ]; + pythonImportsCheck = [ "pypsrp" ]; disabledTests = [ @@ -64,8 +67,8 @@ buildPythonPackage rec { meta = { description = "PowerShell Remoting Protocol Client library"; homepage = "https://github.com/jborean93/pypsrp"; - changelog = "https://github.com/jborean93/pypsrp/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jborean93/pypsrp/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +})