From f546686f7dabde127d65528c2449777e7acac819 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 14 Feb 2024 20:27:27 -0500 Subject: [PATCH 1/2] python311Packages.pylibjpeg-libjpeg: 1.3.4 -> 2.02 --- .../python-modules/pylibjpeg-libjpeg/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index a9ffc663fcaf..3872fa6b2417 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -3,14 +3,16 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook -, cython +, cython_3 +, poetry-core +, setuptools , numpy }: buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "1.3.4"; - format = "setuptools"; + version = "2.02"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,12 +20,14 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk="; + hash = "sha256-mGwku19Xe605fF3UU59712rYp+s/pP79lBRl79fhhTI="; fetchSubmodules = true; }; nativeBuildInputs = [ - cython + cython_3 + poetry-core + setuptools ]; propagatedBuildInputs = [ From a145fd99cdb5e4247ba7e086438b109b5c2465d3 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 14 Feb 2024 20:27:50 -0500 Subject: [PATCH 2/2] python311Packages.pylibjpeg: 1.4.0 -> 2.0.0 --- pkgs/development/python-modules/pylibjpeg/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix index 65055d94280c..134b0ebdb993 100644 --- a/pkgs/development/python-modules/pylibjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pythonOlder , pytestCheckHook +, flit-core , setuptools , numpy , pydicom @@ -31,7 +32,7 @@ in buildPythonPackage rec { pname = "pylibjpeg"; - version = "1.4.0"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -40,10 +41,10 @@ buildPythonPackage rec { owner = "pydicom"; repo = "pylibjpeg"; rev = "refs/tags/v${version}"; - hash = "sha256-Px1DyYDkKAUdYo+ZxZ1w7TkPzWN++styiFl02iQOvyQ="; + hash = "sha256-qGtrphsBBVieGS/8rdymbsjLMU/QEd7zFNAANN8bD+k="; }; - nativeBuildInputs = [ setuptools ]; + nativeBuildInputs = [ flit-core ]; propagatedBuildInputs = [ numpy ];