From 1cab349abfc22d8076d29445840f937b206dbf48 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 10 May 2023 22:55:00 -0400 Subject: [PATCH 1/2] python311Packages.pylibjpeg-libjpeg: 1.3.3 -> 1.3.4; unbreak --- .../python-modules/pylibjpeg-libjpeg/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index 46dd18b109fd..a42ea95ee2b4 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchFromGitHub , pythonOlder @@ -10,14 +9,14 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; - version = "1.3.3"; + version = "1.3.4"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pydicom"; repo = pname; - rev = "refs/tags/v.${version}"; - hash = "sha256-fv3zX+P2DWMdxPKsvSPhPCV8cDX3tAMO/h5coMHBHN8="; + rev = "refs/tags/v${version}"; + hash = "sha256-VmqeoMU8riLpWyC+yKqq56TkruxOie6pjbg+ozivpBk="; fetchSubmodules = true; }; From 2219f70982ec6eb1556bccad9f5c30c4ae4d81e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 11 May 2023 05:54:22 +0200 Subject: [PATCH 2/2] python311Packages.pylibjpeg-libjpeg: add changelog to meta - add format - specify liccense --- .../python-modules/pylibjpeg-libjpeg/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix index a42ea95ee2b4..a9ffc663fcaf 100644 --- a/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix @@ -10,6 +10,8 @@ buildPythonPackage rec { pname = "pylibjpeg-libjpeg"; version = "1.3.4"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -20,13 +22,18 @@ buildPythonPackage rec { fetchSubmodules = true; }; - nativeBuildInputs = [ cython]; + nativeBuildInputs = [ + cython + ]; - propagatedBuildInputs = [ numpy ]; + propagatedBuildInputs = [ + numpy + ]; nativeCheckInputs = [ pytestCheckHook ]; + doCheck = false; # tests try to import 'libjpeg.data', which errors pythonImportsCheck = [ @@ -36,7 +43,8 @@ buildPythonPackage rec { meta = with lib; { description = "A JPEG, JPEG-LS and JPEG XT plugin for pylibjpeg"; homepage = "https://github.com/pydicom/pylibjpeg-libjpeg"; - license = licenses.gpl3; + changelog = "https://github.com/pydicom/pylibjpeg-libjpeg/releases/tag/v${version}"; + license = licenses.gpl3Only; maintainers = with maintainers; [ bcdarwin ]; }; }