diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/gis')
-rw-r--r-- | nixpkgs/pkgs/applications/gis/grass/default.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix | 4 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix | 11 |
3 files changed, 8 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/applications/gis/grass/default.nix b/nixpkgs/pkgs/applications/gis/grass/default.nix index cb574ffc8f1..420f57bb93f 100644 --- a/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, flex, bison, pkgconfig, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK30, netcdf, blas +, cairo, readline, ffmpeg_3, makeWrapper, wxGTK30, netcdf, blas , proj, gdal, geos, sqlite, postgresql, libmysqlclient, python2Packages, libLAS, proj-datumgrid }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ flex bison zlib proj gdal libtiff libpng fftw sqlite cairo proj - readline ffmpeg makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas + readline ffmpeg_3 makeWrapper wxGTK30 netcdf geos postgresql libmysqlclient blas libLAS proj-datumgrid ] ++ (with python2Packages; [ python dateutil wxPython30 numpy ]); diff --git a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 2e11f22f517..72e84620252 100644 --- a/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix +++ b/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.4"; + version = "3.10.7"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0d1rsgjgnnq6jgms5bgppz8lkh4518nf90fk0qvxajdfi9j4jn12"; + sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; }; passthru = { diff --git a/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix index d81a08e2900..c26243c0c59 100644 --- a/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix +++ b/nixpkgs/pkgs/applications/gis/whitebox-tools/default.nix @@ -1,25 +1,22 @@ { stdenv, rustPlatform , fetchFromGitHub, Security }: rustPlatform.buildRustPackage rec { pname = "whitebox_tools"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "jblindsay"; repo = "whitebox-tools"; rev = "v${version}"; - sha256 = "0zi32d0wrbl2763dcllv2g0liwacsfiza5lkx52620prjjbhby8i"; + sha256 = "0c9jmfjz6ys65y65zlllv9xvaaavr9jpqc1dc217iywhj07j8k2v"; }; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; - cargoSha256 = "13k21akyfqgamywj39bw73sldby1s02vyvxfglxbaqq1x96xcy4i"; - - # failures: structures::polyline::test::test_polyline_split - doCheck = false; + cargoSha256 = "05w2jimmygg7dc93i8bpjpjc5yj5xfpfkjnbbgw2sq4kh06r5ii4"; meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; - homepage = "http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html"; + homepage = "https://jblindsay.github.io/ghrg/WhiteboxTools/index.html"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; platforms = platforms.all; |