diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/gis')
8 files changed, 64 insertions, 70 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/infra/libkookie/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index da66b0d9d252..54d3d5987597 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,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.11"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0="; + sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q"; }; passthru = { @@ -53,5 +53,8 @@ in mkDerivation rec { license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ lsix ]; + # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit + # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b + broken = true; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/gis/qmapshack/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/gis/qmapshack/default.nix new file mode 100644 index 000000000000..bc7d888e2c15 --- /dev/null +++ b/infra/libkookie/nixpkgs/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.1"; + + src = fetchFromGitHub { + owner = "Maproom"; + repo = pname; + rev = "V_${version}"; + sha256 = "1q8qczp9bgk3dzdswb1x64fcn3xg339s0yx31nablb518hcb8jkr"; + }; + + 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/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/clang_patch.patch b/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/clang_patch.patch deleted file mode 100644 index e6af8d130514..000000000000 --- a/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/default.nix index aa418148209e..50df22c186c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/default.nix +++ b/infra/libkookie/nixpkgs/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.1"; 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 = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%20${lib.versions.major version}/SAGA%20-%20${version}/saga-${version}.tar.gz"; + sha256 = "qwjuimeoadwf254bwJ7h2vSKaELkcaJdFrGj1WtvnbM="; }; 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/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/finite.patch b/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/finite.patch deleted file mode 100644 index 7f60743534bd..000000000000 --- a/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/opencv4.patch b/infra/libkookie/nixpkgs/pkgs/applications/gis/saga/opencv4.patch deleted file mode 100644 index 0b26192bf09b..000000000000 --- a/infra/libkookie/nixpkgs/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/infra/libkookie/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix index 0ac19c0d1336..61c2bbc542cd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, rustPlatform , fetchFromGitHub, Security }: +{ 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; - cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4"; + cargoSha256 = "09rz8f1xyc64qjbj6pgw8jxr2a7chghmdc6sfkbv7hdvx6vg4wvk"; meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix index 4db60e53ad2a..51740b5ad609 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/gis/zombietrackergps/default.nix +++ b/infra/libkookie/nixpkgs/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; |