diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2022-05-04 14:27:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-04 14:27:20 +0200 |
commit | cf98cc1f85628a864d223ad0ea532574c19b88b6 (patch) | |
tree | d8927a2e4a6d8a2116e7540a1f95c05c66bed5b3 /pkgs/development | |
parent | 6b1a68c045691a91e7d6f9418e91da935b11bf14 (diff) | |
parent | ebaa5279daf393a44b81b74be8a667af12f830ff (diff) |
Merge pull request #171225 from fabaff/pyeapi-py
python310Packages.pyeapi: fix Python 3.10 support
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/python-modules/pyeapi/default.nix | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index a31123492d423..aa9e0983b7e36 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,10 +1,11 @@ { lib , buildPythonPackage -, pythonAtLeast , fetchFromGitHub +, fetchpatch +, mock , netaddr , pytestCheckHook -, mock +, pythonOlder }: buildPythonPackage rec { @@ -12,8 +13,7 @@ buildPythonPackage rec { version = "0.8.4"; format = "pyproject"; - # https://github.com/arista-eosplus/pyeapi/issues/189 - disabled = pythonAtLeast "3.10"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "arista-eosplus"; @@ -22,21 +22,49 @@ buildPythonPackage rec { sha256 = "13chya6wix5jb82k67gr44bjx35gcdwz80nsvpv0gvzs6shn4d7b"; }; - propagatedBuildInputs = [ netaddr ]; + propagatedBuildInputs = [ + netaddr + ]; checkInputs = [ mock pytestCheckHook ]; - pytestFlagsArray = [ "test/unit" ]; + patches = [ + # Fix usage of collection, https://github.com/arista-eosplus/pyeapi/pull/223 + (fetchpatch { + name = "fix-collection-usage.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/81754f57eb095703cc474f527a0915360af76f68.patch"; + sha256 = "sha256-ZNBTPRNmXCFVJeRAJxzIHmCOXZiGwU6t4ekSupU3BX8="; + }) + (fetchpatch { + name = "fix-collection-usage-2.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/cc9c584e4a3167e3c1624cccb6bc0d9c9bcdbc1c.patch"; + sha256 = "sha256-EY0i1Skm1llEQAAzvrb2yelhhLBkqKAFJB5ObAIxAYo="; + excludes = [ + ".github/workflows/ci.yml" + ]; + }) + (fetchpatch { + name = "fix-collection-usage-3.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/dc35ab076687ea71665ae9524480b05a4e893909.patch"; + sha256 = "sha256-xPaYULCPTxiQGB9Im/qLet+XebW9wq+TAfrxcgQxcoE="; + }) + ]; - pythonImportsCheck = [ "pyeapi" ]; + pytestFlagsArray = [ + "test/unit" + ]; + + pythonImportsCheck = [ + "pyeapi" + ]; meta = with lib; { description = "Client for Arista eAPI"; homepage = "https://github.com/arista-eosplus/pyeapi"; license = licenses.bsd3; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ astro ]; }; } |