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

kstars,qolibri: migrate to Qt5.15 #104438

Merged
merged 4 commits into from Dec 23, 2020
Merged

kstars,qolibri: migrate to Qt5.15 #104438

merged 4 commits into from Dec 23, 2020

Conversation

freezeboy
Copy link
Contributor

Motivation for this change

Also added some optional dependencies: libraw, qtkeychain, knotifyconfig and wcslib

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.

@freezeboy freezeboy changed the title kstars: migrate to Qt5.15 kstars,qolibri: migrate to Qt5.15 Nov 21, 2020
@doronbehar
Copy link
Contributor

Thanks for working on this @freezeboy . As I see it, there are different changes here mixed together.

  1. Migration to QT5.15
  2. Adding optional deps.
  3. Using mkDerivation instead of adding wrapQtAppsHook.

I think all 3 changes should be separated to 3x2 commits (to each package).

@freezeboy
Copy link
Contributor Author

Ok will do it

@freezeboy
Copy link
Contributor Author

@doronbehar

@ofborg ofborg bot requested a review from TimPut November 28, 2020 17:39
@doronbehar
Copy link
Contributor

Interestingly, the build fails on x86_64 but not on aarch64:

https://logs.nix.ci/?key=nixos/nixpkgs.104438&attempt_id=027ef031-9149-4d7a-a296-9cea53872fda

@doronbehar
Copy link
Contributor

@freezeboy please squash the fixup commit. Also, after doing it, please request me for a review or cc me.

@freezeboy
Copy link
Contributor Author

Cc @doronbehar if you can double check i didn't try to rebuild it after the rebase

Thank you

@doronbehar
Copy link
Contributor

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

2 packages built:
  • kstars
  • qolibri

@doronbehar doronbehar merged commit 48c3dc1 into NixOS:master Dec 23, 2020
@freezeboy freezeboy deleted the migrate-kstars branch December 26, 2020 11:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doronbehar doronbehar doronbehar approved these changes

@TimPut TimPut Awaiting requested review from TimPut

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@freezeboy @doronbehar