Skip to content

qgis: merge qgis and qgis-ltr packages definitions in to one #259445

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.

Sign up for GitHub

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

Jump to bottom
Open
imincik wants to merge 2 commits into
base: master
Choose a base branch
from
Open

qgis: merge qgis and qgis-ltr packages definitions in to one #259445

imincik wants to merge 2 commits into from

Conversation

@imincik
Copy link
Contributor

@imincik imincik commented Oct 6, 2023

Description of changes

QGIS and QGIS-LTR derivations are almost identical. Keeping them in two separate files is adding maintenace overhead and can be the cause of some unnecessary inconsistencies.

This change is merging these derivations together while preserving differences when needed.

  • qgis-ltr: alphabetical ordering of buildInputs
  • qgis: merge qgis and qgis-ltr derivations in to one

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/)
  • 23.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

@imincik imincik force-pushed the qgis-merge-derivations branch from dc31899 to 7943cde Compare October 6, 2023 20:08
@imincik
Copy link
Contributor Author

imincik commented Oct 6, 2023

@ofborg build qgis qgis-ltr

@imincik imincik changed the title qgis: merge qgis and qgis-ltr derivations in to one qgis: merge qgis and qgis-ltr packages definitions in to one Oct 6, 2023
@imincik imincik force-pushed the qgis-merge-derivations branch from 7943cde to 1571fb7 Compare October 6, 2023 20:21
@imincik
Copy link
Contributor Author

imincik commented Oct 6, 2023

@ofborg build qgis qgis-ltr

@ofborg ofborg bot requested review from lsix, nh2, sikmir and willcohen October 6, 2023 21:33
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Oct 6, 2023
willcohen
willcohen approved these changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@willcohen willcohen left a comment

Choose a reason for hiding this comment

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

This would be lovely.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one person. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. labels Mar 8, 2024
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@wegank wegank added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jul 4, 2024
@autra autra mentioned this pull request Sep 19, 2024
Merged
13 tasks
@wegank wegank removed the 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. label Jan 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@willcohen willcohen willcohen approved these changes

@nh2 nh2 Awaiting requested review from nh2

@lsix lsix Awaiting requested review from lsix

@sikmir sikmir Awaiting requested review from sikmir

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@imincik @willcohen @wegank