From 6a04042b5c9c8385da28142ec9e42b8ee47d4a65 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 12 Jan 2023 12:22:08 -0500 Subject: [PATCH] elastix: 5.0.1 -> 5.1.0 Dropped `python3` dependency since it's only used to run some tests, but these error as the `itk` python package is not present (or indeed available in Nixpkgs) --- .../science/biology/elastix/default.nix | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 4fd4c0c130f0..0344559f8a8f 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,26 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, itk_5_2, python3, Cocoa }: +{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: stdenv.mkDerivation rec { pname = "elastix"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { - owner = "SuperElastix"; - repo = pname; - rev = version; - sha256 = "1mx8kkak2d3ibfrxrh8jkmh2zkdlgl9h578wiw3617zcwaa97bxw"; + owner = "SuperElastix"; + repo = pname; + rev = version; + hash = "sha256-wFeLU8IwiF43a9TAvecQG+QMw88PQZdJ8sI1Zz3ZeXc="; }; - patches = [ - (fetchpatch { - name = "install-executables.patch"; # https://github.com/SuperElastix/elastix/issues/305 - url = "https://github.com/SuperElastix/elastix/commit/8e26cdc0d66f6030c7be085fdc424d84d4fc7546.patch"; - sha256 = "12y9wbpi9jlarnw6fk4iby97jxvx5g4daq9zqblbcmn51r134bj5"; - }) - ]; - - nativeBuildInputs = [ cmake python3 ]; - buildInputs = [ itk_5_2 ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; doCheck = !stdenv.isDarwin; # usual dynamic linker issues