Skip to content

qgis: 3.10.11 → 3.10.13, mark unbroken#107391

Merged
lsix merged 1 commit intoNixOS:masterfrom
sikmir:qgis
Dec 24, 2020
Merged

qgis: 3.10.11 → 3.10.13, mark unbroken#107391
lsix merged 1 commit intoNixOS:masterfrom
sikmir:qgis

Conversation

@sikmir
Copy link
Member

@sikmir sikmir commented Dec 22, 2020

Motivation for this change
  • update to 3.10.12 (LTR)
  • unbroke (build without QtWebKit)
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.

@sikmir sikmir requested a review from lsix December 22, 2020 11:04
@FRidh
Copy link
Member

FRidh commented Dec 22, 2020

Is removing qtwebkit still needed? #104474

@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 Dec 22, 2020
@sikmir
Copy link
Member Author

sikmir commented Dec 22, 2020

Is removing qtwebkit still needed? #104474

You are right, updated.

lsix
lsix reviewed Dec 23, 2020
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

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

Hi.

This looks good to me.

however, qgis-3.10.13 seems to be out. Would you mind including this upgrade to your MR ?

Thanks.

@sikmir sikmir changed the title qgis: 3.10.11 → 3.10.12, mark unbroken qgis: 3.10.11 → 3.10.13, mark unbroken Dec 23, 2020
@sikmir
Copy link
Member Author

sikmir commented Dec 23, 2020

@lsix updated.

@ofborg ofborg bot requested a review from lsix December 23, 2020 18:02
lsix
lsix approved these changes Dec 24, 2020
View reviewed changes
Copy link
Member

@lsix lsix left a comment

Choose a reason for hiding this comment

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

LGTM.

I have built & tested it.

Thanks!

@lsix lsix merged commit a24ea36 into NixOS:master Dec 24, 2020
@sikmir sikmir deleted the qgis branch December 24, 2020 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@lsix lsix lsix approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@sikmir @FRidh @lsix