From 206d26ad5d47702f815e98ea66c6db59cea50ac2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jan 2024 00:39:42 +0100 Subject: [PATCH 1/6] python3Packages.ziafont: fix ModuleNotFoundError: No module named 'setuptools' --- pkgs/development/python-modules/ziafont/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ziafont/default.nix b/pkgs/development/python-modules/ziafont/default.nix index 4e55583b211b..0ab7589c98ba 100644 --- a/pkgs/development/python-modules/ziafont/default.nix +++ b/pkgs/development/python-modules/ziafont/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pytestCheckHook , nbval }: @@ -21,6 +22,10 @@ buildPythonPackage rec { hash = "sha256-3ZVj1ZxbFkFDDYbsIPzo7GMWGx7f5qWZQlcGCVXv73M="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook nbval From 766bb714719c6958ecc98dd806277f37c04b606e Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 7 Jan 2024 22:55:52 +0100 Subject: [PATCH 2/6] python3Packages.ziafont: 0.6 -> 0.7 --- 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 0ab7589c98ba..788dda332941 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.6"; + version = "0.7"; format = "pyproject"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-3ZVj1ZxbFkFDDYbsIPzo7GMWGx7f5qWZQlcGCVXv73M="; + hash = "sha256-DQEVWYOgiGSP3WlmZzEweyRa0UY7fxjjpbued+5EH5I="; }; nativeBuildInputs = [ From faa8fa6cc055aac78f1057df6ab88800d8023e72 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jan 2024 00:40:05 +0100 Subject: [PATCH 3/6] python3Packages.ziamath: fix ModuleNotFoundError: No module named 'setuptools' --- pkgs/development/python-modules/ziamath/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ziamath/default.nix b/pkgs/development/python-modules/ziamath/default.nix index 5e24f3c41670..9de1e6d658dd 100644 --- a/pkgs/development/python-modules/ziamath/default.nix +++ b/pkgs/development/python-modules/ziamath/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , ziafont , pytestCheckHook , nbval @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ ziafont ]; From 7a4a5c709c79167a0953807c24a320e14cb978a9 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 7 Jan 2024 22:56:08 +0100 Subject: [PATCH 4/6] python3Packages.ziamath: 0.8.1 -> 0.9 --- 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 9de1e6d658dd..c2d72a25f810 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.8.1"; + version = "0.9"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-Bbwq4Ods3P/724KO94jSmMLD1ubfaMHP/gTlOL/2pnE="; + hash = "sha256-ISd+J7R8qZ0NXdlyHMj+torzr+541UAhNCSaUH8ytSQ="; }; nativeBuildInputs = [ From 0bd988a489051a0523bebfb3af51094e08ea0f83 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 17 Jan 2024 00:40:16 +0100 Subject: [PATCH 5/6] python3Packages.schemdraw: fix ModuleNotFoundError: No module named 'setuptools' --- pkgs/development/python-modules/schemdraw/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index bf4bcee43758..1c0c05d7d48b 100644 --- a/pkgs/development/python-modules/schemdraw/default.nix +++ b/pkgs/development/python-modules/schemdraw/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , pyparsing , matplotlib , latex2mathml @@ -25,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ pyparsing ]; From 88189d0e878227122db7e8a04624fcbcf7a9bdd2 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 7 Jan 2024 22:56:20 +0100 Subject: [PATCH 6/6] python3Packages.schemdraw: 0.17 -> 0.18 --- pkgs/development/python-modules/schemdraw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/schemdraw/default.nix b/pkgs/development/python-modules/schemdraw/default.nix index 1c0c05d7d48b..441e668f81fc 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.17"; + version = "0.18"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "cdelker"; repo = pname; rev = version; - hash = "sha256-wa/IeNGZynU/xKwyFwebXcFaruhBFqGWsrZYaIEVa8Q="; + hash = "sha256-JJc3LA+fqB+2g7pPIZ8YMV921EyYpLZrHSJCYyYThZg="; }; nativeBuildInputs = [