From dba7e99cc3ee77a6eab00a8402660db5ed7a2807 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 7 Oct 2020 12:15:25 +0300
Subject: [PATCH 01/44] python3.pkgs.pyqt5: 5.14.2 -> 5.15.1

(cherry picked from commit 0331c39d4e5b7a285b7336bc7c206ab125d32bc3)
---
 pkgs/development/python-modules/pyqt/5.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index ece9ad5b4a3fa..5b971c48d785d 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -30,12 +30,12 @@ let
 
 in buildPythonPackage rec {
   pname = "PyQt5";
-  version = "5.14.2";
+  version = "5.15.1";
   format = "other";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx";
+    sha256 = "18grs2p698ihjgi8agksv6sajakciywyr29ihslqvl260a2np9yr";
   };
 
   outputs = [ "out" "dev" ];

From 3a733b6889c4b8bf5f77e5be42f31f1ef91bef2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 7 Oct 2020 15:46:46 +0200
Subject: [PATCH 02/44] pythonPackages: use current qt5 instead of 5.14

(cherry picked from commit edac19f166f18c65a2aede398463b71f219ce3a6)
---
 pkgs/top-level/all-packages.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 15e50c8eacc0a..eb0d81404847f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10119,10 +10119,9 @@ in
   python3Packages = python3.pkgs;
 
   pythonInterpreters = callPackage ./../development/interpreters/python {
-    # Overrides that apply to all Python interpreters
+    # Overrides that apply to all Python interpreters and their packages
+    # Generally, this should be avoided.
     pkgs = pkgs.extend (final: _: {
-      qt5 = final.qt514;
-      libsForQt5 = final.libsForQt514;
     });
   };
   inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;

From 856900112177fcbf330afae50dab61c105ec6970 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 7 Oct 2020 16:44:36 +0200
Subject: [PATCH 03/44] qutebrowser: minor fixup regarding use of qt 514

In https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f
the Qt version used by Qutebrowser was downgraded from 5.15 to 5.14.
Let's be consistent by also setting qt514 and including a comment so one
can trace why it is used.

(Note that downgrade gave it the same Qt version as used by the Python
packages set at the time, so in principle the override could be
removed.)

(cherry picked from commit 4bccbd9592fe3a824033f224a8b0c45785ba8768)
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb0d81404847f..99c625f29ba96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22828,7 +22828,9 @@ in
     pkgs_ = pkgs.extend(_: prev: {
       pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
         pkgs = oldAttrs.pkgs.extend(_: _: {
-          inherit (pkgs) qt5 libsForQt514;
+          # Use 5.14 https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f
+          qt5 = pkgs.qt514;
+          libsForQt5 = pkgs.libsForQt514;
         });
       });
     });

From 224f6752796a1331fe4ff9741c838a359060ae8b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 7 Oct 2020 18:14:02 +0300
Subject: [PATCH 04/44] pythonPackages.pyqtwebengine: Apply qt5.14 patch only
 if needed

Since we now use qt5.15 in all python modules (defaulting to the same
qt5 used in all-packages.nix), That patch is not required, but it will
be needed if qt5.14 is used if pythonInterpreters is overridden, which
is likely to happen like it happend to qutebrowser for instance. See:
https://github.com/NixOS/nixpkgs/pull/99956/commits/2667af4062ef0710b486fbae3108e0141aecb0fc

(cherry picked from commit 15bfdf8e51e25cee54a8711f0a47bc32fd160bda)
---
 .../development/python-modules/pyqtwebengine/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix
index ff511103e5537..51506598ca18b 100644
--- a/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -7,6 +7,10 @@ let
 
   inherit (pythonPackages) buildPythonPackage python isPy3k pyqt5 enum34;
   inherit (pyqt5) sip;
+  # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
+  patches = lib.optional (lib.hasPrefix "5.14" pyqt5.version)
+    [ ./fix-build-with-qt-514.patch ]
+  ;
 
 in buildPythonPackage rec {
   pname = "PyQtWebEngine";
@@ -18,10 +22,7 @@ in buildPythonPackage rec {
     sha256 = "0xdzhl07x3mzfnr5cf4d640168vxi7fyl0fz1pvpbgs0irl14237";
   };
 
-  patches = [
-    # source: https://www.riverbankcomputing.com/pipermail/pyqt/2020-June/042985.html
-    ./fix-build-with-qt-514.patch
-  ];
+  inherit patches;
 
   outputs = [ "out" "dev" ];
 

From bc4fd743f1d99f8e1b337afe289849792dd8a322 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 7 Oct 2020 17:58:32 +0200
Subject: [PATCH 05/44] carla: 2.1.1 -> 2.2.0 and use the default qt515

(cherry picked from commit 1561163203d429ef362d39da99987309333baef2)
---
 pkgs/applications/audio/carla/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix
index 110507616616d..8a566c2499178 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/applications/audio/carla/default.nix
@@ -15,13 +15,13 @@ assert withGtk3 -> gtk3 != null;
 
 stdenv.mkDerivation rec {
   pname = "carla";
-  version = "2.1.1";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "falkTX";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0c3y4a6cgi4bv1mg57i3qn5ia6pqjqlaylvkapj6bmpsw71ig22g";
+    sha256 = "B4xoRuNEW4Lz9haP8fqxOTcysGTNEXFOq9UXqUJLSFw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99c625f29ba96..d3c94d7762334 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19765,7 +19765,7 @@ in
 
   carddav-util = callPackage ../tools/networking/carddav-util { };
 
-  carla = libsForQt514.callPackage ../applications/audio/carla { };
+  carla = libsForQt5.callPackage ../applications/audio/carla { };
 
   castor = callPackage ../applications/networking/browsers/castor { };
 

From be17f03858642663a7b96b6a232d598c51e9ebcb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 7 Oct 2020 18:20:18 +0300
Subject: [PATCH 06/44] calibre-py{2,3}: Use libsForQt5 - same is used in
 python-packages.nix

(cherry picked from commit 2d238fc6b0db021b2fef793419d7ad057bd0240c)
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3c94d7762334..a9a4c253cecc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19746,9 +19746,9 @@ in
 
   calculix = callPackage ../applications/science/math/calculix {};
 
-  calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
+  calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; };
 
-  calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
+  calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; };
 
   calibre = calibre-py3;
 

From f1cf9e1d6ff89860ba5936bebdd10124cb1a47a2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 01:47:20 +0300
Subject: [PATCH 07/44] retext: Fix build by using default qt5.15.

Bonus: Set `makeWrapperArgs` instead of calling `wrapQtApp` - to prevent
double wrapping.

(cherry picked from commit 198e025172ec7b96cce9057030b3b8fd3f061e45)
---
 pkgs/applications/editors/retext/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix              | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix
index 7752313b2a7ed..c32e831575615 100644
--- a/pkgs/applications/editors/retext/default.nix
+++ b/pkgs/applications/editors/retext/default.nix
@@ -46,11 +46,13 @@ in python.pkgs.buildPythonApplication {
   propagatedBuildInputs = [ pythonEnv ];
 
   postInstall = ''
-    wrapQtApp "$out/bin/retext" \
-      --set ASPELL_CONF "dict-dir ${buildEnv {
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      "--set" "ASPELL_CONF" "dict-dir ${buildEnv {
         name = "aspell-all-dicts";
         paths = map (path: "${path}/lib/aspell") enchantAspellDicts;
       }}"
+    )
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9a4c253cecc5..52ec6a66247cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6557,7 +6557,7 @@ in
 
   reredirect = callPackage ../tools/misc/reredirect { };
 
-  retext = libsForQt514.callPackage ../applications/editors/retext { };
+  retext = libsForQt5.callPackage ../applications/editors/retext { };
 
   richgo = callPackage ../development/tools/richgo {  };
 

From 8d4e21df1a4c0bf41d0d5037fc48fafd916ad384 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 02:08:56 +0300
Subject: [PATCH 08/44] ffado: Use libsForQt5 (not 514)

(cherry picked from commit 5cbf0c1beb7307151809ed3cef2f43ef69324191)
---
 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 52ec6a66247cb..e750d13c1dcce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17337,7 +17337,7 @@ in
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
-  ffado = libsForQt514.callPackage ../os-specific/linux/ffado {
+  ffado = libsForQt5.callPackage ../os-specific/linux/ffado {
     inherit (pkgs.linuxPackages) kernel;
   };
   libffado = ffado;

From cdf7e8017955f137d721565c36767d577af11ccb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 10:34:08 +0300
Subject: [PATCH 09/44] cura, curaLulzbot: Use qt5.15

Since now Python packages use qt5.15, this should too.

(cherry picked from commit f3e5c93d03097b7d87d43fcceda330306ed4bc04)
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e750d13c1dcce..6b80576c150e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23139,11 +23139,11 @@ in
 
   curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; };
 
-  cura = libsForQt514.callPackage ../applications/misc/cura { };
+  cura = libsForQt5.callPackage ../applications/misc/cura { };
 
   curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
 
-  curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { };
+  curaLulzbot = libsForQt5.callPackage ../applications/misc/cura/lulzbot/default.nix { };
 
   curaByDagoma = callPackage ../applications/misc/curabydagoma { };
 

From fdb39df357343f9d0cf4b903ba5b5f6465c07a83 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 10:57:05 +0300
Subject: [PATCH 10/44] electron-cash: 4.1.0 -> 4.1.1

Remove included upstream patches. Use qt5.15 (#99956). Spare double
wrapping by using `makeWrapperArgs+=()`.

(cherry picked from commit 2edd4edcb9fd581ed3e545b4b885683af9df755f)
---
 .../misc/electron-cash/default.nix            | 21 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix
index a6ba3444dcdbe..12362823cc50f 100644
--- a/pkgs/applications/misc/electron-cash/default.nix
+++ b/pkgs/applications/misc/electron-cash/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "electron-cash";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "Electron-Cash";
     repo = "Electron-Cash";
     rev = version;
-    sha256 = "1ccfm6kkmbkvykfdzrisxvr0lx9kgq4l43ixk6v3xnvhnbfwz4s2";
+    sha256 = "1fllz2s20lg4hrppzmnlgjy9mrq7gaq66l2apb3vz1avzvsjw3gm";
   };
 
   propagatedBuildInputs = with python3Packages; [
@@ -36,15 +36,6 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ wrapQtAppsHook ];
 
-  patches = [
-    # Patch a failed test, this can be removed in next version
-    (fetchpatch {
-      url =
-        "https://github.com/Electron-Cash/Electron-Cash/commit/1a9122d59be0c351b14c174a60880c2e927e6168.patch";
-      sha256 = "0zw629ypn9jxb1y124s3dkbbf2q3wj1i97j16lzdxpjy3sk0p5hk";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace contrib/requirements/requirements.txt \
       --replace "qdarkstyle==2.6.8" "qdarkstyle<3"
@@ -70,9 +61,11 @@ python3Packages.buildPythonApplication rec {
   #   Electron Cash was unable to find the secp256k1 library on this system.
   #   Elliptic curve cryptography operations will be performed in slow
   #   Python-only mode.
-  postFixup = ''
-    wrapQtApp $out/bin/electron-cash \
-      --prefix LD_LIBRARY_PATH : ${secp256k1}/lib
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      "--prefix" "LD_LIBRARY_PATH" ":" "${secp256k1}/lib"
+    )
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b80576c150e2..b19f079b4ff42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20120,7 +20120,7 @@ in
 
   ekho = callPackage ../applications/audio/ekho { };
 
-  electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { };
+  electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { };
 
   electrum = libsForQt514.callPackage ../applications/misc/electrum { };
 

From 61b17d4b49c317dacf6264bff2984a9e318e4a61 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 11:31:39 +0300
Subject: [PATCH 11/44] python3.pkgs.nose-timer: init at 1.0.0

(cherry picked from commit cd5b560541477433cd87777171e5123f352564da)
---
 .../python-modules/nose-timer/default.nix     | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/python-modules/nose-timer/default.nix

diff --git a/pkgs/development/python-modules/nose-timer/default.nix b/pkgs/development/python-modules/nose-timer/default.nix
new file mode 100644
index 0000000000000..c93f5bda9838a
--- /dev/null
+++ b/pkgs/development/python-modules/nose-timer/default.nix
@@ -0,0 +1,20 @@
+{ buildPythonPackage, fetchPypi, lib, nose, }:
+
+buildPythonPackage rec {
+  pname = "nose-timer";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09hwjwbczi06bfqgiylb2yxs5h88jdl26zi1fdqxdzvamrkksf2c";
+  };
+
+  propagatedBuildInputs = [ nose ];
+
+  meta = with lib; {
+    homepage = "https://github.com/mahmoudimus/nose-timer";
+    license = licenses.mit;
+    description = "A timer plugin for nosetests (how much time does every test take?)";
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64d02446c310b..58e5fb5e6fc0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4012,6 +4012,8 @@ in {
 
   nose-focus = callPackage ../development/python-modules/nose-focus { };
 
+  nose-timer = callPackage ../development/python-modules/nose-timer { };
+
   nosejs = callPackage ../development/python-modules/nosejs { };
 
   nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };

From 9e49c8416e31422ad6d347adb5d4af62af43b0f7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 12:20:06 +0300
Subject: [PATCH 12/44] python3.pkgs.androguard: rewrite

Add an optional withGui flag to turn off gui as most of the time it's
not needed since this is a python library.

Use a GitHub tarball to optionally enable tests, currently disabled by
default, but next release' tests should pass (tested the beta release
tag).

Wrap qt apps properly, without double wrapping, if gui is enabled.

(cherry picked from commit 36b7e89f199a81026caf98a1cabc4940d57cde9e)
---
 .../python-modules/androguard/default.nix     | 70 +++++++++++++++++--
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix
index c71227811111a..ec19f4730a55b 100644
--- a/pkgs/development/python-modules/androguard/default.nix
+++ b/pkgs/development/python-modules/androguard/default.nix
@@ -1,13 +1,44 @@
-{ lib, buildPythonPackage, fetchPypi, future, networkx, pygments, lxml, colorama, matplotlib,
-  asn1crypto, click, pydot, ipython, pyqt5, pyperclip }:
+{ lib
+, fetchpatch
+, buildPythonPackage
+, fetchFromGitHub
+, future
+, networkx
+, pygments
+, lxml
+, colorama
+, matplotlib
+, asn1crypto
+, click
+, pydot
+, ipython
+, pyqt5
+, pyperclip
+, nose
+, nose-timer
+, mock
+, python_magic
+, codecov
+, coverage
+, qt5
+# This is usually used as a library, and it'd be a shame to force the gui
+# libraries to the closure if gui is not desired.
+, withGui ? false
+# Tests take a very long time, and currently fail, but next release' tests
+# shouldn't fail
+, doCheck ? false
+}:
 
 buildPythonPackage rec {
   version = "3.3.5";
   pname = "androguard";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f0655ca3a5add74c550951e79bd0bebbd1c5b239178393d30d8db0bd3202cda2";
+  # No tests in pypi tarball
+  src = fetchFromGitHub {
+    repo = pname;
+    owner = pname;
+    rev = "v${version}";
+    sha256 = "0zc8m1xnkmhz2v12ddn47q0c01p3sbna2v5npfxhcp88szswlr9y";
   };
 
   propagatedBuildInputs = [
@@ -21,12 +52,37 @@ buildPythonPackage rec {
     click
     pydot
     ipython
+  ] ++ lib.optionals withGui [
     pyqt5
     pyperclip
   ];
 
-  # Tests are not shipped on PyPI.
-  doCheck = false;
+  checkInputs = [
+    pyqt5
+    pyperclip
+    nose
+    nose-timer
+    codecov
+    coverage
+    mock
+    python_magic
+  ];
+  inherit doCheck;
+
+  nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ];
+
+  # If it won't be verbose, you'll see nothing going on for a long time.
+  checkPhase = ''
+    runHook preCheck
+
+    nosetests --verbosity=3
+
+    runHook postCheck
+  '';
+
+  preFixup = lib.optionalString withGui ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
 
   meta = {
     description = "Tool and python library to interact with Android Files";

From 8bcf0f2b290fd45fb7744f0bdca56f623c83df8f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 14:52:22 +0300
Subject: [PATCH 13/44] dupeguru: Don't override qt5 version.

Since Python's pyqt5 is using qt5.15, it should use the same version as
well.

(cherry picked from commit 56d047f0b0a618e134d4a5d78268fa6e7aaf695d)
---
 pkgs/applications/misc/dupeguru/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index 0e7155f374d1c..6bcc377d0f344 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -40,15 +40,15 @@ python3Packages.buildPythonApplication rec {
   # Avoid double wrapping Python programs.
   dontWrapQtApps = true;
 
+  # TODO: A bug in python wrapper
+  # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
   preFixup = ''
-    # TODO: A bug in python wrapper
-    # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
     makeWrapperArgs="''${qtWrapperArgs[@]}"
   '';
 
+  # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
+  # so wrapPythonPrograms hook does not handle it automatically.
   postFixup = ''
-    # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py
-    # so wrapPythonPrograms hook does not handle it automatically.
     wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b19f079b4ff42..6ad331f05b30b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -276,7 +276,7 @@ in
 
   dispad = callPackage ../tools/X11/dispad { };
 
-  dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; };
+  dupeguru = callPackage ../applications/misc/dupeguru { };
 
   dump1090 = callPackage ../applications/radio/dump1090 { };
 

From b8ba7b4510fb7ec6e5e8ff6d1e8a19fdbd3e0877 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 14:57:08 +0300
Subject: [PATCH 14/44] electrum-ltc: Use default qt5.15.

The same as used by pyqt5 (#99956).

Also: Fix double wrapping.
(cherry picked from commit bc0113e2c2647419e0adf66e38263f9826b6ae94)
---
 pkgs/applications/misc/electrum/ltc.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix
index 4bcb66f48b927..2c6fb39fa4334 100644
--- a/pkgs/applications/misc/electrum/ltc.nix
+++ b/pkgs/applications/misc/electrum/ltc.nix
@@ -36,8 +36,8 @@ python3Packages.buildPythonApplication rec {
     sed -i '/Created: .*/d' gui/qt/icons_rc.py
   '';
 
-  postFixup = ''
-    wrapQtApp $out/bin/electrum-ltc
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
   checkPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ad331f05b30b..fc534456f1f96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20126,7 +20126,7 @@ in
 
   electrum-dash = callPackage ../applications/misc/electrum/dash.nix { };
 
-  electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { };
+  electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { };
 
   elementary-planner = callPackage ../applications/office/elementary-planner { };
 

From c16a20f2c504649b7c2937da6de48bc09263a746 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 14:59:26 +0300
Subject: [PATCH 15/44] cq-editor: Use qt5.15 completely.

Don't mix qt5.14 and pyqt5 which uses qt5.15 (#99956).

(cherry picked from commit 16c2b3c6143462c25dc72751f4f2b1a4f0380a45)
---
 pkgs/applications/graphics/cq-editor/default.nix | 6 ++++--
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/cq-editor/default.nix b/pkgs/applications/graphics/cq-editor/default.nix
index 036edf80ab902..cf94f4fa32d14 100644
--- a/pkgs/applications/graphics/cq-editor/default.nix
+++ b/pkgs/applications/graphics/cq-editor/default.nix
@@ -2,6 +2,7 @@
 , mkDerivationWith
 , python3Packages
 , fetchFromGitHub
+, wrapQtAppsHook
 }:
 
 mkDerivationWith python3Packages.buildPythonApplication rec {
@@ -27,8 +28,9 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     requests
   ];
 
-  postFixup = ''
-    wrapQtApp "$out/bin/cq-editor"
+  nativeBuildInputs = [ wrapQtAppsHook ];
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
   checkInputs = with python3Packages; [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc534456f1f96..1d20cc48f60d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19908,7 +19908,7 @@ in
 
   coyim = callPackage ../applications/networking/instant-messengers/coyim {};
 
-  cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor {
+  cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor {
     python3Packages = python37Packages;
   };
 

From f508825dce052ad6ab6ec898d2b7b9f8a2000d36 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 15:05:02 +0300
Subject: [PATCH 16/44] flent: Use qt5.15 just like pyqt5 use in it (#99956)

Bonus: Spare double wrapping.
(cherry picked from commit 3d8267ee883ab2627070da21df288614112b9000)
---
 pkgs/applications/networking/flent/default.nix | 6 ++----
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix
index 19f813e5c7584..319630ceff35e 100644
--- a/pkgs/applications/networking/flent/default.nix
+++ b/pkgs/applications/networking/flent/default.nix
@@ -25,10 +25,8 @@ buildPythonApplication rec {
     xvfb-run -s '-screen 0 800x600x24' ./test-runner
   '';
 
-  postInstall = ''
-    for program in $out/bin/*; do
-      wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH
-    done
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d20cc48f60d0..6b7bc84b0becf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3652,7 +3652,7 @@ in
 
   flashrom = callPackage ../tools/misc/flashrom { };
 
-  flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; };
+  flent = python3Packages.callPackage ../applications/networking/flent { };
 
   flpsed = callPackage ../applications/editors/flpsed { };
 

From df17b2db6bee17c80dac7d69c777b0718c6fc0a4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 15:23:06 +0300
Subject: [PATCH 17/44] friture: Use qt5.15 just like pyqt5

Don't double wrap executables.

(cherry picked from commit 62738d495cb7b6445e9959b56a9638b8dbdcdac2)
---
 pkgs/applications/audio/friture/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/friture/default.nix b/pkgs/applications/audio/friture/default.nix
index b93ad14f55eee..e4bd79a08e318 100644
--- a/pkgs/applications/audio/friture/default.nix
+++ b/pkgs/applications/audio/friture/default.nix
@@ -32,9 +32,8 @@ in py.buildPythonApplication rec {
     ./unlock_constraints.patch
   ];
 
-  postFixup = ''
-    wrapQtApp $out/bin/friture
-    wrapQtApp $out/bin/.friture-wrapped
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b7bc84b0becf..a9b9368db7aae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20641,7 +20641,7 @@ in
 
   freerdpUnstable = freerdp;
 
-  friture = libsForQt514.callPackage ../applications/audio/friture { };
+  friture = libsForQt5.callPackage ../applications/audio/friture { };
 
   fte = callPackage ../applications/editors/fte { };
 

From 0fcb1f759a73de666ccac6a7784583a27a1db1b0 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 16:08:40 +0300
Subject: [PATCH 18/44] git-annex-metadata-gui: fix qt wrapping

Wrap application with wrapQtAppsHook and no double wrapping.

(cherry picked from commit f4b8c8f1df3ad1a155dbb85b6ec4100d5b4d9527)
---
 .../git-and-tools/git-annex-metadata-gui/default.nix      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
index ad07a3dba3c8c..cb0103df227a1 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-metadata-gui/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, git-annex-adapter }:
+{ stdenv, buildPythonApplication, fetchFromGitHub, pyqt5, qt5, git-annex-adapter }:
 
 buildPythonApplication rec {
   pname = "git-annex-metadata-gui";
@@ -15,6 +15,12 @@ buildPythonApplication rec {
     substituteInPlace setup.py --replace "'PyQt5', " ""
   '';
 
+  nativeBuildInputs = [ qt5.wrapQtAppsHook ];
+
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
+  '';
+
   propagatedBuildInputs = [ pyqt5 git-annex-adapter ];
 
   meta = with stdenv.lib; {

From 7f8c6469eed1b377a4b54c89bdafcecd39fa3e63 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 16:34:36 +0300
Subject: [PATCH 19/44] freecad: Use libsForQt5 and not qt5.14

(#99956).

(cherry picked from commit 244ef6c24b93197cd838462fd4987b40f9c3d3c1)
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9b9368db7aae..460b945ee1180 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20612,10 +20612,10 @@ in
 
   fractal = callPackage ../applications/networking/instant-messengers/fractal { };
 
-  freecad = libsForQt514.callPackage ../applications/graphics/freecad {
+  freecad = libsForQt5.callPackage ../applications/graphics/freecad {
     mpi = openmpi;
   };
-  freecadStable = libsForQt514.callPackage ../applications/graphics/freecad/stable.nix {
+  freecadStable = libsForQt5.callPackage ../applications/graphics/freecad/stable.nix {
     mpi = openmpi;
     opencascade-occt = opencascade-occt730;
     python3Packages = python37Packages;

From 4a87f3298b729c3e139808a4822c569df0228a6c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 17:55:58 +0300
Subject: [PATCH 20/44] libsForQt5.pulseaudio-qt: init at 1.2.0

(cherry picked from commit faedc6a226862328514a6537409e8fe1bb590217)
---
 .../libraries/pulseaudio-qt/default.nix       | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/pulseaudio-qt/default.nix

diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix
new file mode 100644
index 0000000000000..03d656f91fae4
--- /dev/null
+++ b/pkgs/development/libraries/pulseaudio-qt/default.nix
@@ -0,0 +1,35 @@
+{ mkDerivation
+, lib
+, fetchurl
+, cmake
+, extra-cmake-modules
+, pkg-config
+, pulseaudio
+}:
+
+mkDerivation rec {
+  pname = "pulseaudio-qt";
+  version = "1.2.0";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz";
+    sha256 = "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099";
+  };
+
+  buildInputs = [
+    pulseaudio
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    extra-cmake-modules
+  ];
+
+  meta = with lib; {
+    description = "Pulseaudio bindings for Qt";
+    homepage    = "https://invent.kde.org/libraries/pulseaudio-qt";
+    license     = with licenses; [ lgpl2 ];
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 460b945ee1180..905266517b867 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14973,6 +14973,8 @@ in
       suffix = "qt5";
     };
 
+    pulseaudio-qt = callPackage ../development/libraries/pulseaudio-qt { };
+
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
     qmltermwidget = callPackage ../development/libraries/qmltermwidget {

From a44e9a7581ced26e58a0a7db75bace7edb7e4629 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 17:57:57 +0300
Subject: [PATCH 21/44] libsForQt5.kpeoplevcard: init at 0.1

(cherry picked from commit 8b16b8cb561e5cc401102312eaa0a5a3f7f43ebc)
---
 .../libraries/kpeoplevcard/default.nix        | 40 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/libraries/kpeoplevcard/default.nix

diff --git a/pkgs/development/libraries/kpeoplevcard/default.nix b/pkgs/development/libraries/kpeoplevcard/default.nix
new file mode 100644
index 0000000000000..c405532e43632
--- /dev/null
+++ b/pkgs/development/libraries/kpeoplevcard/default.nix
@@ -0,0 +1,40 @@
+{ mkDerivation
+, lib
+, fetchurl
+, cmake
+, extra-cmake-modules
+, pkg-config
+, kcoreaddons
+, kpeople
+, kcontacts
+}:
+
+mkDerivation rec {
+  pname = "kpeoplevcard";
+  version = "0.1";
+
+  src = fetchurl {
+    url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    sha256 = "1hv3fq5k0pps1wdvq9r1zjnr0nxf8qc3vwsnzh9jpvdy79ddzrcd";
+  };
+
+  buildInputs = [
+    kcoreaddons
+    kpeople
+    kcontacts
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+    extra-cmake-modules
+  ];
+
+  meta = with lib; {
+    description = "Pulseaudio bindings for Qt";
+    homepage    = "KPeople VCard Support";
+    license     = with licenses; [ lgpl2 ];
+    maintainers = with maintainers; [ doronbehar ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 905266517b867..1a417abb955cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14929,6 +14929,8 @@ in
 
     kproperty = callPackage ../development/libraries/kproperty { };
 
+    kpeoplevcard = callPackage ../development/libraries/kpeoplevcard { };
+
     kreport = callPackage ../development/libraries/kreport { };
 
     libcommuni = callPackage ../development/libraries/libcommuni { };

From e5d127dc13c6098980865468aff28749596af591 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 18:21:40 +0300
Subject: [PATCH 22/44] vorta: Fix double wrapping

(cherry picked from commit 883b21debe5e223038715917a527395a4f794bdb)
---
 pkgs/applications/backup/vorta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix
index 3c6a9587a6565..fc7e6c0fc3593 100644
--- a/pkgs/applications/backup/vorta/default.nix
+++ b/pkgs/applications/backup/vorta/default.nix
@@ -28,8 +28,8 @@ buildPythonApplication rec {
   # QT setup in tests broken.
   doCheck = false;
 
-  postFixup = ''
-    wrapQtApp $out/bin/vorta
+  preFixup = ''
+    makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
   meta = with lib; {

From 28992861a0584052e3d9ca980d0b1727f273b8ca Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 18:26:50 +0300
Subject: [PATCH 23/44] krita: Use qt5.15 - same as pyqt5 in it (#99956)

(cherry picked from commit 2aff7cf32c7ed5ca0448b502f37682fb65e31ceb)
---
 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 1a417abb955cc..e1b63ed2526a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21486,7 +21486,7 @@ in
 
   kpt = callPackage ../applications/networking/cluster/kpt { };
 
-  krita = libsForQt514.callPackage ../applications/graphics/krita {
+  krita = libsForQt5.callPackage ../applications/graphics/krita {
     openjpeg = openjpeg_1;
   };
 

From 39fc72820c332aabce6fe1eb437884aafdcc632e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 18:27:53 +0300
Subject: [PATCH 24/44] gmic-qt-krita: Use qt5.15 - as used by `krita` (#99956)

(cherry picked from commit 32a362bb61e8e5a3cce5618fd0b63dfe99009e5e)
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e1b63ed2526a1..d53c5e4cf3504 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2028,8 +2028,10 @@ in
 
   gmic = callPackage ../tools/graphics/gmic { };
 
-  gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { };
+  gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { };
 
+  # NOTE: If overriding qt version, krita needs to use the same qt version as
+  # well.
   gmic-qt-krita = gmic-qt.override {
     variant = "krita";
   };

From 990a86534bc0bc5c9947aa66d80794e3150b363d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:01:14 +0300
Subject: [PATCH 25/44] inkcut: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit aa20203d3cf25c1a83728aff877578166f65cd9c)
---
 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 d53c5e4cf3504..23831193d2997 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21206,7 +21206,7 @@ in
   # Impressive, formerly known as "KeyJNote".
   impressive = callPackage ../applications/office/impressive { };
 
-  inkcut = libsForQt514.callPackage ../applications/misc/inkcut { };
+  inkcut = libsForQt5.callPackage ../applications/misc/inkcut { };
 
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;

From 023936e84ccc18f28f392c74362c674c02f0f56e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:03:57 +0300
Subject: [PATCH 26/44] kcc: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit 36caf7ea26a6b02edb121000dff54105ee6ae2ce)
---
 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 23831193d2997..437b0dd002a68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11094,7 +11094,7 @@ in
 
   kati = callPackage ../development/tools/build-managers/kati { };
 
-  kcc = libsForQt514.callPackage ../applications/graphics/kcc { };
+  kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
 
   kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends {
     gperf = gperf_3_0;

From fe739f14aab2e217dcd1898658c6e44b2caa7e04 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:08:58 +0300
Subject: [PATCH 27/44] leo-editor: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit dfec61ea28c81cd3388cff81c88116f0bde1de8c)
---
 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 437b0dd002a68..e1a6e8d119066 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21566,7 +21566,7 @@ in
 
   legit = gitAndTools.legit;
 
-  leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { };
+  leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { };
 
   libowfat = callPackage ../development/libraries/libowfat { };
 

From a986ec6161aaa5e52206af4d2855a63a47ace857 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:32:46 +0300
Subject: [PATCH 28/44] manuskript: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit a9a2cc99b982a212198c47902f096f3c4e1957de)
---
 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 e1a6e8d119066..71dd419de581b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20741,7 +20741,7 @@ in
     opencv = python37Packages.opencv3;
   };
 
-  manuskript = libsForQt514.callPackage ../applications/editors/manuskript { };
+  manuskript = libsForQt5.callPackage ../applications/editors/manuskript { };
 
   manul = callPackage ../development/tools/manul { };
 

From 560e5f9f76b20c1cb458a5838e2092667d6aca07 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:38:27 +0300
Subject: [PATCH 29/44] qarte: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit 8b8febd15f3d26ae5931be854feb8cf2cf23c4c0)
---
 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 71dd419de581b..dc95545932329 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6455,7 +6455,7 @@ in
 
   openmodelica = callPackage ../applications/science/misc/openmodelica { };
 
-  qarte = libsForQt514.callPackage ../applications/video/qarte { };
+  qarte = libsForQt5.callPackage ../applications/video/qarte { };
 
   qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { };
 

From 0ee4d1e4e8945bea6521458a0e5984636ddefc25 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:39:30 +0300
Subject: [PATCH 30/44] qnotero: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit 0cbd755852a2890ce2e6b6b6fd7c64686a59519b)
---
 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 dc95545932329..59abfdc494df6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22736,7 +22736,7 @@ in
 
   qmmp = libsForQt5.callPackage ../applications/audio/qmmp { };
 
-  qnotero = libsForQt514.callPackage ../applications/office/qnotero { };
+  qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
 
   qrcode = callPackage ../tools/graphics/qrcode {};
 

From fb7035ef07e85d00507a0c0a16e68726ad97656c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:41:02 +0300
Subject: [PATCH 31/44] qpaeq: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit 38d517f6342879bb477f00375dda01d96540008e)
---
 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 59abfdc494df6..0a9364529b1b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16594,7 +16594,7 @@ in
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };
 
-  qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { };
+  qpaeq = libsForQt5.callPackage ../servers/pulseaudio/qpaeq.nix { };
 
   pulseaudioFull = pulseaudio.override {
     x11Support = true;

From 5d0961754ae928c2306cdedce1dc0f462993cf57 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:42:36 +0300
Subject: [PATCH 32/44] rapid-photo-downloader: Use qt5.15, as pyqt5 in it
 (#99956)

(cherry picked from commit 1fa76554c8d9e0e2445f4d34ffc93e241341eecb)
---
 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 0a9364529b1b9..0028567434a47 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22860,7 +22860,7 @@ in
 
   rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
-  rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { };
+  rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
 

From 383e605b2228328acf85ccce8f3cad05c6bb00e4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 19:49:07 +0300
Subject: [PATCH 33/44] webmacs: Use qt5.15, as pyqt5 in it (#99956)

(cherry picked from commit 179986f378ba6d145fe3bd4c1c011bab1537760b)
---
 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 0028567434a47..159a9eed55c8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23859,7 +23859,7 @@ in
 
   webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { };
 
-  webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {};
+  webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {};
 
   webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {};
 

From 5bb95efb7f821818bac2af447e2eec08faecc569 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 18:36:42 +0200
Subject: [PATCH 34/44] qscintilla: 2.11.2 -> 2.11.5, fix license

(cherry picked from commit ae37cb36107f573dca458c3195637d4351d1aa61)
---
 pkgs/development/libraries/qscintilla/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index abaeba51b4511..19aebd715d6ba 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -6,17 +6,17 @@
 
 let
   pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
-  version = "2.11.2";
+  version = "2.11.5";
 
 in stdenv.mkDerivation rec {
   inherit pname version;
 
   src = fetchurl {
-    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla_gpl-${version}.tar.gz";
-    sha256 = "18glb2v07mwfz6p8qmwhzcaaczyc36x3gn9wx8ndm7q6d93xr6q2";
+    url = "https://www.riverbankcomputing.com/static/Downloads/QScintilla/${version}/QScintilla-${version}.tar.gz";
+    sha256 = "k2Hib9f7e1gZp+uSxcGIChjem9PtndLrAI5XOIaWcWs=";
   };
 
-  sourceRoot = "QScintilla_gpl-${version}/Qt4Qt5";
+  sourceRoot = "QScintilla-${version}/Qt4Qt5";
 
   buildInputs = [ (if withQt5 then qtbase else qt4) ];
 
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
       background colours and multiple fonts.
     '';
     homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro";
-    license = with licenses; [ gpl2 gpl3 ]; # and commercial
+    license = with licenses; [ gpl3 ]; # and commercial
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.unix;
   };

From 11ac36825b0ca61d1cde8f74da74b1625363eadd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 18:37:01 +0200
Subject: [PATCH 35/44] qgis: 3.10.9 -> 3.10.10

(cherry picked from commit 084c4da16a07021209d766baa2d7857ef1cb07a2)
---
 pkgs/applications/gis/qgis/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix
index 130c0af6ee20d..da66b0d9d252a 100644
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@@ -10,7 +10,7 @@ let
     [ qscintilla-qt5 gdal jinja2 numpy psycopg2
       chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ];
 in mkDerivation rec {
-  version = "3.10.9";
+  version = "3.10.10";
   pname = "qgis";
   name = "${pname}-unwrapped-${version}";
 
@@ -18,7 +18,7 @@ in mkDerivation rec {
     owner = "qgis";
     repo = "QGIS";
     rev = "final-${lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6";
+    sha256 = "yZBG+bpJA7iKkUEjVo45d+bmRp9WS7mk8z96FLf0ZQ0=";
   };
 
   passthru = {

From 27252519208f2cd357c075972a3ce044ec8cab6f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 18:37:25 +0200
Subject: [PATCH 36/44] qgis: consistently use qt 5.14

(cherry picked from commit 93111343dc30d9418008232ab970cbd33471346b)
---
 pkgs/top-level/all-packages.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 159a9eed55c8a..3cd80d69d5320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22704,7 +22704,18 @@ in
 
   qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {};
 
-  qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix {
+  # Our 3.10 LTS cannot use a newer Qt (5.15) version because it requires qtwebkit
+  # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
+  qgis-unwrapped = let
+    pkgs_ = pkgs.extend(_: prev: {
+      pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
+        pkgs = oldAttrs.pkgs.extend(_: _: {
+          qt5 = pkgs.qt514;
+          libsForQt5 = pkgs.libsForQt514;
+        });
+      });
+    });
+  in pkgs_.libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix {
       withGrass = false;
   };
 

From 471a56f24bd785eea40bea8162058bf6fe754d2e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 19:00:34 +0200
Subject: [PATCH 37/44] cadence: use qt 5.14 consistently

(cherry picked from commit 64388b5b55c15debc89a48987c18d01b8c316df4)
---
 pkgs/top-level/all-packages.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3cd80d69d5320..f28b2458f5f9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19562,7 +19562,17 @@ in
 
   bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { };
 
-  cadence = libsForQt514.callPackage ../applications/audio/cadence { };
+  cadence = let
+    # Use Qt 5.14 consistently
+    pkgs_ = pkgs.extend(_: prev: {
+      pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
+        pkgs = oldAttrs.pkgs.extend(_: _: {
+          qt5 = pkgs.qt514;
+          libsForQt5 = pkgs.libsForQt514;
+        });
+      });
+    });
+  in pkgs_.libsForQt514.callPackage ../applications/audio/cadence { };
 
   cheesecutter = callPackage ../applications/audio/cheesecutter { };
 

From bfb4a3ec5dd62da946938dcca8580d65a612297f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 19:06:35 +0200
Subject: [PATCH 38/44] dupeguru: mark as broken

(cherry picked from commit b9af2d2259f265d70997177da618bccd630968bc)
---
 pkgs/applications/misc/dupeguru/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix
index 6bcc377d0f344..3347567b88b43 100644
--- a/pkgs/applications/misc/dupeguru/default.nix
+++ b/pkgs/applications/misc/dupeguru/default.nix
@@ -58,5 +58,6 @@ python3Packages.buildPythonApplication rec {
     license = licenses.bsd3;
     platforms = platforms.linux;
     maintainers = [ maintainers.novoxudonoser ];
+    broken = true; # mv: cannot stat '_block.cpython-38m*.so': No such file or directory
   };
 }

From a0b965a456f7f0477ac4cdf48aa148c7cf8b1cf2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 19:13:01 +0200
Subject: [PATCH 39/44] qutebrowser: use current qt (5.15) again instead of
 5.14

For security reasons [1] we upgrade to the latest Qt, despite this
breaking a feature, which is why 5.14 was forced earlier.

[1] https://github.com/NixOS/nixpkgs/pull/99456#issuecomment-703523943

(cherry picked from commit 902c567974a3af0795c2efce369dc0be0edea34b)
---
 pkgs/top-level/all-packages.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f28b2458f5f9f..cb0b9e2d60d97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22851,17 +22851,7 @@ in
 
   quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
 
-  qutebrowser = let
-    pkgs_ = pkgs.extend(_: prev: {
-      pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
-        pkgs = oldAttrs.pkgs.extend(_: _: {
-          # Use 5.14 https://github.com/NixOS/nixpkgs/commit/3fafb021256bc594cecd949b3edc5bc480fc721f
-          qt5 = pkgs.qt514;
-          libsForQt5 = pkgs.libsForQt514;
-        });
-      });
-    });
-  in pkgs_.libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { };
+  qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };
 
   rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};
 

From 0a835dc982090979c8c498ecd49be0a3804d465d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 19:13:19 +0200
Subject: [PATCH 40/44] openshot-qt: consustently use qt 5.14

(cherry picked from commit 5d4117bd12bf3e197daf191c38c8e5d7d1a9e924)
---
 pkgs/top-level/all-packages.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb0b9e2d60d97..c94db7428ba1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9210,7 +9210,18 @@ in
     graalvm8-ee
     graalvm11-ee;
 
-  openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { };
+  openshot-qt = let
+    # Cannot use a newer Qt (5.15) version because it requires qtwebkit
+    # and our qtwebkit fails to build with 5.15. 01bcfd3579219d60e5d07df309a000f96b2b658b
+    pkgs_ = pkgs.extend(_: prev: {
+      pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
+        pkgs = oldAttrs.pkgs.extend(_: _: {
+          qt5 = pkgs.qt514;
+          libsForQt5 = pkgs.libsForQt514;
+        });
+      });
+    });
+  in pkgs_.libsForQt514.callPackage ../applications/video/openshot-qt { };
 
   openspin = callPackage ../development/compilers/openspin { };
 

From f66b4727d1057dc0441f1b672e8a72efc97f5a4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 8 Oct 2020 19:26:35 +0200
Subject: [PATCH 41/44] puddletag: mark broken

(cherry picked from commit c0d5cf499321ef5348876d0e21d9397e2e819f3a)
---
 pkgs/applications/audio/puddletag/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix
index 47ea078c4b2d2..56fcdcc94cd2d 100644
--- a/pkgs/applications/audio/puddletag/default.nix
+++ b/pkgs/applications/audio/puddletag/default.nix
@@ -30,5 +30,6 @@ python3Packages.buildPythonApplication rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.linux;
+    broken = true; # Needs Qt wrapping
   };
 }

From f382a99b88f52952ffc9296d12b450f8b8824c85 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 22:14:03 +0300
Subject: [PATCH 42/44] kdeconnect: 1.3.5 -> 20.08.1

Update many dependencies. Add a patch that fixes a build. Use
`libsForQt5` instead of `libsForQt514`.

(cherry picked from commit dfcde0341f5718ee619fd721f712c887c9bc6ea4)
---
 pkgs/applications/misc/kdeconnect/default.nix | 43 ++++++++++++++++---
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index c3d2feb2fed78..31e919e377065 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -1,6 +1,7 @@
 { mkDerivation
 , lib
 , fetchurl
+, fetchpatch
 , extra-cmake-modules
 , kcmutils
 , kconfigwidgets
@@ -13,25 +14,55 @@
 , libfakekey
 , libXtst
 , qtx11extras
+, qtmultimedia
+, qtgraphicaleffects
 , sshfs
 , makeWrapper
 , kwayland
 , kio
+, kpeoplevcard
+, kpeople
+, kirigami2
+, pulseaudio-qt
 }:
 
 mkDerivation rec {
   pname = "kdeconnect";
-  version = "1.3.5";
+  version = "20.08.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/${pname}-kde-${version}.tar.xz";
-    sha256 = "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5";
+    url = "https://download.kde.org/stable/release-service/${version}/src/${pname}-kde-${version}.tar.xz";
+    sha256 = "0s76djgpx08jfmh99c7kx18mnr3w7bv4hdra120nicq89mmy7gwf";
   };
 
+  patches = [
+    # https://invent.kde.org/network/kdeconnect-kde/-/merge_requests/328
+    (fetchpatch {
+      url = "https://invent.kde.org/network/kdeconnect-kde/-/commit/6101ef3ad07d865958d58a3d2736f5536f1c5719.diff";
+      sha256 = "17mr7k13226vzcgxlmfs6q2mdc5j7vwp4iri9apmh6xlf6r591ac";
+    })
+  ];
+
   buildInputs = [
-    libfakekey libXtst
-    ki18n kiconthemes kcmutils kconfigwidgets kdbusaddons knotifications
-    qca-qt5 qtx11extras makeWrapper kwayland kio
+    libfakekey
+    libXtst
+    qtmultimedia
+    qtgraphicaleffects
+    pulseaudio-qt
+    kpeoplevcard
+    kpeople
+    kirigami2
+    ki18n
+    kiconthemes
+    kcmutils
+    kconfigwidgets
+    kdbusaddons
+    knotifications
+    qca-qt5
+    qtx11extras
+    makeWrapper
+    kwayland
+    kio
   ];
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c94db7428ba1d..e39efe7c68a95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21436,7 +21436,7 @@ in
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };
 
-  kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { };
+  kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 
   inherit (kdeFrameworks) kdesu;
 

From 0a7698042d14196401e513ac3bf6ef3ae57a59ba Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 7 Oct 2020 12:14:41 +0300
Subject: [PATCH 43/44] python3.pkgs.sip: 4.19.22 -> 4.19.24

(cherry picked from commit 98e6fdd6a6aa88fa65ca675cf09106e6d9a1045d)
---
 pkgs/development/python-modules/sip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix
index 2bc8b70e4ca5c..0027c1c0ba5f2 100644
--- a/pkgs/development/python-modules/sip/default.nix
+++ b/pkgs/development/python-modules/sip/default.nix
@@ -2,14 +2,14 @@
 
 buildPythonPackage rec {
   pname = sip-module;
-  version = "4.19.22";
+  version = "4.19.24";
   format = "other";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz";
-    sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1";
+    sha256 = "1ra15vb5i9gkg2vdvh16cq9x2mmzw1yi3xphxs8q34q1pf83gkgd";
   };
 
   configurePhase = ''

From 32344431997b89b464096f8a18409c88f5db9b73 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 8 Oct 2020 21:05:53 +0300
Subject: [PATCH 44/44] kdoctools, kapidox: Remove out of top-level scope

They do depend on qt5, and putting them in top level scope could cause
qt5 incompatibilities errors.

(cherry picked from commit 6b6f6808318d4a445870048d1175fcb55b1b69aa)
---
 pkgs/top-level/all-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e39efe7c68a95..fcab22e3ded67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10718,7 +10718,7 @@ in
   };
 
   # Does not actually depend on Qt 5
-  inherit (kdeFrameworks) extra-cmake-modules kapidox;
+  inherit (kdeFrameworks) extra-cmake-modules;
 
   coccinelle = callPackage ../development/tools/misc/coccinelle {
     ocamlPackages = ocaml-ng.ocamlPackages_4_05;
@@ -14896,7 +14896,8 @@ in
       kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui
       kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison
       qqc2-desktop-style solid sonnet syntax-highlighting syndication
-      threadweaver kirigami2 kholidays kpurpose kcontacts kquickcharts;
+      threadweaver kirigami2 kholidays kpurpose kcontacts kquickcharts
+      kapidox;
 
     ### KDE PLASMA 5