qgis: 2.10.0 -> 2.16.1

Upgrade qgis with latest version
This commit is contained in:
Jean-Pierre PRUNARET 2016-08-01 18:01:09 +02:00 committed by Frederik Rietdijk
parent fef4b62657
commit 26a2392594

View file

@ -1,15 +1,16 @@
{ stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper
, qjson, qca2, txt2tags
, withGrass ? false, grass
}:
stdenv.mkDerivation rec {
name = "qgis-2.10.1";
name = "qgis-2.16.1";
buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla
fcgi libspatialindex libspatialite postgresql ] ++
fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++
(stdenv.lib.optional withGrass grass) ++
(with pythonPackages; [ numpy psycopg2 ]) ++ [ pythonPackages.qscintilla ];
(with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ];
nativeBuildInputs = [ cmake makeWrapper ];
@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
sha256 = "79119b54642edaffe3cda513531eb7b81913e013954a49c6d3b21c8b00143307";
sha256 = "4a526cd8ae76fc06bb2b6a158e86db5dc0c94545137a8233cd465ef867acdc8b";
};
cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";