proj: 7.2.1 -> 8.1.1 by dotlambda · Pull Request #138479 · NixOS/nixpkgs

dotlambda · 2021-09-19T01:00:27Z

Motivation for this change

Cartopy is no longer compatible with older versions of PROJ: SciTools/cartopy#1854

Things done

cc @mpickering @MatthewCroughan @tollb

dotlambda · 2021-09-19T01:25:54Z

Does somebody know the URLs for GPlates 2.3.0? See https://www.earthbyte.org/download-gplates-2-3/
cc @kmicklas

pkgs/top-level/all-packages.nix

dotlambda · 2021-09-19T18:22:37Z

Does somebody know the URLs for GPlates 2.3.0? See https://www.earthbyte.org/download-gplates-2-3/

I managed to update GPlates but I'm still trying to convince upstream to make the tarball available under a nice URL: https://discourse.gplates.org/t/gplates-2-3-released/374/3

dotlambda · 2021-09-19T19:54:13Z

Result of nixpkgs-review pr 138479 run on x86_64-linux 1

3 packages marked as broken and skipped:

openspace
python39Packages.basemap
qlandkartegt

52 packages built:

cloudcompare
gdal (python39Packages.gdal)
gdal_2
gmt
gplates
libLAS
libgeotiff
libspatialite
mapproxy
merkaartor
octavePackages.octproj
openorienteering-mapper
osm2pgsql
osm2xmap
paraview
pdal
postgis (postgresql13Packages.postgis)
postgresql11Packages.postgis
postgresql12Packages.postgis
proj
proj7
python38Packages.basemap
python38Packages.cartopy
python38Packages.fiona
python38Packages.gdal
python38Packages.geopandas
python38Packages.osmnx
python38Packages.owslib
python38Packages.pygmt
python38Packages.pyproj
python38Packages.rasterio
python38Packages.worldengine
python39Packages.cartopy
python39Packages.fiona
python39Packages.geopandas
python39Packages.osmnx
python39Packages.owslib
python39Packages.pygmt
python39Packages.pyproj
python39Packages.rasterio
python39Packages.worldengine
pytrainer
qgis
qgis-unwrapped
qmapshack
readosm
saga
spatialite_tools
sumo
udig
valhalla
xastir

risicle · 2021-09-19T23:18:49Z

nixpkgs-review throws up no new failures on macos 10.15 (but there are many existing failures, so that doesn't say too much by itself)

dotlambda · 2021-09-19T23:24:51Z

@ofborg eval

dotlambda · 2021-09-20T05:31:03Z

Expected Python to be a framework

Didn't Apple have plans to not ship macOS with Python anymore?
Should I set GPlates' meta.platforms to linux?

pkgs/applications/gis/qgis/unwrapped.nix

pkgs/applications/science/misc/gplates/default.nix

pkgs/development/libraries/proj/7.nix

pkgs/development/libraries/proj/default.nix

pkgs/top-level/all-packages.nix

dotlambda · 2021-09-24T02:51:13Z

Result of nixpkgs-review pr 138479 run on x86_64-linux 1

5 packages marked as broken and skipped:

googleearth-pro
grass
openspace
python39Packages.basemap
qlandkartegt

52 packages built:

cloudcompare
gdal (python39Packages.gdal)
gdal_2
gmt
gplates
libLAS
libgeotiff
libspatialite
mapproxy
merkaartor
octavePackages.octproj
openorienteering-mapper
osm2pgsql
osm2xmap
paraview
pdal
postgresql11Packages.postgis
postgresql12Packages.postgis
postgresqlPackages.postgis (postgresql13Packages.postgis)
proj
proj_7
python38Packages.basemap
python38Packages.cartopy
python38Packages.fiona
python38Packages.gdal
python38Packages.geopandas
python38Packages.osmnx
python38Packages.owslib
python38Packages.pygmt
python38Packages.pyproj
python38Packages.rasterio
python38Packages.worldengine
python39Packages.cartopy
python39Packages.fiona
python39Packages.geopandas
python39Packages.osmnx
python39Packages.owslib
python39Packages.pygmt
python39Packages.pyproj
python39Packages.rasterio
worldengine-cli (python39Packages.worldengine)
pytrainer
qgis
qgis-unwrapped
qmapshack
readosm
saga
spatialite_tools
sumo
udig
valhalla
xastir

dotlambda · 2021-09-24T02:54:16Z

Does anybody object to merging this? I wanna emphasize that this disables mapnik and qlandkartegt.

sikmir · 2021-09-24T04:45:23Z

Does anybody object to merging this? I wanna emphasize that this disables mapnik and qlandkartegt.

What about using proj_7 with qlandkartegt to not broke it? I still use qlandkartegt.

dotlambda · 2021-09-24T05:44:04Z

Does anybody object to merging this? I wanna emphasize that this disables mapnik and qlandkartegt.

What about using proj_7 with qlandkartegt to not broke it? I still use qlandkartegt.

Can you try whether it works with the following patch?

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f1a830e964e..0f847412114 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26900,7 +26900,10 @@ with pkgs;

   qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };

-  qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {};
+  qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {
+    proj = proj_7;
+    gdal = gdal.override { proj = proj_7; };
+  };

   garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {};

EDIT: It can't really work because GDAL has too many dependencies using PROJ, which we'd also have to override. I suggest we stick with the current solution and you use an overlay that replaces proj with proj_7 or move to QMapShack. If you have a better suggestion, go ahead.
By the way, the AUR package has the same problem: https://aur.archlinux.org/packages/qlandkartegt/#comment-808754

dotlambda · 2021-09-24T05:54:12Z

Maybe someone knows how we could define proj_7Packages in all-packages.nix? Then we could use proj_7Packages.callPackage for qlandkartegt.

It is incompatible with PROJ 8: opengribs/XyGrib#200

It is incompatible with PROJ 8.

It is incompatible with PROJ 8. We cannot use proj7 because gdal has to use the same version.

happysalada · 2021-09-27T01:18:01Z

The change looks good to me, I would say feel free to merge.
I unfortunately don't see a better solution for now than an override for qlandkartegt

Co-authored-by: Robert Schütz <nix@dotlambda.de>

It is incompatible with PROJ 8.

dotlambda · 2021-09-27T06:14:28Z

@sikmir I added all overrides necessary to make qtlandkartegt use to the exact same dependencies as before this PR to all-packages.nix. Actually, they are only the same modulo the removal of preCheck from the expression for proj_7. Please test whether everything works as expected.

sikmir · 2021-09-28T12:59:27Z

@sikmir I added all overrides necessary to make qtlandkartegt use to the exact same dependencies as before this PR to all-packages.nix. Actually, they are only the same modulo the removal of preCheck from the expression for proj_7. Please test whether everything works as expected.

Yes, it works for me. Thanks for keeping it unbroken!

dotlambda requested review from SuperSandro2000, hrdinka, lsix, mredaelli and sikmir September 19, 2021 01:00

github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Sep 19, 2021

ofborg bot added 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package labels Sep 19, 2021

ofborg bot requested a review from vbgl September 19, 2021 01:13

ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Sep 19, 2021

dotlambda force-pushed the proj-8.1.1 branch from 9102574 to 8f94bc8 Compare September 19, 2021 01:17

dotlambda requested review from OPNA2608 and kmicklas September 19, 2021 01:27

dotlambda commented Sep 19, 2021

View reviewed changes

pkgs/top-level/all-packages.nix Outdated Show resolved Hide resolved

dotlambda requested a review from knedlsepp September 19, 2021 15:52

This comment has been minimized.

Sign in to view

dotlambda force-pushed the proj-8.1.1 branch from 34e3000 to 422ed4d Compare September 19, 2021 18:28

dotlambda marked this pull request as ready for review September 19, 2021 18:28

dotlambda requested review from FRidh and jonringer as code owners September 19, 2021 18:28

SuperSandro2000 reviewed Sep 20, 2021

View reviewed changes

dotlambda force-pushed the proj-8.1.1 branch from 422ed4d to 9b2e508 Compare September 22, 2021 00:00

dotlambda requested a review from SuperSandro2000 September 22, 2021 00:00

dotlambda requested a review from Thra11 September 22, 2021 00:34

dotlambda added 8 commits September 25, 2021 16:54

proj_7: init at 7.2.1

cb1fc48

osm2xmap: use proj7

3553854

xygrib: use proj_7

b73a99e

It is incompatible with PROJ 8: opengribs/XyGrib#200

survex: use proj_7

b51c3c2

It is incompatible with PROJ 8.

proj: 7.2.1 -> 8.1.1

71666e1

python3Packages.pyproj: 3.1.0 -> 3.2.1

68ef9d8

python3Packages.cartopy: 0.19.0.post1 -> 0.20.0

0b97370

mapnik: mark as broken

c826ba3

It is incompatible with PROJ 8. We cannot use proj7 because gdal has to use the same version.

dotlambda force-pushed the proj-8.1.1 branch from 9b2e508 to 9fbf912 Compare September 26, 2021 00:11

lsix and others added 4 commits September 26, 2021 23:11

qgis: fix build with PROJ 8

042eebd

Co-authored-by: Robert Schütz <nix@dotlambda.de>

python3Packages.geopandas: fix tests

7e6325e

gplates: 2.2.0 -> 2.3.0

98c8fc6

qlandkartegt: use proj_7

7d38eec

It is incompatible with PROJ 8.

dotlambda force-pushed the proj-8.1.1 branch from 9fbf912 to 7d38eec Compare September 27, 2021 06:11

dotlambda merged commit 54e1db2 into NixOS:master Sep 27, 2021

dotlambda deleted the proj-8.1.1 branch September 27, 2021 23:46

bdj mentioned this pull request Oct 25, 2021

proj.x86_64-darwin build failing #142875

Closed

Uh oh!

Conversation

dotlambda commented Sep 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation for this change

Things done

Uh oh!

dotlambda commented Sep 19, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

This comment has been minimized.

dotlambda commented Sep 19, 2021

Uh oh!

dotlambda commented Sep 19, 2021

Uh oh!

risicle commented Sep 19, 2021

Uh oh!

dotlambda commented Sep 19, 2021

Uh oh!

dotlambda commented Sep 20, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dotlambda commented Sep 24, 2021

Uh oh!

dotlambda commented Sep 24, 2021

Uh oh!

sikmir commented Sep 24, 2021

Uh oh!

dotlambda commented Sep 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dotlambda commented Sep 24, 2021

Uh oh!

happysalada commented Sep 27, 2021

Uh oh!

dotlambda commented Sep 27, 2021

Uh oh!

sikmir commented Sep 28, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

dotlambda commented Sep 19, 2021 •

edited

Loading

dotlambda commented Sep 19, 2021 •

edited

Loading

dotlambda commented Sep 20, 2021 •

edited

Loading

dotlambda commented Sep 24, 2021 •

edited

Loading