3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Commit graph

260 commits

Author SHA1 Message Date
Felix Gruber
e5c5ba749c
gnu: Add python-osmnx
* gnu/packages/geo.scm (python-osmnx): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-06-01 23:28:20 +02:00
Felix Gruber
41ab2f0d76
gnu: python-rtree: Update to 1.0.0.
* gnu/packages/geo.scm (python-rtree): Update to 1.0.0.
[arguments]: Fix 'find-libspatialindex phase.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-06-01 23:28:19 +02:00
Felix Gruber
09d0d0f6a5
gnu: python-geopandas: Fix build.
* gnu/packages/geo.scm (python-geopandas)[arguments]: Disable broken
  tests. Re-enable test_fillna_no_op_returns_copy which does not fail
  anymore.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-05-21 00:15:09 +02:00
Felix Gruber
87238a0b2c
gnu: postgis: Update to 3.2.1.
* gnu/packages/geo.scm (postgis): Update to 3.2.1.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2022-03-25 11:15:09 +01:00
Guillaume Le Vaillant
2da3c84ab7
gnu: opencpn: Update to 5.6.0.
* gnu/packages/geo.scm (opencpn): Update to 5.6.0.
  [inputs]: Add alsa-utils, eudev, jasper, libjpeg-turbo and libusb.
2022-03-16 16:48:11 +01:00
Nikolay Korotkiy
eeac33a3de
gnu: Add osmium-tool.
* gnu/packages/geo.scm (osmium-tool): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-03-09 23:38:18 +01:00
Nikolay Korotkiy
30daa0d972
gnu: libosmium: Update to 2.18.0.
* gnu/packages/geo.scm (libosmium): Update to 2.18.0.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-03-09 23:38:18 +01:00
Leo Famulari
4235c6ee92
gnu: QGIS: Build without QtWebKit.
See <https://issues.guix.gnu.org/53289> and <https://issues.guix.gnu.org/53512>
for more information about this change.

* gnu/packages/geo.scm (qgis)[inputs]: Remove qtwebkit.
[arguments]: Pass "-DWITH_QTWEBKIT=NO" to #:configure-flags. Make the
custom 'check' phase honor TESTS?. Skip even more failing tests.
2022-01-25 15:10:19 -05:00
Guillaume Le Vaillant
b30caf19e6
gnu: python-fiona: Fix build.
* gnu/packages/geo.scm (python-fiona)[arguments]: In 'check' phase, set
  GDAL_ENABLE_DEPRECATED_DRIVER_GTM and disable a test.
2022-01-19 14:10:36 +01:00
Guillaume Le Vaillant
d8d0bd7c67
gnu: grass: Update to 7.8.6.
* gnu/packages/geo.scm (grass): Update to 7.8.6.
2022-01-19 14:10:36 +01:00
Guillaume Le Vaillant
15bcecc5a7
gnu: gdal: Update to 3.3.3.
* gnu/packages/geo.scm (gdal): Update to 3.3.3.
2022-01-19 14:10:35 +01:00
Maxim Cournoyer
276f40fdc3
Merge branch 'version-1.4.0'
With resolved conflicts in:
	gnu/packages/gnome.scm
	gnu/packages/openstack.scm
	gnu/packages/python-xyz.scm
2022-01-17 11:47:09 -05:00
Maxim Cournoyer
41ec0573b8
gnu: Remove meson-0.59 workarounds.
Mostly automated with the following command:

$ grep --include='*.scm' '#:meson ,meson-0.59' -rl \
    | xargs sed -z 's/#:meson[^\n]*\s*//' -i

* gnu/packages/freedesktop.scm (malcontent)
(accountsservice): Delete #:meson argument.
* gnu/packages/games.scm (gnome-2048): Likewise.
* gnu/packages/geo.scm (gnome-maps): Likewise.
* gnu/packages/gnome.scm (gnome-photos, gnome-music)
(gnome-initial-setup, gnome-user-share, gnome-characters)
(gnome-disk-utility, gnome-font-viewer, evince, glade3)
(gnome-mines, gnome-sudoku, gnome-settings-daemon, devhelp)
(totem, eog, gvfs, simple-scan, epiphany, gnome-session, gedit)
(network-manager-applet, gnome-control-center, gnome-shell, nautilus)
(gnome-default-applications, gnome-weather, gnome-tweaks, cheese, gthumb)
(gitg, polari, gnome-boxes, gtranslator): Likewise.
* gnu/packages/gtk.scm: (gtkmm-3): Likewise.
* gnu/packages/pdf.scm (zathura): Likewise.
* gnu/packages/photo.scm (entangle): Likewise.
* gnu/packages/video.scm (pitivi): Likewise.
* gnu/packages/virtualization.scm (libvirt-glib): Likewise.
2022-01-10 11:44:29 -05:00
Felix Gruber
f777c156e0
gnu: python-geopandas: Update to 0.10.2.
* gnu/packages/geo.scm (python-geopandas): Update to 0.10.2.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2022-01-15 23:27:34 +01:00
Julien Lepiller
81ab201626
gnu: josm: Update to 18360.
* gnu/packages/geo.scm (josm): Update to 18360.
2022-01-11 14:43:20 +01:00
Nikolay Korotkiy
d42718f8ea
gnu: proj: Fix version number in CMake build scripts.
* gnu/packages/geo.scm (proj)[arguments]: Add a 'fix-version' build phase.

Signed-off-by: Leo Famulari <leo@famulari.name>
2021-12-27 19:16:46 -05:00
Nikolay Korotkiy
4db16b9cbc
gnu: qmapshack: Update to 1.16.1.
* gnu/packages/geo.scm (qmapshack): Update to 1.16.1.
[inputs]: Replace quazip-0 with quazip.
[arguments]: Remove custom patching in the 'fix-cmake-modules' build phase.

Signed-off-by: Leo Famulari <leo@famulari.name>
2021-12-27 19:14:28 -05:00
Felix Gruber
2495582e08
gnu: postgis: Update to 3.2.0.
* gnu/packages/geo.scm (postgis): Update to 3.2.0.
  [inputs]: Use new simplified format.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-12-26 10:06:51 +01:00
Nikolay Korotkiy
1ca2c6730b
gnu: josm: Update to 18303.
* gnu/packages/geo.scm (josm): Update to 18303.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2021-12-16 23:57:39 +01:00
Nikolay Korotkiy
aa4b555eb5
gnu: libosmium: Update to 2.17.2.
* gnu/packages/geo.scm (libosmium): Update to 2.17.2.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2021-12-16 23:57:32 +01:00
Nikolay Korotkiy
c368431004
gnu: imposm3: Update to 0.11.1.
* gnu/packages/geo.scm (imposm3): Update to 0.11.1.

Signed-off-by: Julien Lepiller <julien@lepiller.eu>
2021-12-16 23:57:19 +01:00
Nikolay Korotkiy
02c9a06976
gnu: Add openorienteering-mapper.
* gnu/packages/geo.scm (openorienteering-mapper): New variable.

Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
2021-12-15 16:10:16 +01:00
Ludovic Courtès
e3196755e6
gnu: Further simplify package inputs.
This is the result of running:

  ./pre-inst-env guix style --input-simplification=safe

and manually undoing changes on a dozen of packages to reduce
rebuilds (derivations for emacs, icecat, and libreoffice are unchanged.)
2021-12-13 22:15:07 +01:00
Ludovic Courtès
8394619bac
gnu: Simplify package inputs.
This commit was obtained by running:

  ./pre-inst-env guix style

without any additional argument.
2021-12-13 17:48:25 +01:00
Vivien Kraus
6104071e48
gnu: gnome-maps: Upgrade to 41.2.
* gnu/packages/geo.scm (gnome-maps): Upgrade to 41.2.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-12-10 18:17:45 +01:00
Vivien Kraus
502d4b5d62
gnu: gnome-maps: Build with libsoup 2.
* gnu/packages/geo.scm (gnome-maps) [inputs]: Use libsoup-minimal-2 instead of
libsoup and webkitgtk-with-libsoup2 instead of webkitgtk.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-12-10 18:17:45 +01:00
Vinicius Monego
e2f01318af
gnu: marble-qt: Move to (gnu packages kde).
* gnu/packages/geo.scm (marble-qt): Move to (gnu packages kde).

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-11-27 14:27:23 +01:00
Ludovic Courtès
b15e543d30
Merge branch 'master' into core-updates-frozen 2021-11-23 11:29:38 +01:00
Guillaume Le Vaillant
4d02165992
gnu: opencpn: Update to 5.2.4.
* gnu/packages/geo.scm (opencpn): Update to 5.2.4.
  [arguments]: Update 'configure-flag' and 'fix-build' phase.
2021-11-20 18:23:15 +01:00
Julien Lepiller
08326f3d62
gnu: Add gplates.
* gnu/packages/geo.scm (gplates): New variable.
2021-11-19 00:02:05 +01:00
Timothy Sample
e13b18b26f
gnu: gnome-maps: Build with Meson 0.59.
See <https://github.com/mesonbuild/meson/issues/9441>.

* gnu/packages/geo.scm (gnome-maps)[arguments]: Use meson-0.59.
2021-11-18 10:10:14 -05:00
Ludovic Courtès
3a317f7476
Merge branch 'master' into core-updates-frozen 2021-11-17 23:43:14 +01:00
Vinicius Monego
3288d6bf76
gnu: Add python-rtree.
* gnu/packages/geo.scm (python-rtree): New variable.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-11-15 17:49:24 +01:00
Guillaume Le Vaillant
43a433df69
gnu: osm-gps-map: Use libsoup 2.
* gnu/packages/geo.scm (osm-gps-map)[inputs]: Replace libsoup by
  libsoup-minimal-2.
2021-11-13 10:00:26 +01:00
Maxim Cournoyer
feab09f72a
gnu: gtk: Replace gdk-pixbuf+svg by librsvg.
With the addition of a profile hook for computing the gdk-pixbuf loaders cache
file, there is no longer a need for gdk-pixbuf+svg, and librsvg can propagate
gdk-pixbuf without fear, so replace the former for the latter.

The replacement was automated with the following command:

   $ git grep -l ',gdk-pixbuf+svg)' \
     | xargs sed 's/(".*" ,gdk-pixbuf+svg)/("librsvg" ,librsvg)/' -i

* gnu/packages/gtk.scm (gdk-pixbuf+svg): Delete package.
(gtk+-2)[propagated-inputs]: Replace gdk-pixbuf+svg with librsvg.
(gtk+)[propagated-inputs]: Likewise.
* gnu/packages/gnome.scm (gdk-pixbuf+svg): Add deprecated package.
2021-11-11 12:18:20 -05:00
1c94392a13
Merge remote-tracking branch 'origin/master' into core-updates-frozen 2021-11-08 09:06:14 +02:00
Felix Gruber
dc8e9d6f88
gnu: osm2pgsql: Update to 1.5.1.
* gnu/packages/geo.scm (osm2pgsql): Update to 1.5.1.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-11-07 10:01:31 +01:00
Felix Gruber
b217208dd0
gnu: libosmium: Update to 2.17.1.
* gnu/packages/geo.scm (libosmium): Update to 2.17.1.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-11-07 09:56:55 +01:00
Mathieu Othacehe
a1eca979fb
Merge remote-tracking branch 'origin/master' into core-updates-frozen. 2021-10-12 17:46:23 +00:00
Felix Gruber
371aa5777a
gnu: Add python-geopandas.
* gnu/packages/geo.scm (python-geopandas): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-10-12 18:13:30 +02:00
Felix Gruber
e159047e3c
gnu: Add python-fiona.
* gnu/packages/geo.scm (python-fiona): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-10-12 18:13:30 +02:00
Felix Gruber
1c27038a06
gnu: Add python-pyproj.
* gnu/packages/geo.scm (python-pyproj): New variable.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-10-12 18:13:30 +02:00
Felix Gruber
2a312105f2
gnu: proj: Update to 7.2.1.
* gnu/packages/geo.scm (proj): Update to 7.2.1.
  [build-system]: Change to cmake-build-system.
  [arguments]: Add configure flag to find googletest.
  [inputs]: Add curl, libjpeg-turbo and libtiff.
  [native-inputs]: Add googletest.
  [description]: Consistently call the package Proj, instead of Proj,
  PROJ or proj.  Use @acronym to define CRS.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2021-10-12 18:13:29 +02:00
Tobias Geerinckx-Rice
8452772433
gnu: quazip: Update to 1.1.
* gnu/packages/compression.scm (quazip): Redefine as an heir to the…
(quazip-0): …new name of the previous package definition.
Adjust all packages with quazip as input to use quazip-0.
2021-10-06 01:44:56 +02:00
Felix Gruber
acf1cae83d
gnu: xygrib: Depend on proj instead of proj.4.
* gnu/packages/geo.scm (xygrib)[inputs]: Replace proj.4 with proj.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-10-04 09:53:01 +03:00
Felix Gruber
552fde3b1e
gnu: grass: Depend on proj instead of proj.4.
* gnu/packages/geo.scm (grass)[inputs]: Replace proj.4 with proj.
[arguments]: Change --with-proj-share.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
2021-10-04 09:37:25 +03:00
Mathieu Othacehe
d0b0912212
gnu: gnome-maps: Update to 40.5.
* gnu/packages/geo.scm (gnome-maps): Update to 40.5.
[source]: Fix the URI.
[arguments]: Remove trailing #t.
[inputs]: Add libhandy.
2021-10-02 10:54:25 +00:00
Clément Lassieur
f9fd3752f6
gnu: josm: Fix .desktop file.
* gnu/packages/geo.scm (josm)[arguments]: In 'install-share-directories'
phase, change org-openstreetmap-josm-MainApplication to
org-openstreetmap-josm-gui-MainApplication.
2021-09-21 17:25:26 +02:00
Marius Bakke
5c3cb22c9b
Merge branch 'master' into core-updates-frozen
Conflicts:
	gnu/packages/bioinformatics.scm
	gnu/packages/chez.scm
	gnu/packages/docbook.scm
	gnu/packages/ebook.scm
	gnu/packages/gnome.scm
	gnu/packages/linux.scm
	gnu/packages/networking.scm
	gnu/packages/python-web.scm
	gnu/packages/python-xyz.scm
	gnu/packages/tex.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/dune.scm
	guix/build-system/go.scm
	guix/build-system/linux-module.scm
	guix/packages.scm
2021-09-17 01:25:52 +02:00
Thiago Jung Bauermann via Guix-patches via
b3ee04cde7
gnu: xygrib: Fix finding resources in the data directory.
Currently, if you start up XyGrib it will not show icons in the toolbar
buttons, translated strings in the UI nor the map in the main view.  These
are all items stored in the data directory, which XyGrib can’t find.

Backport upstream PR 235 (already merged upstream) which makes it use XDG
directories correctly.

As a bonus, the PR also contains a fix to find libjpeg, so we don’t need
the substitution for that anymore.

* gnu/packages/patches/xygrib-fix-finding-data.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/geo.scm (xygrib)[source]: Use it.
  [arguments]<#:configure-flags>: Pass ‘-DGNU_PACKAGE=ON’.
  [arguments]<#:phases>{patch-directories}: Remove fix to find libjpeg.
  Remove trailing ‘#t’.
[native-search-paths]: Add ‘XDG_DATA_DIRS’.

Signed-off-by: Guillaume Le Vaillant <glv@posteo.net>
2021-09-16 09:49:31 +02:00