diff --git a/pkgs/development/python-modules/pylibjpeg-data/default.nix b/pkgs/development/python-modules/pylibjpeg-data/default.nix new file mode 100644 index 000000000000..dcc14a7fd912 --- /dev/null +++ b/pkgs/development/python-modules/pylibjpeg-data/default.nix @@ -0,0 +1,39 @@ +{ + lib, + buildPythonPackage, + pythonOlder, + fetchFromGitHub, + flit-core, +}: + +buildPythonPackage rec { + pname = "pylibjpeg-data"; + version = "unstable-2024-03-28"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "pylibjpeg-data"; + rev = "8253566715800a7fc3d4d949abab102c8172bca0"; + hash = "sha256-TzhiZ4LCFZX75h3YRrEFO5kRVc5VwTOJd+1VFW3LsaQ="; + }; + + build-system = [ flit-core ]; + + doCheck = false; # no tests + + pythonImportsCheck = [ + "ljdata" + "ljdata.ds" + "ljdata.jpg" + ]; + + meta = { + description = "JPEG and DICOM data used for testing pylibjpeg"; + homepage = "https://github.com/pydicom/pylibjpeg-data"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/pylibjpeg/default.nix b/pkgs/development/python-modules/pylibjpeg/default.nix index 468a00d8ef72..4f5a3cbeb846 100644 --- a/pkgs/development/python-modules/pylibjpeg/default.nix +++ b/pkgs/development/python-modules/pylibjpeg/default.nix @@ -8,28 +8,10 @@ setuptools, numpy, pydicom, + pylibjpeg-data, pylibjpeg-libjpeg, }: -let - pylibjpeg-data = buildPythonPackage { - pname = "pylibjpeg-data"; - version = "1.0.0dev0"; - pyproject = true; - - nativeBuildInputs = [ setuptools ]; - - src = fetchFromGitHub { - owner = "pydicom"; - repo = "pylibjpeg-data"; - rev = "2ab4b8a65b070656eca2582bd23197a3d01cdccd"; - hash = "sha256-cFE1XjrqyGqwHCYGRucXK+q4k7ftUIbYwBw4WwIFtEc="; - }; - - doCheck = false; - }; -in - buildPythonPackage rec { pname = "pylibjpeg"; version = "2.0.0"; @@ -44,9 +26,9 @@ buildPythonPackage rec { hash = "sha256-qGtrphsBBVieGS/8rdymbsjLMU/QEd7zFNAANN8bD+k="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16ffb80ef7e9..a13c5f3f1882 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11389,6 +11389,8 @@ self: super: with self; { pylibjpeg = callPackage ../development/python-modules/pylibjpeg { }; + pylibjpeg-data = callPackage ../development/python-modules/pylibjpeg-data { }; + pylibjpeg-libjpeg = callPackage ../development/python-modules/pylibjpeg-libjpeg { }; pyliblo = callPackage ../development/python-modules/pyliblo { };