Unverified Commit 2f3f0fd0 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #231202 from bcdarwin/unbreak-update-pylibjpeg-libjpeg 

python311Packages.pylibjpeg-libjpeg: 1.3.3 -> 1.3.4; unbreak
parents db18fdbd 2219f709

pkgs/development/python-modules/pylibjpeg-libjpeg/default.nix

+14 −7
Original line number Diff line number Diff line 
{ lib

, stdenv

, buildPythonPackage

, fetchFromGitHub

, pythonOlder
@@ -10,24 +9,31 @@ 


buildPythonPackage rec {

  pname = "pylibjpeg-libjpeg";

  version = "1.3.3";

  version = "1.3.4";

  format = "setuptools";



  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;

  };



  nativeBuildInputs = [ cython];

  nativeBuildInputs = [

    cython

  ];



  propagatedBuildInputs = [ numpy ];

  propagatedBuildInputs = [

    numpy

  ];



  nativeCheckInputs = [

    pytestCheckHook

  ];



  doCheck = false;  # tests try to import 'libjpeg.data', which errors



  pythonImportsCheck = [
@@ -37,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 ];

  };

}