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

calligra: 2.9.11 -> 3.0.1 #29068

Merged
merged 5 commits into from Oct 5, 2017
Merged

calligra: 2.9.11 -> 3.0.1 #29068

merged 5 commits into from Oct 5, 2017

Conversation

zraexy
Copy link
Member

@zraexy zraexy commented Sep 7, 2017

Motivation for this change

Update Calligra to 3.0.1 which uses KF5

Kexi has been split off and is now its own package.

Due to the fact that Author, Braindump, Flow, and Stage were removed (Flow and Stage are planned to be added back in) I have kept 2.9.11 under the calligra2 attribute. It can be removed when kde4 is.

I have not used Calligra much so it would be good to have someone who uses it regularly give this a try before merging.

Resolves #22966

cc @Phreedom @ebzzry

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

@zraexy, thanks for your PR! By analyzing the history of the files in this pull request, we identified @abbradar, @urkud and @ttuegel to be potential reviewers.

@vcunat
Copy link
Member

vcunat commented Sep 9, 2017

It builds; neither 2.x nor 3.x will start for me unfortunately, though that might be "just" #13715 or something similar.

Nitpick: why did you drop enableParallelBuilding? It must take ages to build without it.

@zraexy
Copy link
Member Author

zraexy commented Sep 9, 2017

Nitpick: why did you drop enableParallelBuilding? It must take ages to build without it.

Oops. I forgot to use mkDerivation and lib instead of stdenv.mkDerivation and stdenv.lib.
libsForQt5.callPackage's mkDerivation has enableParallelBuilding set to true by default.

@zraexy zraexy force-pushed the calligra branch 2 times, most recently from a871e0b to 98a87ff Compare September 12, 2017 17:59
@zraexy
Copy link
Member Author

zraexy commented Oct 5, 2017

Unless there are any other issues I think this is ready to be merged.

@orivej orivej self-assigned this Oct 5, 2017
@orivej orivej merged commit bb11cae into NixOS:master Oct 5, 2017
@orivej
Copy link
Contributor

orivej commented Oct 5, 2017

Thank you!

@zraexy zraexy deleted the calligra branch October 6, 2017 18:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@orivej orivej

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@zraexy @mention-bot @vcunat @orivej