From 84d42c6d5edda3577dd7ab621fb0679933ca3025 Mon Sep 17 00:00:00 2001 From: Gon Solo Date: Fri, 30 Jan 2026 16:41:47 +0100 Subject: [PATCH 1/2] python313Packages.kfactory: 2.0.0 -> 2.3.0 https://github.com/gdsfactory/kfactory/releases/tag/v2.1.0 https://github.com/gdsfactory/kfactory/releases/tag/v2.2.0 https://github.com/gdsfactory/kfactory/releases/tag/v2.3.0 --- .../python-modules/kfactory/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix index 5e0c219ee589..a2d45a08560b 100644 --- a/pkgs/development/python-modules/kfactory/default.nix +++ b/pkgs/development/python-modules/kfactory/default.nix @@ -30,22 +30,22 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "kfactory"; - version = "2.0.0"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "kfactory"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; # kfactory uses `.git` to infer the project directory. # https://github.com/gdsfactory/kfactory/blob/v2.0.0/src/kfactory/conf.py#L318-L327 # Otherwise, tests fail with: # assert kf.config.project_dir is not None # E AssertionError: assert None is not None leaveDotGit = true; - hash = "sha256-eZRNUb2Qw2HcR2W1pf15ulEt7ZCJwi60SuGdte/cG8E="; + hash = "sha256-6z2JlndmuegpCAf74YRa/qVVjFOWv1Xy3dabeWlOmbs="; }; build-system = [ @@ -55,7 +55,9 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pydantic" + "klayout" ]; + dependencies = [ aenum cachetools @@ -143,8 +145,8 @@ buildPythonPackage rec { meta = { description = "KLayout API implementation of gdsfactory"; homepage = "https://github.com/gdsfactory/kfactory"; - changelog = "https://github.com/gdsfactory/kfactory/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/gdsfactory/kfactory/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fbeffa ]; }; -} +}) From 468d9b621d1af5955369e11be3faa9fdb07ea461 Mon Sep 17 00:00:00 2001 From: Gon Solo Date: Fri, 30 Jan 2026 16:52:15 +0100 Subject: [PATCH 2/2] gdsfactory: 9.20.1 -> 9.32.1 --- .../python-modules/gdsfactory/default.nix | 24 +++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index 7e35b8d2decd..2929dacda135 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -5,11 +5,13 @@ # build-system flit-core, + pythonRelaxDepsHook, # dependencies jinja2, loguru, matplotlib, + natsort, numpy, orjson, pandas, @@ -44,24 +46,31 @@ pytest-regressions, pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "gdsfactory"; - version = "9.20.1"; + version = "9.32.1"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; - tag = "v${version}"; - hash = "sha256-TpMi0Rv6sQA8uAPGl6iR1qgTU7havBlWmdz98DROoSk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uXFH+6uZx+fFo1QfozI/JVomchFlnWx805CwbAj7CPQ="; }; - build-system = [ flit-core ]; + build-system = [ + flit-core + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; dependencies = [ jinja2 loguru matplotlib + natsort numpy orjson pandas @@ -101,6 +110,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "pydantic" "trimesh" + "kfactory" ]; # tests require >32GB of RAM @@ -111,8 +121,8 @@ buildPythonPackage rec { meta = { description = "Python library to generate GDS layouts"; homepage = "https://github.com/gdsfactory/gdsfactory"; - changelog = "https://github.com/gdsfactory/gdsfactory/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/gdsfactory/gdsfactory/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fbeffa ]; }; -} +})