Commit Graph

431 Commits

Author SHA1 Message Date
Nikolay Korotkiy
b2e0cc8227
Merge pull request #255741 from imincik/qgis-ltr-3.28.11
qgis-ltr: 3.28.10 -> 3.28.11
2023-09-18 01:17:53 +04:00
Ivan Mincik
1a50361d89 qgis-ltr: 3.28.10 -> 3.28.11 2023-09-17 22:04:12 +02:00
Ivan Mincik
96bdf87dfe grass: code cleanup
* remove redundant `with`
* get correct package version using `finalAttrs`
2023-09-17 21:07:59 +02:00
Ivan Mincik
0c2f7ed3a2 qgis: 3.32.2 -> 3.32.3 2023-09-17 15:49:35 +02:00
Robert Schütz
d405639f3a
Merge pull request #249203 from dotlambda/spatialite_tools-5.1.0a
spatialite_tools: 5.1.0 -> 5.1.0a
2023-09-03 02:57:20 +00:00
Ivan Mincik
54444b5892 qgis: add nixos tests
Add NixOS test for QGIS and QGIS-LTR. This test creates QGIS vector
memory layer containing Nix snowflake. This proves that application can
successfully start and Python bindings are working.

By default, Python script is executed in non-interactive mode and QGIS
is closed after script is finished. This script can be also executed
interactively by running following command:

```
 nix-build -A qgis
 QGIS_TEST_INTERACTIVE=True ./result/bin/qgis  --code pkgs/applications/gis/qgis/test.py
```

In this case, QGIS is not automatically closed.
2023-09-02 17:15:56 +02:00
Weijia Wang
ff813f8347
Merge pull request #251592 from imincik/qgis-dont-build-test
qgis: disable building tests
2023-08-30 23:55:35 +02:00
Weijia Wang
1f52d286b9
Merge pull request #251641 from imincik/qgis-ltr-3.38.10
qgis-ltr: 3.28.7 -> 3.28.10
2023-08-30 23:55:22 +02:00
Ivan Mincik
a791f731e3 qgis-ltr: disable building tests
No tests are currently executed during the build process. Disable
building them to save significant amount of time and resources.
2023-08-26 19:11:05 +02:00
Ivan Mincik
0e82f77a33 qgis-ltr: alphabetical sorting of dependencies 2023-08-26 19:10:58 +02:00
Ivan Mincik
09f9749a09 qgis: alphabetical sorting of dependencies 2023-08-26 19:08:59 +02:00
Ivan Mincik
2cf9345708 qgis-ltr: 3.28.7 -> 3.28.10 2023-08-26 18:52:56 +02:00
Ivan Mincik
b2a14fc0e4 qgis: disable building tests
No tests are currently executed during the build process. Disable
building them to save significant amount of time and resources.
2023-08-26 15:15:51 +02:00
github-actions[bot]
4cdbb53d13
Merge master into staging-next 2023-08-26 12:01:05 +00:00
Ivan Mincik
85cf505bdf qgis: alphabetical sorting of dependencies 2023-08-23 10:52:22 +02:00
Ivan Mincik
e831daaf4d qgis: 3.28.3 -> 3.32.2 2023-08-23 10:52:21 +02:00
Jan Tojnar
86797b2008 Merge branch 'staging-next' into staging
Conflicts:
- pkgs/development/libraries/qt-6/default.nix
  Merge a5b92645f1 and 0597d865ef
2023-08-16 19:37:11 +02:00
K900
6edd6f71c7 treewide: clean up all qttranslations workarounds
There are two kinds of changes here:
- removing explicit qttranslations path hardcoding from applications that were patched to do it
- replacing qttranslations in buildInputs with qttools for packages that really depend on the latter

After this, qttranslation is never used outside Qt itself, as it should.
2023-08-15 22:11:39 +03:00
Robert Schütz
1dc9ecec90 spatialite_tools: 5.1.0 -> 5.1.0a 2023-08-14 14:03:59 -07:00
R. Ryantm
1a2bcd8551 saga: 9.0.2 -> 9.1.1 2023-08-14 05:18:06 +00:00
Robert Schütz
619248ce8d spatialite_tools: 5.0.1 -> 5.1.0 2023-08-06 12:15:33 -07:00
Nikolay Korotkiy
4d2ce90a43
qmapshack: 1.16.1 → 1.17.0 2023-07-21 23:42:30 +04:00
Pol Dellaiera
2c687f06f2
tunnelx: minor refactor and cleanup
Follow up of https://github.com/NixOS/nixpkgs/pull/239739
2023-07-15 19:02:08 +02:00
Guillaume Girol
4774ffce45
Merge pull request #241164 from imincik/grass-ordering-cleanup
grass: alphabetical reordering of dependencies and adding package tests
2023-07-14 14:36:49 +00:00
Sandro
4cbe570fc8
Merge pull request #239739 from goatchurchprime/gtch/tunnelx
tunnelx: init at 2023-07-nix
2023-07-13 22:08:44 +02:00
Julian Todd
35ec55c813 tunnelx: init at 2023-07-nix 2023-07-13 18:15:43 +01:00
Ivan Mincik
79dffec139 grass: add package tests 2023-07-02 23:36:36 +02:00
Ivan Mincik
dbb11d0990 grass: alphabetical reordering of dependencies
Code cleanup, no functional changes.
2023-07-01 19:14:49 +02:00
Ivan Mincik
f3db0b9eec
grass: 8.2.1 -> 8.3.0 (#239901) 2023-06-26 20:24:19 +02:00
Nikolay Korotkiy
c4cf696adc
saga: misc improvements, add geospatial team to maintainers 2023-06-25 23:26:16 +04:00
R. Ryantm
7edd8c2f39 saga: 9.0.1 -> 9.0.2 2023-06-25 13:12:42 +00:00
Weijia Wang
9dc5a7a513
Merge pull request #238598 from imincik/grass-geospatial-team-maint
grass: change package maintainer to geospatial team
2023-06-20 01:43:43 +03:00
Ivan Mincik
f28c626a19 qgis: change package maintainer to geospatial team
Maintainer change was pre-discussed with @willcohen and @sikmir over
email. @willcohen and @sikmir are now members of Geospatial team.
2023-06-19 17:19:14 +02:00
Ivan Mincik
925f9e5d80 grass: change package maintainer to geospatial team
Maintainer change was pre-discussed with @willcohen over email. @willcohen is now
member of Geospatial team.
2023-06-19 17:09:46 +02:00
Ivan Mincik
27721801c1 qgis-ltr: 3.28.5 -> 3.28.7 2023-06-01 12:49:58 +02:00
Niklas Hambüchen
6897f813ea grass: Be explicit about build-time tools and run-time dependencies 2023-05-31 13:55:47 +00:00
Niklas Hambüchen
01e8760db8 grass: 8.2.0 -> 8.2.1. Fixes build failure.
See build failure at:
https://github.com/NixOS/nixpkgs/pull/215960#issuecomment-1568854089
2023-05-31 13:55:47 +00:00
R. Ryantm
fc1133dc0d saga: 9.0.0 -> 9.0.1 2023-04-27 07:25:52 +00:00
R. Ryantm
0b2d9c673f saga: 8.5.1 -> 9.0.0 2023-04-19 21:03:09 +00:00
Ivan Mincik
2f27b9cb0c qgis-ltr: 3.22.16 -> 3.28.5 2023-04-04 14:48:59 +02:00
Kerstin Humm
0b0cc93e79
remove myself (erictapen) from packages which I don't use anymore 2023-04-03 17:07:16 +02:00
figsoda
a2fc959c03 whitebox-tools: 2.0.0 -> 2.2.0
Diff: 7551aa70e8...v2.2.0
2023-03-21 13:18:11 -04:00
K900
b0cdb866af zombietrackergps: mark broken 2023-03-12 16:27:08 +03:00
R. Ryantm
418178435e saga: 8.5.0 -> 8.5.1 2023-02-16 11:46:51 +00:00
Ivan Mincik
4f77f9a0f4 qgis-ltr: 3.22.15 -> 3.22.16 2023-02-07 12:21:35 +01:00
Weijia Wang
2caf4ef500
Merge pull request #213529 from imincik/qgis-3.28.3
qgis: 3.28.2 -> 3.28.3
2023-01-30 22:55:03 +01:00
Ivan Mincik
92929e2cfe qgis: 3.22.14 -> 3.22.15 2023-01-30 17:28:39 +01:00
Ivan Mincik
6b3986df94 qgis: 3.28.2 -> 3.28.3 2023-01-30 10:22:01 +01:00
Nikolay Korotkiy
245eff7171
Merge pull request #206856 from imincik/qgis-3.22.14
qgis-ltr: 3.22.13 -> 3.22.14
2023-01-05 18:31:07 +04:00
Nikolay Korotkiy
12461da090
Merge pull request #208692 from hqurve/qgis
qgis, qgis-ltr: disable qtwebkit by default and correctly link grass
2023-01-04 00:19:50 +04:00
hqurve
bba45f07ce qgis, qgis-ltr: fix grass 2023-01-02 10:10:02 -04:00
hqurve
cc51367718 qgis, qgis-ltr: disable qtwebkit by default
qtwebkit has been marked has having known vulnerabilities.

Since qtlocation was propagated by qtwebkit, it now needs to be
explicitly added.

See also: 783d526965
2023-01-02 10:09:36 -04:00
R. Ryantm
b221d0ad73 saga: 8.4.0 -> 8.5.0 2022-12-31 19:03:55 +00:00
Ivan Mincik
b62a567b74 qgis-ltr: 3.22.13 -> 3.22.14 2022-12-19 14:17:55 +01:00
Nikolay Korotkiy
283502a299
Merge pull request #205575 from willcohen/qgis-3.22.13
qgis-ltr: 3.22.10 -> 3.22.13
2022-12-18 05:07:47 +04:00
Ivan Mincik
e5348c1c8c qgis: 3.26.2 -> 3.28.2 2022-12-17 08:25:40 +01:00
figsoda
69ce4fbad8
Merge pull request #206154 from trofi/qgis-without-xlibsWrapper
qgis: drop unused xlibsWrapper inputs
2022-12-14 21:55:01 -05:00
Sergei Trofimovich
dce61952e2 qgis-ltr: drop unused xlibsWrapper inputs
Validated as no material change in `out` output with `diffoscope`.
2022-12-14 23:37:51 +00:00
Sergei Trofimovich
1666dc68b7 qgis: drop unused xlibsWrapper inputs
Validated as no material change in `out` output with `diffoscope`.
2022-12-14 23:36:40 +00:00
Will Cohen
657a5766d2 qgis-ltr: 3.22.10 -> 3.22.13 2022-12-10 19:34:32 -05:00
Sandro
5f09433baf
Merge pull request #199625 from wegank/grass-wxgtk 2022-11-20 07:14:52 +01:00
Weijia Wang
b8dfcc76d6 grass: migrate to wxPython_4_2 2022-11-05 03:41:49 +01:00
Weijia Wang
8af76d9ec4 saga: 7.9.1 -> 8.4.0 2022-11-04 00:26:43 +01:00
Weijia Wang
30d66019b4 wxGTK31: drop gtk2 support 2022-10-27 15:30:15 +02:00
Jan Tojnar
457f28f6f8 Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/tools/codespell/default.nix

codespell 2.2.2 switched to pyproject & setuptools_scm:
https://github.com/codespell-project/codespell/pull/2523
2022-10-19 05:24:28 +02:00
Weijia Wang
6f46852c6f grass: fix build on aarch64-darwin 2022-10-15 20:36:51 +02:00
github-actions[bot]
886633ba43
Merge master into staging-next 2022-10-15 00:04:00 +00:00
Artturi
eb49b683f3
Merge pull request #195661 from wamserma/arg-cleanup-app
pkgs.applications: remove unused args
2022-10-15 02:20:29 +03:00
Vladimír Čunát
00a757ed3f
Merge branch 'master' into staging 2022-10-13 08:27:55 +02:00
Artturi
e66d2fd89d
Merge pull request #194256 from Artturin/treewides2 2022-10-13 00:08:01 +03:00
Markus S. Wamser
c9d167f174 pkgs.applications: remove unused args 2022-10-12 16:00:16 +02:00
Weijia Wang
8f31bb2012 spatialite_gui: migrate to wxGTK32 2022-10-11 14:28:20 +02:00
Martin Weinelt
7cc67d5e6b
spatialite_gui: Fix build by adding xz 2022-10-10 22:01:32 +02:00
Artturin
7e49471316 treewide: optional -> optionals where the argument is a list
the argument to optional should not be list
2022-10-10 15:40:21 +03:00
Nikolay Korotkiy
57ec8cf4b3
spatialite_gui: init at 2.1.0-beta1 2022-09-19 21:18:20 +03:00
Nikolay Korotkiy
5fbc12bd70
spatialite_tools: move to applications/gis 2022-09-19 10:45:09 +03:00
Artturi
79c42aa06c
Merge pull request #186564 from Artturin/crossevalfixes
Fixes for cross-compilation
2022-08-27 17:49:00 +03:00
Nikolay Korotkiy
30536606bb
qgis-ltr: 3.22.9 → 3.22.10 2022-08-21 01:31:26 +03:00
Nikolay Korotkiy
e54e97acec
qgis: 3.26.1 → 3.26.2 2022-08-21 01:30:53 +03:00
Christian Kögler
71bcefa910
Merge pull request #174538 from r-ryantm/auto-update/dcw-gmt
dcw-gmt: 2.1.0 -> 2.1.1
2022-08-16 17:18:23 +02:00
Artturin
c6568adb00 treewide: makeWrapper buildInputs to nativeBuildInputs
most found with https://github.com/siraben/nix-lint
2022-08-16 13:14:19 +03:00
Thomas Watson
c3aff2b7d7 qgis, qgis-ltr: fix build
A recent upgrade to PyQt5 broke the build due to incompatibilities
with SIP < 5. Upstream QGIS has supported SIP >= 5 for a while now
so this patch corrects the issue by using the latest SIP and adding
the necessary dependencies.

The logic to find the PyQt5 libraries and SIP files is different
for SIP >= 5, so a patch is included to correctly supply them.

This also adds wrapGAppsHook to prevent opening file dialogs from
crashing on non-NixOS distributions.
2022-08-06 19:17:07 -05:00
Will Cohen
1d908484a8 grass: 8.0.1 -> 8.2.0 2022-07-19 12:52:16 -04:00
github-actions[bot]
83702a6ef7
Merge master into staging-next 2022-07-18 18:01:14 +00:00
Nikolay Korotkiy
75fdfe76cd qgis-ltr: 3.22.8 → 3.22.9 2022-07-18 14:09:45 +02:00
Nikolay Korotkiy
83841f8bf7 qgis: 3.26.0 → 3.26.1 2022-07-18 14:09:45 +02:00
R. Ryantm
ad4097bbf4 dcw-gmt: 2.1.0 -> 2.1.1 2022-07-07 22:03:58 +00:00
Josef Kemetmüller
1ca04aa9f1 treewide: Stop setting CMAKE_SKIP_BUILD_RPATH=OFF
This is now the new default and thus doesn't need to be set manually
anymore.
2022-07-04 03:49:01 +03:00
R. Ryantm
7a7f7327b1 gmt: 6.3.0 -> 6.4.0 2022-06-25 23:06:31 +00:00
Robert Scott
466c2e342a treewide/applications: add sourceType binaryNativeCode for many packages 2022-06-23 18:38:19 +01:00
Will Cohen
f2eef30c0d qgis-ltr: 3.22.6 -> 3.22.8 2022-06-23 12:41:04 +02:00
Will Cohen
34a533b1e2 qgis: 3.24.2 -> 3.26.0 2022-06-23 12:41:04 +02:00
AndersonTorres
bdbfd5cead whitebox-tools: use SRI hash format 2022-06-09 23:16:59 -03:00
AndersonTorres
0965a51404 udig: use SRI hash format 2022-06-09 23:16:58 -03:00
AndersonTorres
254a82389d openorienteering-mapper: use SRI hash format 2022-06-09 23:16:58 -03:00
Rick van Schijndel
37c633f7ae treewide: pkgs/applications: mark broken for darwin 2022-05-29 10:56:04 +02:00
Will Cohen
8d03b2418e qgis-ltr: 3.22.5 -> 3.22.6 2022-05-03 14:39:07 +02:00
Will Cohen
14d77e895d qgis: 3.24.1 -> 3.24.2 2022-05-03 14:39:07 +02:00
Will Cohen
699a5dd470 grass: add willcohen to maintainers 2022-04-28 15:21:54 -04:00
Will Cohen
0bc0206244 grass: 7.8.6 -> 8.0.1 2022-04-28 15:20:32 -04:00
Ben Siraphob
1cf5591a99
Merge pull request #165303 from Stunkymonkey/treewide-pname-version-18 2022-03-24 22:55:34 -05:00
Felix Buehler
e0476d93fe treewide: rename name to pname&version 2022-03-23 22:34:54 +01:00
Will Cohen
fd620c8da1 qgis: 3.24.0 -> 3.24.1 2022-03-22 17:56:16 +01:00
Will Cohen
826febf74f qgis-ltr: 3.22.4 -> 3.22.5 2022-03-22 17:56:16 +01:00
Will Cohen
b2ffb9fc96 qgis-ltr: add willcohen to maintainers 2022-02-27 22:30:33 +01:00
Will Cohen
e18d2801ad qgis: add willcohen to maintainers 2022-02-27 22:30:33 +01:00
Will Cohen
9f27578b40 qgis-ltr: 3.16.16 -> 3.22.4 2022-02-27 22:30:33 +01:00
Will Cohen
2448f4dd45 qgis: 3.22.3 -> 3.24.0 2022-02-27 22:30:33 +01:00
R. Ryantm
bdc257a47c dcw-gmt: 2.0.2 -> 2.1.0 2022-02-12 21:26:09 -08:00
R. RyanTM
b9f12b66d5
gmt: 6.2.0 -> 6.3.0
(#149186)
2022-02-11 12:14:39 +01:00
Will Cohen
8b1103b60e grass: fix build on darwin 2022-01-26 07:44:26 -05:00
Will Cohen
0072957c7e qgis-ltr: 3.16.14 -> 3.16.16 2022-01-25 23:14:33 -08:00
Will Cohen
2ca00af2c7 qgis: 3.22.1 -> 3.22.3 2022-01-25 23:14:33 -08:00
Will Cohen
de256f2c02 qgis, qgis-ltr: only expose unwrapped via passthru 2022-01-25 23:14:33 -08:00
Matthew Pickering
85d0a94f90 qgis, pyqt: introduce qgis-ltr and update qgis
Add qtlocation to pyqt, and ensure that it is included with both
qgis derivations.
2022-01-25 23:14:33 -08:00
Matthew Pickering
ce4927f0d5 qgis: enable 3D, grass
Grass is a runtime dependency which qgis attempts to find on the path.

3D is on by default with normal distributions so we should
also enable it.
2022-01-25 23:14:33 -08:00
Matthew Pickering
8b2cf0a45d grass: wrap grass with wrapGAppsHook 2022-01-25 23:14:33 -08:00
Matthew Pickering
92b62e7353 grass: Add pdal dep and missing feature flags
This is used for processing lidar point clouds.
2022-01-25 23:14:33 -08:00
Matthew Pickering
b9ea948aca grass: 7.6.1 -> 7.8.6 2022-01-25 23:14:33 -08:00
Nikolay Korotkiy
f16e78d0a0
zombietrackergps: 1.03 → 1.10 2022-01-09 23:50:50 +03:00
Will Cohen
2cdbb565ad qgis: update QSCI_SIP_DIR location 2022-01-05 19:02:00 -05:00
R. Ryantm
44586149d7 dcw-gmt: 2.0.1 -> 2.0.2 2021-12-31 09:36:06 +00:00
Thiago Kenji Okada
99d5bdf78f
Merge pull request #150287 from mpickering/whitebox-tools
whitebox-tools: 1.4.0 -> 2.0.0
2021-12-12 12:12:26 -03:00
Matthew Pickering
94809fac30 whitebox-tools: 1.4.0 -> 2.0.0 2021-12-11 18:40:13 +00:00
R. Ryantm
8690dd9467 dcw-gmt: 1.1.4 -> 2.0.1 2021-12-11 08:51:17 +00:00
Robert Schütz
53801ef122 qmapshack: 1.16.0 -> 1.16.1
https://github.com/Maproom/qmapshack/releases/tag/V_1.16.1
2021-12-04 16:51:53 -08:00
Kerstin Humm
2d0c11c034
qgis: add erictapen as maintainer 2021-11-26 20:58:59 +01:00
Lancelot SIX
e5adc91d63
qgis: 3.16.13 -> 3.16.14 2021-11-24 14:16:50 +00:00
Lancelot SIX
39a0639b70
qgis: 3.6.10 -> 3.6.13 2021-11-14 17:28:41 +00:00
Nikolay Korotkiy
5fe151db46
qmapshack: fix localization 2021-11-12 12:26:48 +03:00
Dmitry Kalinkin
e0532475bc
treewide: remove darwin-only manual wrapQtApp invocations 2021-09-28 10:29:46 -04:00
Lancelot SIX
042eebd8d9 qgis: fix build with PROJ 8
Co-authored-by: Robert Schütz <nix@dotlambda.de>
2021-09-26 23:11:28 -07:00
R. RyanTM
44d045f7d3 saga: 7.9.0 -> 7.9.1 2021-09-14 09:05:52 +00:00
Nikolay Korotkiy
ac47659bde
qgis: 3.16.9 → 3.16.10 2021-08-24 00:47:39 +03:00
Nikolay Korotkiy
8d49729305
qgis: 3.16.7 → 3.16.9 2021-08-01 13:36:28 +03:00
Robert Schütz
1ec5651913 treewide: use pythonPackages.python-dateutil instead of pythonPackages.dateutil 2021-07-03 13:45:57 +02:00
Eduardo Sánchez Muñoz
3626f2663b qgis: fix PyQt5 SIP path 2021-06-27 00:25:13 +02:00
R. RyanTM
91a67c5c1a gmt: 6.1.1 -> 6.2.0 2021-06-07 02:26:31 +00:00
Robert Schütz
103d945f80 qmapshack: 1.15.2 -> 1.16.0
https://github.com/Maproom/qmapshack/releases/tag/V_1.16.0
2021-05-27 09:35:57 +02:00
Lancelot SIX
93f419b7a8 qgis: 3.16.6 -> 3.16.7 2021-05-27 09:35:57 +02:00
github-actions[bot]
6cdac75d25
Merge staging-next into staging 2021-05-16 18:32:44 +00:00
Eduardo Sánchez Muñoz
08a26e4579 pythonPackages.sip: rename to sip_4
sip 4 is the old and unmaintained version
2021-05-10 20:41:38 +02:00
Daniël de Kok
85f96822a0 treewide: fix cargoSha256/cargoHash
Rust 1.50.0 incorporated a Cargo change (rust-lang/cargo#8937) in
which cargo vendor erroneously changed permissions of vendored
crates. This was fixed in Rust
1.51.0 (rust-lang/cargo#9131). Unfortunately, this means that all
cargoSha256/cargoHashes produced during the Rust 1.50.0 cycle are
potentially broken.

This change updates cargoSha256/cargoHash tree-wide.

Fixes #121994.
2021-05-08 00:36:37 -07:00
Luke Granger-Brown
59ecd5167a qmapshack: support Quazip 1.x 2021-05-02 01:18:50 +00:00
Lancelot SIX
689b77097e qgis: 3.16.5 -> 3.16.6 2021-04-21 17:17:31 +01:00
Lancelot SIX
f8da9ce9fc qgis: 3.10.13 -> 3.16.5
The file has been reformated using nixpkgs-fmt.
2021-04-15 11:14:15 -04:00
Sandro Jäckel
3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Sandro
2e38cbe858
Merge pull request #116169 from sikmir/oomapper
openorienteering-mapper: 0.9.4 → 0.9.5
2021-03-25 10:46:43 +01:00
Nikolay Korotkiy
0149eb8a42
openorienteering-mapper: 0.9.4 → 0.9.5 2021-03-14 19:52:18 +03:00
R. RyanTM
2d632d08ad saga: 7.8.2 -> 7.9.0 2021-03-09 13:34:57 +00:00