diff --git a/pkgs/development/python-modules/napalm/default.nix b/pkgs/development/python-modules/napalm/default.nix index c942625fe8911..07da3c408cf62 100644 --- a/pkgs/development/python-modules/napalm/default.nix +++ b/pkgs/development/python-modules/napalm/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch, pythonOlder, # build-system @@ -46,6 +47,16 @@ buildPythonPackage rec { hash = "sha256-Abw3h69qTFwOOFeAfivqAIWLozErJ1yZZfx7CbMy1AI="; }; + patches = [ + (fetchpatch { + url = "https://github.com/napalm-automation/napalm/commit/7e509869f7cb56892380629d1cb5f99e3e2c6190.patch"; + hash = "sha256-vJDACa5SmSJ/rcmKEow4Prqju/jYcCrzGpTdEYsAPq0="; + includes = [ + "napalm/ios/ios.py" + ]; + }) + ]; + nativeBuildInputs = [ setuptools ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ntc-templates/default.nix b/pkgs/development/python-modules/ntc-templates/default.nix index 5619fc76cbc9d..cae6faa9f594a 100644 --- a/pkgs/development/python-modules/ntc-templates/default.nix +++ b/pkgs/development/python-modules/ntc-templates/default.nix @@ -28,7 +28,9 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - propagatedBuildInputs = [ textfsm ]; + pythonRelaxDeps = [ "textfsm" ]; + + dependencies = [ textfsm ]; nativeCheckInputs = [ invoke diff --git a/pkgs/development/python-modules/textfsm/default.nix b/pkgs/development/python-modules/textfsm/default.nix index 89ba02bf4f258..397b1cb2ce272 100644 --- a/pkgs/development/python-modules/textfsm/default.nix +++ b/pkgs/development/python-modules/textfsm/default.nix @@ -2,33 +2,23 @@ lib, buildPythonPackage, fetchFromGitHub, - six, - future, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "textfsm"; - version = "1.1.3"; - format = "setuptools"; + version = "2.1.0"; + pyproject = true; src = fetchFromGitHub { owner = "google"; repo = pname; - rev = "v${version}"; - hash = "sha256-IHgKG8v0X+LSK6purWBdwDnI/BCs5XA12ZJixuqqXWg="; + tag = "v${version}"; + hash = "sha256-ygVcDdT85mRN+qYfTZqraRVyp2JlLwwujBW1e/pPJNc="; }; - # upstream forgot to update the release version - postPatch = '' - substituteInPlace textfsm/__init__.py \ - --replace "1.1.2" "1.1.3" - ''; - - propagatedBuildInputs = [ - six - future - ]; + build-system = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ];