Skip to content

Commit a2afac3

Browse files
authored
gdsfactory: 9.20.1 -> 9.32.1; python313Packages.kfactory: 2.0.0 -> 2.3.0 (#485393)
2 parents e441ad3 + 468d9b6 commit a2afac3

File tree

2 files changed

+25
-13
lines changed

2 files changed

+25
-13
lines changed

pkgs/development/python-modules/gdsfactory/default.nix

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55

66
# build-system
77
flit-core,
8+
pythonRelaxDepsHook,
89

910
# dependencies
1011
jinja2,
1112
loguru,
1213
matplotlib,
14+
natsort,
1315
numpy,
1416
orjson,
1517
pandas,
@@ -44,24 +46,31 @@
4446
pytest-regressions,
4547
pytestCheckHook,
4648
}:
47-
buildPythonPackage rec {
49+
buildPythonPackage (finalAttrs: {
4850
pname = "gdsfactory";
49-
version = "9.20.1";
51+
version = "9.32.1";
5052
pyproject = true;
5153

5254
src = fetchFromGitHub {
5355
owner = "gdsfactory";
5456
repo = "gdsfactory";
55-
tag = "v${version}";
56-
hash = "sha256-TpMi0Rv6sQA8uAPGl6iR1qgTU7havBlWmdz98DROoSk=";
57+
tag = "v${finalAttrs.version}";
58+
hash = "sha256-uXFH+6uZx+fFo1QfozI/JVomchFlnWx805CwbAj7CPQ=";
5759
};
5860

59-
build-system = [ flit-core ];
61+
build-system = [
62+
flit-core
63+
];
64+
65+
nativeBuildInputs = [
66+
pythonRelaxDepsHook
67+
];
6068

6169
dependencies = [
6270
jinja2
6371
loguru
6472
matplotlib
73+
natsort
6574
numpy
6675
orjson
6776
pandas
@@ -101,6 +110,7 @@ buildPythonPackage rec {
101110
pythonRelaxDeps = [
102111
"pydantic"
103112
"trimesh"
113+
"kfactory"
104114
];
105115

106116
# tests require >32GB of RAM
@@ -111,8 +121,8 @@ buildPythonPackage rec {
111121
meta = {
112122
description = "Python library to generate GDS layouts";
113123
homepage = "https://github.com/gdsfactory/gdsfactory";
114-
changelog = "https://github.com/gdsfactory/gdsfactory/blob/${src.tag}/CHANGELOG.md";
124+
changelog = "https://github.com/gdsfactory/gdsfactory/blob/${finalAttrs.src.tag}/CHANGELOG.md";
115125
license = lib.licenses.mit;
116126
maintainers = with lib.maintainers; [ fbeffa ];
117127
};
118-
}
128+
})

pkgs/development/python-modules/kfactory/default.nix

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@
3030
pytestCheckHook,
3131
}:
3232

33-
buildPythonPackage rec {
33+
buildPythonPackage (finalAttrs: {
3434
pname = "kfactory";
35-
version = "2.0.0";
35+
version = "2.3.0";
3636
pyproject = true;
3737

3838
src = fetchFromGitHub {
3939
owner = "gdsfactory";
4040
repo = "kfactory";
41-
tag = "v${version}";
41+
tag = "v${finalAttrs.version}";
4242
# kfactory uses `.git` to infer the project directory.
4343
# https://github.com/gdsfactory/kfactory/blob/v2.0.0/src/kfactory/conf.py#L318-L327
4444
# Otherwise, tests fail with:
4545
# assert kf.config.project_dir is not None
4646
# E AssertionError: assert None is not None
4747
leaveDotGit = true;
48-
hash = "sha256-eZRNUb2Qw2HcR2W1pf15ulEt7ZCJwi60SuGdte/cG8E=";
48+
hash = "sha256-6z2JlndmuegpCAf74YRa/qVVjFOWv1Xy3dabeWlOmbs=";
4949
};
5050

5151
build-system = [
@@ -55,7 +55,9 @@ buildPythonPackage rec {
5555

5656
pythonRelaxDeps = [
5757
"pydantic"
58+
"klayout"
5859
];
60+
5961
dependencies = [
6062
aenum
6163
cachetools
@@ -143,8 +145,8 @@ buildPythonPackage rec {
143145
meta = {
144146
description = "KLayout API implementation of gdsfactory";
145147
homepage = "https://github.com/gdsfactory/kfactory";
146-
changelog = "https://github.com/gdsfactory/kfactory/blob/${src.tag}/CHANGELOG.md";
148+
changelog = "https://github.com/gdsfactory/kfactory/blob/${finalAttrs.src.tag}/CHANGELOG.md";
147149
license = lib.licenses.mit;
148150
maintainers = with lib.maintainers; [ fbeffa ];
149151
};
150-
}
152+
})

0 commit comments

Comments
 (0)