From 3379ddaa64b02d84fe13d264cb3fa5c772b6f1ac Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 23 Jan 2025 17:22:44 -0500 Subject: [PATCH 1/2] python312Packages.pylibjpeg-openjpeg: unbreak by lifting poetry-core version bounds --- pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix index e6d301908db7..ddd616eb0bfe 100644 --- a/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-openjpeg/default.nix @@ -36,6 +36,8 @@ buildPythonPackage rec { rmdir lib/openjpeg cp -r ${openjpeg.src} lib/openjpeg chmod +rwX -R lib/openjpeg + + substituteInPlace pyproject.toml --replace-fail "poetry-core >=1.8,<2" "poetry-core" ''; dontUseCmakeConfigure = true; From 63a37dd5ed6093fe1e3a4fdf3823b5996cadc69f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Jan 2025 18:05:03 -0500 Subject: [PATCH 2/2] python312Packages.highdicom: restore pylibjpeg-openjpeg optional dependency --- pkgs/development/python-modules/highdicom/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/highdicom/default.nix b/pkgs/development/python-modules/highdicom/default.nix index fd3a9318b8ca..9310cb72eedd 100644 --- a/pkgs/development/python-modules/highdicom/default.nix +++ b/pkgs/development/python-modules/highdicom/default.nix @@ -10,6 +10,7 @@ pydicom, pylibjpeg, pylibjpeg-libjpeg, + pylibjpeg-openjpeg, setuptools, }: @@ -50,7 +51,7 @@ buildPythonPackage rec { libjpeg = [ pylibjpeg pylibjpeg-libjpeg - #pylibjpeg-openjpeg # broken on aarch64-linux + pylibjpeg-openjpeg ]; };