diff options
| author | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-06-19 17:38:47 +0200 |
| commit | 6f9a80b331ae41d142a49fbeb94b90ee587b6155 (patch) | |
| tree | 2da042a6ccf5368c73d6e3d54c2ee02a62d284e4 /gnu/packages/geo.scm | |
| parent | 6500c9a5b364616e38a7e03aa4516fc2d7cee876 (diff) | |
| parent | dece03e2b98fc1c2428c2448ce5792f813eb79bf (diff) | |
| download | guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar guix-patches-6f9a80b331ae41d142a49fbeb94b90ee587b6155.tar.gz | |
Merge branch 'master' into core-updates
Note: this merge actually changes the 'curl' and 'python-attrs' derivations,
as part of solving caf4a7a2770ef4d05a6e18f40d602e51da749ddc and
12964df69a99de6190422c752fef65ef813f3b6b respectively.
4604d43c0e (gnu: gnutls@3.6.16: Fix cross-compilation.) was ignored because it
cannot currently be tested.
Conflicts:
gnu/local.mk
gnu/packages/aidc.scm
gnu/packages/boost.scm
gnu/packages/curl.scm
gnu/packages/nettle.scm
gnu/packages/networking.scm
gnu/packages/python-xyz.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/geo.scm')
| -rw-r--r-- | gnu/packages/geo.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index c4bdb6aca0..a0b43308e4 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1247,7 +1247,7 @@ map display. Downloads map data from a number of websites, including ("libpng" ,libpng) ("openjpeg" ,openjpeg) ("proj.4" ,proj.4) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("zlib" ,zlib))) (synopsis "Weather Forecast Visualization") (description @@ -1663,7 +1663,7 @@ using the dataset of topographical information collected by `(("gdal" ,gdal) ("libjpeg-turbo" ,libjpeg-turbo) ("proj" ,proj) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtlocation" ,qtlocation) ("qtwebchannel" ,qtwebchannel) @@ -2282,7 +2282,7 @@ growing set of geoscientific methods.") ("python-urllib3" ,python-urllib3) ("qca" ,qca) ("qscintilla" ,qscintilla) - ("qtbase" ,qtbase) + ("qtbase" ,qtbase-5) ("qtdeclarative" ,qtdeclarative) ("qtkeychain" ,qtkeychain) ("qtlocation" ,qtlocation) |