1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-25 03:17:13 +00:00
Commit graph

196 commits

Author SHA1 Message Date
Doron Behar adaf0065a0 saga: 7.6.3 -> 7.7.0
Other changes include:
- Reformat inputs and arguments to drv.
- Use autoreconfHook as upstream's generated ./configure has proved to
be not reliable (it didn't detect properly missing deps).
- Add many more dependencies that were detected now with autoreconfHook.
- Upgrade gui dep to wxGTK31-gtk3.
- Upgrade opencv dep to opencv4.
2020-08-08 15:54:33 +03:00
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook"
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
2020-07-29 18:20:56 -05:00
Nikolay Korotkiy b53902f535
cmake: fix CMAKE_FIND_FRAMEWORK 2020-07-28 19:05:43 +03:00
Lancelot SIX 3bdefc8802
qgis: 3.10.4 -> 3.10.7 2020-06-22 13:47:53 +01:00
Nikolay Korotkiy 1ae9228fb6
whitebox-tools: 1.2.0 -> 1.3.0 2020-06-18 12:06:37 +03:00
Doron Behar 01d4e2fe33 treewide: use ffmpeg_3 explicitly if not wanted otherwise
After making `ffmpeg` point to the latest `ffmpeg_4`, all packages that
used `ffmpeg` without requiring a specific version now use ffmpeg_3
explicitly so they shouldn't change.
2020-06-12 11:55:31 -07:00
Benjamin Hipple 33e9db21d6
Merge pull request #87950 from sikmir/mapper
openorienteering-mapper: 0.9.2 -> 0.9.3
2020-06-03 23:42:51 -04:00
R. RyanTM 84b0c4ee58 saga: 7.6.2 -> 7.6.3 2020-05-27 12:29:19 +00:00
Nikolay Korotkiy a46d7f2d72
openorienteering-mapper: 0.9.2 -> 0.9.3 2020-05-16 23:28:54 +03:00
Doron Behar c0137489ef saga: explicitly use opencv2 2020-05-05 10:32:14 +03:00
Michael Reilly 84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
R. RyanTM 73d63a68a3 saga: 7.6.1 -> 7.6.2 2020-04-07 17:00:20 +00:00
Lancelot SIX 8e8efc7ace qgis: 3.10.1 -> 3.10.4 2020-03-24 20:38:01 -07:00
Mario Rodas fa9290102e
Merge pull request #82717 from r-ryantm/auto-update/saga
saga: 7.5.0 -> 7.6.1
2020-03-17 08:20:22 -05:00
R. RyanTM c9836e9f6d saga: 7.5.0 -> 7.6.1 2020-03-16 09:54:28 +00:00
Nikolay Korotkiy cfb57680ee openorienteering-mapper: 0.9.1 -> 0.9.2 2020-03-15 08:03:51 +00:00
Benjamin Hipple 6a54fd3acf whitebox-tools: upgrade cargo fetcher and cargoSha256
Infra upgrade as part of #79975; no functional change expected.
2020-02-28 00:24:54 -08:00
Maxim Krivchikov bba9b7fe6e whitebox-tools: 0.16.0 -> 1.2.0 2020-02-22 10:45:35 +00:00
Benjamin Hipple eb11feaa0b treewide: change fetchCargoTarball default to opt-out
Changes the default fetcher in the Rust Platform to be the newer
`fetchCargoTarball`, and changes every application using the current default to
instead opt out.

This commit does not change any hashes or cause any rebuilds. Once integrated,
we will start deleting the opt-outs and recomputing hashes.

See #79975 for details.
2020-02-13 22:41:37 -08:00
R. RyanTM 1543fd14be saga: 7.3.0 -> 7.5.0 2020-02-10 18:04:44 +01:00
Robin Gloster f9f46dc327
treewide: NIX_*_FLAGS -> string 2019-12-31 00:15:46 +01:00
Renaud 013e439fd8
Merge pull request #75036 from sikmir/oom
openorienteering-mapper: 0.9.0 -> 0.9.1
2019-12-21 17:30:50 +01:00
Lancelot SIX 90ebbaa86a
qgis: 3.10.0 -> 3.10.1 2019-12-17 12:17:13 +01:00
Izorkin 154f6f1e43 grass: fix mysql_config query 2019-12-08 11:08:31 +01:00
Nikolay Korotkiy 191de93ea7
openorienteering-mapper: 0.9.0 -> 0.9.1 2019-12-05 10:52:55 +03:00
c0bw3b 9315000432 saga: remove jasper from inputs
It is unused since v2.2.6 (2016)
https://sourceforge.net/p/saga-gis/bugs/224/
2019-11-17 19:17:12 +01:00
Lancelot SIX c803971bfd
qgis: 3.8.2 -> 3.10.0
See http://changelog.qgis.org/en/qgis/version/3.10/
2019-10-29 10:22:01 +01:00
Nikolay Korotkiy f6b8a4d7ef openorienteering-mapper: 0.8.4 -> 0.9.0 2019-10-23 13:31:47 -07:00
Lancelot SIX 5d8ec9b99b
qgis: 3.8.0 -> 3.8.3 2019-10-02 10:03:06 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Vladimír Čunát b6c6e1f9e8
Merge branch 'master' into staging-next 2019-09-15 13:18:54 +02:00
Daniel Schaefer a5b2e090ec whitebox: 0.9.0 -> 0.16.0 (#68682) 2019-09-13 17:08:57 +00:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth 7bb6b373ab treewide: name -> pname (#67513) 2019-08-31 07:41:22 -04:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
volth 46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
Frederik Rietdijk a28a9ac156 Merge master into staging-next 2019-07-16 11:15:46 +02:00
Jonathan Ringer c8ec54b969 saga_2_3_2: remove package
No longer used by qgis
2019-07-14 09:59:29 -07:00
Jonathan Ringer 70671e71d1 qgis: 3.4.8 -> 3.8.0 2019-07-14 09:59:28 -07:00
Jonathan Ringer c93c65a21d saga: 7.2.0 -> 7.3.0 2019-07-14 09:59:28 -07:00
Jonathan Ringer d43f0b5d6d grass: 7.2.2 -> 7.6.1 2019-07-14 09:59:28 -07:00
Jonathan Ringer d9504f9aab openorienteering-mapper: fix build 2019-07-14 09:59:27 -07:00
Thomas Tuegel 51d78034a1
wrapQtAppsHook: Remove ad hoc Qt wrappers 2019-07-05 10:42:08 -05:00
Vincent Laporte e478e6bdff saga: 6.3.0 -> 7.2.0 2019-06-25 07:07:32 +00:00
volth f3282c8d1e treewide: remove unused variables (#63177)
* treewide: remove unused variables

* making ofborg happy
2019-06-16 19:59:05 +00:00
Alyssa Ross 062210bdff treewide: update cargoSha256 hashes for cargo-vendor upgrade
A recent upgrade of cargo-vendor changed its output slightly, which
broke all cargoSha256 hashes in nixpkgs.
See https://github.com/NixOS/nixpkgs/issues/60668 for more information.

Since then, a few hashes have been fixed in master by hand, but there
were a lot still to do, so I did all of the ones left over with some
scripts I wrote.

The one hash I wasn’t able to update was habitat's, because it’s
currently broken and the build doesn’t get far enough to produce a
hash anyway.
2019-06-01 15:17:52 +00:00
Lancelot SIX 56835a890f
qgis: 3.4.7 -> 3.4.8 2019-05-27 16:26:59 +02:00
Lancelot SIX 2014975789
qgis: 3.4.6 -> 3.4.7 2019-04-26 15:11:28 +02:00
Daniel Schaefer bac4d95aa2 treewide: Change URLs to HTTPS
Lots of URLs were HTTP redirect to HTTPS. Changed those and checked them
if there's actual content. Inspired by
https://github.com/NixOS/nixpkgs/issues/60004
2019-04-22 10:19:54 +02:00
Lancelot SIX 37aebd002a qgis: 3.4.5 -> 3.4.6 2019-04-16 18:39:27 +02:00
Lancelot SIX 9bcdf81708
qgis: 2.18.28 -> 3.4.5 2019-03-05 09:39:58 +01:00
Lancelot SIX 76b1610a35
qgis: 2.18.22 -> 2.18.28 2019-01-24 22:23:52 +01:00
R. RyanTM 1fb390b52a openorienteering-mapper: 0.8.3 -> 0.8.4
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openorienteering-mapper/versions
2019-01-02 19:54:20 -08:00
R. RyanTM 4b2a4a387e openorienteering-mapper: 0.8.2 -> 0.8.3 (#49217)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openorienteering-mapper/versions
2018-10-27 12:03:09 -04:00
Michael Raskin 08cc85951e saga: add mpickering as a co-maintainer after #39125 2018-10-15 13:28:24 +03:00
Michael Raskin 878c6c090d
Merge pull request #39125 from mpickering/darwin-saga
SAGA, SAGA LTS release, dependencies and QGIS SAGA plugin
2018-10-14 19:14:48 +00:00
Andrew Childs 90464f6049 qgis: patch for compatibility with cmake 3.12 (#45880) 2018-09-01 10:52:33 +02:00
R. RyanTM 45b5bef60f openorienteering-mapper: 0.8.1.2 -> 0.8.2 (#45552)
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/OpenOrienteering-Mapper/versions.
2018-08-24 20:15:16 +02:00
Matthew Pickering 1c9af2d89c Remove unecessary option 2018-08-15 09:10:42 +01:00
Matthew Pickering 86b966f108 Patches for saga-6.3.0 2018-08-15 09:10:28 +01:00
Matthew Pickering 8a4661588a Fixes for rebase 2018-08-12 22:13:00 +01:00
Matthew Pickering 5caa3fcae9 Small fixes 2018-08-12 10:36:43 +01:00
Matthew Pickering 115027abe1 Fix linux build 2018-08-11 22:38:01 +01:00
Matthew Pickering f5b097b346 Build QGIS with SAGA plugins 2018-08-11 22:38:00 +01:00
Matthew Pickering 7262b88b0a saga_2_3_2: Init at 2.3.2
This is the lts branch of SAGA which is currently used by QGIS 2.18.x
series.
2018-08-11 22:37:59 +01:00
Matthew Pickering cce0fc8fe5 saga: Build on darwin
There are some unresolved dependency issues which means a lot of
additional dependencies have to be added explicitly on darwin but not on
linux. Maybe something to do with libtool.

See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
2018-08-11 22:37:55 +01:00
Lancelot SIX 51b8c7986a qgis: 2.18.20 -> 2.18.22 (#44266) 2018-08-03 20:34:47 +02:00
Lluís Batlle i Rossell 66d7126255 Take me (viric) out of most maintenance
Since years I'm not maintaining anything of the list below other
than some updates when I needed them for some reason. Other people
is doing that maintenance on my behalf so I better take me out but
for very few packages. Finally!
2018-07-22 21:50:19 +02:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Matthew Pickering 97a47b8160 whitebox-tools: init at 0.9.0 2018-07-10 19:10:24 +01:00
Silvan Mosberger 57bccb3cb8 treewide: http -> https sources (#42676)
* treewide: http -> https sources

This updates the source urls of all top-level packages from http to
https where possible.

* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Lancelot SIX e48b54c078 qgis: 2.18.17 -> 2.18.20 (#41195) 2018-05-31 19:44:31 +02:00
Jason Hilton 577bbdc501 grass: compile with libLAS 2018-04-17 09:29:02 +01:00
Matthew Pickering 1fe53b8511 QGIS: Build with GRASS by default 2018-04-13 21:02:56 +01:00
Matthew Pickering e84325e6ab grass, qgis: Add myself to maintainers list 2018-04-13 21:02:55 +01:00
Matthew Pickering a134b9354b QGIS: Allow plugins to find GDAL tools by looking on PATH 2018-04-13 21:02:55 +01:00
Matthew Pickering a3de225864 grass: Symlink include/ as well as bin/ 2018-04-13 21:02:54 +01:00
Matthew Pickering b65181d78b grass: Fix Can't load GDAL library errors on darwin
It is required to pass this extra flag to the build to avoid trying to
dynamically load the library.
2018-04-13 21:02:53 +01:00
Frederik Rietdijk 0aa59a08d6 Merge master into staging 2018-04-09 15:12:32 +02:00
Jörg Thalheim a2efd3e81c openorienteering-mapper: also enable linux 2018-04-08 18:27:52 +01:00
Matthew Pickering 0fe94a1258 openorienteering-mapper: Load additional image formats
This allows tiff images to be loaded correctly as templates.
2018-04-07 00:23:45 +01:00
Matthew Pickering 4c7db1c77a openorienteering-mapper: 0.8.1 -> 0.8.1.2
Fixes crashes on darwin
2018-04-06 20:19:34 +01:00
Tuomas Tynkkynen 747ebe3f66 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/top-level/all-packages.nix
2018-04-03 02:22:54 +03:00
Ryan Mulligan 9b3570a7c9 saga: 6.2.0 -> 6.3.0
Semi-automatic update generated by https://github.com/ryantm/nix-update tools.

This update was made based on information from https://repology.org/metapackage/saga/versions.

These checks were done:

- built on NixOS
- ran `/nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0/bin/saga_cmd -h` got 0 exit code
- ran `/nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0/bin/saga_cmd --help` got 0 exit code
- ran `/nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0/bin/saga_cmd -v` and found version 6.3.0
- ran `/nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0/bin/saga_cmd --version` and found version 6.3.0
- ran `/nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0/bin/saga_cmd -h` and found version 6.3.0
- ran `/nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0/bin/saga_cmd --help` and found version 6.3.0
- found 6.3.0 with grep in /nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0
- found 6.3.0 in filename of file in /nix/store/2wk34cz1vvl58pzw8szv4fdy5qwcc1g9-saga-6.3.0
- directory tree listing: https://gist.github.com/338621d772f5e116a34641ab1a84ee1e
2018-03-27 23:31:32 -07:00
Matthew Justin Bauer 75616ceb49
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
2018-03-27 18:43:03 -05:00
Matthew Pickering 1e0a60b738 open-orienteering-mapper: init at 0.8.1 2018-03-24 14:38:57 -05:00
Shea Levy f4f76bdf33
Merge branch 'master' into staging 2018-03-24 08:44:40 -04:00
Matthew Pickering 9031300f5e Remove darwin specific patch 2018-03-21 08:28:03 +00:00
Matthew Pickering 7842e5dda5 Package QGIS 2.18 for darwin
There are still some problems with the withGrass option but the package
is mostly functional.
2018-03-21 08:28:03 +00:00
Matthew Pickering 49182bcd34 Fix grass build on darwin 2018-03-21 08:27:57 +00:00
Lancelot SIX 4aaf23a698 qgis: 2.18.16 -> 2.18.17 2018-03-04 22:04:38 +01:00
Ryan Mulligan af38b888fc qgis: 2.18.15 -> 2.18.16
Semi-automatic update. These checks were performed:

- built on NixOS
- ran `/nix/store/cqjd4b5av6rrmmz9qvagqgq2vqwi5mmi-qgis-2.18.16/bin/qgis_bench -h` got 0 exit code
- found 2.18.16 with grep in /nix/store/cqjd4b5av6rrmmz9qvagqgq2vqwi5mmi-qgis-2.18.16

cc "@viric"
2018-02-28 14:22:48 +00:00
Michel Kuhlmann 3b33aba309 saga: 5.0.0 -> 6.2.0 2018-01-03 20:18:57 +01:00
Robin Gloster e2254dff8b grass: 7.0.2 -> 7.2.2, fix build 2017-12-29 02:18:35 +01:00
Izorkin 3acfd319e4 grass: client -> connector-c 2017-12-29 02:18:35 +01:00
Lancelot SIX cf58ab88a9
qgis: 2.18.14 -> 2.18.15 2017-12-12 13:21:37 +01:00
Orivej Desh 00fd31c169 qgis: disable parallel building 2017-12-07 08:52:42 +00:00
Raphael Das Gupta d756dedb9a qgis: 2.18.13 -> 2.18.14 2017-11-22 18:42:42 +01:00
Lancelot SIX eaeb6721d9 Merge pull request #30471 from thall/qgis_2_18_13
qgis: 2.18.12 -> 2.18.13
2017-10-16 18:29:09 +02:00