From bc76800bba4095be2c6d34deb482e5d258e85f1c Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 14 Aug 2024 01:24:23 -0400 Subject: [PATCH 1/2] simpleitk: 2.3.1 -> 2.4.0 --- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index 10e055d5acde..fbdfd20441d9 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "simpleitk"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "SimpleITK"; repo = "SimpleITK"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-JmZUlIdcCQ9yEqxoUwRaxvr/Q7xZm41QA3mtDtoSdyI="; + hash = "sha256-/FV5NAM9DJ54Vg6/5yn9DCybry+a8lS3fQ3HWLOeOTA="; }; nativeBuildInputs = [ From b5edded29125b9786fd696538a79df69281637d5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 18 Jul 2024 11:07:50 -0400 Subject: [PATCH 2/2] elastix: 5.1.0 -> 5.2.0 --- .../science/biology/elastix/default.nix | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 0344559f8a8f..44e76244c987 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + itk, + Cocoa, +}: -stdenv.mkDerivation rec { - pname = "elastix"; - version = "5.1.0"; +stdenv.mkDerivation (finalAttrs: { + pname = "elastix"; + version = "5.2.0"; src = fetchFromGitHub { owner = "SuperElastix"; - repo = pname; - rev = version; - hash = "sha256-wFeLU8IwiF43a9TAvecQG+QMw88PQZdJ8sI1Zz3ZeXc="; + repo = "elastix"; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-edUMj8sjku8EVYaktteIDS+ouaN3kg+CXQCeSWKlLDI="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ itk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; - doCheck = !stdenv.isDarwin; # usual dynamic linker issues + doCheck = !stdenv.isDarwin; # usual dynamic linker issues meta = with lib; { homepage = "https://elastix.lumc.nl"; description = "Image registration toolkit based on ITK"; + changelog = "https://github.com/SuperElastix/elastix/releases/tag/${finalAttrs.version}"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 + mainProgram = "elastix"; + platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 license = licenses.asl20; }; -} +})