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.

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

mapbox-gl-native: use upstream version plus patch #117052

Merged
merged 2 commits into from Mar 21, 2021
Merged

mapbox-gl-native: use upstream version plus patch #117052

merged 2 commits into from Mar 21, 2021

Conversation

dotlambda
Copy link
Member

Motivation for this change
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.

@dotlambda dotlambda requested a review from Thra11 March 20, 2021 19:02
@dotlambda dotlambda mentioned this pull request Mar 20, 2021
Merged
10 tasks
@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

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

3 packages built:
  • mapbox-gl-native
  • mapbox-gl-qml
  • pure-maps

@r-rmcgibbo
Copy link

Result of nixpkgs-review pr 117052 at 1f0e9124 run on aarch64-linux 1

3 packages built successfully:
2 suggestions:
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/development/libraries/mapbox-gl-native/default.nix:17:5:

       |
17 |     (fetchpatch {
   |     ^
  • warning: missing-patch-comment

    Please add a comment on the line above, explaining the purpose of this patch.
    Near pkgs/development/libraries/mapbox-gl-native/default.nix:22:5:

       |
22 |     (fetchpatch {
   |     ^

Thra11
Thra11 approved these changes Mar 20, 2021
View reviewed changes
Copy link
Member

@Thra11 Thra11 left a comment

Choose a reason for hiding this comment

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

This looks good to me!

@Thra11 Thra11 self-requested a review March 20, 2021 22:58
Thra11
Thra11 suggested changes Mar 20, 2021
View reviewed changes
Copy link
Member

@Thra11 Thra11 left a comment

Choose a reason for hiding this comment

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

Looks good, but I think the patch name should match the commit it's from and we might as well add the other patch now to save me adding it later 😝

pkgs/development/libraries/mapbox-gl-native/default.nix Outdated
fetchSubmodules = true;
};

patches = [
(fetchpatch {
name = "add-support-for-using-qmapboxgl-as-proper-cmake-dependency.patch";
Copy link
Member

@Thra11 Thra11 Mar 20, 2021 •
edited

Choose a reason for hiding this comment

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

This commit is actually called "Add support for qmapboxgl installation"

I think we should also add "add-support-for-using-qmapboxgl-as-proper-cmake-dependency" from the same PR as the first patch too: with it, I believe we'll be able to update to the latest mapbox-gl-qml version, switch to building mapbox-gl-qml with cmake and drop some hacks.

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, I took the wrong commit. I'll fix it later.

@dotlambda
Copy link
Member Author

Can someone from @NixOS/qt-kde confirm whether it was correct to move these libraries to libsForQt5?

@dotlambda dotlambda force-pushed the mapbox-gl-native-upstream-version branch from 1f0e912 to 84e3856 Compare March 21, 2021 10:53
@ofborg ofborg bot requested a review from Thra11 March 21, 2021 11:03
doronbehar
doronbehar reviewed Mar 21, 2021
View reviewed changes
Copy link
Contributor

@doronbehar doronbehar left a comment

Choose a reason for hiding this comment

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

I think the move to qt5-packages.nix is good, and that the PR can consist of two squashed commits - 1 for each package.

Thra11
Thra11 reviewed Mar 21, 2021
View reviewed changes
Copy link
Member

@Thra11 Thra11 left a comment

Choose a reason for hiding this comment

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

Agree with squashing, but otherwise looks really good to me.

@dotlambda
mapbox-gl-native: use upstream version, unvendor rapidjson, and move …
42f157f 
…to libsForQt5

The first two patches are needed for mapbox-gl-qml.
The third patch is required when building without the vendored rapidjson.
@dotlambda
mapbox-gl-qml: 1.7.5 -> 1.7.6 and move to libsForQt5
cccebb6
@dotlambda dotlambda force-pushed the mapbox-gl-native-upstream-version branch from 84e3856 to cccebb6 Compare March 21, 2021 17:47
@ofborg ofborg bot requested a review from Thra11 March 21, 2021 18:03
Thra11
Thra11 approved these changes Mar 21, 2021
View reviewed changes
Copy link
Member

@Thra11 Thra11 left a comment

Choose a reason for hiding this comment

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

Looks good to me! Thanks!

@SuperSandro2000 SuperSandro2000 merged commit 32a38d8 into NixOS:master Mar 21, 2021
@dotlambda dotlambda deleted the mapbox-gl-native-upstream-version branch March 21, 2021 22:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doronbehar doronbehar doronbehar left review comments

@Thra11 Thra11 Thra11 approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@dotlambda @SuperSandro2000 @r-rmcgibbo @Thra11 @doronbehar