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

qgis: 3.8.0 -> 3.8.3 #68375

Merged
merged 3 commits into from Oct 3, 2019
Merged

qgis: 3.8.0 -> 3.8.3 #68375

merged 3 commits into from Oct 3, 2019

Conversation

lsix
Copy link
Member

@lsix lsix commented Sep 9, 2019

Motivation for this change

This fixes build issues for qscintilla (good for #68361) and bumps QGis to last version.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

@lsix lsix requested a review from FRidh as a code owner September 9, 2019 20:02
@ofborg ofborg bot requested a review from peterhoeg September 9, 2019 20:17
@FRidh
Copy link
Member

FRidh commented Sep 10, 2019 •
edited by markuskowa

@GrahamcOfBorg build python3.pkgs.qscintilla-qt5 qgis

@lheckemann lheckemann added this to the 19.09 milestone Sep 10, 2019
@lsix lsix force-pushed the qgis-3.8.2 branch 2 times, most recently from 196052a to 816b9a3 Compare September 19, 2019 19:07
@lsix lsix changed the title qgis: 3.8.0 -> 3.8.2 qgis: 3.8.0 -> 3.8.3 Sep 19, 2019
@lsix lsix mentioned this pull request Sep 19, 2019
Merged
10 tasks
@peterhoeg
Copy link
Member

Further to the other PR (that was merged), I think your approach of not stripping the suffix and creating the symlinks is better. Do you mind incorporating that ehre?

@lsix
Copy link
Member Author

lsix commented Sep 30, 2019

Yes, I’ll do that ASAP (I had a quick look at rebasing my branch this morning, but qgis does not build that way).

@lsix
qscintilla: Use both .so and _qt5.so suffix
4bf49d9 
Make sure that the both libqscintilla2_qt5.so and libqscintilla2.so are
present in `$out/lib` so all the dependant packages can find the most
appropriate library (some except the empty suffix, such as
sqlitebrowser, other expect the _qt5 suffix such as
python3Packages.qscintilla-qt5).

The mechanism would also work work for qt4 build, but it is broken at
the moment.

Also make sure python*Packages.qscintilla* are up to date
@lsix
python3Packages.qscintilla-qt5: fix build
edc638c
@lsix
Copy link
Member Author

lsix commented Sep 30, 2019

@peterhoeg rebased, and done.

I am rebuilding qgis at the moment.

Do you think it can be backported to release-19.09 ? Having a up to date qgis there would be great.

jonringer
jonringer reviewed Oct 2, 2019
View reviewed 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.

doesn't seem to be properly wrapped

[nix-shell:/home/jon/.cache/nix-review/pr-68375]$ ./results/qgis/bin/qgis
Warning: Could not find the Qt platform plugin "xcb" in ""
Fatal: This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem.

QGIS died on signal -1Aborted (core dumped)

@lsix
Copy link
Member Author

lsix commented Oct 2, 2019 •
edited

🤔 odd, it might have been lost in a rebase somewhere… I did fix that in the original MR 😓

I’ll fix that right away ! Thanks for the double check !

@lsix
Copy link
Member Author

lsix commented Oct 2, 2019

Should be fixed… I am building at the moment, and I’ll test when done.

jonringer
jonringer approved these changes Oct 2, 2019
View reviewed 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.

nix-review passes on NixOS (3 failures on master)
diff LGTM
executables in all the affected packages seem to work

[3 built (3 failed), 2 copied (12.9 MiB), 2.4 MiB DL]
error: build of '/nix/store/xmm51irv87xyc8kgpkbkrvp067bi66az-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/68375
3 package failed to build:
python27Packages.ovito python37Packages.ovito sonic-pi

9 package were build:
libsForQt5.qscintilla libsForQt511.qscintilla openscad python27Packages.qscintilla-qt5 python37Packages.qscintilla-qt5 qgis qgis-unwrapped sqlitebrowser tora

@lsix
Copy link
Member Author

lsix commented Oct 2, 2019

👍

Once merged I’ll prepare a PR to backport it to 19.09 with all the required dependencies.

@peterhoeg peterhoeg mentioned this pull request Oct 3, 2019
Closed
10 tasks
@peterhoeg peterhoeg merged commit 95a3c8d into NixOS:master Oct 3, 2019
@jonringer jonringer added the 9.needs: port to stable A PR needs a backport to the stable release. label Oct 3, 2019
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Oct 3, 2019
@peterhoeg @dtzWill
Merge pull request NixOS#68375 from lsix/qgis-3.8.2
042c717 
qgis: 3.8.0 -> 3.8.3
(cherry picked from commit 95a3c8d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JohnAZoidberg JohnAZoidberg JohnAZoidberg left review comments

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@peterhoeg peterhoeg Awaiting requested review from peterhoeg

Assignees
No one assigned
Labels
6.topic: python 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@lsix @FRidh @peterhoeg @JohnAZoidberg @jonringer @lheckemann