git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107527 from ttuegel/frameworks-qt-5.15

Update packages to Qt 5.15 for KDE Frameworks 5.76

commit6b342809b1b66dce758364f763b64c6a1a9e6211 authorThomas Tuegel <ttuegel@mailbox.org> dateFri 25 Dec 2020, 07:57 (6 years ago) parentbe0b4532e2047e
2 files changed+27−16
pkgs/applications/office/zanshin/default.nix+10−1 pkgs/top-level/all-packages.nix+17−15
pkgs/applications/office/zanshin/default.nix+10−1
@@ -1,6 +1,7 @@
11{ mkDerivation
22, lib
33, fetchurl
4+, fetchpatch
45, extra-cmake-modules
56, qtbase
67, boost
@@ -24,6 +25,15 @@ mkDerivation rec {
2425 sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh";
2526 };
2627
28+ patches = [
29+ # Build with kontactinterface >= 5.14.42.
30+ # Remove after next release.
31+ (fetchpatch {
32+ url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff";
33+ sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps";
34+ })
35+ ];
36+
2737 nativeBuildInputs = [
2838 extra-cmake-modules
2939 ];
@@ -48,6 +58,5 @@ mkDerivation rec {
4858 maintainers = with maintainers; [ zraexy ];
4959 platforms = platforms.linux;
5060 license = licenses.gpl2Plus;
51− broken = true;
5261 };
5362}
pkgs/top-level/all-packages.nix+17−15
@@ -15705,6 +15705,12 @@ in
1570515705 suffix = "qt5";
1570615706 };
1570715707
15708+ poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix {
15709+ lcms = lcms2;
15710+ qt5Support = true;
15711+ suffix = "qt5";
15712+ };
15713+
1570815714 pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
1570915715
1571015716 qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
@@ -20630,13 +20636,10 @@ in
2063020636
2063120637 calibre = calibre-py3;
2063220638
20633− calligra = libsForQt514.callPackage ../applications/office/calligra {
20639+ calligra = libsForQt5.callPackage ../applications/office/calligra {
2063420640 openjpeg = openjpeg_1;
20635− poppler = poppler_0_61.override {
20636− qt5Support = true;
20637− # Must be using the same qt version as calligra itself.
20638− qtbase = qt514.qtbase;
20639− };
20641+ # Must use the same Qt version as Calligra itself:
20642+ poppler = libsForQt5.poppler_0_61;
2064020643 };
2064120644
2064220645 perkeep = callPackage ../applications/misc/perkeep { };
@@ -22308,14 +22311,14 @@ in
2230822311
2230922312 k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
2231022313
22311− kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
22314+ kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
2231222315
22313− kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
22316+ kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
2231422317 llvmPackages = llvmPackages_10;
2231522318 };
2231622319
22317− kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
22318− kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
22320+ kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
22321+ kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
2231922322 python = python3;
2232022323 };
2232122324
@@ -24469,7 +24472,7 @@ in
2446924472
2447024473 tribler = callPackage ../applications/networking/p2p/tribler { };
2447124474
24472− trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { };
24475+ trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { };
2447324476
2447424477 tudu = callPackage ../applications/office/tudu { };
2447524478
@@ -25284,7 +25287,7 @@ in
2528425287
2528525288 zam-plugins = callPackage ../applications/audio/zam-plugins { };
2528625289
25287− zanshin = libsForQt514.callPackage ../applications/office/zanshin {
25290+ zanshin = libsForQt5.callPackage ../applications/office/zanshin {
2528825291 boost = boost160;
2528925292 };
2529025293
@@ -25623,7 +25626,7 @@ in
2562325626
2562425627 dhewm3 = callPackage ../games/dhewm3 {};
2562525628
25626− digikam = libsForQt514.callPackage ../applications/graphics/digikam {};
25629+ digikam = libsForQt5.callPackage ../applications/graphics/digikam {};
2562725630
2562825631 displaycal = callPackage ../applications/graphics/displaycal {};
2562925632
@@ -26509,10 +26512,9 @@ in
2650926512 lumina = recurseIntoAttrs (callPackage ../desktops/lumina { });
2651026513
2651126514 lxqt = recurseIntoAttrs (import ../desktops/lxqt {
26512− inherit qt5;
26513− inherit libsForQt5;
2651426515 inherit pkgs;
2651526516 inherit (lib) makeScope;
26517+ inherit qt5 libsForQt5;
2651626518 });
2651726519
2651826520 mate = recurseIntoAttrs (callPackage ../desktops/mate { });