diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-08-08 16:04:42 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-08-13 06:35:37 +0000 |
commit | 12aaa58dac35800b5b7d77f81cf2a87c21ee55da (patch) | |
tree | be0add9e5c22a85d20b5d78206aa74f956eb2a1b /nixpkgs/pkgs/applications/gis/grass/default.nix | |
parent | 45892a5591202f75a1c2f1ca7c62a92c7566e3c5 (diff) | |
parent | 5a8e9243812ba528000995b294292d3b5e120947 (diff) | |
download | nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.gz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.bz2 nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.lz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.xz nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.tar.zst nixlib-12aaa58dac35800b5b7d77f81cf2a87c21ee55da.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/libraries/mesa/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix Link: https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/issues/391
Diffstat (limited to 'nixpkgs/pkgs/applications/gis/grass/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/gis/grass/default.nix | 114 |
1 files changed, 81 insertions, 33 deletions
diff --git a/nixpkgs/pkgs/applications/gis/grass/default.nix b/nixpkgs/pkgs/applications/gis/grass/default.nix index 452ee11827cb..0d16ba036a9c 100644 --- a/nixpkgs/pkgs/applications/gis/grass/default.nix +++ b/nixpkgs/pkgs/applications/gis/grass/default.nix @@ -1,38 +1,82 @@ -{ lib, stdenv, fetchFromGitHub, flex, bison, pkg-config, zlib, libtiff, libpng, fftw -, cairo, readline, ffmpeg, makeWrapper, wxGTK32, libiconv, netcdf, blas -, proj, gdal, geos, sqlite, postgresql, libmysqlclient, python3Packages, proj-datumgrid -, zstd, pdal, wrapGAppsHook +{ lib +, stdenv +, callPackage +, fetchFromGitHub +, makeWrapper +, wrapGAppsHook + +, bison +, blas +, cairo +, ffmpeg +, fftw +, flex +, gdal +, geos +, libiconv +, libmysqlclient +, libpng +, libtiff +, libxml2 +, netcdf +, pdal +, pkg-config +, postgresql +, proj +, proj-datumgrid +, python3Packages +, readline +, sqlite +, wxGTK32 +, zlib +, zstd }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: rec { pname = "grass"; - version = "8.2.1"; + version = "8.3.0"; src = with lib; fetchFromGitHub { owner = "OSGeo"; repo = "grass"; rev = version; - hash = "sha256-U3PQd3u9i+9Bc7BSd0gK8Ss+iV9BT1xLBDrKydtl3Qk="; + hash = "sha256-YHQtvp/AYMWme46yIc4lE/izjqVePnPxn3GY5RRfPq4="; }; nativeBuildInputs = [ - pkg-config bison flex makeWrapper wrapGAppsHook + makeWrapper + wrapGAppsHook + + bison + flex gdal # for `gdal-config` geos # for `geos-config` - netcdf # for `nc-config` libmysqlclient # for `mysql_config` - pdal # for `pdal-config`; remove with next version, see https://github.com/OSGeo/grass/pull/2851 + netcdf # for `nc-config` + pkg-config ] ++ (with python3Packages; [ python-dateutil numpy wxPython_4_2 ]); buildInputs = [ - cairo zlib proj libtiff libpng fftw sqlite - readline ffmpeg postgresql blas wxGTK32 - proj-datumgrid zstd + blas + cairo + ffmpeg + fftw gdal geos - netcdf libmysqlclient + libpng + libtiff + libxml2 + netcdf pdal + postgresql + proj + proj-datumgrid + readline + sqlite + wxGTK32 + zlib + zstd ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; strictDeps = true; @@ -47,24 +91,24 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-proj-share=${proj}/share/proj" - "--with-proj-includes=${proj.dev}/include" - "--with-proj-libs=${proj}/lib" - "--without-opengl" - "--with-readline" - "--with-wxwidgets" - "--with-netcdf" + "--with-blas" + "--with-fftw" "--with-geos" - "--with-postgres" - "--with-postgres-libs=${postgresql.lib}/lib/" - # it complains about missing libmysqld but doesn't really seem to need it + # It complains about missing libmysqld but doesn't really seem to need it "--with-mysql" "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql" "--with-mysql-libs=${libmysqlclient}/lib/mysql" - "--with-blas" - "--with-zstd" - "--with-fftw" + "--with-netcdf" + "--with-postgres" + "--with-postgres-libs=${postgresql.lib}/lib/" + "--with-proj-includes=${proj.dev}/include" + "--with-proj-libs=${proj}/lib" + "--with-proj-share=${proj}/share/proj" "--with-pthread" + "--with-readline" + "--with-wxwidgets" + "--with-zstd" + "--without-opengl" ] ++ lib.optionals stdenv.isLinux [ "--with-pdal" ] ++ lib.optionals stdenv.isDarwin [ @@ -97,11 +141,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = { - homepage = "https://grass.osgeo.org/"; + passthru.tests = { + grass = callPackage ./tests.nix { grass = finalAttrs.finalPackage; }; + }; + + meta = with lib; { description = "GIS software suite used for geospatial data management and analysis, image processing, graphics and maps production, spatial modeling, and visualization"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ mpickering willcohen ]; + homepage = "https://grass.osgeo.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; teams.geospatial.members ++ [ mpickering ]; + platforms = platforms.all; }; -} +}) |