git.iko.soy/typeable/nixpkgs
on master help sign in
qgis: 3.10.13 -> 3.16.5
f8da9ceLancelot SIX
pkgs/applications/gis/qgis/unwrapped.nix+61−25
@@ -1,25 +1,38 @@
1−{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl
1+{ mkDerivation, lib, fetchFromGitHub, cmake, ninja, flex, bison, proj, geos
2−, qwt, fcgi, python3Packages, libspatialindex, libspatialite, postgresql
2+, xlibsWrapper, sqlite, gsl, qwt, fcgi, python3Packages, libspatialindex
3−, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
3+, libspatialite, postgresql, txt2tags, openssl, libzip, hdf5, netcdf, exiv2
4−, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport, qtxmlpatterns
4+, protobuf, qtbase, qtsensors, qca-qt5, qtkeychain, qscintilla, qtserialport
5−, withGrass ? true, grass
6−, withWebKit ? true, qtwebkit
5+, qtxmlpatterns, withGrass ? true, grass, withWebKit ? true, qtwebkit }:
7−}:
8with lib;
6with lib;
9let
7let
10− pythonBuildInputs = with python3Packages;
8+ pythonBuildInputs = with python3Packages; [
11− [ qscintilla-qt5 gdal jinja2 numpy psycopg2
9+ qscintilla-qt5
12− chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
10+ gdal
11+ jinja2
12+ numpy
13+ psycopg2
14+ chardet
15+ dateutil
16+ pyyaml
17+ pytz
18+ requests
19+ urllib3
20+ pygments
21+ pyqt5
22+ sip
23+ owslib
24+ six
25+ ];
13in mkDerivation rec {
26in mkDerivation rec {
14− version = "3.10.13";
27+ version = "3.16.5";
15 pname = "qgis";
28 pname = "qgis";
16 name = "${pname}-unwrapped-${version}";
29 name = "${pname}-unwrapped-${version}";
17
30
18 src = fetchFromGitHub {
31 src = fetchFromGitHub {
19 owner = "qgis";
32 owner = "qgis";
20 repo = "QGIS";
33 repo = "QGIS";
21− rev = "final-${lib.replaceStrings ["."] ["_"] version}";
34+ rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
22− sha256 = "0za77znk1phrxzy2cgxpwrld3d0pi0xvhsg78rg4wkb23vaqv6zb";
35+ sha256 = "1xkvgj1v2jgp107jyh9xmk1dzbbqxwkqy69z56vsaa8lf9gwgn5h";
23 };
36 };
24
37
25 passthru = {
38 passthru = {
@@ -27,10 +40,32 @@ in mkDerivation rec {
27 inherit python3Packages;
40 inherit python3Packages;
28 };
41 };
29
42
30− buildInputs = [ openssl proj geos xlibsWrapper sqlite gsl qwt exiv2
43+ buildInputs = [
31− fcgi libspatialindex libspatialite postgresql txt2tags libzip hdf5 netcdf
44+ openssl
32− qtbase qtsensors qca-qt5 qtkeychain qscintilla qtserialport qtxmlpatterns ]
45+ proj
46+ geos
47+ xlibsWrapper
48+ sqlite
49+ gsl
50+ qwt
51+ exiv2
52+ protobuf
53+ fcgi
54+ libspatialindex
55+ libspatialite
56+ postgresql
57+ txt2tags
58+ libzip
59+ hdf5
60+ netcdf
61+ qtbase
62+ qtsensors
63+ qca-qt5
64+ qtkeychain
65+ qscintilla
66+ qtserialport
67+ qtxmlpatterns
33− ++ lib.optional withGrass grass
68+ ] ++ lib.optional withGrass grass
34 ++ lib.optional withWebKit qtwebkit
69 ++ lib.optional withWebKit qtwebkit
35 ++ pythonBuildInputs;
70 ++ pythonBuildInputs;
36
71
@@ -41,15 +76,16 @@ in mkDerivation rec {
41 # TODO: Correct PyQt5 to provide the expected directory and fix
76 # TODO: Correct PyQt5 to provide the expected directory and fix
42 # build to use PYQT5_SIP_DIR consistently.
77 # build to use PYQT5_SIP_DIR consistently.
43 postPatch = ''
78 postPatch = ''
44− substituteInPlace cmake/FindPyQt5.py \
79+ substituteInPlace cmake/FindPyQt5.py \
45− --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"'
80+ --replace 'sip_dir = cfg.default_sip_dir' 'sip_dir = "${python3Packages.pyqt5}/share/sip/PyQt5"'
46− '';
81+ '';
47
82
83+ cmakeFlags = [
48− cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
84+ "-DCMAKE_SKIP_BUILD_RPATH=OFF"
49− "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
85+ "-DPYQT5_SIP_DIR=${python3Packages.pyqt5}/share/sip/PyQt5"
50− "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5" ]
86+ "-DQSCI_SIP_DIR=${python3Packages.qscintilla-qt5}/share/sip/PyQt5"
51− ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
87+ ] ++ lib.optional (!withWebKit) "-DWITH_QTWEBKIT=OFF"
52− ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
88+ ++ lib.optional withGrass "-DGRASS_PREFIX7=${grass}/${grass.name}";
53
89
54 meta = {
90 meta = {
55 description = "A Free and Open Source Geographic Information System";
91 description = "A Free and Open Source Geographic Information System";