Unverified Commit 7dbe1078 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #328212 from bcdarwin/update-elastix

parents 0c143150 b5edded2

pkgs/development/libraries/science/biology/elastix/default.nix

+19 −10
Original line number Diff line number Diff line 
{ lib, stdenv, fetchFromGitHub, cmake, itk, Cocoa }:

{

  lib,

  stdenv,

  fetchFromGitHub,

  cmake,

  itk,

  Cocoa,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "elastix";

  version = "5.1.0";

  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 ];
@@ -19,8 +26,10 @@ stdenv.mkDerivation rec { 
  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 ];

    mainProgram = "elastix";

    platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1

    license = licenses.asl20;

  };

}
 
})

pkgs/development/libraries/simpleitk/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [