summary refs log tree commit diff
diff options
context:
space:
mode:
authorBen Darwin <bcdarwin@gmail.com>2023-10-06 16:29:13 -0400
committerBen Darwin <bcdarwin@gmail.com>2023-10-07 18:32:56 -0400
commitb66c1ca1852ac68ca8bc5696e830765825bf6923 (patch)
tree2c7a30c9f9d0c6c574791d71b504f2583167dec4
parent08f237546122aa8adb63605c485e78187b6fbd0c (diff)
downloadnixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.tar
nixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.tar.gz
nixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.tar.bz2
nixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.tar.lz
nixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.tar.xz
nixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.tar.zst
nixpkgs-b66c1ca1852ac68ca8bc5696e830765825bf6923.zip
simpleitk: package cleanup
 - added changelog
 - bump lua version
 - use finalAttrs pattern
 - improve formatting
-rw-r--r--pkgs/development/libraries/simpleitk/default.nix31
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 25 insertions, 8 deletions
diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix
index 411622c26a4..c2f75bdd6c2 100644
--- a/pkgs/development/libraries/simpleitk/default.nix
+++ b/pkgs/development/libraries/simpleitk/default.nix
@@ -1,27 +1,44 @@
-{ lib, stdenv, fetchFromGitHub, cmake, swig4, lua, itk }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, swig4
+, lua
+, itk
+}:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "simpleitk";
   version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "SimpleITK";
     repo = "SimpleITK";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-SJSFJEFu1qKowX5/98MslN7GFDS8aF5+EKkQ2983Azg=";
   };
 
-  nativeBuildInputs = [ cmake swig4 ];
-  buildInputs = [ lua itk ];
+  nativeBuildInputs = [
+    cmake
+    swig4
+  ];
+  buildInputs = [
+    lua
+    itk
+  ];
 
   # 2.0.0: linker error building examples
-  cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" "-DBUILD_SHARED_LIBS=ON" ];
+  cmakeFlags = [
+    "-DBUILD_EXAMPLES=OFF"
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
 
   meta = with lib; {
     homepage = "https://www.simpleitk.org";
     description = "Simplified interface to ITK";
+    changelog = "https://github.com/SimpleITK/SimpleITK/releases/tag/v${finalAttrs.version}";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.linux;
     license = licenses.asl20;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3288e469ef3..8e3eeb7412e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25142,7 +25142,7 @@ with pkgs;
 
   simp_le = callPackage ../tools/admin/simp_le { };
 
-  simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_3; };
+  simpleitk = callPackage ../development/libraries/simpleitk { lua = lua5_4; };
 
   sioclient = callPackage ../development/libraries/sioclient { };