diff options
| author | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-15 19:32:38 +0200 |
|---|---|---|
| committer | Vincent Laporte <Vincent.Laporte@gmail.com> | 2017-07-15 19:32:38 +0200 |
| commit | 681f866e22756a8a24cdec5ee57d8a0245d0df4b (patch) | |
| tree | b12ca11d269695e8c485a9819dc04d1cb7952ae2 /pkgs/applications/gis | |
| parent | bf6ebda14189f242c0f0c622ea6c4aea57bfb403 (diff) | |
| download | nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.tar nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.tar.gz nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.tar.bz2 nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.tar.lz nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.tar.xz nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.tar.zst nixlib-681f866e22756a8a24cdec5ee57d8a0245d0df4b.zip | |
qgis: 2.18.4 -> 2.18.10
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/qgis/default.nix | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index b8c9d1718143..10c2ab9ebf99 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -5,24 +5,15 @@ }: stdenv.mkDerivation rec { - name = "qgis-2.18.4"; + name = "qgis-2.18.10"; buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with python2Packages; [ numpy psycopg2 requests python2Packages.qscintilla sip ]); + (with python2Packages; [ jinja2 numpy psycopg2 pygments requests python2Packages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; - patches = [ - # See https://hub.qgis.org/issues/16071 - (fetchpatch { - name = "fix-build-against-recent-sip"; - url = "https://github.com/qgis/QGIS/commit/85a0db24f32351f6096cd8282f03ad5c2f4e6ef5.patch"; - sha256 = "0snspzdrpawd7j5b69i8kk7pmmy6ij8bn02bzg94qznfpf9ihf30"; - }) - ]; - # fatal error: ui_qgsdelimitedtextsourceselectbase.h: No such file or directory #enableParallelBuilding = true; @@ -34,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1s264pahxpn0215xmzm8q2khr5xspipd7bbvxah5kj339kyjfy3k"; + sha256 = "1vrzxhnpzd75iia4xmhbxy90x0wlvj2w4210f0r8203hd2m4sxdj"; }; cmakeFlags = stdenv.lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; |