From 14036488ad68208e1452be67f240eed805677c86 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:38:50 +0200 Subject: [PATCH 1/5] python312Packages.netutils: 1.7.0 -> 1.8.0 Diff: https://github.com/networktocode/netutils/compare/refs/tags/v1.7.0...v1.8.0 Changelog: https://github.com/networktocode/netutils/releases/tag/v1.8.0 --- pkgs/development/python-modules/netutils/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index c7a1580ba951..b78f197bb28f 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "netutils"; - version = "1.7.0"; + version = "1.8.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,14 +23,14 @@ buildPythonPackage rec { owner = "networktocode"; repo = "netutils"; rev = "refs/tags/v${version}"; - hash = "sha256-B2epTqG0PzcD876Bk222nDSorHHB8Znepp+cgl1++gY="; + hash = "sha256-Eqs/YkU2XrjD7x2WgvvR89/Pdi9AW9vhw3alJ8kIDgc="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ jsonschema ]; From 732c13373e57970fe4ecf87b60b9f6144e6ec751 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:39:14 +0200 Subject: [PATCH 2/5] python312Packages.netutils: use nixfmt --- .../python-modules/netutils/default.nix | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix index b78f197bb28f..93b1d2b2e3bb 100644 --- a/pkgs/development/python-modules/netutils/default.nix +++ b/pkgs/development/python-modules/netutils/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, buildPythonPackage -, fetchFromGitHub -, jinja2 -, jsonschema -, napalm -, poetry-core -, pytestCheckHook -, pythonOlder -, pyyaml -, toml +{ + lib, + stdenv, + buildPythonPackage, + fetchFromGitHub, + jinja2, + jsonschema, + napalm, + poetry-core, + pytestCheckHook, + pythonOlder, + pyyaml, + toml, }: buildPythonPackage rec { @@ -26,13 +27,9 @@ buildPythonPackage rec { hash = "sha256-Eqs/YkU2XrjD7x2WgvvR89/Pdi9AW9vhw3alJ8kIDgc="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; - dependencies = [ - jsonschema - ]; + dependencies = [ jsonschema ]; passthru.optional-dependencies.optionals = [ jsonschema @@ -46,9 +43,7 @@ buildPythonPackage rec { toml ]; - pythonImportsCheck = [ - "netutils" - ]; + pythonImportsCheck = [ "netutils" ]; disabledTests = [ # Tests require network access From f03249355c36f4f0b6ccf7795877ccb1647aafe7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:54:07 +0200 Subject: [PATCH 3/5] python311Packages.pyeapi: refactor --- pkgs/development/python-modules/pyeapi/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index 2ca3ff02edd9..50e1bcba0ca9 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -11,22 +11,22 @@ buildPythonPackage rec { pname = "pyeapi"; version = "1.0.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "arista-eosplus"; - repo = pname; + repo = "pyeapi"; rev = "refs/tags/v${version}"; sha256 = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ netaddr ]; @@ -46,6 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Client for Arista eAPI"; homepage = "https://github.com/arista-eosplus/pyeapi"; + changelog = "https://github.com/arista-eosplus/pyeapi/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ astro ]; }; From 2f12e41de3d4823823adb3231de94aff823a2730 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 20:59:39 +0200 Subject: [PATCH 4/5] python312Packages.pyeapi: add patch to replace imp --- pkgs/development/python-modules/pyeapi/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index 50e1bcba0ca9..57abd38fd478 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , setuptools , mock , netaddr @@ -22,6 +23,15 @@ buildPythonPackage rec { sha256 = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; }; + patches = [ + # Replace imp, https://github.com/arista-eosplus/pyeapi/pull/295 + (fetchpatch { + name = "replace-imp.patch"; + url = "https://github.com/arista-eosplus/pyeapi/commit/1f2d8e1fa61566082ccb11a1a17e0f3d8a0c89df.patch"; + hash = "sha256-ONviRU6eUUZ+TTJ4F41ZXqavW7RIi1MBO7s7OsnWknk="; + }) + ]; + build-system = [ setuptools ]; From cb860be46180e66b7d921e361f5406080a3fcbe9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 21:00:23 +0200 Subject: [PATCH 5/5] python312Packages.pyeapi: use nixfmt --- .../python-modules/pyeapi/default.nix | 37 ++++++++----------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/pyeapi/default.nix b/pkgs/development/python-modules/pyeapi/default.nix index 57abd38fd478..a7063c55e7ae 100644 --- a/pkgs/development/python-modules/pyeapi/default.nix +++ b/pkgs/development/python-modules/pyeapi/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, setuptools -, mock -, netaddr -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + setuptools, + mock, + netaddr, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "arista-eosplus"; repo = "pyeapi"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; + hash = "sha256-GZBoCoAqij54rZezRDF/ihJDQ5T6FFyDSRXGV3//avQ="; }; patches = [ @@ -32,26 +33,18 @@ buildPythonPackage rec { }) ]; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - netaddr - ]; + dependencies = [ netaddr ]; nativeCheckInputs = [ mock pytestCheckHook ]; - pytestFlagsArray = [ - "test/unit" - ]; + pytestFlagsArray = [ "test/unit" ]; - pythonImportsCheck = [ - "pyeapi" - ]; + pythonImportsCheck = [ "pyeapi" ]; meta = with lib; { description = "Client for Arista eAPI";