From b509436a771c000303b3e5146f7c0ed4dd83d512 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Apr 2024 13:07:13 +0200 Subject: [PATCH 1/6] python3Packages.ziafont: 0.7 -> 0.8 --- pkgs/development/python-modules/ziafont/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 788dda332941..1e454f2a3044 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "ziafont"; - version = "0.7"; + version = "0.8"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; + hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; }; nativeBuildInputs = [ From fc6d0644e08d0e72f4b71e4e25c363c2f944b41b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Apr 2024 13:07:35 +0200 Subject: [PATCH 2/6] python3Packages.ziamath: 0.9 -> 0.10 --- pkgs/development/python-modules/ziamath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index c2d72a25f810..578cf6a32fdd 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "ziamath"; - version = "0.9"; + version = "0.10"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; + hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; }; nativeBuildInputs = [ From 415b57a01076720b674867cbb9dd614906f0c5b8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 30 Apr 2024 13:07:51 +0200 Subject: [PATCH 3/6] python3Packages.schemdraw: 0.18 -> 0.19 --- pkgs/development/python-modules/schemdraw/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 441e668f81fc..9a152fc701b3 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "schemdraw"; - version = "0.18"; + version = "0.19"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; + hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; }; nativeBuildInputs = [ @@ -59,6 +59,8 @@ buildPythonPackage rec { substituteInPlace test/test_styles.ipynb --replace "font='Times', " "" ''; + preCheck = "rm test/test_pictorial.ipynb"; # Tries to download files + pytestFlagsArray = [ "--nbval-lax" ]; pythonImportsCheck = [ "schemdraw" ]; From 23dedf27d2647b7a963c40e994121d1d5a4117b0 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 13:38:08 +0200 Subject: [PATCH 4/6] python3Packages.ziafont: refactor --- pkgs/development/python-modules/ziafont/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 1e454f2a3044..d50e5fdefe17 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -10,8 +10,7 @@ buildPythonPackage rec { pname = "ziafont"; version = "0.8"; - - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +21,7 @@ buildPythonPackage rec { hash = "sha256-C+dC+mNquDuj6RfJpiEbeuGZOIXcgSrTB4XM21reBPs="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; From 35f095b712a40b16cf9fb70816c4f475c4c135f6 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 13:38:21 +0200 Subject: [PATCH 5/6] python3Packages.ziamath: refactor --- pkgs/development/python-modules/ziamath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index 578cf6a32fdd..592e486edce1 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ziamath"; version = "0.10"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,11 +23,11 @@ buildPythonPackage rec { hash = "sha256-Drssi+YySh4OhVYAOvgIwzeeu5dQbUUXuhwTedhUUt8="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ ziafont ]; From edcbc9acf4bb1d740986c4af2bf5b9ddb91dca37 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 8 May 2024 13:38:31 +0200 Subject: [PATCH 6/6] python3Packages.schemdraw: refactor --- pkgs/development/python-modules/schemdraw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 9a152fc701b3..08eecb1d8a2d 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "schemdraw"; version = "0.19"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -26,15 +26,15 @@ buildPythonPackage rec { hash = "sha256-vqEHcazE5DNHr0FceOWLqq+RZmMK5ovHDVjy/2wbTJU="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyparsing ]; - passthru.optional-dependencies = { + optional-dependencies = { matplotlib = [ matplotlib ];