Commit Graph

117 Commits

Author SHA1 Message Date
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