Merge pull request #328212 from bcdarwin/update-elastix

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;
   };
-}
+})

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 = [