1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 23:24:35 +00:00
Commit graph

73 commits

Author SHA1 Message Date
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
Niclas Thall 2c8058183f qgis: 2.18.12 -> 2.18.13 2017-10-16 13:41:39 +02:00
Orivej Desh fda26c8476 Merge branch 'master' into staging
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
2017-10-02 00:22:12 +00:00
Robin Gloster 40ed226507 treewide: mark a bunch of failing builds as broken
(cherry picked from commit 23fdbaa375)
[dezgeg: Un-mark shotcut, tokei & uchiwa that do build on master]
2017-10-01 00:26:52 +03:00
John Ericson 531e4b80c9 misc pkgs: Basic sed to get fix pkgconfig and autoreconfHook buildInputs
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
Michel Kuhlmann 7a96ec95bf saga: 2.3.1 -> 5.0.0 2017-09-05 12:24:34 +02:00
Lancelot SIX 3d41279b76 qgis: 2.18.10 -> 2.18.12 2017-08-29 21:56:53 +02:00
Vincent Laporte 681f866e22 qgis: 2.18.4 -> 2.18.10 2017-07-15 19:32:38 +02:00
Frederik Rietdijk ef4442e827 Python: replace requests2 with requests tree-wide
See f63eb58573

The `requests2` attribute now throws an error informing that `requests`
should be used instead.
2017-05-07 12:56:09 +02:00
Lancelot SIX 1375a2eecf
qgis: Fix build after pythonPackages.sip update
QGis seems to have a problem with recent sip releases. This patch fixes
the issue.
2017-03-13 16:05:31 +01:00
Lancelot SIX be20195704
qgis: 2.18.3 -> 2.18.4 2017-03-09 14:27:29 +01:00
Robin Gloster 2fdfb123a0
Revert "qgis: enableParallelBuilding"
This reverts commit 632934862b.

Still sometimes fails on hydra
2017-01-29 15:20:07 +01:00
Jean-Pierre PRUNARET 632934862b qgis: enableParallelBuilding 2017-01-22 17:15:24 +01:00
Jean-Pierre PRUNARET 8d4fc1a65e qgis: 2.16.2 -> 2.18.3 2017-01-22 17:14:47 +01:00
Vincent Laporte 4e88fe4998 grass: fix build 2017-01-14 14:55:18 +01:00
Tom Hinton b0bfa88848 Fiddle LD_LIBRARY_PATH to include GDAL
Some GRASS functions dlopen GDAL, and don't get patched in the install.
To make them work I have to export LD_LIBRARY_PATH from within grass again with pkgs.gdal/lib.
Alternatively this does the trick - there might be a better way to do this, if the configure script can take the true path to gdal and reflect it in the dlopen calls or something?
2016-12-16 15:10:23 +00:00
Frederik Rietdijk e7f9195169 grass: use python2 2016-11-08 22:48:55 +01:00
Frederik Rietdijk 88a03eb725 qgis: use python2 2016-11-08 22:48:54 +01:00
Vladimír Čunát 6eeea6effd Python: more evaluation fixups. 2016-10-14 00:03:12 +02:00
Domen Kožar fc74bf2ccc qgis: fix build
(cherry picked from commit dccf8c5f27)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-09-11 21:20:50 +02:00
Lancelot SIX 290ea9102c
qgis: 2.16.1 -> 2.16.2 2016-08-30 15:10:07 +02:00
Vladimír Čunát 950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Jean-Pierre PRUNARET 26a2392594 qgis: 2.10.0 -> 2.16.1
Upgrade qgis with latest version
2016-08-01 21:26:01 +02:00
Michel Kuhlmann fb4a53b1c1 saga: 2.2.2 -> 2.3.1 2016-07-21 16:47:29 +01:00