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.

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

qgis: 2.18.28 -> 3.4.5 #56486

Merged
merged 2 commits into from Mar 10, 2019
Merged

qgis: 2.18.28 -> 3.4.5 #56486

merged 2 commits into from Mar 10, 2019

Conversation

lsix
Copy link
Member

@lsix lsix commented Feb 27, 2019

Motivation for this change

QGis-3.4.5 is the new LTR version.

We should use this instead of the now obselete 2.18 one for the upcoming 19.03 release. I am really sorry this comes this close to the branch off deadline.

See #35669

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@FRidh
Copy link
Member

FRidh commented Mar 1, 2019

@lsix could you rebase onto master and check qscintilla, as that seems to be broken. We should definitely cherry-pick this to 19.03.

@lsix
Copy link
Member Author

lsix commented Mar 1, 2019

@FRidh I have rebased onto master.

I’ll check ASAP what is happening with qscintilla (qscintilla-qt5 is fixed as part of this PR).

@lsix
Copy link
Member Author

lsix commented Mar 1, 2019

@FRidh It seems that I have a new problem for qscintilla-qt5 after rebase. I’ll let you know as soon as I fix it.

@lsix
Copy link
Member Author

lsix commented Mar 1, 2019

@FRidh I have not had much time to look into what changed recently, but my patches works fine against master from 3 days ago and completely fails on a recent master (mainly qscintilla-qt5 fails). Do you of any important change in the Qt5 infrastructure that was merged in the last few days ?

I’ll try to have a proper look at it this week-end

@FRidh
Copy link
Member

FRidh commented Mar 2, 2019

There was a Qt upgrade, qt511: 5.11.1 -> 5.11.3, and I fixed pyqt5 in 6bffe97

@das-g
Copy link
Member

das-g commented Mar 2, 2019

If I check out branch release-18.09 of github.com/NixOS/nixpkgs (80754f5), I can run QGIS without installing it system-wide or into a user profile with

nix run -f /path/to/nixpkgs qgis -c qgis

If I check out branch add_qgis_3 of github.com/NixOS/lsix (6c8b10e1c750a2c95a30361789ca9884f5a28e10), this results in the following error message:

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

If I install QGIS 3, e.g. with

nix-env -i /nix/store/5dgl07kvbvm1s5n07dxsv6ccjfhx95q0-qgis-3.4.5

then I can start it.

(As far as I remember, I already got the same error message with the branch from the older, now abandoned and closed PR #38022.)

Is this expected?

Output of nix-shell -p nix-info --run "nix-info -m"
  • system: "x86_64-linux"
  • host os: Linux 4.14.102, NixOS, 18.09.2252.8ee1cdde220 (Jellyfish)
  • multi-user?: yes
  • sandbox: yes
  • version: nix-env (Nix) 2.1.3
  • channels(root): "nixos-18.09.2275.060bcd6df50"
  • channels(das-g): ""
  • nixpkgs: /nix/var/nix/profiles/per-user/root/channels/nixos

@lsix
Copy link
Member Author

lsix commented Mar 2, 2019

@FRidh I have pushed a rebased, fixed and working version of the PR.

For the moment, I have disabled the dependency on grass because 1) it is broken (because of wxPython) and 2) it still uses python2 and we should be updated to use python3. I’ll try to work on that when I have time for it.

@das-g I am experiencing the same thing, it is, as far as I know, related to qt5 (qt-2.18 was Qt4 based).

@lsix
Copy link
Member Author

lsix commented Mar 4, 2019

the build jobs are failing because of timeout, but this is not unexpected given the time required to build QGis.

On aarch64-linux, the failure is related to qtwebkit, so unrelated to this PR.

Copy link
Member

@das-g das-g left a comment

Choose a reason for hiding this comment

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

Seems like the GRASS description has been changed instead of the QGIS description.

pkgs/applications/gis/grass/default.nix Outdated Show resolved Hide resolved
pkgs/applications/gis/qgis/unwrapped.nix Outdated Show resolved Hide resolved
@lsix lsix force-pushed the add_qgis_3 branch 2 times, most recently from fd285d4 to 716fd94 Compare March 5, 2019 08:27
@lsix
Copy link
Member Author

lsix commented Mar 5, 2019

@das-g while I was at it, I added a meta to the wrapped version of qgis.

@das-g
Copy link
Member

das-g commented Mar 5, 2019

I added a meta to the wrapped version of qgis.

As far as I can see, their meta content is identical. So should one inherit the meta attribute of the other instead of repeating everything?

@lsix
Copy link
Member Author

lsix commented Mar 5, 2019

done.

I have used

  meta = qgis-unwrapped.meta;

instead

Copy link
Member

@das-g das-g 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.

(For whatever that's worth. I still consider myself a nixpkgs noob.)

pkgs/applications/gis/qgis/unwrapped.nix Show resolved Hide resolved
@lsix
Copy link
Member Author

lsix commented Mar 5, 2019

Hi,

grass is fixed on master, so I can re-enable it in QGIS-3, given that it will add approximately 330M to the closure size.

To do that, I just need to rebase, and remove the wathGrass = false line from all-packages.nix. This can also be done later.

@luzpaz
Copy link
Contributor

luzpaz commented Mar 7, 2019

When this PR is merged 🤞 then the following tickets should be closed:
#38022 #35669

Also would be important to fix the related issues:
#31199

@lsix lsix merged commit ce51fba into NixOS:master Mar 10, 2019
@lsix lsix deleted the add_qgis_3 branch August 22, 2019 07:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants