From 0937f24518e05afb8b0b8cd449a62c0d10ae3410 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 14:03:53 -0600 Subject: calligra: use qt515 --- pkgs/top-level/all-packages.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5a25414c..69236539952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15701,6 +15701,12 @@ in suffix = "qt5"; }; + poppler_0_61 = callPackage ../development/libraries/poppler/0.61.nix { + lcms = lcms2; + qt5Support = true; + suffix = "qt5"; + }; + pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; @@ -20623,13 +20629,10 @@ in calibre = calibre-py3; - calligra = libsForQt514.callPackage ../applications/office/calligra { + calligra = libsForQt5.callPackage ../applications/office/calligra { openjpeg = openjpeg_1; - poppler = poppler_0_61.override { - qt5Support = true; - # Must be using the same qt version as calligra itself. - qtbase = qt514.qtbase; - }; + # Must use the same Qt version as Calligra itself: + poppler = libsForQt5.poppler_0_61; }; perkeep = callPackage ../applications/misc/perkeep { }; -- cgit 1.4.1 From 66ee431f3d131636111dfeae01c70fb1b683be18 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 16:58:56 -0600 Subject: digikam: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69236539952..e9b2c511f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25618,7 +25618,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt514.callPackage ../applications/graphics/digikam {}; + digikam = libsForQt5.callPackage ../applications/graphics/digikam {}; displaycal = callPackage ../applications/graphics/displaycal {}; -- cgit 1.4.1 From 4070b3deff1fdfb9cc5d12a505123a87f62349b7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 18:32:35 -0600 Subject: kdevelop: use qt515 --- pkgs/top-level/all-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9b2c511f7d..855385d1f2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22304,14 +22304,14 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; -- cgit 1.4.1 From ed58d97091ee94177b36960d3b2fee868d38667a Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 18:58:29 -0600 Subject: trojita: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855385d1f2e..72d558c2757 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24465,7 +24465,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { }; + trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; tudu = callPackage ../applications/office/tudu { }; -- cgit 1.4.1 From df00d5d9d0bfa3232c97084b0b10396baba8cccd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 20:29:35 -0600 Subject: zanshin: use qt515 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72d558c2757..a173b391dd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25280,7 +25280,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt514.callPackage ../applications/office/zanshin { + zanshin = libsForQt5.callPackage ../applications/office/zanshin { boost = boost160; }; -- cgit 1.4.1 From 754d97f8a04300a01aa44d9b93ddfeedca5b3d0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Dec 2020 05:13:05 -0600 Subject: zanshin: patch for kontactinterface >= 5.14.42 --- pkgs/applications/office/zanshin/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index e3b9408ed96..c724c239a45 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -1,6 +1,7 @@ { mkDerivation , lib , fetchurl +, fetchpatch , extra-cmake-modules , qtbase , boost @@ -24,6 +25,15 @@ mkDerivation rec { sha256 = "0b316ddcd46sawva84x5d8nsp19v66gbm83djrra7fv3k8nkv4xh"; }; + patches = [ + # Build with kontactinterface >= 5.14.42. + # Remove after next release. + (fetchpatch { + url = "https://invent.kde.org/pim/zanshin/-/commit/4850c08998b33b37af99c3312d193b063b3e8174.diff"; + sha256 = "sha256:0lh0a035alhmws3zyfnkb814drq5cqxvzpwl4g1g5d435gy8k4ps"; + }) + ]; + nativeBuildInputs = [ extra-cmake-modules ]; -- cgit 1.4.1 From 266a6b296833d8346441c5b958bd405714475d30 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Dec 2020 05:16:19 -0600 Subject: lxqt: use qt515 --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a173b391dd5..76a739e45c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26504,10 +26504,9 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit qt5; - inherit libsForQt5; inherit pkgs; inherit (lib) makeScope; + inherit qt5 libsForQt5; }); mate = recurseIntoAttrs (callPackage ../desktops/mate { }); -- cgit 1.4.1 From 2e2047ef863ea15922c316b65b5f7ee76deae5d7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Dec 2020 05:43:54 -0600 Subject: zanshin: not broken --- pkgs/applications/office/zanshin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index c724c239a45..843e7ec0145 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -58,6 +58,5 @@ mkDerivation rec { maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; - broken = true; }; } -- cgit 1.4.1