From 94ce6278f9947e81ba1e918abba2be1121fe1448 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 19 Jan 2023 23:24:19 -0500 Subject: [PATCH] python310Packages.dcmstack: 0.8 -> 0.9; unbreak --- .../python-modules/dcmstack/default.nix | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix index ee554a6e2bd7..45b7fa0f5599 100644 --- a/pkgs/development/python-modules/dcmstack/default.nix +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -1,34 +1,32 @@ { lib , buildPythonPackage , fetchFromGitHub -, pythonAtLeast -, nose +, pythonOlder +, pytestCheckHook , nibabel , pydicom +, pylibjpeg-libjpeg }: buildPythonPackage rec { pname = "dcmstack"; - version = "0.8"; - - disabled = pythonAtLeast "3.8"; - # https://github.com/moloney/dcmstack/issues/67 + version = "0.9"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "moloney"; repo = pname; - rev = "v${version}"; - sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; + rev = "refs/tags/v${version}"; + hash = "sha256-GVzih9H2m2ZGSuZMRuaDG78b95PI3j0WQw5M3l4KNCs="; }; - propagatedBuildInputs = [ nibabel pydicom ]; + propagatedBuildInputs = [ + nibabel + pydicom + pylibjpeg-libjpeg + ]; - checkInputs = [ nose ]; - checkPhase = '' - runHook preCheck - nosetests - runHook postCheck - ''; + checkInputs = [ pytestCheckHook ]; meta = with lib; { homepage = "https://github.com/moloney/dcmstack";