From 98d3153bf6af7fce4399c9b6d55f184294984899 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 21 Sep 2024 15:44:34 +0200 Subject: [PATCH 1/4] saga: 9.3.2 -> 9.5.1 --- pkgs/by-name/sa/saga/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index ae4670a002bb3..86ec37bc13497 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -16,6 +16,7 @@ , libharu , opencv , vigra +, pdal , postgresql , darwin , unixODBC @@ -31,11 +32,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.3.2"; + version = "9.5.1"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-741O6C7amxSnOOTledF0izmVhiT79tFI4+EOtpNqP2Q="; + hash = "sha256-6rdtEpHxbSqJDWf7+jRx0IAS3tCQ5NioqskTVkhpSQo="; }; sourceRoot = "saga-${version}/saga-gis"; @@ -53,6 +54,7 @@ stdenv.mkDerivation rec { hdf5 gdal wxGTK32 + pdal proj libharu opencv From 4ee01360f389d4abd9d9339379ae345f64aef8b0 Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Sat, 21 Sep 2024 15:45:13 +0200 Subject: [PATCH 2/4] saga: reformat with nixfmt --- pkgs/by-name/sa/saga/package.nix | 126 ++++++++++++++++--------------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 86ec37bc13497..57f0665527dc2 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -1,33 +1,34 @@ -{ stdenv -, lib -, fetchurl -# native -, cmake -, desktopToDarwinBundle -, pkg-config -# not native -, gdal -, wxGTK32 -, proj -, libsForQt5 -, curl -, libiodbc -, xz -, libharu -, opencv -, vigra -, pdal -, postgresql -, darwin -, unixODBC -, poppler -, hdf5 -, netcdf -, sqlite -, qhull -, giflib -, libsvm -, fftw +{ + stdenv, + lib, + fetchurl, + # native + cmake, + desktopToDarwinBundle, + pkg-config, + # not native + gdal, + wxGTK32, + proj, + libsForQt5, + curl, + libiodbc, + xz, + libharu, + opencv, + vigra, + pdal, + postgresql, + darwin, + unixODBC, + poppler, + hdf5, + netcdf, + sqlite, + qhull, + giflib, + libsvm, + fftw, }: stdenv.mkDerivation rec { @@ -46,34 +47,35 @@ stdenv.mkDerivation rec { pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; - buildInputs = [ - curl - libsForQt5.dxflib - fftw - libsvm - hdf5 - gdal - wxGTK32 - pdal - proj - libharu - opencv - vigra - postgresql - libiodbc - xz - qhull - giflib - ] - # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs - # for why the have additional buildInputs on darwin - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Cocoa - unixODBC - poppler - netcdf - sqlite - ]; + buildInputs = + [ + curl + libsForQt5.dxflib + fftw + libsvm + hdf5 + gdal + wxGTK32 + pdal + proj + libharu + opencv + vigra + postgresql + libiodbc + xz + qhull + giflib + ] + # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs + # for why the have additional buildInputs on darwin + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + unixODBC + poppler + netcdf + sqlite + ]; cmakeFlags = [ (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.hostPlatform.isDarwin)) @@ -84,7 +86,13 @@ stdenv.mkDerivation rec { homepage = "https://saga-gis.sourceforge.io"; changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog ${version}/"; license = licenses.gpl2Plus; - maintainers = with maintainers; teams.geospatial.members ++ [ michelk mpickering ]; + maintainers = + with maintainers; + teams.geospatial.members + ++ [ + michelk + mpickering + ]; platforms = with platforms; unix; }; } From 908190b81f2d438ad9857bbcc5533cc3d1243c7b Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 4 Oct 2024 12:52:41 +0200 Subject: [PATCH 3/4] saga: fix crash when displaying file picker --- pkgs/by-name/sa/saga/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index 57f0665527dc2..ee6806db3b57d 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -6,6 +6,7 @@ cmake, desktopToDarwinBundle, pkg-config, + wrapGAppsHook3, # not native gdal, wxGTK32, @@ -44,6 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake + wrapGAppsHook3 pkg-config ] ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle; From 09d41c9dbbb3273dd8e0fc51031e3f12c3bab9df Mon Sep 17 00:00:00 2001 From: Augustin Trancart Date: Fri, 4 Oct 2024 23:21:32 +0200 Subject: [PATCH 4/4] saga: 9.5.1 -> 9.6.0 --- pkgs/by-name/sa/saga/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix index ee6806db3b57d..e7642e0425157 100644 --- a/pkgs/by-name/sa/saga/package.nix +++ b/pkgs/by-name/sa/saga/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { pname = "saga"; - version = "9.5.1"; + version = "9.6.0"; src = fetchurl { url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; - hash = "sha256-6rdtEpHxbSqJDWf7+jRx0IAS3tCQ5NioqskTVkhpSQo="; + hash = "sha256-M4228GDo9jIVJMfl61n7cgTAmBYZrmHdXb+mD40vWqY"; }; sourceRoot = "saga-${version}/saga-gis";