Skip to content

Improvements to qgis and grass packaging, introduce qgis-ltr derivation (revised)#156747

Merged
jonringer merged 8 commits intoNixOS:masterfrom
willcohen:wip/grass
Jan 26, 2022
Merged

Improvements to qgis and grass packaging, introduce qgis-ltr derivation (revised)#156747
jonringer merged 8 commits intoNixOS:masterfrom
willcohen:wip/grass

Conversation

@willcohen
Copy link
Contributor

Motivation for this change

Picking up on @mpickering's #150286

I've built it on an x86_linux machine but don't actually have a working X environment on it that I can access so I can only confirm that it builds rather than test functionality.

@sikmir @erictapen @lsix

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Jan 25, 2022
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Jan 25, 2022
@ofborg ofborg bot requested review from erictapen, lsix and sikmir January 25, 2022 18:53
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 25, 2022
@mpickering
Copy link
Contributor

Thanks for pushing this forwards @willcohen

@jonringer
Copy link
Contributor

other than that, diff LGTM

the git history could use some squashing of fixup commits. I think there's around 8 logical actions done, there should be a commit for each:

the 3 bumps
wrapping of 2 packages
enabling of more use cases

@willcohen
Copy link
Contributor Author

Got it. Will squash and cleanup.

@ofborg ofborg bot added the 8.has: clean-up This PR removes packages or removes other cruft label Jan 25, 2022
mpickering and others added 5 commits January 25, 2022 15:28
Grass is a runtime dependency which qgis attempts to find on the path.

3D is on by default with normal distributions so we should
also enable it.
Add qtlocation to pyqt, and ensure that it is included with both
qgis derivations.
@willcohen
Copy link
Contributor Author

Squashed and reordered. Re-running nixpkgs-review.

@willcohen
Copy link
Contributor Author

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

3 packages built:
  • grass
  • qgis
  • qgis-ltr

@willcohen
Copy link
Contributor Author

ofborg seems stuck on darwin but we know it'll fail there, so this looks ready to go from my perspective, unless there's any other changes!

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.

After 6 hours, this finally finished:

https://github.com/NixOS/nixpkgs/pull/156747

3 packages built:
grass qgis qgis-ltr

@willcohen willcohen deleted the wip/grass branch January 26, 2022 09:39
@willcohen
Copy link
Contributor Author

Many, many thanks @jonringer!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants