From 875e737bfabe34b3976a1613b9810de52e497a49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Sep 2023 11:57:30 +0000 Subject: [PATCH 1/5] ants: 2.4.4 -> 2.5.0 --- pkgs/applications/science/biology/ants/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index d71fbca4becd..a28a601fcda3 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ANTs"; - version = "2.4.4"; + version = "2.5.0"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; rev = "refs/tags/v${version}"; - hash = "sha256-GQndI8ayBvqujb2/qXT6RBAfr8hNPCI5IbwYkPlyNg0="; + hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q="; }; nativeBuildInputs = [ cmake makeWrapper ]; From 35145f9df092a476a7995018ec1115c97d426fee Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Sep 2023 22:17:19 +0200 Subject: [PATCH 2/5] ants: reformat file using `nixpkgs-fmt` --- .../science/biology/ants/default.nix | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index a28a601fcda3..dc0b16e9f4a6 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, makeBinaryWrapper +, itk +, vtk +, Cocoa +}: stdenv.mkDerivation rec { pname = "ANTs"; @@ -11,10 +19,22 @@ stdenv.mkDerivation rec { hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q="; }; - nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; + nativeBuildInputs = [ + cmake + makeBinaryWrapper + ]; - cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ]; + buildInputs = [ + itk + vtk + ] ++ lib.optionals stdenv.isDarwin [ + Cocoa + ]; + + cmakeFlags = [ + "-DANTS_SUPERBUILD=FALSE" + "-DUSE_VTK=TRUE" + ]; postInstall = '' for file in $out/bin/*; do @@ -22,11 +42,11 @@ stdenv.mkDerivation rec { done ''; - meta = with lib; { - homepage = "https://github.com/ANTsX/ANTs"; + meta = { description = "Advanced normalization toolkit for medical image registration and other processing"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.bsd3; + homepage = "https://github.com/ANTsX/ANTs"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bcdarwin ]; + platforms = lib.platforms.unix; }; } From d04a1a598e1a4113359c4b8cbaa806a65274e8be Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Sep 2023 22:18:19 +0200 Subject: [PATCH 3/5] ants: use `finalAttrs` pattern --- pkgs/applications/science/biology/ants/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index dc0b16e9f4a6..16e20b6790e5 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -8,14 +8,14 @@ , Cocoa }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "ANTs"; version = "2.5.0"; src = fetchFromGitHub { owner = "ANTsX"; repo = "ANTs"; - rev = "refs/tags/v${version}"; + rev = "refs/tags/v${finalAttrs.version}"; hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q="; }; @@ -49,4 +49,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.unix; }; -} +}) From ad1e8a5b434b8be9bf5a4db6680d7c2032676c98 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Sep 2023 23:08:44 +0200 Subject: [PATCH 4/5] ants: update `meta` attributes --- pkgs/applications/science/biology/ants/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 16e20b6790e5..b6c679178e77 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -43,9 +43,11 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/ANTsX/ANTs/releases/tag/v${finalAttrs.version}"; description = "Advanced normalization toolkit for medical image registration and other processing"; homepage = "https://github.com/ANTsX/ANTs"; - license = lib.licenses.bsd3; + license = lib.licenses.asl20; + mainProgram = "antsRegistration"; maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.unix; }; From 55b00aa1f78a0bba81cd25f45b7819825f17260d Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 2 Sep 2023 23:09:28 +0200 Subject: [PATCH 5/5] ants: update `postInstall` attribute --- pkgs/applications/science/biology/ants/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index b6c679178e77..cb3ec8a4f7ed 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' for file in $out/bin/*; do - wrapProgram $file --set ANTSPATH "$out/bin" + wrapProgram $file --set PATH "$out/bin" done '';