From 54382867214c6704670cea1992a639f93f3fda9f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 May 2024 00:25:35 -0400 Subject: [PATCH 1/2] mirtk: pin itk = itk_5_2 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c37280dd9f1..a815d8b9b4dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37953,7 +37953,7 @@ with pkgs; minia = callPackage ../applications/science/biology/minia { }; - mirtk = callPackage ../development/libraries/science/biology/mirtk { }; + mirtk = callPackage ../development/libraries/science/biology/mirtk { itk = itk_5_2; }; muscle = callPackage ../applications/science/biology/muscle { }; From 1a40f8e76fd978f85613a94962e4a8efa5c96ed9 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 24 Apr 2024 12:45:35 -0400 Subject: [PATCH 2/2] itk: 5.3.0 -> 5.4.0 --- pkgs/development/libraries/itk/5.x.nix | 6 +++--- pkgs/development/libraries/itk/generic.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/itk/5.x.nix b/pkgs/development/libraries/itk/5.x.nix index 765b464e46a1..c3086d86ac11 100644 --- a/pkgs/development/libraries/itk/5.x.nix +++ b/pkgs/development/libraries/itk/5.x.nix @@ -1,5 +1,5 @@ import ./generic.nix rec { - version = "5.3.0"; - rev = "v${version}"; - sourceSha256 = "sha256-+qCd8Jzpl5fEPTUpLyjjFBkfgCn3+Lf4pi8QnjCwofs="; + version = "5.4.0"; + rev = "refs/tags/v${version}"; + sourceSha256 = "sha256-1RSWgH0iQ2NQNsieW2m37udXWQlqYslJNM3TXC9xeP4="; } diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix index be59969aaecb..54f725683a2e 100644 --- a/pkgs/development/libraries/itk/generic.nix +++ b/pkgs/development/libraries/itk/generic.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { sha256 = sourceSha256; }; - patches = [ + patches = lib.optionals (lib.versionOlder version "5.4") [ (fetchpatch { name = "fix-gcc13-build"; url = "https://github.com/InsightSoftwareConsortium/ITK/commit/9a719a0d2f5f489eeb9351b0ef913c3693147a4f.patch";