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

KDE Applications 20.08.3 #107622

Merged
merged 6 commits into from Dec 26, 2020
Merged

KDE Applications 20.08.3 #107622

merged 6 commits into from Dec 26, 2020

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Dec 26, 2020 •
edited

Motivation for this change

Update KDE Applications with a scheduled minor release. Fix the derivation names using the { pname, version } convention.

See: #107570.

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.

@ttuegel
Revert "fetch-kde-qt.sh: get hashes from metadata"
3db0433 
This reverts commit 4b7d9dc.

The KDE project has changed their source index pages so that the links to
package metadata files are generated by JavaScript after the page loads. As a
result, wget is no longer able to recursively fetch the package metadata
automatically.
@ttuegel
kdeApplications: 20.08.2 -> 20.08.3
a3dd7de
@ttuegel
kdeconnect-kde: remove obsolete patch
4aa5c81
@ttuegel
kaddressbook: patch for Qt 5.15.2
3ade461
@ttuegel
calendarsupport: patch for Qt 5.15.2
672e363
@ttuegel
kdeApplications: fix derivation names
8851c97
@ttuegel ttuegel added 6.topic: qt/kde 9.needs: port to stable A PR needs a backport to the stable release. labels Dec 26, 2020
@ttuegel ttuegel merged commit 3da6ec1 into NixOS:staging Dec 26, 2020
@Narice
Copy link
Contributor

Narice commented Dec 30, 2020

I was trying to build my system today on nixpkgs-unstable but calendarsupport fails to build, do you know if this problem is fixed with the patch for Qt 5.15.2 that you provided in this PR @ttuegel?
I'm getting the following error for reference:

builder for '/nix/store/dxmv0l2icv4kslgnl03hmdr1v8a599dl-calendarsupport.drv' failed with exit code 2; last 10 log lines:
    148 |         printer.setOrientation(QPrinter::Portrait);
        |                 ^~~~~~~~~~~~~~
        |                 Orientation
  /build/calendarsupport-20.08.2/src/printing/calprinter.cpp:151:17: error: 'class QPrinter' has no member named 'setOrientation'; did you mean 'Orientation'?
    151 |         printer.setOrientation(QPrinter::Landscape);
        |                 ^~~~~~~~~~~~~~
        |                 Orientation
  make[2]: *** [src/CMakeFiles/KF5CalendarSupport.dir/build.make:405: src/CMakeFiles/KF5CalendarSupport.dir/printing/calprinter.cpp.o] Error 1
  make[1]: *** [CMakeFiles/Makefile2:284: src/CMakeFiles/KF5CalendarSupport.dir/all] Error 2
  make: *** [Makefile:149: all] Error 2

Seems to be a Qt error so that's why I'm asking this ;)

I saw that this was not merged into master but into staging (and now it's on staging next). Do you know approximately when staging-next might be merged into master @ttuegel? I know that even after this, in can take a while to be available in nixpkgs-unstable but it can give me a rough idea nevertheless ^^

@erictapen
Copy link
Member

@ttuegel Backporting this one seems to be non-trivial. Do you know of any effort that is being done that could be referenced here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: qt/kde 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 1-10 10.rebuild-linux: 501-1000 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ttuegel @Narice @erictapen