diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 16b7c1d29dcb..b396c69a61e5 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -5,6 +5,7 @@ , buildPythonPackage , empty-files , fetchFromGitHub +, fetchpatch2 , mock , mrjob , numpy @@ -20,7 +21,7 @@ buildPythonPackage rec { pname = "approvaltests"; - version = "11.1.2"; + version = "11.1.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -29,14 +30,21 @@ buildPythonPackage rec { owner = "approvals"; repo = "ApprovalTests.Python"; rev = "refs/tags/v${version}"; - hash = "sha256-VM4TP98bS9NmhxZz+YHMJrHKr5g6E6aYidxjKQyXp7k="; + hash = "sha256-VqE2Oj3b+ZfKT+fhJ9DxBClfa8Wz8w/puAnAotN3eG4="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + url = "https://github.com/approvals/ApprovalTests.Python/commit/dac7c8a8aa62f31dca7a687d4dbf08158351d5e1.patch"; + hash = "sha256-TMyfXNtzpGci6tdFRhxiKJRjCWRD5LkaffPY8EVj53E="; + }) + ]; + + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ allpairspy approval-utilities beautifulsoup4 @@ -56,7 +64,7 @@ buildPythonPackage rec { ]; disabledTests = [ - # Tests expects paths below ApprovalTests.Python directory + # Tests expect paths below ApprovalTests.Python directory "test_received_filename" "test_pytest_namer" ]; diff --git a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix index 797bda0d3ea4..39feab338d24 100644 --- a/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix +++ b/pkgs/development/python-modules/robotframework-pythonlibcore/default.nix @@ -2,16 +2,18 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, fetchpatch2 , setuptools +, robotframework +, approvaltests , pytest-mockito , pytestCheckHook -, robotframework , typing-extensions }: buildPythonPackage rec { pname = "robotframework-pythonlibcore"; - version = "4.3.0"; + version = "4.4.0"; disabled = pythonOlder "3.8"; @@ -21,23 +23,30 @@ buildPythonPackage rec { owner = "robotframework"; repo = "PythonLibCore"; rev = "refs/tags/v${version}"; - hash = "sha256-5ayOQyOhCg4nLpAyH/eQ6NYEApix0wsL2nhJzEXKJRo="; + hash = "sha256-282A4EW88z6ODSIEIIeBbN8YO491rwI4M7njI7kL3XQ="; }; - nativeBuildInputs = [ + patches = [ + (fetchpatch2 { + url = "https://github.com/robotframework/PythonLibCore/commit/8b756a4bd119d660109437023789bfada21bdc78.patch"; + hash = "sha256-4NtgkGbIj9gH9Det6VNh1MpGSGroESxQ8X2ZTeoX/zU="; + }) + ]; + + build-system = [ setuptools ]; - nativeCheckInputs = [ - pytest-mockito - pytestCheckHook + dependencies = [ robotframework - typing-extensions ]; - preCheck = '' - export PYTHONPATH="atest:utest/helpers:$PYTHONPATH" - ''; + nativeCheckInputs = [ + approvaltests + pytest-mockito + pytestCheckHook + typing-extensions + ]; pythonImportsCheck = [ "robotlibcore" ];