From 66580553974cab56f3959fbb75f900f4c7624c3d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 13:03:40 +0100 Subject: [PATCH 1/2] python311Packages.pydicom: 2.4.3 -> 2.4.4 Diff: https://github.com/pydicom/pydicom/compare/refs/tags/v2.4.3...v2.4.4 --- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index ddb4482ef3e7..30b4bd4fa30e 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -11,13 +11,13 @@ let pname = "pydicom"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "pydicom"; repo = "pydicom"; rev = "refs/tags/v${version}"; - hash = "sha256-PF4iA/FPxPYD8OfgWqKRndwi2vURuzh6tlEwduxs/3E="; + hash = "sha256-iJE1horEmdL7bKPn+NlZLgmtCbLZCZWQ8NjDBQPzXk8="; }; # Pydicom needs pydicom-data to run some tests. If these files aren't downloaded From 59738de84bdaa0b3c9975475bd85d30d7f42d542 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 13:10:43 +0100 Subject: [PATCH 2/2] python311Packages.pydicom: refactor --- .../development/python-modules/pydicom/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 30b4bd4fa30e..48824469b230 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -2,10 +2,11 @@ , stdenv , buildPythonPackage , fetchFromGitHub -, pythonOlder -, pytestCheckHook +, flit-core , numpy , pillow +, pytestCheckHook +, pythonOlder , setuptools }: @@ -32,15 +33,19 @@ let in buildPythonPackage { inherit pname version src; - disabled = pythonOlder "3.6"; + pyproject = true; - format = "setuptools"; + disabled = pythonOlder "3.10"; patches = [ # backport of https://github.com/pydicom/pydicom/commit/2513a20cc41743a42bdb86f4cbb4873899b7823c ./pillow-10.1.0-compat.patch ]; + nativeBuildInputs = [ + flit-core + ]; + propagatedBuildInputs = [ numpy pillow @@ -78,6 +83,7 @@ buildPythonPackage { meta = with lib; { description = "Python package for working with DICOM files"; homepage = "https://pydicom.github.io"; + changelog = "https://github.com/pydicom/pydicom/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; };