3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request from michelk/qgis_2.8.0

[WIP] qgis: update to 2.8.0
This commit is contained in:
vbgl 2015-04-25 14:35:40 +02:00
commit 3591040468
2 changed files with 4 additions and 4 deletions
pkgs
applications/gis/qgis
development/libraries/qscintilla

View file

@ -2,7 +2,7 @@
pyqt4, qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper }:
stdenv.mkDerivation rec {
name = "qgis-2.6.1";
name = "qgis-2.8.1";
buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt qscintilla
fcgi libspatialindex libspatialite postgresql ] ++
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "http://qgis.org/downloads/${name}.tar.bz2";
sha256 = "1avw9mnhrcxsdalqr2yhyif1cacl4dsgcpfc31axkv7vj401djnl";
sha256 = "19acb74e4e2739238b87bf64f2750e10e366e9d61d070a4b8ca341ce01ca9741";
};
postInstall = ''

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "qscintilla";
version = "2.8.4";
version = "2.9";
name = "${pname}-${version}";
src = fetchurl {
url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
sha256 = "03z8mc7wpk0hyza9b45pyf523gdk0qsqaywkprmp6ffc81s2sywv";
sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
};
buildInputs = [ qt ];