about summary refs log tree commit diff
path: root/pkgs/applications/gis
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/gis')
-rw-r--r--pkgs/applications/gis/gmt/dcw.nix4
-rw-r--r--pkgs/applications/gis/gmt/default.nix4
-rw-r--r--pkgs/applications/gis/gmt/gshhg.nix4
-rw-r--r--pkgs/applications/gis/grass/default.nix14
-rw-r--r--pkgs/applications/gis/openorienteering-mapper/default.nix6
-rw-r--r--pkgs/applications/gis/qgis/unwrapped.nix22
-rw-r--r--pkgs/applications/gis/qmapshack/default.nix41
-rw-r--r--pkgs/applications/gis/saga/clang_patch.patch19
-rw-r--r--pkgs/applications/gis/saga/default.nix21
-rw-r--r--pkgs/applications/gis/saga/finite.patch13
-rw-r--r--pkgs/applications/gis/saga/opencv4.patch14
-rw-r--r--pkgs/applications/gis/whitebox-tools/default.nix14
-rw-r--r--pkgs/applications/gis/zombietrackergps/default.nix9
13 files changed, 90 insertions, 95 deletions
diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix
index 58390e8929032..bc253f394c7ff 100644
--- a/pkgs/applications/gis/gmt/dcw.nix
+++ b/pkgs/applications/gis/gmt/dcw.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "dcw-gmt";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     cp -rv ./* $out/share/dcw-gmt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.soest.hawaii.edu/pwessel/dcw/";
     description = "Vector basemap of the world, for use with GMT";
     longDescription = ''
diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix
index f045ec067fee3..0e2b45888b488 100644
--- a/pkgs/applications/gis/gmt/default.nix
+++ b/pkgs/applications/gis/gmt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo
+{ lib, stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo
 , fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt
 , gshhg-gmt }:
 
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       "-DBLAS_LIBRARY=${blas}/lib/libblas.so"
     ]);
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.generic-mapping-tools.org";
     description = "Tools for manipulating geographic and cartesian data sets";
     longDescription = ''
diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix
index 0f22f87c89b5f..62758c71d594e 100644
--- a/pkgs/applications/gis/gmt/gshhg.nix
+++ b/pkgs/applications/gis/gmt/gshhg.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   pname = "gshhg-gmt";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     cp -rv ./* $out/share/gshhg-gmt
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/";
     description = "High-resolution shoreline data set, for use with GMT";
     longDescription = ''
diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix
index c1b7841dc58a0..65f42d7c53f0d 100644
--- a/pkgs/applications/gis/grass/default.nix
+++ b/pkgs/applications/gis/grass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw
+{ stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw
 , cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas
 , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid
 }:
@@ -9,14 +9,14 @@ stdenv.mkDerivation rec {
   name = "grass";
   version = "7.6.1";
 
-  src = with stdenv.lib; fetchFromGitHub {
+  src = with lib; fetchFromGitHub {
     owner = "OSGeo";
     repo = "grass";
     rev = "${name}_${replaceStrings ["."] ["_"] version}";
     sha256 = "1amjk9rz7vw5ha7nyl5j2bfwj5if9w62nlwx5qbp1x7spldimlll";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkg-config ];
   buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj
   readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas
   libLAS proj-datumgrid ]
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
   ];
 
   # Otherwise a very confusing "Can't load GDAL library" error
-  makeFlags = stdenv.lib.optional stdenv.isDarwin "GDAL_DYNAMIC=";
+  makeFlags = lib.optional stdenv.isDarwin "GDAL_DYNAMIC=";
 
   /* Ensures that the python script run at build time are actually executable;
    * otherwise, patchShebangs ignores them.  */
@@ -103,8 +103,8 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://grass.osgeo.org/";
     description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [mpickering];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [mpickering];
   };
 }
diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 45c38b3e5732b..81e81c88537d4 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv
+{ lib, stdenv
 , mkDerivation
 , fetchFromGitHub
 , substituteAll
@@ -52,7 +52,7 @@ mkDerivation rec {
     # See https://github.com/NixOS/nixpkgs/issues/85306
     "-DLICENSING_PROVIDER:BOOL=OFF"
     "-DMapper_MANUAL_QTHELP:BOOL=OFF"
-  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+  ] ++ lib.optionals stdenv.isDarwin [
     # FindGDAL is broken and always finds /Library/Framework unless this is
     # specified
     "-DGDAL_INCLUDE_DIR=${gdal}/include"
@@ -75,7 +75,7 @@ mkDerivation rec {
     ln -s $out/Applications/Mapper.app/Contents/MacOS/Mapper $out/bin/mapper
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = ''
       OpenOrienteering Mapper is an orienteering mapmaking program
       and provides a free alternative to the existing proprietary solution.
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index da66b0d9d252a..6f395640f5002 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -1,8 +1,9 @@
 { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
 , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
 , txt2tags, openssl, libzip, hdf5, netcdf, exiv2
-, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
+, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
 , withGrass ? true, grass
+, withWebKit ? true, qtwebkit
 }:
 with lib;
 let
@@ -10,7 +11,7 @@ let
     [ qscintilla-qt5 gdal jinja2 numpy psycopg2
       chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
 in mkDerivation rec {
-  version = "3.10.10";
+  version = "3.10.13";
   pname = "qgis";
   name = "${pname}-unwrapped-${version}";
 
@@ -18,7 +19,7 @@ in mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0=";
+    sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb";
   };
 
   passthru = {
@@ -28,8 +29,10 @@ in mkDerivation rec {
 
   buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
     fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
-    qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++
-    (lib.optional withGrass grass) ++ pythonBuildInputs;
+    qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ]
+    ++ lib.optional withGrass grass
+    ++ lib.optional withWebKit qtwebkit
+    ++ pythonBuildInputs;
 
   nativeBuildInputs = [ cmake flex bison ninja ];
 
@@ -44,14 +47,15 @@ in mkDerivation rec {
 
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
                  "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
-                 "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++
-                 lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
+                 "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ]
+                 ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
+                 ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
 
   meta = {
     description = "A Free and Open Source Geographic Information System";
-    homepage = "http://www.qgis.org";
+    homepage = "https://www.qgis.org";
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ lsix ];
+    maintainers = with lib.maintainers; [ lsix sikmir ];
   };
 }
diff --git a/pkgs/applications/gis/qmapshack/default.nix b/pkgs/applications/gis/qmapshack/default.nix
new file mode 100644
index 0000000000000..ef036fb71b043
--- /dev/null
+++ b/pkgs/applications/gis/qmapshack/default.nix
@@ -0,0 +1,41 @@
+{ mkDerivation, lib, fetchFromGitHub, cmake
+, qtscript, qtwebengine, gdal, proj, routino, quazip }:
+
+mkDerivation rec {
+  pname = "qmapshack";
+  version = "1.15.2";
+
+  src = fetchFromGitHub {
+    owner = "Maproom";
+    repo = pname;
+    rev = "V_${version}";
+    sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ qtscript qtwebengine gdal proj routino quazip ];
+
+  cmakeFlags = [
+    "-DROUTINO_XML_PATH=${routino}/share/routino"
+    "-DQUAZIP_INCLUDE_DIR=${quazip}/include/quazip5"
+    "-DLIBQUAZIP_LIBRARY=${quazip}/lib/libquazip.so"
+  ];
+
+  patches = [
+    "${src}/FindPROJ4.patch"
+    "${src}/FindQuaZip5.patch"
+  ];
+
+  qtWrapperArgs = [
+    "--suffix PATH : ${lib.makeBinPath [ gdal routino ]}"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/Maproom/qmapshack";
+    description = "Consumer grade GIS software";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ dotlambda sikmir ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/gis/saga/clang_patch.patch b/pkgs/applications/gis/saga/clang_patch.patch
deleted file mode 100644
index e6af8d130514e..0000000000000
--- a/pkgs/applications/gis/saga/clang_patch.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e92b250968e9656084ab5984689747ca615ff6e7
-Author: Volker Wichmann <wichmann@laserdata.at>
-Date:   Sun Mar 5 13:49:53 2017 +0100
-
-    saga_api, CSG_Table::Del_Records(): bug fix, check record count correctly
-
-diff --git a/src/saga_core/saga_api/table.cpp b/src/saga_core/saga_api/table.cpp
-index 76a1d8d..fa1a66f 100644
---- a/src/saga_core/saga_api/table.cpp
-+++ b/src/saga_core/saga_api/table.cpp
-@@ -901,7 +901,7 @@ bool CSG_Table::Del_Record(int iRecord)
- //---------------------------------------------------------
- bool CSG_Table::Del_Records(void)
- {
--	if( m_Records > 0 )
-+	if( m_nRecords > 0 )
- 	{
- 		_Index_Destroy();
-
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index aa418148209ed..96c2e8066820f 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -1,4 +1,6 @@
 { stdenv
+, mkDerivation
+, lib
 , fetchurl
 # native
 , autoreconfHook
@@ -28,13 +30,13 @@
 , fftw
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "saga";
-  version = "7.7.0";
+  version = "7.8.2";
 
   src = fetchurl {
-    url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${stdenv.lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
-    sha256 = "1nmvrlcpcm2pas9pnav13iydnym9d8yqqnwq47lm0j6b0a2wy9zk";
+    url = "mirror://sourceforge/saga-gis/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz";
+    sha256 = "1008l8f4733vsxy3y6d1yg8m4h8pp65d2p48ljc9kp5nyrg5vfy5";
   };
 
   nativeBuildInputs = [
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
   ]
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
-  ++ stdenv.lib.optionals stdenv.isDarwin [
+  ++ lib.optionals stdenv.isDarwin [
     Cocoa
     unixODBC
     poppler
@@ -76,16 +78,11 @@ stdenv.mkDerivation rec {
     sqlite
   ];
 
-  patches = [
-    # See https://sourceforge.net/p/saga-gis/bugs/280/
-    ./opencv4.patch
-  ];
-
   enableParallelBuilding = true;
 
-  CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
+  CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "System for Automated Geoscientific Analyses";
     homepage = "http://www.saga-gis.org";
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/gis/saga/finite.patch b/pkgs/applications/gis/saga/finite.patch
deleted file mode 100644
index 7f60743534bd4..0000000000000
--- a/pkgs/applications/gis/saga/finite.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/saga-gis/src/modules/imagery/imagery_maxent/me.cpp b/saga-gis/src/modules/imagery/imagery_maxent/me.cpp
-index c5da854..d3e9cff 100755
---- a/src/modules/imagery/imagery_maxent/me.cpp
-+++ b/src/modules/imagery/imagery_maxent/me.cpp
-@@ -21,7 +21,7 @@
- #ifdef _SAGA_MSW
- #define isinf(x) (!_finite(x))
- #else
--#define isinf(x) (!finite(x))
-+#define isinf(x) (!isfinite(x))
- #endif
-
- /** The input array contains a set of log probabilities lp1, lp2, lp3
diff --git a/pkgs/applications/gis/saga/opencv4.patch b/pkgs/applications/gis/saga/opencv4.patch
deleted file mode 100644
index 0b26192bf09bd..0000000000000
--- a/pkgs/applications/gis/saga/opencv4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/tools/imagery/imagery_opencv/Makefile.am
-+++ b/src/tools/imagery/imagery_opencv/Makefile.am
-@@ -7,9 +7,9 @@
- 
- if HAVE_CV
- DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD
--CXX_INCS           = -I$(top_srcdir)/src/saga_core -I/usr/include/opencv
-+CXX_INCS           = -I$(top_srcdir)/src/saga_core `pkg-config opencv4 --cflags`
- AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
--AM_LDFLAGS         = -fPIC -shared -avoid-version `pkg-config opencv --libs`
-+AM_LDFLAGS         = -fPIC -shared -avoid-version `pkg-config opencv4 --libs`
- pkglib_LTLIBRARIES = libimagery_opencv.la
- libimagery_opencv_la_SOURCES =\
- MLB_Interface.cpp\
diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix
index 0ac19c0d13361..1e7390f8c8385 100644
--- a/pkgs/applications/gis/whitebox-tools/default.nix
+++ b/pkgs/applications/gis/whitebox-tools/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, rustPlatform , fetchFromGitHub, Security }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, Security }:
 rustPlatform.buildRustPackage rec {
   pname = "whitebox_tools";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "jblindsay";
     repo = "whitebox-tools";
-    rev = "v${version}";
-    sha256 = "0c9jmfjz6ys65y65zlllv9xvaaavr9jpqc1dc217iywhj07j8k2v";
+    rev = version;
+    sha256 = "0s5byn8qyi1bm59j9vhwqaygw5cxipc7wbd3flh7n24nx0s8pr8c";
   };
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin Security;
+  buildInputs = lib.optional stdenv.isDarwin Security;
 
-  cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4";
+  cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "An advanced geospatial data analysis platform";
     homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html";
     license = licenses.mit;
diff --git a/pkgs/applications/gis/zombietrackergps/default.nix b/pkgs/applications/gis/zombietrackergps/default.nix
index 4db60e53ad2a1..51740b5ad609a 100644
--- a/pkgs/applications/gis/zombietrackergps/default.nix
+++ b/pkgs/applications/gis/zombietrackergps/default.nix
@@ -2,7 +2,6 @@
 , lib
 , fetchFromGitLab
 , qmake
-, qtbase
 , qtcharts
 , qtsvg
 , marble
@@ -12,18 +11,17 @@
 
 mkDerivation rec {
   pname = "zombietrackergps";
-  version = "1.01";
+  version = "1.03";
 
   src = fetchFromGitLab {
     owner = "ldutils-projects";
     repo = pname;
     rev = "v_${version}";
-    sha256 = "0h354ydbahy8rpkmzh5ym5bddbl6irjzklpcg6nbkv6apry84d48";
+    sha256 = "1rmdy6kijmcxamm4mqmz8638xqisijlnpv8mimgxywpf90h9rrwq";
   };
 
   buildInputs = [
     ldutils
-    qtbase
     qtcharts
     qtsvg
     marble.dev
@@ -49,7 +47,8 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "GPS track manager for Qt using KDE Marble maps";
-    homepage = "https://gitlab.com/ldutils-projects/zombietrackergps";
+    homepage = "https://www.zombietrackergps.net/ztgps/";
+    changelog = "https://www.zombietrackergps.net/ztgps/history.html";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ sohalt ];
     platforms = platforms.linux;
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-08-31 07:10:14 +0000