diff options
author | Jean-Pierre PRUNARET <jean-pierre+git@prunetwork.fr> | 2016-08-01 18:01:09 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-08-01 21:26:01 +0200 |
commit | 26a2392594ad432883f9af06951e7b4c5e108eac (patch) | |
tree | c01d292f45792e4063ad20e658569b21c821ba16 /pkgs/applications/gis/qgis | |
parent | fef4b62657903021f9b60fc6a6cf6fe4bac167ed (diff) |
qgis: 2.10.0 -> 2.16.1
Upgrade qgis with latest version
Diffstat (limited to 'pkgs/applications/gis/qgis')
-rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b771d2552d87d..a8c1428f8cb7f 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -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}"; |