Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.03] qgis: 3.10.1 -> 3.10.4 #83382

Merged
merged 3 commits into from Mar 27, 2020
Merged

Conversation

lsix
Copy link
Member

@lsix lsix commented Mar 25, 2020

Motivation for this change

This is a backport of #83317 to release-20.03.

This PR will remove few packages from python2Packages set (pyproj and revdeps). The amount of packages removed is fairly limited and since release-20.03 is not released yet, I hope there is still room for it. I would prefer this to ship with 20.03, but can understand if someone prefers to freeze versions as they are, but if we do so we will not be able to port qgis LTR fixes (3.10.*).

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

(cherry picked from commit 4f6fc6d)
(cherry picked from commit 6cd915b)
(cherry picked from commit 8e8efc7)
Copy link
Member

@FRidh FRidh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as it does not cause any failing packages I approve.

Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

https://github.com/NixOS/nixpkgs/pull/83382
8 package marked as broken and skipped:
gazebo gazebo-headless gazeboSimulator.gazebo6 gazeboSimulator.gazebo6-headless gazeboSimulator.gazebo7 gazeboSimulator.gazebo7-headless gplates openspace

56 package built:
gdal gdal_1_11 gdal_2 grass libLAS libgeotiff libspatialite mapnik merkaartor mysql-workbench openorienteering-mapper osm2pgsql osm2xmap perl528Packages.Tirex perl530Packages.Tirex postgresqlPackages.postgis proj python27Packages.fiona python27Packages.labelbox python27Packages.python-mapnik python27Packages.rasterio python27Packages.tilestache python27Packages.worldengine python37Packages.basemap python37Packages.cartopy python37Packages.fiona python37Packages.gdal python37Packages.geopandas python37Packages.labelbox python37Packages.osmnx python37Packages.owslib python37Packages.pyproj python37Packages.python-mapnik python37Packages.rasterio worldengine-cli python38Packages.basemap python38Packages.cartopy python38Packages.fiona python38Packages.gdal python38Packages.geopandas python38Packages.labelbox python38Packages.osmnx python38Packages.owslib python38Packages.pyproj python38Packages.python-mapnik python38Packages.rasterio python38Packages.worldengine qgis qgis-unwrapped qlandkartegt qmapshack readosm saga spatialite_tools xastir xygrib

@jonringer jonringer merged commit d0f67fb into NixOS:release-20.03 Mar 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants