From fa08ce096ef911f18b7a222f7e2389ecad1bc392 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Oct 2020 20:21:20 +0200 Subject: [PATCH 1/2] kdeconnect: Use Qt 5.12 Fixes #99951. $ kdeconnect-app Cannot mix incompatible Qt library (5.12.7) with this library (5.15.0) Aborted (core dumped) --- 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 9534a53d612..554aed1990e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21596,7 +21596,7 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; + kdeconnect = libsForQt512.callPackage ../applications/misc/kdeconnect { }; inherit (kdeFrameworks) kdesu; From 42bf61811b1e78d4bba2c644c38c50e756234ce3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 21 Oct 2020 20:39:37 +0200 Subject: [PATCH 2/2] kdeconnect: 20.08.1 -> 20.08.2 Fixes an invalid MIME type. --- pkgs/applications/misc/kdeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index 31e919e3770..d042f011bb7 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -28,11 +28,11 @@ mkDerivation rec { pname = "kdeconnect"; - version = "20.08.1"; + version = "20.08.2"; src = fetchurl { url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz"; - sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf"; + sha256 = "0rzfnkgkv759d4pa16qk0sw87wqzwgkd99yzrzfy2zcq423f6hvd"; }; patches = [