Merge pull request #295605 from r-ryantm/auto-update/saga

saga: 9.3.1 -> 9.3.2

authored by Ivan Mincik and committed by GitHub 7858badc 09364e24

+7 -12
+7 -7
pkgs/applications/gis/saga/default.nix pkgs/by-name/sa/saga/package.nix
··· 9 , gdal 10 , wxGTK32 11 , proj 12 - , dxflib 13 , curl 14 , libiodbc 15 , xz ··· 17 , opencv 18 , vigra 19 , postgresql 20 - , Cocoa 21 , unixODBC 22 , poppler 23 , hdf5 ··· 31 32 stdenv.mkDerivation rec { 33 pname = "saga"; 34 - version = "9.3.1"; 35 36 src = fetchurl { 37 url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; 38 - sha256 = "sha256-QrpEbb8zN003Afnu9UZUanWE0lIiy95POSWd1jB8EtA="; 39 }; 40 41 sourceRoot = "saga-${version}/saga-gis"; ··· 47 48 buildInputs = [ 49 curl 50 - dxflib 51 fftw 52 libsvm 53 hdf5 ··· 66 # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs 67 # for why the have additional buildInputs on darwin 68 ++ lib.optionals stdenv.isDarwin [ 69 - Cocoa 70 unixODBC 71 poppler 72 netcdf ··· 74 ]; 75 76 cmakeFlags = [ 77 - "-DOpenMP_SUPPORT=${if stdenv.isDarwin then "OFF" else "ON"}" 78 ]; 79 80 meta = with lib; {
··· 9 , gdal 10 , wxGTK32 11 , proj 12 + , libsForQt5 13 , curl 14 , libiodbc 15 , xz ··· 17 , opencv 18 , vigra 19 , postgresql 20 + , darwin 21 , unixODBC 22 , poppler 23 , hdf5 ··· 31 32 stdenv.mkDerivation rec { 33 pname = "saga"; 34 + version = "9.3.2"; 35 36 src = fetchurl { 37 url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz"; 38 + sha256 = "sha256-741O6C7amxSnOOTledF0izmVhiT79tFI4+EOtpNqP2Q="; 39 }; 40 41 sourceRoot = "saga-${version}/saga-gis"; ··· 47 48 buildInputs = [ 49 curl 50 + libsForQt5.dxflib 51 fftw 52 libsvm 53 hdf5 ··· 66 # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs 67 # for why the have additional buildInputs on darwin 68 ++ lib.optionals stdenv.isDarwin [ 69 + darwin.apple_sdk.frameworks.Cocoa 70 unixODBC 71 poppler 72 netcdf ··· 74 ]; 75 76 cmakeFlags = [ 77 + (lib.cmakeBool "OpenMP_SUPPORT" (!stdenv.isDarwin)) 78 ]; 79 80 meta = with lib; {
-5
pkgs/top-level/all-packages.nix
··· 29909 29910 qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; 29911 29912 - saga = callPackage ../applications/gis/saga { 29913 - inherit (darwin.apple_sdk.frameworks) Cocoa; 29914 - inherit (libsForQt5) dxflib; 29915 - }; 29916 - 29917 spatialite_gui = callPackage ../applications/gis/spatialite-gui { 29918 inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; 29919 wxGTK = wxGTK32;
··· 29909 29910 qmapshack = libsForQt5.callPackage ../applications/gis/qmapshack { }; 29911 29912 spatialite_gui = callPackage ../applications/gis/spatialite-gui { 29913 inherit (darwin.apple_sdk.frameworks) Carbon Cocoa IOKit; 29914 wxGTK = wxGTK32;