From 2703dd4b65e762254d98ea253d501d67bfac9e1e Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 03:00:19 +0100 Subject: [PATCH 1/2] python312Packages.dcmstack: 0.9 -> 0.9-unstable-2024-12-05 --- .../python-modules/dcmstack/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index fd84640e8d78..f4982057e9e9 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -4,24 +4,25 @@ fetchFromGitHub, nibabel, pydicom, - pylibjpeg-libjpeg, + pylibjpeg, + pint, pytestCheckHook, pythonOlder, setuptools, }: -buildPythonPackage rec { +buildPythonPackage { pname = "dcmstack"; - version = "0.9"; + version = "0.9-unstable-2024-12-05"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "moloney"; repo = "dcmstack"; - rev = "refs/tags/v${version}"; - hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; + rev = "68575996c8956152865e3598b15f621d7c803a96"; + hash = "sha256-QXnBtlXkxYDJFdjiqCoEuBMcHnq+87YmHX8j5EPW7HU="; }; build-system = [ setuptools ]; @@ -29,7 +30,8 @@ buildPythonPackage rec { dependencies = [ nibabel pydicom - pylibjpeg-libjpeg + pylibjpeg + pint ]; nativeCheckInputs = [ pytestCheckHook ]; From 582399a5d92819c94129f576cc7c1d85e6c6279a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 3 Jan 2025 03:00:29 +0100 Subject: [PATCH 2/2] python312Packages.heudiconv: fix build --- pkgs/development/python-modules/heudiconv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/heudiconv/default.nix b/pkgs/development/python-modules/heudiconv/default.nix index 6d19a460fde1..b44c00fb041a 100644 --- a/pkgs/development/python-modules/heudiconv/default.nix +++ b/pkgs/development/python-modules/heudiconv/default.nix @@ -8,6 +8,7 @@ fetchPypi, filelock, git, + git-annex, nibabel, nipype, pydicom, @@ -53,6 +54,7 @@ buildPythonPackage rec { dcm2niix pytestCheckHook git + git-annex ]; preCheck = ''