From c30e201d06238b645056cbbac2ba8f10779ee209 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Apr 2023 19:56:32 +0200 Subject: [PATCH 1/3] python310Packages.edalize: add changelog to meta --- pkgs/development/python-modules/edalize/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index 9621fe42caac..cbd93919b4c7 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -67,7 +67,8 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction library for interfacing EDA tools"; homepage = "https://github.com/olofk/edalize"; + changelog = "https://github.com/olofk/edalize/releases/tag/v${version}"; license = licenses.bsd2; - maintainers = [ maintainers.astro ]; + maintainers = with maintainers; [ astro ]; }; } From 922975063092ec3bb559909c4d580ee5609110ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Apr 2023 19:57:44 +0200 Subject: [PATCH 2/3] python310Packages.edalize: disable on unsupported Python releases - add format --- pkgs/development/python-modules/edalize/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index cbd93919b4c7..f3c1376336ce 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -5,6 +5,7 @@ , jinja2 , pandas , pytestCheckHook +, pythonOlder , which , yosys }: @@ -12,6 +13,9 @@ buildPythonPackage rec { pname = "edalize"; version = "0.4.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "olofk"; @@ -26,7 +30,9 @@ buildPythonPackage rec { patchShebangs tests/mock_commands/vsim ''; - propagatedBuildInputs = [ jinja2 ]; + propagatedBuildInputs = [ + jinja2 + ]; nativeCheckInputs = [ pytestCheckHook @@ -35,7 +41,9 @@ buildPythonPackage rec { yosys ]; - pythonImportsCheck = [ "edalize" ]; + pythonImportsCheck = [ + "edalize" + ]; disabledTestPaths = [ "tests/test_questa_formal.py" From 5fca56b3fbd5f631d3463dd9ef5833d501439dd6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Apr 2023 20:00:17 +0200 Subject: [PATCH 3/3] python310Packages.edalize: 0.4.1 -> 0.5.0 Diff: https://github.com/olofk/edalize/compare/refs/tags/v0.4.1...v0.5.0 Changelog: https://github.com/olofk/edalize/releases/tag/v0.5.0 --- .../python-modules/edalize/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/edalize/default.nix b/pkgs/development/python-modules/edalize/default.nix index f3c1376336ce..9455cdc1b81d 100644 --- a/pkgs/development/python-modules/edalize/default.nix +++ b/pkgs/development/python-modules/edalize/default.nix @@ -4,6 +4,7 @@ , coreutils , jinja2 , pandas +, pyparsing , pytestCheckHook , pythonOlder , which @@ -12,7 +13,7 @@ buildPythonPackage rec { pname = "edalize"; - version = "0.4.1"; + version = "0.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +22,7 @@ buildPythonPackage rec { owner = "olofk"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-h6b0mdAUR4NsN2SpnLu5OgS9Fy9ZRitG+5Sbon1jlUM="; + hash = "sha256-jsrJr/iuezh9/KL0PykWB1XKev4Wr5QeDh0ZWNMZSp8="; }; postPatch = '' @@ -34,12 +35,18 @@ buildPythonPackage rec { jinja2 ]; + passthru.optional-dependencies = { + reporting = [ + pandas + pyparsing + ]; + }; + nativeCheckInputs = [ pytestCheckHook - pandas which yosys - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); pythonImportsCheck = [ "edalize"