diff options
| author | Nikolay Korotkiy <sikmir@gmail.com> | 2020-12-22 13:13:59 +0300 |
|---|---|---|
| committer | Nikolay Korotkiy <sikmir@gmail.com> | 2020-12-23 20:53:15 +0300 |
| commit | 1ed65d38c5944919d652cdf70ba18cca5fb51e21 (patch) | |
| tree | ac7229c73e9de4b7f2fd9cc5b78011510e5bc930 /pkgs/applications/gis | |
| parent | 9d92c9d0a797b19662968b250919d075317d7379 (diff) | |
qgis: 3.10.11 → 3.10.13, mark unbroken
Diffstat (limited to 'pkgs/applications/gis')
| -rw-r--r-- | pkgs/applications/gis/qgis/unwrapped.nix | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 54d3d5987597..6f395640f500 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -1,8 +1,9 @@ { mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql , txt2tags, openssl, libzip, hdf5, netcdf, exiv2 -, qtbase, qtwebkit, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns +, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns , withGrass ? true, grass +, withWebKit ? true, qtwebkit }: with lib; let @@ -10,7 +11,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.11"; + version = "3.10.13"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +19,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "157hwi9sgnsf0csbfg4x3c7vh0zgf1hnqgn04lhg9xa1n8jjbv2q"; + sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb"; }; passthru = { @@ -28,8 +29,10 @@ in mkDerivation rec { buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2 fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf - qtbase qtwebkit qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns] ++ - (lib.optional withGrass grass) ++ pythonBuildInputs; + qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ] + ++ lib.optional withGrass grass + ++ lib.optional withWebKit qtwebkit + ++ pythonBuildInputs; nativeBuildInputs = [ cmake flex bison ninja ]; @@ -44,17 +47,15 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5" - "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] ++ - lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; + "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ] + ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF" + ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}"; meta = { description = "A Free and Open Source Geographic Information System"; - homepage = "http://www.qgis.org"; + homepage = "https://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; - maintainers = with lib.maintainers; [ lsix ]; - # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit - # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b - broken = true; + maintainers = with lib.maintainers; [ lsix sikmir ]; }; } |