From 3f2a81f1ba8fc6f6ea2a864528493bade28438d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 10 Oct 2022 19:24:59 +0000
Subject: [PATCH 01/56] fheroes2: 0.9.19 -> 0.9.20

---
 pkgs/games/fheroes2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix
index 673c7d3e6d37..5f3bb86d51d7 100644
--- a/pkgs/games/fheroes2/default.nix
+++ b/pkgs/games/fheroes2/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fheroes2";
-  version = "0.9.19";
+  version = "0.9.20";
 
   src = fetchFromGitHub {
     owner = "ihhub";
     repo = "fheroes2";
     rev = version;
-    sha256 = "sha256-GLF5OXPEc1V1r9INbEdIM17tm7pKq1ZuOuShtAnqXjM=";
+    sha256 = "sha256-IF8ESbMDvermghBGLMq+GdE67Hg5XedX0REGGnWQhRA=";
   };
 
   buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ];

From 990575a3bb04d7b593b1ea92cda8262209d4dc4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Oct 2022 21:36:49 +0000
Subject: [PATCH 02/56] kubemq-community: 2.3.0 -> 2.3.1

---
 pkgs/servers/kubemq-community/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/kubemq-community/default.nix b/pkgs/servers/kubemq-community/default.nix
index 6524fe6fcd19..3e739b09a25f 100644
--- a/pkgs/servers/kubemq-community/default.nix
+++ b/pkgs/servers/kubemq-community/default.nix
@@ -2,12 +2,12 @@
 
 buildGoModule rec {
   pname = "kubemq-community";
-  version = "2.3.0";
+  version = "2.3.1";
   src = fetchFromGitHub {
     owner = "kubemq-io";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-E4X8srrfbOHV2XmjaXV25WilIjBGPjEGD6BqK7HreoQ=";
+    sha256 = "sha256-d5ZhQFVh7yzZsozlMaxkLMGdLraCFAvuQvQiSdF56wY=";
   };
 
   CGO_ENABLED=0;
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   doCheck = false;  # grpc tests are flaky
 
-  vendorSha256 = "sha256-kvQ5sPMudI75fVIWJkkwXpmVrJysvWcIgpgjyQh19W0=";
+  vendorSha256 = "sha256-mie+Akfsn+vjoxYnI23Zxk0OTFbMf51BDbJk2c0U7iU=";
 
   meta = {
     homepage = "https://github.com/kubemq-io/kubemq-community";

From 17659a0cf647916ff748695c1599254042b4dc9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Oct 2022 21:52:07 +0000
Subject: [PATCH 03/56] python310Packages.pysimplegui: 4.60.3 -> 4.60.4

---
 pkgs/development/python-modules/pysimplegui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysimplegui/default.nix b/pkgs/development/python-modules/pysimplegui/default.nix
index 4b6f61b8114d..3028f0cac9b7 100644
--- a/pkgs/development/python-modules/pysimplegui/default.nix
+++ b/pkgs/development/python-modules/pysimplegui/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pysimplegui";
-  version = "4.60.3";
+  version = "4.60.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PySimpleGUI";
     inherit version;
-    sha256 = "sha256-dexGaU3JdcDka+jFendOA4QztTCVgh1nvjsiGso/1o0=";
+    sha256 = "sha256-+IyCwwGlGuo1vmBdwGC8zrDctmguFigFRIhHAatLI7o=";
   };
 
   propagatedBuildInputs = [

From b2ccc249397ae87545d24154d44f1fe22bac1d80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Oct 2022 22:00:08 +0000
Subject: [PATCH 04/56] python310Packages.azure-mgmt-resource: 21.1.0 -> 21.2.0

---
 .../python-modules/azure-mgmt-resource/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
index 8ac4330b45a8..4988406ac968 100644
--- a/pkgs/development/python-modules/azure-mgmt-resource/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-resource/default.nix
@@ -8,14 +8,14 @@
 
 
 buildPythonPackage rec {
-  version = "21.1.0";
+  version = "21.2.0";
   pname = "azure-mgmt-resource";
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-UpZa3jHNBZ/qKxUT1l/mFgRuQz3g5YPc9cnJvr8+vWk=";
+    sha256 = "sha256-v4pd5sTate/H8NGND1cWXe5SMepS0j0Q2C5Ee4wqGlQ=";
   };
 
   propagatedBuildInputs = [

From 1329ea0d578b890a69e9af652336c52e60992ee5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 11 Oct 2022 23:09:09 +0000
Subject: [PATCH 05/56] multus-cni: 3.9.1 -> 3.9.2

---
 pkgs/applications/networking/cluster/multus-cni/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/multus-cni/default.nix b/pkgs/applications/networking/cluster/multus-cni/default.nix
index 2cfbcaa6bd11..2d01d470c871 100644
--- a/pkgs/applications/networking/cluster/multus-cni/default.nix
+++ b/pkgs/applications/networking/cluster/multus-cni/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "multus-cni";
-  version = "3.9.1";
+  version = "3.9.2";
 
   src = fetchFromGitHub {
     owner = "k8snetworkplumbingwg";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-U5Ji+f7ckynBVMb4xsmoRZzYJx8obMO+bO9TU6GqcW0=";
+    sha256 = "sha256-AYSUJEoNYt4DYNcPynRBal5c5QAzRVltkjwoEM66VcY=";
   };
 
   ldflags = [

From 538299fed412117d502c18bba09a7a3940e11df3 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Tue, 11 Oct 2022 19:18:15 -0400
Subject: [PATCH 06/56] cargo-clone: init at 1.1.0

---
 .../tools/rust/cargo-clone/default.nix        | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/tools/rust/cargo-clone/default.nix

diff --git a/pkgs/development/tools/rust/cargo-clone/default.nix b/pkgs/development/tools/rust/cargo-clone/default.nix
new file mode 100644
index 000000000000..68af8c0a2d39
--- /dev/null
+++ b/pkgs/development/tools/rust/cargo-clone/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, openssl
+, stdenv
+, Security
+, SystemConfiguration
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "cargo-clone";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "janlikar";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1lfg47kw07k4r795n0iixl5cnrb13g74hqlbp8jzbypr255bc16q";
+  };
+
+  cargoSha256 = "sha256-rJcTl5fe3vkNNyLRvm7q5KmzyJXchh1/JuzK0GFhHLk=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
+    Security
+    SystemConfiguration
+  ];
+
+  # requires internet access
+  doCheck = false;
+
+  meta = with lib; {
+    description = "A cargo subcommand to fetch the source code of a Rust crate";
+    homepage = "https://github.com/janlikar/cargo-clone";
+    changelog = "https://github.com/janlikar/cargo-clone/blob/v${version}/CHANGELOG.md";
+    license = with licenses; [ asl20 mit ];
+    maintainers = with maintainers; [ figsoda ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 987f3341dc00..7ff0a4956d2d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14744,6 +14744,9 @@ with pkgs;
   cargo-c = callPackage ../development/tools/rust/cargo-c {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
+  cargo-clone = callPackage ../development/tools/rust/cargo-clone {
+    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+  };
   cargo-criterion = callPackage ../development/tools/rust/cargo-criterion { };
   cargo-deadlinks = callPackage ../development/tools/rust/cargo-deadlinks {
     inherit (darwin.apple_sdk.frameworks) Security;

From 756169bde74edbeafc086ab4b588af6584b3b36b Mon Sep 17 00:00:00 2001
From: laalsaas <laalsaas@systemli.org>
Date: Tue, 11 Oct 2022 23:00:35 +0200
Subject: [PATCH 07/56] maintainers: add laalsaas

---
 maintainers/maintainer-list.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3d5c0f2067c9..f99856bbd188 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7466,6 +7466,10 @@
     githubId = 72546287;
     name = "L3af";
   };
+  laalsaas = {
+    email = "laalsaas@systemli.org";
+    name = "laalsaas";
+  };
   lach = {
     email = "iam@lach.pw";
     github = "CertainLach";

From 4a22f4be4ed2619b905701b02539528805741b91 Mon Sep 17 00:00:00 2001
From: laalsaas <laalsaas@systemli.org>
Date: Wed, 12 Oct 2022 02:08:14 +0200
Subject: [PATCH 08/56] bfcal: init at 1.0

---
 pkgs/applications/misc/bfcal/default.nix | 41 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/misc/bfcal/default.nix

diff --git a/pkgs/applications/misc/bfcal/default.nix b/pkgs/applications/misc/bfcal/default.nix
new file mode 100644
index 000000000000..9b77d1ebe3c1
--- /dev/null
+++ b/pkgs/applications/misc/bfcal/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, lib
+, fetchFromSourcehut
+, meson
+, ninja
+, pkg-config
+, wrapQtAppsHook
+, qtbase
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bfcal";
+  version = "1.0";
+
+  src = fetchFromSourcehut {
+    owner = "~bitfehler";
+    repo = "bfcal";
+    rev = "v${version}";
+    sha256 = "sha256-2z5ICVEZ55omwcoVWpac/HPwyKF9jDCYO78S9p21VMU=";
+  };
+
+  nativeBuildInputs = [
+    meson ninja pkg-config wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qtbase
+  ];
+
+  postInstall = ''
+    mkdir -p $out/bin
+    install bfcal $out/bin
+  '';
+
+  meta = with lib; {
+    description = "Quickly display a calendar";
+    homepage = "https://git.sr.ht/~bitfehler/bfcal";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ laalsaas ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e7546d684a7..876da10188ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27083,6 +27083,8 @@ with pkgs;
 
   bevelbar = callPackage ../applications/window-managers/bevelbar { };
 
+  bfcal = libsForQt5.callPackage ../applications/misc/bfcal { };
+
   bibletime = libsForQt5.callPackage ../applications/misc/bibletime { };
 
   bino3d = libsForQt5.callPackage ../applications/video/bino3d {

From 3fe9fb887772bf84c4167a6e07046c1eb06ae622 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Oct 2022 04:45:55 +0000
Subject: [PATCH 09/56] freeradius: 3.2.0 -> 3.2.1

---
 pkgs/servers/freeradius/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix
index fb557bb73fb8..f5e504bb02c2 100644
--- a/pkgs/servers/freeradius/default.nix
+++ b/pkgs/servers/freeradius/default.nix
@@ -24,11 +24,11 @@ assert withRest -> withJson;
 
 stdenv.mkDerivation rec {
   pname = "freeradius";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchurl {
     url = "ftp://ftp.freeradius.org/pub/freeradius/freeradius-server-${version}.tar.gz";
-    hash = "sha256-QtGgoC7CrxRyjcdoySHUeAC8gwP0FyIetvMvBCNbBDE=";
+    hash = "sha256-Xw7seQike8dSV6SIAsrK1Sc/HBOyaA8fhHzwrISKyBA=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From 656846781c5c8969b06d62cc0870123310e50169 Mon Sep 17 00:00:00 2001
From: Skyler Grey <skyler3665@gmail.com>
Date: Wed, 12 Oct 2022 06:13:36 +0100
Subject: [PATCH 10/56] pridefetch: 1.0.0 -> 1.1.0

---
 pkgs/tools/misc/pridefetch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/pridefetch/default.nix b/pkgs/tools/misc/pridefetch/default.nix
index 9a93c6770e81..80fd1b0e9bc2 100644
--- a/pkgs/tools/misc/pridefetch/default.nix
+++ b/pkgs/tools/misc/pridefetch/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchFromGitHub, python3, zip }: let
-  version = "1.0.0";
-  sha256 = "sha256-/o4er8bO/3HUFXzP+sC+5DYv9EwmxW05o1RT5fEulEg=";
+  version = "1.1.0";
+  sha256 = "sha256-563xOz63vto19yuaHtReV1dSw6BgNf+CLtS3lrPnaoc=";
 
   pname = "pridefetch";
   src = fetchFromGitHub {

From 290707f8410f7c64322f22485a18074840208b9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Oct 2022 05:15:49 +0000
Subject: [PATCH 11/56] treesheets: unstable-2022-09-26 -> unstable-2022-10-11

---
 pkgs/applications/office/treesheets/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix
index 7b1fd1ae73a8..6a0bb48c7ded 100644
--- a/pkgs/applications/office/treesheets/default.nix
+++ b/pkgs/applications/office/treesheets/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "treesheets";
-  version = "unstable-2022-09-26";
+  version = "unstable-2022-10-11";
 
   src = fetchFromGitHub {
     owner = "aardappel";
     repo = "treesheets";
-    rev = "4778c343ac78a3b3ccdaf079187b53d8cd64e235";
-    sha256 = "UyltzT9B+7/hME7famQa/XgrDPaNw3apwchKgxwscOo=";
+    rev = "be79e537c148d961d40137a7f83d7bdcc4119dd6";
+    sha256 = "GKRxb6W9PDY7nzgPTPRPmA9GBvD4zLaZwnalZan3+m0=";
   };
 
   nativeBuildInputs = [

From d560440cfbdde99f7df60a07d1b122e21bcfda3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Oct 2022 05:38:08 +0000
Subject: [PATCH 12/56] python310Packages.tgcrypto: 1.2.3 -> 1.2.4

---
 pkgs/development/python-modules/tgcrypto/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/tgcrypto/default.nix b/pkgs/development/python-modules/tgcrypto/default.nix
index 728676b53b38..a1188e8f0104 100644
--- a/pkgs/development/python-modules/tgcrypto/default.nix
+++ b/pkgs/development/python-modules/tgcrypto/default.nix
@@ -7,15 +7,15 @@
 
 buildPythonPackage rec {
   pname = "tgcrypto";
-  version = "1.2.3";
+  version = "1.2.4";
 
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "pyrogram";
     repo = "tgcrypto";
-    rev = "v${version}";
-    sha256 = "06g1kv3skq2948h0sjf64s1cr2p1rhxnx5pf9nmvhxkmri1xmfzs";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-hifRWVEvNZVFyIJPwYY+CDR04F1I9GyAi3dt2kx+81c=";
   };
 
   checkInputs = [

From 31fa7802506dbb3fe23f43742767acafe016d647 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Oct 2022 05:55:45 +0000
Subject: [PATCH 13/56] python310Packages.trimesh: 3.15.3 -> 3.15.4

---
 pkgs/development/python-modules/trimesh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 5bd24653f30d..9fd7048166c4 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.15.3";
+  version = "3.15.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-wvoxZXSlPWEifwP4Gdgg4wsVjDGm5NzhaZjAUZ886ZI=";
+    sha256 = "sha256-D9hgnaX9YdYvYApIc5IB2hHyJSJFm9Tgia5KlwM56Rw=";
   };
 
   propagatedBuildInputs = [ numpy ];

From 16085338c099f5882101c4ed8160c6a4ab97f001 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Wed, 12 Oct 2022 08:22:32 +0000
Subject: [PATCH 14/56] bingo: 0.6.0 -> 0.7.0

---
 .../tools/bingo/bingo_version.patch           | 13 ------------
 pkgs/development/tools/bingo/default.nix      | 21 ++++---------------
 pkgs/development/tools/bingo/version_go.patch | 17 ---------------
 3 files changed, 4 insertions(+), 47 deletions(-)
 delete mode 100644 pkgs/development/tools/bingo/bingo_version.patch
 delete mode 100644 pkgs/development/tools/bingo/version_go.patch

diff --git a/pkgs/development/tools/bingo/bingo_version.patch b/pkgs/development/tools/bingo/bingo_version.patch
deleted file mode 100644
index a3d85df6a9ce..000000000000
--- a/pkgs/development/tools/bingo/bingo_version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/pkg/version/version.go b/pkg/version/version.go
-index 30f8f30..11c12a0 100644
---- a/pkg/version/version.go
-+++ b/pkg/version/version.go
-@@ -6,7 +6,7 @@ package version
- import "github.com/Masterminds/semver"
- 
- // Version returns 'bingo' version.
--const Version = "v0.6"
-+const Version = "v0.6.0"
- 
- var (
- 	Go114 = semver.MustParse("1.14")
diff --git a/pkgs/development/tools/bingo/default.nix b/pkgs/development/tools/bingo/default.nix
index 1b4ddd41c0e3..0c0d90bb9fc9 100644
--- a/pkgs/development/tools/bingo/default.nix
+++ b/pkgs/development/tools/bingo/default.nix
@@ -1,24 +1,17 @@
-{ lib, buildGoModule, fetchFromGitHub, testers, bingo }:
+{ lib, buildGoModule, fetchFromGitHub }:
 
 buildGoModule rec {
   pname = "bingo";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "bwplotka";
     repo = "bingo";
     rev = "v${version}";
-    sha256 = "sha256-t2nkY+mwek2NcbCwCkI3Mc1ULEJIjatBjChBdnKFAg8=";
+    sha256 = "sha256-s+vdtMzeHUtUlmMlvgnK83RYoMqS3GqrTnu7LssIK6A=";
   };
 
-  vendorSha256 = "sha256-TCbwIHDg2YaLIscCoGPRBv5G3YSJ+qn/koOjPh+KKRY=";
-
-  patches = [
-    # Do not execute `go` command when invoking `bingo version`.
-    ./version_go.patch
-    # Specific to v0.6.0. `v0.6` -> `v0.6.0`
-    ./bingo_version.patch
-  ];
+  vendorSha256 = "sha256-28p1g+p+guJ0x4/5QDGsGN6gDnZkE4AKF/2cFgNjPDM=";
 
   postPatch = ''
     rm get_e2e_test.go get_e2e_utils_test.go
@@ -28,12 +21,6 @@ buildGoModule rec {
 
   ldflags = [ "-s" "-w" ];
 
-  passthru.tests.version = testers.testVersion {
-    package = bingo;
-    command = "bingo version";
-    version = "v${version}";
-  };
-
   meta = with lib; {
     description = "Like `go get` but for Go tools! CI Automating versioning of Go binaries in a nested, isolated Go modules.";
     homepage = "https://github.com/bwplotka/bingo";
diff --git a/pkgs/development/tools/bingo/version_go.patch b/pkgs/development/tools/bingo/version_go.patch
deleted file mode 100644
index 2898326a0547..000000000000
--- a/pkgs/development/tools/bingo/version_go.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/main.go b/main.go
-index 5600f7e..662ed1b 100644
---- a/main.go
-+++ b/main.go
-@@ -201,10 +201,8 @@ func main() {
- 			return pkgs.PrintTab(target, os.Stdout)
- 		}
- 	case "version":
--		cmdFunc = func(ctx context.Context, r *runner.Runner) error {
--			_, err := fmt.Fprintln(os.Stdout, version.Version)
--			return err
--		}
-+		_, _ = fmt.Fprintln(os.Stdout, version.Version)
-+		return
- 	default:
- 		exitOnUsageError(flags.Usage, "No such command", flags.Arg(0))
- 	}

From 73e93f456c9ec5c7e15d0bf33462ce6b0a4bae03 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Wed, 12 Oct 2022 11:26:50 +0300
Subject: [PATCH 15/56] kubedog: init at 0.9.6

---
 .../networking/cluster/kubedog/default.nix    | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kubedog/default.nix

diff --git a/pkgs/applications/networking/cluster/kubedog/default.nix b/pkgs/applications/networking/cluster/kubedog/default.nix
new file mode 100644
index 000000000000..9c1b14e6dd20
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kubedog/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, buildGoModule
+, fetchFromGitHub
+, testers
+, kubedog
+}:
+
+buildGoModule rec {
+  pname = "kubedog";
+  version = "0.9.6";
+
+  src = fetchFromGitHub {
+    owner = "werf";
+    repo = "kubedog";
+    rev = "v${version}";
+    hash = "sha256-mwITvv2MuqzH1aB4iTVaFfZljyqOAu7vl4cORHT/OXQ=";
+  };
+
+  vendorHash = "sha256-HBo26cPiWJPDpsjPYUEBraHB2SZsUttrlBKpB9/SS6o=";
+
+  subPackages = [ "cmd/kubedog" ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/werf/kubedog.Version=${src.rev}"
+  ];
+
+  # There are no tests.
+  doCheck = false;
+
+  passthru.tests.version = testers.testVersion {
+    package = kubedog;
+    command = "kubedog version";
+    version = src.rev;
+  };
+
+  meta = with lib; {
+    description = ''
+      A tool to watch and follow Kubernetes resources in CI/CD deployment
+      pipelines
+    '';
+    homepage = "https://github.com/werf/kubedog";
+    changelog = "https://github.com/werf/kubedog/releases/tag/${src.rev}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ azahi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 673f42bd5df8..09a33800986c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29409,6 +29409,8 @@ with pkgs;
 
   kubedb-cli = callPackage ../applications/networking/cluster/kubedb-cli { };
 
+  kubedog = callPackage ../applications/networking/cluster/kubedog { };
+
   kubecfg = callPackage ../applications/networking/cluster/kubecfg { };
 
   kube-score = callPackage ../applications/networking/cluster/kube-score { };

From 57dd8624991d73de0473513a282333b565db4501 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Oct 2022 11:12:27 +0000
Subject: [PATCH 16/56] copilot-cli: 1.22.0 -> 1.22.1

---
 pkgs/tools/admin/copilot-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/copilot-cli/default.nix b/pkgs/tools/admin/copilot-cli/default.nix
index 0031004a0fa3..bac1cbd375f2 100644
--- a/pkgs/tools/admin/copilot-cli/default.nix
+++ b/pkgs/tools/admin/copilot-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "copilot-cli";
-  version = "1.22.0";
+  version = "1.22.1";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ApIEMUit0iVwVGq48qPhQG+i4+HCCwPmiH/QQOdZNjs=";
+    sha256 = "sha256-Jm4UTwWuqbtckIoXD7YVQk2MQlvzdfRbLW7YA+CmhDE=";
   };
 
-  vendorSha256 = "sha256-GKGMM5oFfEuXS1utbmIcH/5COqfNrSUzthLQSUxSkbo=";
+  vendorSha256 = "sha256-MOFPuxn6LwPUw0A14OXhZefAgvtm+9qcDTR3kfwCtjQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 61a13e2dc7a12a6b2a75c994f0f331103da31bf2 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 8 Oct 2022 00:35:04 +0200
Subject: [PATCH 17/56] =?UTF-8?q?selfoss:=202.18=20=E2=86=92=202.19?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/fossar/selfoss/releases/tag/2.19
---
 pkgs/servers/web-apps/selfoss/default.nix | 29 +++++++++++++++--------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix
index 383c57ee9382..b0b888012f46 100644
--- a/pkgs/servers/web-apps/selfoss/default.nix
+++ b/pkgs/servers/web-apps/selfoss/default.nix
@@ -1,26 +1,35 @@
-{ lib, stdenv, fetchurl, unzip }:
+{ lib, stdenvNoCC, fetchurl, unzip }:
 
-stdenv.mkDerivation rec {
+stdenvNoCC.mkDerivation rec {
   pname = "selfoss";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchurl {
-    url = "https://github.com/SSilence/selfoss/releases/download/${version}/${pname}-${version}.zip";
-    sha256 = "1vd699r1kjc34n8avggckx2b0daj5rmgrj997sggjw2inaq4cg8b";
+    url = "https://github.com/SSilence/selfoss/releases/download/${version}/selfoss-${version}.zip";
+    sha256 = "5JxHUOlyMneWPKaZtgLwn5FI4rnyWPzmsUQpSYrw5Pw=";
   };
 
-  sourceRoot = ".";
-  nativeBuildInputs = [ unzip ];
+  nativeBuildInputs = [
+    unzip
+  ];
 
   installPhase = ''
-    mkdir $out
-    cp -ra * $out/
+    runHook preInstall
+
+    mkdir "$out"
+    cp -ra \
+      .htaccess \
+      .nginx.conf \
+      * \
+      "$out/"
+
+    runHook postInstall
   '';
 
   meta = with lib; {
     description = "Web-based news feed (RSS/Atom) aggregator";
     homepage = "https://selfoss.aditu.de";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
     maintainers = with maintainers; [ jtojnar regnat ];
     platforms = platforms.all;
   };

From fca1f7508b6d4c1077124fa3c51c67e84b1a4078 Mon Sep 17 00:00:00 2001
From: laalsaas <laalsaas@systemli.org>
Date: Tue, 11 Oct 2022 23:00:35 +0200
Subject: [PATCH 18/56] maintainers: add laalsaas

---
 maintainers/maintainer-list.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6030ae15c982..cf9dfaf507cc 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7475,6 +7475,10 @@
     githubId = 72546287;
     name = "L3af";
   };
+  laalsaas = {
+    email = "laalsaas@systemli.org";
+    name = "laalsaas";
+  };
   lach = {
     email = "iam@lach.pw";
     github = "CertainLach";

From 790c45e29ced477c88f6a37078a00b994ba77099 Mon Sep 17 00:00:00 2001
From: laalsaas <laalsaas@systemli.org>
Date: Wed, 12 Oct 2022 13:57:45 +0200
Subject: [PATCH 19/56] wwcd: init at unstable-2022-02-05

---
 pkgs/tools/misc/wwcd/default.nix | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/wwcd/default.nix

diff --git a/pkgs/tools/misc/wwcd/default.nix b/pkgs/tools/misc/wwcd/default.nix
new file mode 100644
index 000000000000..d18c72a25eeb
--- /dev/null
+++ b/pkgs/tools/misc/wwcd/default.nix
@@ -0,0 +1,31 @@
+{ stdenv
+, lib
+, fetchFromSourcehut
+, autoreconfHook
+, pkg-config
+, check
+}:
+
+stdenv.mkDerivation rec {
+  pname = "wwcd";
+  version = "unstable-2022-02-05";
+
+  src = fetchFromSourcehut {
+    owner = "~bitfehler";
+    repo = pname;
+    rev = "cdf70bb18dc60c66c074d4810cb37b9e697811e5";
+    sha256 = "sha256-laf1DEtdEs7q+rtp5Y5rb+7AGsKUv5T413CFWJiURWw=";
+  };
+
+  autoreconfFlags = "-if";
+  nativeBuildInputs = [
+    autoreconfHook pkg-config check
+  ];
+
+  meta = with lib; {
+    description = "What would cron do? Read crontab entries from stdin and print time of next execution(s)";
+    homepage = "https://git.sr.ht/~bitfehler/wwcd";
+    license = licenses.mit;
+    maintainers = with maintainers; [ laalsaas ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f75ae2d08e8..3a0605841598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1430,6 +1430,8 @@ with pkgs;
     use64 = true;
   };
 
+  wwcd = callPackage ../tools/misc/wwcd { };
+
   writedisk = callPackage ../tools/misc/writedisk { };
 
   xcd = callPackage ../tools/misc/xcd { };

From 7e99c2ed5bf1bbb5752a6ebabeed65bd05e7cb71 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 15 Sep 2022 19:23:51 +0300
Subject: [PATCH 20/56] plasma5Packages: 5.25.5 -> 5.26.0

---
 pkgs/desktops/plasma-5/aura-browser.nix       |  18 +
 pkgs/desktops/plasma-5/bluedevil.nix          |   6 +-
 pkgs/desktops/plasma-5/default.nix            |   5 +
 pkgs/desktops/plasma-5/discover.nix           |   4 +
 pkgs/desktops/plasma-5/fetch.sh               |   2 +-
 pkgs/desktops/plasma-5/kpipewire.nix          |  15 +
 pkgs/desktops/plasma-5/kscreen.nix            |   4 +-
 pkgs/desktops/plasma-5/libkscreen/default.nix |   4 +-
 pkgs/desktops/plasma-5/plank-player.nix       |  18 +
 pkgs/desktops/plasma-5/plasma-bigscreen.nix   |  48 ++
 .../plasma-5/plasma-desktop/default.nix       |   8 +-
 .../plasma-5/plasma-mobile/default.nix        |   4 +-
 pkgs/desktops/plasma-5/plasma-nm/default.nix  |   4 +-
 pkgs/desktops/plasma-5/plasma-pa.nix          |   4 +-
 .../plasma-5/plasma-remotecontrollers.nix     |  41 ++
 .../0002-absolute-wallpaper-install-dir.patch |  22 +-
 .../plasma-5/plasma-workspace/default.nix     |  15 +-
 pkgs/desktops/plasma-5/srcs.nix               | 466 ++++++++++--------
 18 files changed, 435 insertions(+), 253 deletions(-)
 create mode 100644 pkgs/desktops/plasma-5/aura-browser.nix
 create mode 100644 pkgs/desktops/plasma-5/kpipewire.nix
 create mode 100644 pkgs/desktops/plasma-5/plank-player.nix
 create mode 100644 pkgs/desktops/plasma-5/plasma-bigscreen.nix
 create mode 100644 pkgs/desktops/plasma-5/plasma-remotecontrollers.nix

diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix
new file mode 100644
index 000000000000..b012417a6bc7
--- /dev/null
+++ b/pkgs/desktops/plasma-5/aura-browser.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation,
+  extra-cmake-modules,
+  qtwebengine,
+  qtquickcontrols2,
+  kirigami2,
+  ki18n,
+}:
+mkDerivation {
+  pname = "aura-browser";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    qtwebengine
+    qtquickcontrols2
+    kirigami2
+    ki18n
+  ];
+}
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 0474d875997f..389746f17af9 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,8 +1,8 @@
 {
   mkDerivation, lib, extra-cmake-modules, shared-mime-info,
   qtbase, qtdeclarative, bluez-qt,
-  kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications,
-  kwidgetsaddons, kwindowsystem, plasma-framework
+  kcoreaddons, kcmutils, kdbusaddons, kded, ki18n, kiconthemes, kio,
+  knotifications, kwidgetsaddons, kwindowsystem, plasma-framework
 }:
 
 mkDerivation {
@@ -11,6 +11,6 @@ mkDerivation {
   buildInputs = [
     qtbase qtdeclarative bluez-qt
     ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded
-    kiconthemes knotifications kwidgetsaddons
+    kiconthemes knotifications kwidgetsaddons kcmutils
   ];
 }
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 09027d368083..581bd25027fd 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -103,6 +103,7 @@ let
       };
 
     in {
+      aura-browser = callPackage ./aura-browser.nix {};
       bluedevil = callPackage ./bluedevil.nix {};
       breeze-gtk = callPackage ./breeze-gtk.nix {};
       breeze-qt5 = callPackage ./breeze-qt5.nix {};
@@ -118,6 +119,7 @@ let
       khotkeys = callPackage ./khotkeys.nix {};
       kinfocenter = callPackage ./kinfocenter.nix {};
       kmenuedit = callPackage ./kmenuedit.nix {};
+      kpipewire = callPackage ./kpipewire.nix {};
       kscreen = callPackage ./kscreen.nix {};
       kscreenlocker = callPackage ./kscreenlocker.nix {};
       ksshaskpass = callPackage ./ksshaskpass.nix {};
@@ -132,6 +134,8 @@ let
       milou = callPackage ./milou.nix {};
       oxygen = callPackage ./oxygen.nix {};
       oxygen-sounds = callPackage ./oxygen-sounds.nix {};
+      plank-player = callPackage ./plank-player.nix {};
+      plasma-bigscreen = callPackage ./plasma-bigscreen.nix {};
       plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
       plasma-desktop = callPackage ./plasma-desktop {};
       plasma-disks = callPackage ./plasma-disks.nix {};
@@ -140,6 +144,7 @@ let
       plasma-nano = callPackage ./plasma-nano {};
       plasma-nm = callPackage ./plasma-nm {};
       plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
+      plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix {};
       plasma-sdk = callPackage ./plasma-sdk.nix {};
       plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
       plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix
index dd6c7a3008ca..82c636bf7a51 100644
--- a/pkgs/desktops/plasma-5/discover.nix
+++ b/pkgs/desktops/plasma-5/discover.nix
@@ -14,6 +14,7 @@
 , util-linux
 , qtbase
 , qtquickcontrols2
+, qtwebview
 , qtx11extras
 , karchive
 , kcmutils
@@ -26,6 +27,7 @@
 , kirigami2
 , kitemmodels
 , knewstuff
+, kpurpose
 , kwindowsystem
 , kxmlgui
 , plasma-framework
@@ -45,6 +47,7 @@ mkDerivation {
     pcre
     util-linux
     qtquickcontrols2
+    qtwebview
     qtx11extras
     karchive
     kcmutils
@@ -57,6 +60,7 @@ mkDerivation {
     kirigami2
     kitemmodels
     knewstuff
+    kpurpose
     kwindowsystem
     kxmlgui
     plasma-framework
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 95361c1173e2..8464646a592b 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.5/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.26.0/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix
new file mode 100644
index 000000000000..41191e6f4c6a
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kpipewire.nix
@@ -0,0 +1,15 @@
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kwayland, ki18n, kcoreaddons, plasma-wayland-protocols,
+  libepoxy, ffmpeg, mesa, pipewire, wayland
+}:
+
+mkDerivation {
+  pname = "kpipewire";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kwayland ki18n kcoreaddons plasma-wayland-protocols
+    libepoxy ffmpeg mesa pipewire wayland
+  ];
+}
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 49f77fc5ff8c..0d67c702dd5c 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules,
   kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
   kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
-  kwindowsystem, kdeclarative, plasma-framework, qtx11extras
+  kwindowsystem, kdeclarative, plasma-framework, qtx11extras, layer-shell-qt
 }:
 
 mkDerivation {
@@ -12,6 +12,6 @@ mkDerivation {
   buildInputs = [
     kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
     kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
-    kwindowsystem kdeclarative plasma-framework qtx11extras
+    kwindowsystem kdeclarative plasma-framework qtx11extras layer-shell-qt
   ];
 }
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index 6798a2cdcb0e..cebe1ad4451e 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, propagate,
   extra-cmake-modules,
   qtbase,
-  wayland-scanner, kwayland,
+  wayland-scanner, kconfig, kwayland,
   plasma-wayland-protocols, wayland,
   libXrandr, qtx11extras
 }:
@@ -10,7 +10,7 @@
 mkDerivation {
   pname = "libkscreen";
   nativeBuildInputs = [ extra-cmake-modules wayland-scanner ];
-  buildInputs = [ kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ];
+  buildInputs = [ kconfig kwayland plasma-wayland-protocols wayland libXrandr qtx11extras ];
   outputs = [ "out" "dev" ];
   patches = [
     ./libkscreen-backends-path.patch
diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix
new file mode 100644
index 000000000000..536db96ef3c3
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plank-player.nix
@@ -0,0 +1,18 @@
+{
+  mkDerivation,
+  extra-cmake-modules,
+  qtquickcontrols2,
+  qtmultimedia,
+  kirigami2,
+  ki18n,
+}:
+mkDerivation {
+  pname = "plank-player";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    qtquickcontrols2
+    qtmultimedia
+    kirigami2
+    ki18n
+  ];
+}
diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix
new file mode 100644
index 000000000000..96b7b148fa08
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-bigscreen.nix
@@ -0,0 +1,48 @@
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kactivities,
+  kactivities-stats,
+  plasma-framework,
+  ki18n,
+  kirigami2,
+  kdeclarative,
+  kcmutils,
+  knotifications,
+  kio,
+  kwayland,
+  kwindowsystem,
+  plasma-workspace,
+  qtmultimedia,
+}:
+mkDerivation {
+  pname = "plasma-bigscreen";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kactivities
+    kactivities-stats
+    plasma-framework
+    ki18n
+    kirigami2
+    kdeclarative
+    kcmutils
+    knotifications
+    kio
+    kwayland
+    kwindowsystem
+    plasma-workspace
+    qtmultimedia
+  ];
+
+  postPatch = ''
+    substituteInPlace bin/plasma-bigscreen-wayland.in \
+      --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
+  '';
+
+  preFixup = ''
+    wrapQtApp $out/bin/plasma-bigscreen-x11
+    wrapQtApp $out/bin/plasma-bigscreen-wayland
+  '';
+
+  passthru.providedSessions = [ "plasma-bigscreen-x11" "plasma-bigscreen-wayland" ];
+}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 6c8d8a3bc4b6..6ab13f0c7261 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,10 +1,10 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
+  extra-cmake-modules, kdoctools, wayland-scanner,
 
   boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
   libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
-  xorgserver, util-linux,
+  xorgserver, util-linux, wayland, wayland-protocols,
 
   accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
   qtx11extras,
@@ -18,11 +18,11 @@
 
 mkDerivation {
   pname = "plasma-desktop";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
     boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
     libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput
-    xkeyboard_config
+    xkeyboard_config wayland wayland-protocols
 
     accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
 
diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
index 3625376f6c2b..41324d53b6a7 100644
--- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
@@ -27,7 +27,7 @@ mkDerivation {
   ];
 
   postPatch = ''
-    substituteInPlace bin/kwinwrapper.in \
+    substituteInPlace bin/startplasmamobile.in \
       --replace @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec"
 
     substituteInPlace bin/plasma-mobile.desktop.cmake \
@@ -36,7 +36,7 @@ mkDerivation {
 
   # Ensures dependencies like libqofono (at the very least) are present for the shell.
   preFixup = ''
-    wrapQtApp "$out/bin/kwinwrapper"
+    wrapQtApp "$out/bin/startplasmamobile"
   '';
 
   passthru.providedSessions = [ "plasma-mobile" ];
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 54c8079cf5f4..28331fc70738 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, substituteAll,
   extra-cmake-modules, kdoctools,
-  kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
+  kcmutils, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
   ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet,
   kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid,
 
@@ -15,7 +15,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
   buildInputs = [
     kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion
-    kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kcmutils kconfigwidgets kcoreaddons kdbusaddons kiconthemes
     kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
     prison solid
 
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index 9e47356579e3..b0a4e614bf32 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
-  kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
+  kcmutils, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
   qtbase, qtdeclarative,
   gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
 }:
@@ -12,7 +12,7 @@ mkDerivation {
   buildInputs = [
     gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop
 
-    kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
+    kcmutils kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
     kwindowsystem
 
     qtbase qtdeclarative
diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
new file mode 100644
index 000000000000..a1688e939c7b
--- /dev/null
+++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
@@ -0,0 +1,41 @@
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kconfig,
+  knotifications,
+  ki18n,
+  solid,
+  kcoreaddons,
+  kdeclarative,
+  kcmutils,
+  kpackage,
+  kwindowsystem,
+  wayland,
+  pkg-config,
+  libcec,
+  libcec_platform,
+  libevdev,
+  plasma-workspace,
+  plasma-wayland-protocols,
+}:
+mkDerivation {
+  pname = "plasma-remotecontrollers";
+  nativeBuildInputs = [ extra-cmake-modules pkg-config ];
+  buildInputs = [
+    kconfig
+    knotifications
+    ki18n
+    solid
+    kcoreaddons
+    kdeclarative
+    kcmutils
+    kpackage
+    kwindowsystem
+    wayland
+    libcec
+    libcec_platform
+    libevdev
+    plasma-workspace
+    plasma-wayland-protocols
+  ];
+}
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
index 211316e24736..45c9f695b452 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch
@@ -1,23 +1,9 @@
-From 914d2ec5e669ecf8771cc1308028990f733fb8cc Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Wed, 5 Feb 2020 05:03:11 -0600
-Subject: [PATCH] absolute-wallpaper-install-dir
-
----
- sddm-theme/theme.conf.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
-index a560da3..f723c1e 100644
---- a/sddm-theme/theme.conf.cmake
-+++ b/sddm-theme/theme.conf.cmake
+--- a/lookandfeel/sddm-theme/theme.conf.cmake
++++ b/lookandfeel/sddm-theme/theme.conf.cmake
 @@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
  type=image
  color=#1d99f3
  fontSize=10
--background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg
-+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg
+-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
  needsFullUserModel=false
--- 
-2.30.0
-
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index ce17561d73fc..27fb2b0c594e 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -12,10 +12,10 @@
   kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
   kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
   phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
-  appstream-qt, plasma-wayland-protocols,
+  appstream-qt, plasma-wayland-protocols, kpipewire, libkexiv2,
 
   qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
-  qtwayland, qtx11extras, qqc2-desktop-style,
+  qtwayland, qtx11extras, qqc2-desktop-style, polkit-qt,
 
   pipewire, libdrm
 }:
@@ -35,10 +35,11 @@ mkDerivation {
     knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
     ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
     libqalculate networkmanager-qt phonon plasma-framework prison solid
-    kholidays kquickcharts appstream-qt plasma-wayland-protocols
+    kholidays kquickcharts appstream-qt plasma-wayland-protocols kpipewire
+    libkexiv2
 
     qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
-    qtx11extras qqc2-desktop-style
+    qtx11extras qqc2-desktop-style polkit-qt
 
     pipewire libdrm
   ];
@@ -60,6 +61,12 @@ mkDerivation {
       --replace 'ecm_query_qt(QtBinariesDir QT_INSTALL_BINS)' 'set(QtBinariesDir "${lib.getBin qttools}/bin")'
   '';
 
+  # work around wrapQtAppsHook double-wrapping kcminit_startup,
+  # which is a symlink to kcminit
+  postFixup = ''
+    ln -sf $out/bin/kcminit $out/bin/kcminit_startup
+  '';
+
   NIX_CFLAGS_COMPILE = [
     ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
     ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"''
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 7db192740255..c600d8039924 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,428 +3,468 @@
 { fetchurl, mirror }:
 
 {
-  bluedevil = {
-    version = "5.25.5";
+  aura-browser = {
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/bluedevil-5.25.5.tar.xz";
-      sha256 = "1dsah7rcx2brcd1d5x7bvhrixx5nvwp1fwq9b8k2zc038xzpx6ys";
-      name = "bluedevil-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/aura-browser-5.26.0.tar.xz";
+      sha256 = "1r43p7jjmsjhav6b3zdk9lx8cg56dapxd6sh2c6cwc1xy8pmvpm9";
+      name = "aura-browser-5.26.0.tar.xz";
+    };
+  };
+  bluedevil = {
+    version = "5.26.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.26.0/bluedevil-5.26.0.tar.xz";
+      sha256 = "1br3vj7xxgzzc82fw1qq1zqk9gcpl5dpmlz61lqq87wnjhqb6xdj";
+      name = "bluedevil-5.26.0.tar.xz";
     };
   };
   breeze = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/breeze-5.25.5.tar.xz";
-      sha256 = "0m3ggv5znzfcp25afgl7v5w7m27v5hdvv6jw9vrvwbqj8lzq1hlx";
-      name = "breeze-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/breeze-5.26.0.tar.xz";
+      sha256 = "0z2371bwv7m1zhlgby8vjvx5qblpf94281p5l3qa22ws0k4jgv8i";
+      name = "breeze-5.26.0.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/breeze-grub-5.25.5.tar.xz";
-      sha256 = "1w5lrnfhnzd9mjs93r1y8f9mlpqd7jlrjwzfryy919alqsxfpyyl";
-      name = "breeze-grub-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/breeze-grub-5.26.0.tar.xz";
+      sha256 = "12fpxnddcvig9zgj3knjkarl4y2kywgqg60cdjj3shsk2q6q2lh0";
+      name = "breeze-grub-5.26.0.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/breeze-gtk-5.25.5.tar.xz";
-      sha256 = "0wj8qzy2104ggczxagxm45zwsvvpwd6jjnbv1893mhlr6f2zrbmh";
-      name = "breeze-gtk-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/breeze-gtk-5.26.0.tar.xz";
+      sha256 = "1q3lf5sj9f0fx4ahdffd16m0ak4q742b6zpw6crvz4cymh3n9fy8";
+      name = "breeze-gtk-5.26.0.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/breeze-plymouth-5.25.5.tar.xz";
-      sha256 = "1p9xgcxx543dddpz7sahk1ky6inzl9lyaf0z506vh91xs5rn0srv";
-      name = "breeze-plymouth-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/breeze-plymouth-5.26.0.tar.xz";
+      sha256 = "04xhdy89p83p8dhhs40hkp2xlpj20j4l2dwiry9qaqd1yk331gz8";
+      name = "breeze-plymouth-5.26.0.tar.xz";
     };
   };
   discover = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/discover-5.25.5.tar.xz";
-      sha256 = "01vdi66c7v60db25p0qi0q73wgqw6dy2kirbk34bvhld41gpxhhv";
-      name = "discover-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/discover-5.26.0.tar.xz";
+      sha256 = "0w7i9w5y1ybd1qzzx1psgf97960bdjkbdr1p90jymqwflcr5yjyz";
+      name = "discover-5.26.0.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/drkonqi-5.25.5.tar.xz";
-      sha256 = "0vw4bfld2jdiwm4g3008x8s1lq1ydf87ckb0fvyzsp11hq9nnnk7";
-      name = "drkonqi-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/drkonqi-5.26.0.tar.xz";
+      sha256 = "01zsyy4v6ss3iflman0p3m3cq3ckbwjd6928frdvdlvc5w35zrj1";
+      name = "drkonqi-5.26.0.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kactivitymanagerd-5.25.5.tar.xz";
-      sha256 = "0hsllhqi46n25sr27crnad053ghk3hni2w496g6d2qfmi20l3g4n";
-      name = "kactivitymanagerd-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kactivitymanagerd-5.26.0.tar.xz";
+      sha256 = "1l8dncc2ijwg5vxd0l05fd2x3ssbvnhk5m4hhy6k84xaxjvinqnj";
+      name = "kactivitymanagerd-5.26.0.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kde-cli-tools-5.25.5.tar.xz";
-      sha256 = "0i1lnkyb2bdvbhnr2wsgjy2sjichzxxqkvn30ca85rj21cavk2z3";
-      name = "kde-cli-tools-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kde-cli-tools-5.26.0.tar.xz";
+      sha256 = "0w4nx2zdwaaqhm7xrqh0s5p2yp0wjwj0svyr396z8lapimgjn80l";
+      name = "kde-cli-tools-5.26.0.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kde-gtk-config-5.25.5.tar.xz";
-      sha256 = "0zr4626fmx5adg65qa0npc222kjxmhml1i014gsrmjmsp0s5w8pw";
-      name = "kde-gtk-config-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kde-gtk-config-5.26.0.tar.xz";
+      sha256 = "0yffhbrkh204ma8pv11256hn290gml4pmhgplygpwbn7ir9ir72p";
+      name = "kde-gtk-config-5.26.0.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kdecoration-5.25.5.tar.xz";
-      sha256 = "1x3scszz5nfwqciwc3bv0r04wgqlxs0c9j1090zvn6mjjg2nsyb7";
-      name = "kdecoration-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kdecoration-5.26.0.tar.xz";
+      sha256 = "0cd67mmqriqcx1xvkx7s1zz01y6gc614g0qv6i2ybd6p5r2f3qcb";
+      name = "kdecoration-5.26.0.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kdeplasma-addons-5.25.5.tar.xz";
-      sha256 = "1a5cq0jz69hlcr22wxi2p5mzxv5xcp88220irxmq0dhpk85kywlx";
-      name = "kdeplasma-addons-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kdeplasma-addons-5.26.0.tar.xz";
+      sha256 = "1nfnvbm27rb2sljg01m4s61yqz7pw4h7z5zjp2n1x6l1gmbsbh1h";
+      name = "kdeplasma-addons-5.26.0.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kgamma5-5.25.5.tar.xz";
-      sha256 = "1c305bs50km7bsn0phz7yj4x2168sxwsw9zxbpcgw4q3r53c0ywz";
-      name = "kgamma5-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kgamma5-5.26.0.tar.xz";
+      sha256 = "117pwi6ykyhkp7vfpvgxz158m4a76b75mkynichn0b5k3q8svy4h";
+      name = "kgamma5-5.26.0.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/khotkeys-5.25.5.tar.xz";
-      sha256 = "0c9i4vxiiv90dpzsd2hjwavks87cvwplkj63751z8mazax6r95as";
-      name = "khotkeys-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/khotkeys-5.26.0.tar.xz";
+      sha256 = "02inmqfrsp3w3pig45m3ay544vhdhmrx0alf36van561w76kkdc5";
+      name = "khotkeys-5.26.0.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kinfocenter-5.25.5.tar.xz";
-      sha256 = "0zvki76yghkn158s7hb5g9drz7xaqxkmp2747404n2n0gmnmsdif";
-      name = "kinfocenter-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kinfocenter-5.26.0.tar.xz";
+      sha256 = "0nif06xsf7nmgyb3d1navz3vykw88xk88fzgqnax001cmrmiph82";
+      name = "kinfocenter-5.26.0.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kmenuedit-5.25.5.tar.xz";
-      sha256 = "0z85w7w207dnsinsz8yg6s408pwfy3l7wjkcsjpyg8aj8s9x6nl7";
-      name = "kmenuedit-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kmenuedit-5.26.0.tar.xz";
+      sha256 = "1cfinj96la1c4nkz885lfybk5fw8z8d42yshb3nks66r528xgsmi";
+      name = "kmenuedit-5.26.0.tar.xz";
+    };
+  };
+  kpipewire = {
+    version = "5.26.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.26.0/kpipewire-5.26.0.tar.xz";
+      sha256 = "1vmynvwcf2ll6hbcgdkmmdfyvib6fk1cq3yi6n0qdrqvbcrg62bs";
+      name = "kpipewire-5.26.0.tar.xz";
     };
   };
   kscreen = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kscreen-5.25.5.tar.xz";
-      sha256 = "0361202n0366jiyv61w06jikh2i4s1fzr6x3chmdykx4fgvbqj7s";
-      name = "kscreen-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kscreen-5.26.0.tar.xz";
+      sha256 = "0ay5qc31b33q9h8isppga97vy1h5hrk8i44pbsr45qcjmigjkr16";
+      name = "kscreen-5.26.0.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kscreenlocker-5.25.5.tar.xz";
-      sha256 = "0mivx0l266310iy52qi94b6wi8w2a8nl7cjn5750x66dz81jl3yj";
-      name = "kscreenlocker-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kscreenlocker-5.26.0.tar.xz";
+      sha256 = "0gf77s8pn8nyjmy5y8khw9l3094lnjbj6cyhcsl817yncp7v44p4";
+      name = "kscreenlocker-5.26.0.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/ksshaskpass-5.25.5.tar.xz";
-      sha256 = "0z8pp2mh4s98jh8jkf6r8v014gb6svapmp0m1npzw7zcmr6jvpn6";
-      name = "ksshaskpass-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/ksshaskpass-5.26.0.tar.xz";
+      sha256 = "1wf5dn73g5whgf40g2irxm72lv6fhr3nillp8y6d08iw8p2mc9yc";
+      name = "ksshaskpass-5.26.0.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/ksystemstats-5.25.5.tar.xz";
-      sha256 = "07xm6gn2k3vsl1pkrd2n9w8w8b7jq26h3cpslqha4ipw0by2mlqa";
-      name = "ksystemstats-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/ksystemstats-5.26.0.tar.xz";
+      sha256 = "033b0b1qgkh27d708s6pzyra9dxy2h9fs0w4s0kvy9gkva1y2254";
+      name = "ksystemstats-5.26.0.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kwallet-pam-5.25.5.tar.xz";
-      sha256 = "14w803lc3s2c0f4mqzzdhpfy5qnlz7wv00pbrc3v4k3zv381ci8n";
-      name = "kwallet-pam-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kwallet-pam-5.26.0.tar.xz";
+      sha256 = "1krcnsnyfxz7k2q9pcipv6mvzajkcgmgxsknb9g5cvrh0hla3fxq";
+      name = "kwallet-pam-5.26.0.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kwayland-integration-5.25.5.tar.xz";
-      sha256 = "10xl7yrj519b9s5vq0hqqfz3vvg1fdwggw96snzm44iwycqbgss8";
-      name = "kwayland-integration-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kwayland-integration-5.26.0.tar.xz";
+      sha256 = "0h54mpj9z4cxb2f67lzp8zjm59xxlc35jffk2r0pyjs203a4247f";
+      name = "kwayland-integration-5.26.0.tar.xz";
     };
   };
   kwin = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kwin-5.25.5.tar.xz";
-      sha256 = "1dh7ydwxbb9r53p353d53gq7w9vmp7idvsr4s5ldxmah35436v2s";
-      name = "kwin-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kwin-5.26.0.tar.xz";
+      sha256 = "1z9980s4pz9q4wd2lgr6iahqcc6y02f02mprzfbq6mlcq1llg7rs";
+      name = "kwin-5.26.0.tar.xz";
     };
   };
   kwrited = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/kwrited-5.25.5.tar.xz";
-      sha256 = "03gw3czdgyf35n6x79x416rk6f7w1ayzmy5pb65v9733nx1j34mh";
-      name = "kwrited-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/kwrited-5.26.0.tar.xz";
+      sha256 = "173b5ppah5mapgx52hnkq6wfp6nn6z7mvm94mfz224r1vcr4841f";
+      name = "kwrited-5.26.0.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/layer-shell-qt-5.25.5.tar.xz";
-      sha256 = "1mvhklq7n9hhjing704jr3ybq58ixwr9fdg3phnqhmdnqc2q3w0l";
-      name = "layer-shell-qt-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/layer-shell-qt-5.26.0.tar.xz";
+      sha256 = "07mnrwk100mazrghg9biv4vlnnw92l88hwqchwkh541dgqa3s16y";
+      name = "layer-shell-qt-5.26.0.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/libkscreen-5.25.5.tar.xz";
-      sha256 = "17f2pbbkpmw3a32nsqlwd0x5xb71l6dzrh7ldwcqv46nvb54yhfa";
-      name = "libkscreen-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/libkscreen-5.26.0.tar.xz";
+      sha256 = "092y26bn7g1a2v1jv1d7r71xrp5a8kdnfvz58szs4d4qm1iyp6jf";
+      name = "libkscreen-5.26.0.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/libksysguard-5.25.5.tar.xz";
-      sha256 = "1gqsjsdkp25abqqp4f6cv6ih199q9ad7q1a4lkhjgsh4h8jq1856";
-      name = "libksysguard-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/libksysguard-5.26.0.tar.xz";
+      sha256 = "15ljaa6ypqdrb0x2b4chs7piq9pi4lm5hx36708has64xmrz9cj3";
+      name = "libksysguard-5.26.0.tar.xz";
     };
   };
   milou = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/milou-5.25.5.tar.xz";
-      sha256 = "0ijdbiq169sy47g0x22pj9x6abldpfxcnski4w1jh9hi9qz1rc25";
-      name = "milou-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/milou-5.26.0.tar.xz";
+      sha256 = "1g4ga1ylzj4zcdx3wh5y4rz84w5bwv7041bkp7b03pia2hwfgvy0";
+      name = "milou-5.26.0.tar.xz";
     };
   };
   oxygen = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/oxygen-5.25.5.tar.xz";
-      sha256 = "1szkaln4if8rafvjg2yjxarspf7lqls2pk0gzac89ncr7840c970";
-      name = "oxygen-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/oxygen-5.26.0.tar.xz";
+      sha256 = "0mbcdnv40j1jvc1i77rknrrs5xs6w5qaz7sliyygm2f01vgha6cz";
+      name = "oxygen-5.26.0.tar.xz";
     };
   };
   oxygen-sounds = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/oxygen-sounds-5.25.5.tar.xz";
-      sha256 = "04rn3ccqszznknvblz2i8r406m32hk4d3yzma4vzq93jfk57hdf1";
-      name = "oxygen-sounds-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/oxygen-sounds-5.26.0.tar.xz";
+      sha256 = "0ww7njndc4ilwsc16l5jv7cbq8mzjm9yz7x515fhvwqzwh61vd47";
+      name = "oxygen-sounds-5.26.0.tar.xz";
+    };
+  };
+  plank-player = {
+    version = "5.26.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.26.0/plank-player-5.26.0.tar.xz";
+      sha256 = "0jwhrhbbwblj8c7n13hg7ac3dbmnybsspq1gpcd16l797msdyp2k";
+      name = "plank-player-5.26.0.tar.xz";
+    };
+  };
+  plasma-bigscreen = {
+    version = "5.26.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.26.0/plasma-bigscreen-5.26.0.tar.xz";
+      sha256 = "1jmv2f60pbgfs110560h4gix1hj8awmlydrikcyn0p2hhc6xdc9r";
+      name = "plasma-bigscreen-5.26.0.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-browser-integration-5.25.5.tar.xz";
-      sha256 = "18pbn5ic5l3m8i1y99yprpwd4x4746aq3abqn1f2cq5h2683h2ia";
-      name = "plasma-browser-integration-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-browser-integration-5.26.0.tar.xz";
+      sha256 = "0vzkqhrafqwl5whqyjv1np37wzv5dm49gh4z3acv0yz83842asgl";
+      name = "plasma-browser-integration-5.26.0.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-desktop-5.25.5.tar.xz";
-      sha256 = "05s1pkwr4xmkghp8jrwcyrvjm83n68ngmk2694055xcfgi0pxicg";
-      name = "plasma-desktop-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-desktop-5.26.0.tar.xz";
+      sha256 = "0x5csx29x81szmmil4mlxmfcmz3v1q0n3q3f6k3p4knhpv77x7vx";
+      name = "plasma-desktop-5.26.0.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-disks-5.25.5.tar.xz";
-      sha256 = "0vci2cf8vx2lclypys9rmvjb8haakv6ksrvqm5j28pazbq2kskvl";
-      name = "plasma-disks-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-disks-5.26.0.tar.xz";
+      sha256 = "0wb31vnh8bs5wxl07wawji2l66pmnhn9li3smcygsx0qcqxsmcxm";
+      name = "plasma-disks-5.26.0.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-firewall-5.25.5.tar.xz";
-      sha256 = "0k3pc0dcsjr2hhh4hr8vhsvaddn66s6imm8skrr02icxqvljs6jh";
-      name = "plasma-firewall-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-firewall-5.26.0.tar.xz";
+      sha256 = "08ayf84ah294q473554zlgs8ri0l20bzc6gmbfrw833byviqwppr";
+      name = "plasma-firewall-5.26.0.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-integration-5.25.5.tar.xz";
-      sha256 = "1pab56cg2zi8fcaar53lhhh98iw7l07f5lkymkqhsh8a5crfc3yr";
-      name = "plasma-integration-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-integration-5.26.0.tar.xz";
+      sha256 = "0mqv9haanmp3q29ik2x07bmcfdly1icrzdcid76rlycnsr1v0qdg";
+      name = "plasma-integration-5.26.0.tar.xz";
     };
   };
   plasma-mobile = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-mobile-5.25.5.tar.xz";
-      sha256 = "1q4amdqvjbcx88qdyvhhl6j5f0f9p41b3k99zsqv381f94dpybn9";
-      name = "plasma-mobile-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-mobile-5.26.0.tar.xz";
+      sha256 = "0zw7ppg8fqqb6i2z0zacij4qzwki1ixxi3ky1qvk8q7pqb8n47y2";
+      name = "plasma-mobile-5.26.0.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-nano-5.25.5.tar.xz";
-      sha256 = "1kgglhr3cvg0crfr6di21kp1pfdc017qh3jnaf25f15bllypznq9";
-      name = "plasma-nano-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-nano-5.26.0.tar.xz";
+      sha256 = "0cnb1y8xwxq711ighi9zzw6x3npfwpf9865bi16hha8fk7vzn6z7";
+      name = "plasma-nano-5.26.0.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-nm-5.25.5.tar.xz";
-      sha256 = "036bx0qjrjanfxy8aiy6ab7rmm2h8l7wlkvlwhzw2hgl1w03xjps";
-      name = "plasma-nm-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-nm-5.26.0.tar.xz";
+      sha256 = "1bjy4iq1v2nkhl0ib2v26anxvpl6dns1c1zqf5w24rfmpdmxz6ky";
+      name = "plasma-nm-5.26.0.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-pa-5.25.5.tar.xz";
-      sha256 = "0g06pm1isnzx4hv6380rjpyr22s4j5iw9083s71vnl4npx28npvb";
-      name = "plasma-pa-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-pa-5.26.0.tar.xz";
+      sha256 = "00ajjrjyvjxhfxg9amsr009rwpg35r2c29679dypkxfldki81czz";
+      name = "plasma-pa-5.26.0.tar.xz";
+    };
+  };
+  plasma-remotecontrollers = {
+    version = "5.26.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.26.0/plasma-remotecontrollers-5.26.0.tar.xz";
+      sha256 = "0gwmhsqdkr5ra2r7iwasggkxmd0xw08fm7fqvdqcp8m7p0fzc9ap";
+      name = "plasma-remotecontrollers-5.26.0.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-sdk-5.25.5.tar.xz";
-      sha256 = "1z0cn0aiiivdb02r5vn8hm8hj9wbx053ksh5jgx2x048g67gmq96";
-      name = "plasma-sdk-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-sdk-5.26.0.tar.xz";
+      sha256 = "1wsgksds7ygq6d65x1yziqnicczq780gdx1z8xsfdw66gjajxf0r";
+      name = "plasma-sdk-5.26.0.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-systemmonitor-5.25.5.tar.xz";
-      sha256 = "0rs3avhpmfapzha8dkir9ny60ba2m92bbfv4avsd85vz5kggg29h";
-      name = "plasma-systemmonitor-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-systemmonitor-5.26.0.tar.xz";
+      sha256 = "1yj72qli0zjm0m20ys5djxcz2ab2v24l7grdk914x6yk4iz6pgs1";
+      name = "plasma-systemmonitor-5.26.0.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-tests-5.25.5.tar.xz";
-      sha256 = "14gdnyxl4fb5rqv1gpmp2wgx3x30pli919wjn835lbd2mf4rzwfq";
-      name = "plasma-tests-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-tests-5.26.0.tar.xz";
+      sha256 = "0hvklywisglygv74y2in9a8qkw00rqx78i0snw64hpmfl7n610p8";
+      name = "plasma-tests-5.26.0.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-thunderbolt-5.25.5.tar.xz";
-      sha256 = "1lbs4y163ccvd5zllazlp0f5v0g0rii1apbji9j7mr1n4w10wp16";
-      name = "plasma-thunderbolt-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-thunderbolt-5.26.0.tar.xz";
+      sha256 = "07davvxifdswm6s5v8sg3gzwd9s5b46q72c7jjnryjsb3gj0w755";
+      name = "plasma-thunderbolt-5.26.0.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-vault-5.25.5.tar.xz";
-      sha256 = "15nf4myl6sry0930m8qiixpr1i8bh1g58cy2gf304h029vr2fn5j";
-      name = "plasma-vault-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-vault-5.26.0.tar.xz";
+      sha256 = "0jx7i7xzi15hnwwscif0ilymfk2nrb93n8q5cjpr79gksmdwdajd";
+      name = "plasma-vault-5.26.0.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-5.25.5.tar.xz";
-      sha256 = "0pxwg3i07sipfchn4qkmlr6kcgqbhj2s10xq69wi32x1fc13jx5x";
-      name = "plasma-workspace-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-workspace-5.26.0.tar.xz";
+      sha256 = "1cjnalc1yyc3ijm9idjd7bsghr34mnrk7fkk8d6qr8azqm5x67w4";
+      name = "plasma-workspace-5.26.0.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plasma-workspace-wallpapers-5.25.5.tar.xz";
-      sha256 = "0pdgg8h6zwyxf1pj241mg3hd94wh38bqxj68af5jfp10xrwkzcyr";
-      name = "plasma-workspace-wallpapers-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plasma-workspace-wallpapers-5.26.0.tar.xz";
+      sha256 = "10da3xpm82nn971yb9zh3qls78ngcghab3ivknqc6jbqzkk9z76v";
+      name = "plasma-workspace-wallpapers-5.26.0.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/plymouth-kcm-5.25.5.tar.xz";
-      sha256 = "1knywmc6wdjqfq1xqli8hyi69kj7fvc0x0s246y7nrkskfc9ah67";
-      name = "plymouth-kcm-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/plymouth-kcm-5.26.0.tar.xz";
+      sha256 = "0y7c8wmxb9aigrs6l1rjwhx1hxyip1g4csy121kjisdxzp4fijcd";
+      name = "plymouth-kcm-5.26.0.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.25.5";
+    version = "1-5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/polkit-kde-agent-1-5.25.5.tar.xz";
-      sha256 = "1qb9nxlkgcv0c30l2vqgf9xs9d220q5pg7ikpb6zjzvj4wsvlvwd";
-      name = "polkit-kde-agent-1-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/polkit-kde-agent-1-5.26.0.tar.xz";
+      sha256 = "1fw8qh9yg87dq3vmxhas4qpx4zb0knf9nnz96fvcmfnnrh56ahxa";
+      name = "polkit-kde-agent-1-5.26.0.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/powerdevil-5.25.5.tar.xz";
-      sha256 = "0anisirn7z8aw442npdnk1csb5ghpzj2hx49gpw4l6ijk70b76pr";
-      name = "powerdevil-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/powerdevil-5.26.0.tar.xz";
+      sha256 = "1bph5kg6w2rb5n2xwwh85zrar5cif6hcvwy4j8kazhqm2m507vkn";
+      name = "powerdevil-5.26.0.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/qqc2-breeze-style-5.25.5.tar.xz";
-      sha256 = "0z71kmhajk1jyp0f32kpl4pklbvxc34jp9jzq09gkq5vpsdccy6g";
-      name = "qqc2-breeze-style-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/qqc2-breeze-style-5.26.0.tar.xz";
+      sha256 = "1j6y636r4s0m30d9ynwqf9p9f85ivi5pys78y24787rh5nynq519";
+      name = "qqc2-breeze-style-5.26.0.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/sddm-kcm-5.25.5.tar.xz";
-      sha256 = "1hvwjcgsjvlg61rfrak5111828lxf0lfh5p95d5kw1x4y2wlr756";
-      name = "sddm-kcm-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/sddm-kcm-5.26.0.tar.xz";
+      sha256 = "1hx6qrcb1sd7dhnsp6lma7wmrzkd348mcf3ya7v4daixyyasy7i7";
+      name = "sddm-kcm-5.26.0.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/systemsettings-5.25.5.tar.xz";
-      sha256 = "0n7mf6ygi8fgn1m6pk2fadnqj1h58mxqni3h19xbi373wfypq5fl";
-      name = "systemsettings-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/systemsettings-5.26.0.tar.xz";
+      sha256 = "1k2gi0mrd91xcjch79rmz63imc5ngiyjx4agv5kxam0lnp010bxz";
+      name = "systemsettings-5.26.0.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.25.5";
+    version = "5.26.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.5/xdg-desktop-portal-kde-5.25.5.tar.xz";
-      sha256 = "0l3lmwihxyl65y0mkyg3afk1k6gc0ldjw2vg92g7yydbgmn39q7k";
-      name = "xdg-desktop-portal-kde-5.25.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.26.0/xdg-desktop-portal-kde-5.26.0.tar.xz";
+      sha256 = "17ig8yxm2iygyqg8r1jqbzhqp5sz71j05c7lsiilqpq5r4zng6ly";
+      name = "xdg-desktop-portal-kde-5.26.0.tar.xz";
     };
   };
 }

From 5e62c78f4b565f98b798046c9285f5c0d663695f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 17 Sep 2022 16:02:37 +0300
Subject: [PATCH 21/56] nixos/plasma5: add very basic plasma-bigscreen module

---
 .../services/x11/desktop-managers/plasma5.nix | 32 ++++++++++++++++-
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/plasma-bigscreen.nix              | 36 +++++++++++++++++++
 3 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/plasma-bigscreen.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 3e04f6d0e6bb..aa1359bf3584 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -228,6 +228,14 @@ in
         is not strictly required for Plasma Mobile to run.
       '';
     };
+
+    bigscreen.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = lib.mdDoc ''
+        Enable support for running the Plasma Bigscreen session.
+      '';
+    };
   };
 
   imports = [
@@ -237,7 +245,7 @@ in
 
   config = mkMerge [
     # Common Plasma dependencies
-    (mkIf (cfg.enable || cfg.mobile.enable) {
+    (mkIf (cfg.enable || cfg.mobile.enable || cfg.bigscreen.enable) {
 
       security.wrappers = {
         kscreenlocker_greet = {
@@ -595,5 +603,27 @@ in
 
       services.xserver.displayManager.sessionPackages = [ pkgs.libsForQt5.plasma5.plasma-mobile ];
     })
+
+    # Plasma Bigscreen
+    (mkIf cfg.bigscreen.enable {
+      environment.systemPackages =
+        with pkgs.plasma5Packages;
+        [
+          plasma-nano
+          plasma-settings
+          plasma-bigscreen
+          plasma-remotecontrollers
+
+          aura-browser
+          plank-player
+
+          plasma-pa
+          plasma-nm
+          kdeconnect-kde
+        ];
+
+      services.xserver.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ];
+      services.udev.packages = [ pkgs.plasma5Packages.plasma-remotecontrollers ];
+    })
   ];
 }
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3b697139dc84..47a433c0322b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -486,6 +486,7 @@ in {
   phylactery = handleTest ./web-apps/phylactery.nix {};
   pict-rs = handleTest ./pict-rs.nix {};
   pinnwand = handleTest ./pinnwand.nix {};
+  plasma-bigscreen = handleTest ./plasma-bigscreen.nix {};
   plasma5 = handleTest ./plasma5.nix {};
   plasma5-systemd-start = handleTest ./plasma5-systemd-start.nix {};
   plausible = handleTest ./plausible.nix {};
diff --git a/nixos/tests/plasma-bigscreen.nix b/nixos/tests/plasma-bigscreen.nix
new file mode 100644
index 000000000000..ab459b6bffbe
--- /dev/null
+++ b/nixos/tests/plasma-bigscreen.nix
@@ -0,0 +1,36 @@
+import ./make-test-python.nix ({ pkgs, ...} :
+
+{
+  name = "plasma-bigscreen";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ ttuegel k900 ];
+  };
+
+  nodes.machine = { ... }:
+
+  {
+    imports = [ ./common/user-account.nix ];
+    services.xserver.enable = true;
+    services.xserver.displayManager.sddm.enable = true;
+    services.xserver.displayManager.defaultSession = "plasma-bigscreen-x11";
+    services.xserver.desktopManager.plasma5.bigscreen.enable = true;
+    services.xserver.displayManager.autoLogin = {
+      enable = true;
+      user = "alice";
+    };
+  };
+
+  testScript = { nodes, ... }: let
+    user = nodes.machine.users.users.alice;
+    xdo = "${pkgs.xdotool}/bin/xdotool";
+  in ''
+    with subtest("Wait for login"):
+        start_all()
+        machine.wait_for_file("${user.home}/.Xauthority")
+        machine.succeed("xauth merge ${user.home}/.Xauthority")
+
+    with subtest("Check plasmashell started"):
+        machine.wait_until_succeeds("pgrep plasmashell")
+        machine.wait_for_window("Plasma Big Screen")
+  '';
+})

From 13961bf28e4e33bde5c7a365ec62bc5f182e9bf9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 7 Oct 2022 13:39:27 +0300
Subject: [PATCH 22/56] pkgs/desktops/plasma-5: nixpkgs-fmt the whole thing

---
 .../3rdparty/addons/caffeine-plus.nix         |  12 +-
 .../3rdparty/addons/krunner-symbols.nix       |  13 +-
 .../3rdparty/addons/virtual-desktop-bar.nix   |   4 +-
 .../kwin/scripts/dynamic-workspaces.nix       |  15 +-
 .../3rdparty/kwin/scripts/krohnkite.nix       |  15 +-
 .../plasma-5/3rdparty/kwin/scripts/kzones.nix |  15 +-
 .../3rdparty/kwin/scripts/parachute.nix       |  15 +-
 .../plasma-5/3rdparty/kwin/scripts/tiling.nix |  15 +-
 .../plasma-5/3rdparty/lightly/default.nix     |   2 +-
 pkgs/desktops/plasma-5/aura-browser.nix       |  13 +-
 pkgs/desktops/plasma-5/bluedevil.nix          |  40 +++-
 pkgs/desktops/plasma-5/breeze-grub.nix        |   3 +-
 .../plasma-5/breeze-plymouth/default.nix      |  55 +++--
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  37 +++-
 pkgs/desktops/plasma-5/default.nix            | 193 ++++++++++--------
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  31 ++-
 pkgs/desktops/plasma-5/kde-cli-tools.nix      |  34 ++-
 .../plasma-5/kde-gtk-config/default.nix       |  40 +++-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |  49 ++++-
 pkgs/desktops/plasma-5/kgamma5.nix            |  14 +-
 pkgs/desktops/plasma-5/khotkeys.nix           |  33 ++-
 pkgs/desktops/plasma-5/kinfocenter.nix        |  59 ++++--
 pkgs/desktops/plasma-5/kmenuedit.nix          |  23 ++-
 pkgs/desktops/plasma-5/kpipewire.nix          |  27 ++-
 pkgs/desktops/plasma-5/kscreen.nix            |  45 +++-
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  38 +++-
 pkgs/desktops/plasma-5/ksshaskpass.nix        |  13 +-
 pkgs/desktops/plasma-5/ksystemstats.nix       |   8 +-
 .../plasma-5/kwayland-integration.nix         |  16 +-
 pkgs/desktops/plasma-5/kwin/default.nix       | 137 ++++++++++---
 pkgs/desktops/plasma-5/kwrited.nix            |  13 +-
 pkgs/desktops/plasma-5/layer-shell-qt.nix     |  12 +-
 pkgs/desktops/plasma-5/libkscreen/default.nix |  19 +-
 .../plasma-5/libksysguard/default.nix         |  51 ++++-
 pkgs/desktops/plasma-5/milou.nix              |  29 ++-
 pkgs/desktops/plasma-5/oxygen-sounds.nix      |   5 +-
 pkgs/desktops/plasma-5/oxygen.nix             |  39 +++-
 pkgs/desktops/plasma-5/plank-player.nix       |  13 +-
 pkgs/desktops/plasma-5/plasma-bigscreen.nix   |  31 ++-
 .../plasma-5/plasma-browser-integration.nix   |  34 ++-
 .../plasma-5/plasma-desktop/default.nix       | 129 +++++++++---
 pkgs/desktops/plasma-5/plasma-disks.nix       |  49 ++++-
 .../plasma-5/plasma-integration/default.nix   |  33 ++-
 .../plasma-5/plasma-mobile/default.nix        |  73 +++++--
 .../desktops/plasma-5/plasma-nano/default.nix |   7 +-
 pkgs/desktops/plasma-5/plasma-nm/default.nix  |  75 +++++--
 pkgs/desktops/plasma-5/plasma-pa.nix          |  42 +++-
 .../plasma-5/plasma-remotecontrollers.nix     |  37 ++--
 .../plasma-5/plasma-vault/default.nix         |  29 +--
 .../plasma-5/plasma-workspace-wallpapers.nix  |   2 +-
 .../plasma-5/plasma-workspace/default.nix     | 155 +++++++++++---
 pkgs/desktops/plasma-5/polkit-kde-agent.nix   |  30 ++-
 pkgs/desktops/plasma-5/powerdevil.nix         |  46 ++++-
 pkgs/desktops/plasma-5/systemsettings.nix     |  47 ++++-
 .../plasma-5/xdg-desktop-portal-kde.nix       |  50 ++++-
 55 files changed, 1517 insertions(+), 547 deletions(-)

diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
index 66e1255f223a..1a18e1a89de1 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix
@@ -1,5 +1,10 @@
-{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules
-, kwindowsystem, plasma-framework }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, extra-cmake-modules
+, kwindowsystem
+, plasma-framework
+}:
 
 mkDerivation rec {
   pname = "plasma-applet-caffeine-plus";
@@ -13,7 +18,8 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    kwindowsystem plasma-framework
+    kwindowsystem
+    plasma-framework
   ];
 
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
index 5255bb4b0501..3ac49717390e 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/krunner-symbols.nix
@@ -1,6 +1,13 @@
-{ lib, stdenv
-, cmake, fetchFromGitHub, extra-cmake-modules
-, qtbase, wrapQtAppsHook, ki18n, kdelibs4support, krunner
+{ lib
+, stdenv
+, cmake
+, fetchFromGitHub
+, extra-cmake-modules
+, qtbase
+, wrapQtAppsHook
+, ki18n
+, kdelibs4support
+, krunner
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
index e71a0bd0230c..5e4ac584047c 100644
--- a/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/addons/virtual-desktop-bar.nix
@@ -19,7 +19,9 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    kwindowsystem plasma-framework qtx11extras
+    kwindowsystem
+    plasma-framework
+    qtx11extras
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
index 043f52c37efc..2e9864cb1da3 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
@@ -1,5 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub
-, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, kcoreaddons
+, kwindowsystem
+, plasma-framework
+, systemsettings
+}:
 
 mkDerivation rec {
   pname = "dynamic_workspaces";
@@ -13,7 +19,10 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    kcoreaddons kwindowsystem plasma-framework systemsettings
+    kcoreaddons
+    kwindowsystem
+    plasma-framework
+    systemsettings
   ];
 
   dontBuild = true;
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
index 23802bef97bd..b6025c5bdf10 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix
@@ -1,5 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub
-, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, kcoreaddons
+, kwindowsystem
+, plasma-framework
+, systemsettings
+}:
 
 mkDerivation rec {
   pname = "krohnkite";
@@ -13,7 +19,10 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    kcoreaddons kwindowsystem plasma-framework systemsettings
+    kcoreaddons
+    kwindowsystem
+    plasma-framework
+    systemsettings
   ];
 
   dontBuild = true;
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
index a56ebf1579b1..ce0556ee1a77 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix
@@ -1,5 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub
-, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, kcoreaddons
+, kwindowsystem
+, plasma-framework
+, systemsettings
+}:
 
 mkDerivation rec {
   pname = "kzones";
@@ -13,7 +19,10 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    kcoreaddons kwindowsystem plasma-framework systemsettings
+    kcoreaddons
+    kwindowsystem
+    plasma-framework
+    systemsettings
   ];
 
   dontBuild = true;
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
index 5de935b9ec23..8d38583e1d51 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
@@ -1,5 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub
-, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, kcoreaddons
+, kwindowsystem
+, plasma-framework
+, systemsettings
+}:
 
 mkDerivation rec {
   pname = "parachute";
@@ -13,7 +19,10 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    kcoreaddons kwindowsystem plasma-framework systemsettings
+    kcoreaddons
+    kwindowsystem
+    plasma-framework
+    systemsettings
   ];
 
   dontBuild = true;
diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
index 8a455cb88826..5f13a95ce081 100644
--- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix
@@ -1,5 +1,11 @@
-{ lib, mkDerivation, fetchFromGitHub
-, kcoreaddons, kwindowsystem, plasma-framework, systemsettings }:
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, kcoreaddons
+, kwindowsystem
+, plasma-framework
+, systemsettings
+}:
 
 mkDerivation rec {
   pname = "kwin-tiling";
@@ -18,7 +24,10 @@ mkDerivation rec {
   '';
 
   buildInputs = [
-    kcoreaddons kwindowsystem plasma-framework systemsettings
+    kcoreaddons
+    kwindowsystem
+    plasma-framework
+    systemsettings
   ];
 
   dontBuild = true;
diff --git a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
index 39be6c63f1e3..c4ae4d75d201 100644
--- a/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
+++ b/pkgs/desktops/plasma-5/3rdparty/lightly/default.nix
@@ -22,7 +22,7 @@ mkDerivation rec{
     sha256 = "k1fEZbhzluNlAmj5s/O9X20aCVQxlWQm/Iw/euX7cmI=";
   };
 
-  extraCmakeFlags=["-DBUILD_TESTING=OFF"];
+  extraCmakeFlags = [ "-DBUILD_TESTING=OFF" ];
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
 
diff --git a/pkgs/desktops/plasma-5/aura-browser.nix b/pkgs/desktops/plasma-5/aura-browser.nix
index b012417a6bc7..67af48b2bcb9 100644
--- a/pkgs/desktops/plasma-5/aura-browser.nix
+++ b/pkgs/desktops/plasma-5/aura-browser.nix
@@ -1,10 +1,9 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtwebengine,
-  qtquickcontrols2,
-  kirigami2,
-  ki18n,
+{ mkDerivation
+, extra-cmake-modules
+, qtwebengine
+, qtquickcontrols2
+, kirigami2
+, ki18n
 }:
 mkDerivation {
   pname = "aura-browser";
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 389746f17af9..ab7ceea4b117 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,16 +1,40 @@
-{
-  mkDerivation, lib, extra-cmake-modules, shared-mime-info,
-  qtbase, qtdeclarative, bluez-qt,
-  kcoreaddons, kcmutils, kdbusaddons, kded, ki18n, kiconthemes, kio,
-  knotifications, kwidgetsaddons, kwindowsystem, plasma-framework
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, shared-mime-info
+, qtbase
+, qtdeclarative
+, bluez-qt
+, kcoreaddons
+, kcmutils
+, kdbusaddons
+, kded
+, ki18n
+, kiconthemes
+, kio
+, knotifications
+, kwidgetsaddons
+, kwindowsystem
+, plasma-framework
 }:
 
 mkDerivation {
   pname = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared-mime-info ];
   buildInputs = [
-    qtbase qtdeclarative bluez-qt
-    ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded
-    kiconthemes knotifications kwidgetsaddons kcmutils
+    qtbase
+    qtdeclarative
+    bluez-qt
+    ki18n
+    kio
+    kwindowsystem
+    plasma-framework
+    kcoreaddons
+    kdbusaddons
+    kded
+    kiconthemes
+    knotifications
+    kwidgetsaddons
+    kcmutils
   ];
 }
diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
index 24d0c96cad97..86ce3dc112d0 100644
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/pkgs/desktops/plasma-5/breeze-grub.nix
@@ -1,5 +1,4 @@
-{
-  mkDerivation
+{ mkDerivation
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index bc60662b434a..b8188fece80b 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -1,26 +1,25 @@
-{
-  mkDerivation,
-  lib,
-  extra-cmake-modules,
-  plymouth,
-  nixos-icons,
-  imagemagick,
-  netpbm,
-  perl,
-  logoName ? null,
-  logoFile ? null,
-  osName ? null,
-  osVersion ? null,
-  topColor ? "black",
-  bottomColor ? "black"
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, plymouth
+, nixos-icons
+, imagemagick
+, netpbm
+, perl
+, logoName ? null
+, logoFile ? null
+, osName ? null
+, osVersion ? null
+, topColor ? "black"
+, bottomColor ? "black"
 }:
 
 let
   validColors = [ "black" "cardboard_grey" "charcoal_grey" "icon_blue" "paper_white" "plasma_blue" "neon_blue" "neon_green" ];
-  resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf(toString logoFile)) else logoName;
+  resolvedLogoName = if (logoFile != null && logoName == null) then lib.strings.removeSuffix ".png" (baseNameOf (toString logoFile)) else logoName;
 in
-  assert lib.asserts.assertOneOf "topColor" topColor validColors;
-  assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors;
+assert lib.asserts.assertOneOf "topColor" topColor validColors;
+assert lib.asserts.assertOneOf "bottomColor" bottomColor validColors;
 
 
 mkDerivation {
@@ -30,21 +29,21 @@ mkDerivation {
   patches = [
     ./install-paths.patch
   ];
-  cmakeFlags = []
-    ++ lib.optional (osName      != null) "-DDISTRO_NAME=${osName}"
-    ++ lib.optional (osVersion   != null) "-DDISTRO_VERSION=${osVersion}"
-    ++ lib.optional (logoName    != null) "-DDISTRO_LOGO=${logoName}"
-    ++ lib.optional (topColor    != null) "-DBACKGROUND_TOP_COLOR=${topColor}"
+  cmakeFlags = [ ]
+    ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}"
+    ++ lib.optional (osVersion != null) "-DDISTRO_VERSION=${osVersion}"
+    ++ lib.optional (logoName != null) "-DDISTRO_LOGO=${logoName}"
+    ++ lib.optional (topColor != null) "-DBACKGROUND_TOP_COLOR=${topColor}"
     ++ lib.optional (bottomColor != null) "-DBACKGROUND_BOTTOM_COLOR=${bottomColor}"
   ;
 
   postPatch = ''
-      substituteInPlace cmake/FindPlymouth.cmake --subst-var out
+    substituteInPlace cmake/FindPlymouth.cmake --subst-var out
   '' + lib.optionalString (logoFile != null) ''
-      cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png
+    cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png
 
-      # conversion for 16bit taken from the breeze-plymouth readme
-      convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png
-      pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png
+    # conversion for 16bit taken from the breeze-plymouth readme
+    convert ${logoFile} -alpha Background -background "#000000" -fill "#000000" -flatten tmp.png
+    pngtopnm tmp.png | pnmquant 16 | pnmtopng > breeze/images/16bit/${resolvedLogoName}.logo.png
   '';
 }
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index 13a426bb2587..bcabd31eea64 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -1,9 +1,18 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
-  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative,
-  qtx11extras, fftw
+{ mkDerivation
+, extra-cmake-modules
+, frameworkintegration
+, kcmutils
+, kconfigwidgets
+, kcoreaddons
+, kdecoration
+, kguiaddons
+, ki18n
+, kwayland
+, kwindowsystem
+, plasma-framework
+, qtdeclarative
+, qtx11extras
+, fftw
 }:
 
 mkDerivation {
@@ -11,9 +20,19 @@ mkDerivation {
   sname = "breeze";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
-    frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
-    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
-    qtx11extras fftw
+    frameworkintegration
+    kcmutils
+    kconfigwidgets
+    kcoreaddons
+    kdecoration
+    kguiaddons
+    ki18n
+    kwayland
+    kwindowsystem
+    plasma-framework
+    qtdeclarative
+    qtx11extras
+    fftw
   ];
   outputs = [ "bin" "dev" "out" ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 581bd25027fd..bb3119ed6d45 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -1,31 +1,35 @@
 /*
 
-# New packages
+  # New packages
 
-READ THIS FIRST
+  READ THIS FIRST
 
-This module is for official packages in KDE Plasma 5. All available packages are
-listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
-below).
+  This module is for official packages in KDE Plasma 5. All available packages are
+  listed in `./srcs.nix`, although a few are not yet packaged in Nixpkgs (see
+  below).
 
-IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
+  IF YOUR PACKAGE IS NOT LISTED IN `./srcs.nix`, IT DOES NOT GO HERE.
 
-Many of the packages released upstream are not yet built in Nixpkgs due to lack
-of demand. To add a Nixpkgs build for an upstream package, copy one of the
-existing packages here and modify it as necessary.
+  Many of the packages released upstream are not yet built in Nixpkgs due to lack
+  of demand. To add a Nixpkgs build for an upstream package, copy one of the
+  existing packages here and modify it as necessary.
 
-# Updates
+  # Updates
 
-1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
+  1. Update the URL in `./fetch.sh`.
+  2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5`
    from the top of the Nixpkgs tree.
-3. Use `nox-review wip` to check that everything builds.
-4. Commit the changes and open a pull request.
+  3. Use `nox-review wip` to check that everything builds.
+  4. Commit the changes and open a pull request.
 
 */
 
-{ libsForQt5, lib, config, fetchurl
-, gconf, gsettings-desktop-schemas
+{ libsForQt5
+, lib
+, config
+, fetchurl
+, gconf
+, gsettings-desktop-schemas
 }:
 
 let
@@ -33,7 +37,13 @@ let
   broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
   maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
   license = with lib.licenses; [
-    lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+    lgpl21Plus
+    lgpl3Plus
+    bsd2
+    mit
+    gpl2Plus
+    gpl3Plus
+    fdl12
   ];
 
   srcs = import ./srcs.nix {
@@ -41,33 +51,35 @@ let
     mirror = "mirror://kde";
   };
 
-  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) { };
 
   packages = self: with self;
     let
 
       propagate = out:
-        let setupHook = { writeScript }:
-              writeScript "setup-hook" ''
-                if [[ "''${hookName-}" != postHook ]]; then
-                    postHooks+=("source @dev@/nix-support/setup-hook")
-                else
-                    # Propagate $${out} output
-                    propagatedUserEnvPkgs+=" @${out}@"
+        let
+          setupHook = { writeScript }:
+            writeScript "setup-hook" ''
+              if [[ "''${hookName-}" != postHook ]]; then
+                  postHooks+=("source @dev@/nix-support/setup-hook")
+              else
+                  # Propagate $${out} output
+                  propagatedUserEnvPkgs+=" @${out}@"
 
-                    if [ -z "$outputDev" ]; then
-                        echo "error: \$outputDev is unset!" >&2
-                        exit 1
-                    fi
+                  if [ -z "$outputDev" ]; then
+                      echo "error: \$outputDev is unset!" >&2
+                      exit 1
+                  fi
 
-                    # Propagate $dev so that this setup hook is propagated
-                    # But only if there is a separate $dev output
-                    if [ "$outputDev" != out ]; then
-                        propagatedBuildInputs+=" @dev@"
-                    fi
-                fi
-              '';
-        in callPackage setupHook {};
+                  # Propagate $dev so that this setup hook is propagated
+                  # But only if there is a separate $dev output
+                  if [ "$outputDev" != out ]; then
+                      propagatedBuildInputs+=" @dev@"
+                  fi
+              fi
+            '';
+        in
+        callPackage setupHook { };
 
       propagateBin = propagate "bin";
 
@@ -88,11 +100,11 @@ let
             setupHook = args.setupHook or defaultSetupHook;
 
             meta =
-              let meta = args.meta or {}; in
+              let meta = args.meta or { }; in
               meta // {
                 homepage = meta.homepage or "http://www.kde.org";
                 license = meta.license or license;
-                maintainers = (meta.maintainers or []) ++ maintainers;
+                maintainers = (meta.maintainers or [ ]) ++ maintainers;
                 platforms = meta.platforms or lib.platforms.linux;
                 broken = meta.broken or broken;
               };
@@ -102,61 +114,62 @@ let
           });
       };
 
-    in {
-      aura-browser = callPackage ./aura-browser.nix {};
-      bluedevil = callPackage ./bluedevil.nix {};
-      breeze-gtk = callPackage ./breeze-gtk.nix {};
-      breeze-qt5 = callPackage ./breeze-qt5.nix {};
-      breeze-grub = callPackage ./breeze-grub.nix {};
-      breeze-plymouth = callPackage ./breeze-plymouth {};
-      discover = callPackage ./discover.nix {};
-      kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
-      kde-cli-tools = callPackage ./kde-cli-tools.nix {};
+    in
+    {
+      aura-browser = callPackage ./aura-browser.nix { };
+      bluedevil = callPackage ./bluedevil.nix { };
+      breeze-gtk = callPackage ./breeze-gtk.nix { };
+      breeze-qt5 = callPackage ./breeze-qt5.nix { };
+      breeze-grub = callPackage ./breeze-grub.nix { };
+      breeze-plymouth = callPackage ./breeze-plymouth { };
+      discover = callPackage ./discover.nix { };
+      kactivitymanagerd = callPackage ./kactivitymanagerd.nix { };
+      kde-cli-tools = callPackage ./kde-cli-tools.nix { };
       kde-gtk-config = callPackage ./kde-gtk-config { inherit gsettings-desktop-schemas; };
-      kdecoration = callPackage ./kdecoration.nix {};
-      kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
-      kgamma5 = callPackage ./kgamma5.nix {};
-      khotkeys = callPackage ./khotkeys.nix {};
-      kinfocenter = callPackage ./kinfocenter.nix {};
-      kmenuedit = callPackage ./kmenuedit.nix {};
-      kpipewire = callPackage ./kpipewire.nix {};
-      kscreen = callPackage ./kscreen.nix {};
-      kscreenlocker = callPackage ./kscreenlocker.nix {};
-      ksshaskpass = callPackage ./ksshaskpass.nix {};
-      ksystemstats = callPackage ./ksystemstats.nix {};
-      kwallet-pam = callPackage ./kwallet-pam.nix {};
-      kwayland-integration = callPackage ./kwayland-integration.nix {};
-      kwin = callPackage ./kwin {};
-      kwrited = callPackage ./kwrited.nix {};
-      layer-shell-qt = callPackage ./layer-shell-qt.nix {};
-      libkscreen = callPackage ./libkscreen {};
-      libksysguard = callPackage ./libksysguard {};
-      milou = callPackage ./milou.nix {};
-      oxygen = callPackage ./oxygen.nix {};
-      oxygen-sounds = callPackage ./oxygen-sounds.nix {};
-      plank-player = callPackage ./plank-player.nix {};
-      plasma-bigscreen = callPackage ./plasma-bigscreen.nix {};
-      plasma-browser-integration = callPackage ./plasma-browser-integration.nix {};
-      plasma-desktop = callPackage ./plasma-desktop {};
-      plasma-disks = callPackage ./plasma-disks.nix {};
-      plasma-integration = callPackage ./plasma-integration {};
-      plasma-mobile = callPackage ./plasma-mobile {};
-      plasma-nano = callPackage ./plasma-nano {};
-      plasma-nm = callPackage ./plasma-nm {};
+      kdecoration = callPackage ./kdecoration.nix { };
+      kdeplasma-addons = callPackage ./kdeplasma-addons.nix { };
+      kgamma5 = callPackage ./kgamma5.nix { };
+      khotkeys = callPackage ./khotkeys.nix { };
+      kinfocenter = callPackage ./kinfocenter.nix { };
+      kmenuedit = callPackage ./kmenuedit.nix { };
+      kpipewire = callPackage ./kpipewire.nix { };
+      kscreen = callPackage ./kscreen.nix { };
+      kscreenlocker = callPackage ./kscreenlocker.nix { };
+      ksshaskpass = callPackage ./ksshaskpass.nix { };
+      ksystemstats = callPackage ./ksystemstats.nix { };
+      kwallet-pam = callPackage ./kwallet-pam.nix { };
+      kwayland-integration = callPackage ./kwayland-integration.nix { };
+      kwin = callPackage ./kwin { };
+      kwrited = callPackage ./kwrited.nix { };
+      layer-shell-qt = callPackage ./layer-shell-qt.nix { };
+      libkscreen = callPackage ./libkscreen { };
+      libksysguard = callPackage ./libksysguard { };
+      milou = callPackage ./milou.nix { };
+      oxygen = callPackage ./oxygen.nix { };
+      oxygen-sounds = callPackage ./oxygen-sounds.nix { };
+      plank-player = callPackage ./plank-player.nix { };
+      plasma-bigscreen = callPackage ./plasma-bigscreen.nix { };
+      plasma-browser-integration = callPackage ./plasma-browser-integration.nix { };
+      plasma-desktop = callPackage ./plasma-desktop { };
+      plasma-disks = callPackage ./plasma-disks.nix { };
+      plasma-integration = callPackage ./plasma-integration { };
+      plasma-mobile = callPackage ./plasma-mobile { };
+      plasma-nano = callPackage ./plasma-nano { };
+      plasma-nm = callPackage ./plasma-nm { };
       plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; };
-      plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix {};
-      plasma-sdk = callPackage ./plasma-sdk.nix {};
+      plasma-remotecontrollers = callPackage ./plasma-remotecontrollers.nix { };
+      plasma-sdk = callPackage ./plasma-sdk.nix { };
       plasma-systemmonitor = callPackage ./plasma-systemmonitor.nix { };
       plasma-thunderbolt = callPackage ./plasma-thunderbolt.nix { };
-      plasma-vault = callPackage ./plasma-vault {};
-      plasma-workspace = callPackage ./plasma-workspace {};
-      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
-      polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
-      powerdevil = callPackage ./powerdevil.nix {};
-      qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix {};
-      sddm-kcm = callPackage ./sddm-kcm.nix {};
-      systemsettings = callPackage ./systemsettings.nix {};
-      xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {};
+      plasma-vault = callPackage ./plasma-vault { };
+      plasma-workspace = callPackage ./plasma-workspace { };
+      plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix { };
+      polkit-kde-agent = callPackage ./polkit-kde-agent.nix { };
+      powerdevil = callPackage ./powerdevil.nix { };
+      qqc2-breeze-style = callPackage ./qqc2-breeze-style.nix { };
+      sddm-kcm = callPackage ./sddm-kcm.nix { };
+      systemsettings = callPackage ./systemsettings.nix { };
+      xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix { };
 
       thirdParty = let inherit (libsForQt5) callPackage; in {
         plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { };
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 57800c316aa7..eb094c687105 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,15 +1,32 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
-  kwindowsystem, kxmlgui, kcrash, qtbase
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, boost
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, kio
+, kglobalaccel
+, kwindowsystem
+, kxmlgui
+, kcrash
+, qtbase
 }:
 
 mkDerivation {
   pname = "kactivitymanagerd";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
-    kxmlgui kcrash
+    boost
+    kconfig
+    kcoreaddons
+    kdbusaddons
+    kglobalaccel
+    ki18n
+    kio
+    kwindowsystem
+    kxmlgui
+    kcrash
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 02694b085f89..e02f1297c012 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,15 +1,37 @@
-{
-  lib, mkDerivation, extra-cmake-modules, kdoctools,
-  kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
-  qtsvg, qtx11extras, kactivities, plasma-workspace
+{ lib
+, mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kcmutils
+, kconfig
+, kdesu
+, ki18n
+, kiconthemes
+, kinit
+, kio
+, kwindowsystem
+, qtsvg
+, qtx11extras
+, kactivities
+, plasma-workspace
 }:
 
 mkDerivation {
   pname = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
-    qtx11extras kactivities plasma-workspace
+    kcmutils
+    kconfig
+    kdesu
+    ki18n
+    kiconthemes
+    kinit
+    kio
+    kwindowsystem
+    qtsvg
+    qtx11extras
+    kactivities
+    plasma-workspace
   ];
   postInstall = ''
     # install a symlink in bin so that kdesu can eventually be found in PATH
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 6949f73a9ce7..a61fc328236d 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,17 +1,41 @@
-{
-  mkDerivation,
-  extra-cmake-modules, wrapGAppsHook,
-  glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
-  knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass
+{ mkDerivation
+, extra-cmake-modules
+, wrapGAppsHook
+, glib
+, gtk2
+, gtk3
+, karchive
+, kcmutils
+, kconfigwidgets
+, ki18n
+, kiconthemes
+, kio
+, knewstuff
+, gsettings-desktop-schemas
+, xsettingsd
+, kdecoration
+, sass
 }:
 
 mkDerivation {
   pname = "kde-gtk-config";
   nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
-  dontWrapGApps = true;  # There is nothing to wrap
+  dontWrapGApps = true; # There is nothing to wrap
   buildInputs = [
-    ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
-    knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass
+    ki18n
+    kio
+    glib
+    gtk2
+    gtk3
+    karchive
+    kcmutils
+    kconfigwidgets
+    kiconthemes
+    knewstuff
+    gsettings-desktop-schemas
+    xsettingsd
+    kdecoration
+    sass
   ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 5be47327d723..b8461fbd108d 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,18 +1,47 @@
-{
-  mkDerivation,
-  extra-cmake-modules, kdoctools,
-  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays,
-  kio, knewstuff, kpurpose, kross, krunner, kservice,
-  kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative,
-  qtwebengine, qtx11extras
+{ mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kcmutils
+, kholidays
+, kio
+, knewstuff
+, kpurpose
+, kross
+, krunner
+, kservice
+, kunitconversion
+, ibus
+, plasma-framework
+, plasma-workspace
+, qtdeclarative
+, qtwebengine
+, qtx11extras
 }:
 
 mkDerivation {
   pname = "kdeplasma-addons";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio
-    knewstuff kpurpose kross krunner kservice kunitconversion ibus
-    plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kcmutils
+    kholidays
+    kio
+    knewstuff
+    kpurpose
+    kross
+    krunner
+    kservice
+    kunitconversion
+    ibus
+    plasma-framework
+    plasma-workspace
+    qtdeclarative
+    qtwebengine
+    qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index be5b191c3de7..5c05eca47979 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,7 +1,13 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, kconfig
+, kconfigwidgets
+, ki18n
+, qtbase
+, qtx11extras
+, libXxf86vm
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index dfd5d4668a22..c30e1c447582 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,17 +1,34 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  qtbase,
-  kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
-  plasma-framework, plasma-workspace, qtx11extras
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, qtbase
+, kcmutils
+, kdbusaddons
+, kdelibs4support
+, kglobalaccel
+, ki18n
+, kio
+, kxmlgui
+, plasma-framework
+, plasma-workspace
+, qtx11extras
 }:
 
 mkDerivation {
   pname = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
-    plasma-framework plasma-workspace qtx11extras
+    kcmutils
+    kdbusaddons
+    kdelibs4support
+    kglobalaccel
+    ki18n
+    kio
+    kxmlgui
+    plasma-framework
+    plasma-workspace
+    qtx11extras
   ];
   outputs = [ "bin" "dev" "out" ];
 }
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index 662662cdb2fd..c63d22858a55 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -1,22 +1,57 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  qtbase,
-  kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
-  kdeclarative, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice,
-  kwayland, kwidgetsaddons, kxmlgui, solid, systemsettings,
-  libraw1394, libGLU, pciutils,
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, qtbase
+, kcmutils
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeclarative
+, ki18n
+, kiconthemes
+, kio
+, kirigami2
+, kpackage
+, kservice
+, kwayland
+, kwidgetsaddons
+, kxmlgui
+, solid
+, systemsettings
+, libraw1394
+, libGLU
+, pciutils
 }:
 
 mkDerivation {
   pname = "kinfocenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
-    kdeclarative ki18n kiconthemes kio kirigami2 kpackage kservice kwayland
-    kwidgetsaddons kxmlgui solid systemsettings
+    kcmutils
+    kcompletion
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kdbusaddons
+    kdeclarative
+    ki18n
+    kiconthemes
+    kio
+    kirigami2
+    kpackage
+    kservice
+    kwayland
+    kwidgetsaddons
+    kxmlgui
+    solid
+    systemsettings
 
-    libraw1394 libGLU pciutils
+    libraw1394
+    libGLU
+    pciutils
   ];
   preFixup = ''
     # fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index 6a9d055abe43..57b327a7cdc4 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -1,14 +1,25 @@
-{
-  mkDerivation,
-  extra-cmake-modules, kdoctools,
-  kdbusaddons, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
-  sonnet
+{ mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kdbusaddons
+, khotkeys
+, ki18n
+, kiconthemes
+, kio
+, kxmlgui
+, sonnet
 }:
 
 mkDerivation {
   pname = "kmenuedit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kdbusaddons khotkeys ki18n kiconthemes kio kxmlgui sonnet
+    kdbusaddons
+    khotkeys
+    ki18n
+    kiconthemes
+    kio
+    kxmlgui
+    sonnet
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kpipewire.nix b/pkgs/desktops/plasma-5/kpipewire.nix
index 41191e6f4c6a..fd412711e4a2 100644
--- a/pkgs/desktops/plasma-5/kpipewire.nix
+++ b/pkgs/desktops/plasma-5/kpipewire.nix
@@ -1,15 +1,28 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kwayland, ki18n, kcoreaddons, plasma-wayland-protocols,
-  libepoxy, ffmpeg, mesa, pipewire, wayland
+{ mkDerivation
+, extra-cmake-modules
+, kwayland
+, ki18n
+, kcoreaddons
+, plasma-wayland-protocols
+, libepoxy
+, ffmpeg
+, mesa
+, pipewire
+, wayland
 }:
 
 mkDerivation {
   pname = "kpipewire";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kwayland ki18n kcoreaddons plasma-wayland-protocols
-    libepoxy ffmpeg mesa pipewire wayland
+    kwayland
+    ki18n
+    kcoreaddons
+    plasma-wayland-protocols
+    libepoxy
+    ffmpeg
+    mesa
+    pipewire
+    wayland
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 0d67c702dd5c..ca5ad59072f0 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,17 +1,44 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
-  kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
-  kwindowsystem, kdeclarative, plasma-framework, qtx11extras, layer-shell-qt
+{ mkDerivation
+, extra-cmake-modules
+, kconfig
+, kcmutils
+, kconfigwidgets
+, kdbusaddons
+, kglobalaccel
+, ki18n
+, kwidgetsaddons
+, kxmlgui
+, libkscreen
+, qtdeclarative
+, qtgraphicaleffects
+, qtsensors
+, kwindowsystem
+, kdeclarative
+, plasma-framework
+, qtx11extras
+, layer-shell-qt
 }:
 
 mkDerivation {
   pname = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
-    kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
-    kwindowsystem kdeclarative plasma-framework qtx11extras layer-shell-qt
+    kconfig
+    kcmutils
+    kconfigwidgets
+    kdbusaddons
+    kglobalaccel
+    ki18n
+    kwidgetsaddons
+    kxmlgui
+    libkscreen
+    qtdeclarative
+    qtgraphicaleffects
+    qtsensors
+    kwindowsystem
+    kdeclarative
+    plasma-framework
+    qtx11extras
+    layer-shell-qt
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index b37bbc6c8456..d53d808e1084 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,17 +1,39 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  kcmutils, kcrash, kdeclarative, kglobalaccel, kidletime,
-  kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras,
-  wayland, layer-shell-qt,
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcmutils
+, kcrash
+, kdeclarative
+, kglobalaccel
+, kidletime
+, kwayland
+, libXcursor
+, pam
+, plasma-framework
+, qtbase
+, qtdeclarative
+, qtx11extras
+, wayland
+, layer-shell-qt
 }:
 
 mkDerivation {
   pname = "kscreenlocker";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland
-    libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
+    kcmutils
+    kcrash
+    kdeclarative
+    kglobalaccel
+    kidletime
+    kwayland
+    libXcursor
+    pam
+    plasma-framework
+    qtdeclarative
+    qtx11extras
+    wayland
     layer-shell-qt
   ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index 4cbf08044934..9a5ee90cd362 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,7 +1,12 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcoreaddons
+, ki18n
+, kwallet
+, kwidgetsaddons
+, qtbase
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix
index d5f96e42981b..6b04d055eac7 100644
--- a/pkgs/desktops/plasma-5/ksystemstats.nix
+++ b/pkgs/desktops/plasma-5/ksystemstats.nix
@@ -1,6 +1,10 @@
-{ mkDerivation, lib
+{ mkDerivation
+, lib
 , extra-cmake-modules
-, libksysguard, libnl, lm_sensors, networkmanager-qt
+, libksysguard
+, libnl
+, lm_sensors
+, networkmanager-qt
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index 5462814e8de2..eab364d90d00 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,8 +1,14 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kguiaddons, kidletime, kwayland, kwindowsystem, qtbase,
-  wayland-protocols, wayland-scanner, wayland
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kguiaddons
+, kidletime
+, kwayland
+, kwindowsystem
+, qtbase
+, wayland-protocols
+, wayland-scanner
+, wayland
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 46283eae26f4..f8177c929097 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,20 +1,61 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools, fetchpatch,
-
-  libepoxy, lcms2, libICE, libSM, libcap, libdrm, libinput, libxkbcommon, mesa,
-  pipewire, udev, wayland, xcb-util-cursor, xwayland,
-  plasma-wayland-protocols, wayland-protocols, libxcvt,
-
-  qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors,
-  qtvirtualkeyboard, qtx11extras,
-
-  breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
-  kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
-  kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
-  krunner, kscreenlocker, kservice, kwayland, kwidgetsaddons,
-  kwindowsystem, kxmlgui, plasma-framework, libqaccessibilityclient,
-  python3
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, fetchpatch
+, libepoxy
+, lcms2
+, libICE
+, libSM
+, libcap
+, libdrm
+, libinput
+, libxkbcommon
+, mesa
+, pipewire
+, udev
+, wayland
+, xcb-util-cursor
+, xwayland
+, plasma-wayland-protocols
+, wayland-protocols
+, libxcvt
+, qtdeclarative
+, qtmultimedia
+, qtquickcontrols2
+, qtscript
+, qtsensors
+, qtvirtualkeyboard
+, qtx11extras
+, breeze-qt5
+, kactivities
+, kcompletion
+, kcmutils
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kcrash
+, kdeclarative
+, kdecoration
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kidletime
+, kinit
+, kio
+, knewstuff
+, knotifications
+, kpackage
+, krunner
+, kscreenlocker
+, kservice
+, kwayland
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+, plasma-framework
+, libqaccessibilityclient
+, python3
 }:
 
 # TODO (ttuegel): investigate qmlplugindump failure
@@ -23,18 +64,60 @@ mkDerivation {
   pname = "kwin";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    libepoxy lcms2 libICE libSM libcap libdrm libinput libxkbcommon mesa pipewire
-    udev wayland xcb-util-cursor xwayland
-    libxcvt plasma-wayland-protocols wayland-protocols
+    libepoxy
+    lcms2
+    libICE
+    libSM
+    libcap
+    libdrm
+    libinput
+    libxkbcommon
+    mesa
+    pipewire
+    udev
+    wayland
+    xcb-util-cursor
+    xwayland
+    libxcvt
+    plasma-wayland-protocols
+    wayland-protocols
 
-    qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors
-    qtvirtualkeyboard qtx11extras
+    qtdeclarative
+    qtmultimedia
+    qtquickcontrols2
+    qtscript
+    qtsensors
+    qtvirtualkeyboard
+    qtx11extras
 
-    breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
-    kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
-    kidletime kinit kio knewstuff knotifications kpackage krunner kscreenlocker
-    kservice kwayland kwidgetsaddons kwindowsystem kxmlgui
-    plasma-framework libqaccessibilityclient
+    breeze-qt5
+    kactivities
+    kcmutils
+    kcompletion
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kcrash
+    kdeclarative
+    kdecoration
+    kglobalaccel
+    ki18n
+    kiconthemes
+    kidletime
+    kinit
+    kio
+    knewstuff
+    knotifications
+    kpackage
+    krunner
+    kscreenlocker
+    kservice
+    kwayland
+    kwidgetsaddons
+    kwindowsystem
+    kxmlgui
+    plasma-framework
+    libqaccessibilityclient
 
   ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 9ba1afaf9f83..3f19acea6bdc 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,7 +1,12 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kcoreaddons
+, kdbusaddons
+, ki18n
+, knotifications
+, kpty
+, qtbase
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix
index 812637795531..721eee493730 100644
--- a/pkgs/desktops/plasma-5/layer-shell-qt.nix
+++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix
@@ -1,6 +1,14 @@
-{ mkDerivation, lib
+{ mkDerivation
+, lib
 , extra-cmake-modules
-, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, wayland-scanner, wayland, wayland-protocols
+, kguiaddons
+, kidletime
+, kwayland
+, kwindowsystem
+, qtbase
+, wayland-scanner
+, wayland
+, wayland-protocols
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index cebe1ad4451e..ad9ddc95c045 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,10 +1,15 @@
-{
-  mkDerivation, lib, propagate,
-  extra-cmake-modules,
-  qtbase,
-  wayland-scanner, kconfig, kwayland,
-  plasma-wayland-protocols, wayland,
-  libXrandr, qtx11extras
+{ mkDerivation
+, lib
+, propagate
+, extra-cmake-modules
+, qtbase
+, wayland-scanner
+, kconfig
+, kwayland
+, plasma-wayland-protocols
+, wayland
+, libXrandr
+, qtx11extras
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index ef4e44384448..8e9be6f743cf 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -1,9 +1,26 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
-  knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework,
-  qtbase, qtscript, qtwebengine, qtx11extras, libnl, libpcap, qtsensors, lm_sensors,
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kauth
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, ki18n
+, kiconthemes
+, knewstuff
+, kservice
+, kwidgetsaddons
+, kwindowsystem
+, plasma-framework
+, qtbase
+, qtscript
+, qtwebengine
+, qtx11extras
+, libnl
+, libpcap
+, qtsensors
+, lm_sensors
 }:
 
 mkDerivation {
@@ -13,9 +30,25 @@ mkDerivation {
   ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
-    kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
-    qtwebengine knewstuff libnl libpcap qtsensors lm_sensors
+    kauth
+    kconfig
+    ki18n
+    kiconthemes
+    kwindowsystem
+    kcompletion
+    kconfigwidgets
+    kcoreaddons
+    kservice
+    kwidgetsaddons
+    plasma-framework
+    qtscript
+    qtx11extras
+    qtwebengine
+    knewstuff
+    libnl
+    libpcap
+    qtsensors
+    lm_sensors
   ];
   outputs = [ "bin" "dev" "out" ];
 }
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index 8ae5061436d1..87f5f3b170f2 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,15 +1,30 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice,
-  plasma-framework, qtbase, qtscript, qtdeclarative
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kcoreaddons
+, kdeclarative
+, ki18n
+, kitemmodels
+, krunner
+, kservice
+, plasma-framework
+, qtbase
+, qtscript
+, qtdeclarative
 }:
 
 mkDerivation {
   pname = "milou";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework
-    qtdeclarative qtscript
+    kcoreaddons
+    kdeclarative
+    ki18n
+    kitemmodels
+    krunner
+    kservice
+    plasma-framework
+    qtdeclarative
+    qtscript
   ];
 }
diff --git a/pkgs/desktops/plasma-5/oxygen-sounds.nix b/pkgs/desktops/plasma-5/oxygen-sounds.nix
index ddb5be869bea..78fdebc416c8 100644
--- a/pkgs/desktops/plasma-5/oxygen-sounds.nix
+++ b/pkgs/desktops/plasma-5/oxygen-sounds.nix
@@ -1,6 +1,5 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
+{ mkDerivation
+, extra-cmake-modules
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index 78603c3c306a..a9e4eb18820b 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,18 +1,39 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
-  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
-  qtx11extras, libXdmcp
+{ mkDerivation
+, extra-cmake-modules
+, frameworkintegration
+, kcmutils
+, kcompletion
+, kconfig
+, kdecoration
+, kguiaddons
+, ki18n
+, kwidgetsaddons
+, kservice
+, kwayland
+, kwindowsystem
+, qtdeclarative
+, qtx11extras
+, libXdmcp
 }:
 
 mkDerivation {
   pname = "oxygen";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
-    frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
-    qtx11extras libXdmcp
+    frameworkintegration
+    kcmutils
+    kcompletion
+    kconfig
+    kdecoration
+    kguiaddons
+    ki18n
+    kservice
+    kwayland
+    kwidgetsaddons
+    kwindowsystem
+    qtdeclarative
+    qtx11extras
+    libXdmcp
   ];
   outputs = [ "bin" "dev" "out" ];
 }
diff --git a/pkgs/desktops/plasma-5/plank-player.nix b/pkgs/desktops/plasma-5/plank-player.nix
index 536db96ef3c3..f67cd8728ee7 100644
--- a/pkgs/desktops/plasma-5/plank-player.nix
+++ b/pkgs/desktops/plasma-5/plank-player.nix
@@ -1,10 +1,9 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtquickcontrols2,
-  qtmultimedia,
-  kirigami2,
-  ki18n,
+{ mkDerivation
+, extra-cmake-modules
+, qtquickcontrols2
+, qtmultimedia
+, kirigami2
+, ki18n
 }:
 mkDerivation {
   pname = "plank-player";
diff --git a/pkgs/desktops/plasma-5/plasma-bigscreen.nix b/pkgs/desktops/plasma-5/plasma-bigscreen.nix
index 96b7b148fa08..f94b49efabc7 100644
--- a/pkgs/desktops/plasma-5/plasma-bigscreen.nix
+++ b/pkgs/desktops/plasma-5/plasma-bigscreen.nix
@@ -1,19 +1,18 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kactivities,
-  kactivities-stats,
-  plasma-framework,
-  ki18n,
-  kirigami2,
-  kdeclarative,
-  kcmutils,
-  knotifications,
-  kio,
-  kwayland,
-  kwindowsystem,
-  plasma-workspace,
-  qtmultimedia,
+{ mkDerivation
+, extra-cmake-modules
+, kactivities
+, kactivities-stats
+, plasma-framework
+, ki18n
+, kirigami2
+, kdeclarative
+, kcmutils
+, knotifications
+, kio
+, kwayland
+, kwindowsystem
+, plasma-workspace
+, qtmultimedia
 }:
 mkDerivation {
   pname = "plasma-bigscreen";
diff --git a/pkgs/desktops/plasma-5/plasma-browser-integration.nix b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
index 1ddd844444d8..dcd895efbbc7 100644
--- a/pkgs/desktops/plasma-5/plasma-browser-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-browser-integration.nix
@@ -1,9 +1,17 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  qtbase,
-  kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
-  krunner, kwindowsystem, kactivities, plasma-workspace
+{ mkDerivation
+, extra-cmake-modules
+, qtbase
+, kfilemetadata
+, kio
+, ki18n
+, kconfig
+, kdbusaddons
+, knotifications
+, kpurpose
+, krunner
+, kwindowsystem
+, kactivities
+, plasma-workspace
 }:
 
 mkDerivation {
@@ -12,7 +20,17 @@ mkDerivation {
     extra-cmake-modules
   ];
   buildInputs = [
-    qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
-    krunner kwindowsystem kactivities plasma-workspace
+    qtbase
+    kfilemetadata
+    kio
+    ki18n
+    kconfig
+    kdbusaddons
+    knotifications
+    kpurpose
+    krunner
+    kwindowsystem
+    kactivities
+    plasma-workspace
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 6ab13f0c7261..5c71b38eaaf1 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,36 +1,115 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wayland-scanner,
-
-  boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
-  libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
-  xorgserver, util-linux, wayland, wayland-protocols,
-
-  accounts-qt, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
-  qtx11extras,
-
-  attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth,
-  kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
-  kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
-  kpeople, krunner, kscreenlocker, kwallet, kwin, phonon,
-  plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, wayland-scanner
+, boost
+, fontconfig
+, ibus
+, libXcursor
+, libXft
+, libcanberra_kde
+, libpulseaudio
+, libxkbfile
+, xf86inputevdev
+, xf86inputsynaptics
+, xinput
+, xkeyboard_config
+, xorgserver
+, util-linux
+, wayland
+, wayland-protocols
+, accounts-qt
+, qtdeclarative
+, qtquickcontrols
+, qtquickcontrols2
+, qtsvg
+, qtx11extras
+, attica
+, baloo
+, kaccounts-integration
+, kactivities
+, kactivities-stats
+, kauth
+, kcmutils
+, kdbusaddons
+, kdeclarative
+, kded
+, kdelibs4support
+, kemoticons
+, kglobalaccel
+, ki18n
+, kitemmodels
+, knewstuff
+, knotifications
+, knotifyconfig
+, kpeople
+, krunner
+, kscreenlocker
+, kwallet
+, kwin
+, phonon
+, plasma-framework
+, plasma-workspace
+, qqc2-desktop-style
+, xf86inputlibinput
 }:
 
 mkDerivation {
   pname = "plasma-desktop";
   nativeBuildInputs = [ extra-cmake-modules kdoctools wayland-scanner ];
   buildInputs = [
-    boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver
-    libxkbfile phonon xf86inputlibinput xf86inputevdev xf86inputsynaptics xinput
-    xkeyboard_config wayland wayland-protocols
+    boost
+    fontconfig
+    ibus
+    libcanberra_kde
+    libpulseaudio
+    libXcursor
+    libXft
+    xorgserver
+    libxkbfile
+    phonon
+    xf86inputlibinput
+    xf86inputevdev
+    xf86inputsynaptics
+    xinput
+    xkeyboard_config
+    wayland
+    wayland-protocols
 
-    accounts-qt qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
+    accounts-qt
+    qtdeclarative
+    qtquickcontrols
+    qtquickcontrols2
+    qtsvg
+    qtx11extras
 
-    attica baloo kaccounts-integration kactivities kactivities-stats kauth
-    kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons
-    kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig
-    kpeople krunner kscreenlocker kwallet kwin plasma-framework
-    plasma-workspace qqc2-desktop-style
+    attica
+    baloo
+    kaccounts-integration
+    kactivities
+    kactivities-stats
+    kauth
+    kcmutils
+    kdbusaddons
+    kdeclarative
+    kded
+    kdelibs4support
+    kemoticons
+    kglobalaccel
+    ki18n
+    kitemmodels
+    knewstuff
+    knotifications
+    knotifyconfig
+    kpeople
+    krunner
+    kscreenlocker
+    kwallet
+    kwin
+    plasma-framework
+    plasma-workspace
+    qqc2-desktop-style
   ];
 
   patches = [
diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix
index 8ddd53548e75..801bf4d978b3 100644
--- a/pkgs/desktops/plasma-5/plasma-disks.nix
+++ b/pkgs/desktops/plasma-5/plasma-disks.nix
@@ -1,18 +1,49 @@
-{
-  mkDerivation, extra-cmake-modules, kdoctools,
-  kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
-  kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
-  kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace,
-  systemsettings
+{ mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kcmutils
+, kconfig
+, kdbusaddons
+, khtml
+, ki18n
+, kiconthemes
+, kio
+, kitemviews
+, kservice
+, kwindowsystem
+, kxmlgui
+, qtquickcontrols
+, qtquickcontrols2
+, kactivities
+, kactivities-stats
+, kirigami2
+, kcrash
+, plasma-workspace
+, systemsettings
 }:
 
 mkDerivation {
   pname = "plasma-disks";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
-    kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
-    kactivities kactivities-stats kirigami2 kcrash plasma-workspace
+    kcmutils
+    kconfig
+    kdbusaddons
+    khtml
+    ki18n
+    kiconthemes
+    kio
+    kitemviews
+    kservice
+    kwindowsystem
+    kxmlgui
+    qtquickcontrols
+    qtquickcontrols2
+    kactivities
+    kactivities-stats
+    kirigami2
+    kcrash
+    plasma-workspace
     systemsettings
   ];
   outputs = [ "bin" "dev" "out" ];
diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix
index 2c6bd8337ff1..f88b737e0ec7 100644
--- a/pkgs/desktops/plasma-5/plasma-integration/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix
@@ -1,9 +1,17 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
-  kwayland, libXcursor, qtquickcontrols2, wayland, wayland-protocols,
-  plasma-wayland-protocols
+{ mkDerivation
+, extra-cmake-modules
+, breeze-qt5
+, kconfig
+, kconfigwidgets
+, kiconthemes
+, kio
+, knotifications
+, kwayland
+, libXcursor
+, qtquickcontrols2
+, wayland
+, wayland-protocols
+, plasma-wayland-protocols
 }:
 
 # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
@@ -12,8 +20,17 @@ mkDerivation {
   pname = "plasma-integration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
-    libXcursor qtquickcontrols2 wayland wayland-protocols
+    breeze-qt5
+    kconfig
+    kconfigwidgets
+    kiconthemes
+    kio
+    knotifications
+    kwayland
+    libXcursor
+    qtquickcontrols2
+    wayland
+    wayland-protocols
     plasma-wayland-protocols
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
index 41324d53b6a7..ce0da404bb59 100644
--- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
@@ -1,16 +1,36 @@
-{
-  mkDerivation, lib,
-
-  extra-cmake-modules, kdoctools,
-
-  coreutils, dbus, gnugrep, gnused, libdbusmenu, pam, wayland, appstream,
-
-  kdeclarative, kdelibs4support, kpeople, kconfig, krunner, kinit, kwayland, kwin,
-  plasma-framework, telepathy, libphonenumber, protobuf, libqofono, modemmanager-qt,
-  networkmanager-qt, plasma-workspace,
-  maliit-framework, maliit-keyboard, qtfeedback,
-
-  qtwayland, qttools
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, coreutils
+, dbus
+, gnugrep
+, gnused
+, libdbusmenu
+, pam
+, wayland
+, appstream
+, kdeclarative
+, kdelibs4support
+, kpeople
+, kconfig
+, krunner
+, kinit
+, kwayland
+, kwin
+, plasma-framework
+, telepathy
+, libphonenumber
+, protobuf
+, libqofono
+, modemmanager-qt
+, networkmanager-qt
+, plasma-workspace
+, maliit-framework
+, maliit-keyboard
+, qtfeedback
+, qtwayland
+, qttools
 }:
 
 let inherit (lib) getBin getLib; in
@@ -20,10 +40,29 @@ mkDerivation {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    appstream libdbusmenu pam wayland
-    kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin
-    plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt
-    networkmanager-qt maliit-framework maliit-keyboard plasma-workspace qtfeedback
+    appstream
+    libdbusmenu
+    pam
+    wayland
+    kdeclarative
+    kdelibs4support
+    kpeople
+    kconfig
+    krunner
+    kinit
+    kwayland
+    kwin
+    plasma-framework
+    telepathy
+    libphonenumber
+    protobuf
+    libqofono
+    modemmanager-qt
+    networkmanager-qt
+    maliit-framework
+    maliit-keyboard
+    plasma-workspace
+    qtfeedback
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/plasma-5/plasma-nano/default.nix b/pkgs/desktops/plasma-5/plasma-nano/default.nix
index 6e2608c7f97b..50f0d321b394 100644
--- a/pkgs/desktops/plasma-5/plasma-nano/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nano/default.nix
@@ -1,7 +1,6 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  plasma-framework
+{ mkDerivation
+, extra-cmake-modules
+, plasma-framework
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 28331fc70738..99f4033303f9 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,27 +1,70 @@
-{
-  mkDerivation, lib, substituteAll,
-  extra-cmake-modules, kdoctools,
-  kcmutils, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
-  ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet,
-  kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, prison, solid,
-
-  mobile-broadband-provider-info, openconnect, openvpn,
-  modemmanager-qt, networkmanager-qt, qca-qt5,
-  qtbase, qtdeclarative, qttools,
+{ mkDerivation
+, lib
+, substituteAll
+, extra-cmake-modules
+, kdoctools
+, kcmutils
+, kcompletion
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeclarative
+, ki18n
+, kiconthemes
+, kinit
+, kio
+, kitemviews
+, knotifications
+, kservice
+, kwallet
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+, plasma-framework
+, prison
+, solid
+, mobile-broadband-provider-info
+, openconnect
+, openvpn
+, modemmanager-qt
+, networkmanager-qt
+, qca-qt5
+, qtbase
+, qtdeclarative
+, qttools
 }:
 
 mkDerivation {
   pname = "plasma-nm";
   nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
   buildInputs = [
-    kdeclarative ki18n kio kwindowsystem plasma-framework kcompletion
-    kcmutils kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
-    prison solid
+    kdeclarative
+    ki18n
+    kio
+    kwindowsystem
+    plasma-framework
+    kcompletion
+    kcmutils
+    kconfigwidgets
+    kcoreaddons
+    kdbusaddons
+    kiconthemes
+    kinit
+    kitemviews
+    knotifications
+    kservice
+    kwallet
+    kwidgetsaddons
+    kxmlgui
+    prison
+    solid
 
     qtdeclarative
-    modemmanager-qt networkmanager-qt qca-qt5
-    mobile-broadband-provider-info openconnect
+    modemmanager-qt
+    networkmanager-qt
+    qca-qt5
+    mobile-broadband-provider-info
+    openconnect
   ];
   patches = [
     (substituteAll {
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index b0a4e614bf32..07170892f279 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,20 +1,44 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  kcmutils, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework,
-  qtbase, qtdeclarative,
-  gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcmutils
+, kconfigwidgets
+, kcoreaddons
+, kdeclarative
+, kglobalaccel
+, ki18n
+, kwindowsystem
+, plasma-framework
+, qtbase
+, qtdeclarative
+, gconf
+, glib
+, libcanberra-gtk3
+, libpulseaudio
+, sound-theme-freedesktop
 }:
 
 mkDerivation {
   pname = "plasma-pa";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop
+    gconf
+    glib
+    libcanberra-gtk3
+    libpulseaudio
+    sound-theme-freedesktop
 
-    kcmutils kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework
+    kcmutils
+    kconfigwidgets
+    kcoreaddons
+    kdeclarative
+    kglobalaccel
+    ki18n
+    plasma-framework
     kwindowsystem
 
-    qtbase qtdeclarative
+    qtbase
+    qtdeclarative
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
index a1688e939c7b..3f169244fdaf 100644
--- a/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
+++ b/pkgs/desktops/plasma-5/plasma-remotecontrollers.nix
@@ -1,22 +1,21 @@
-{
-  mkDerivation,
-  extra-cmake-modules,
-  kconfig,
-  knotifications,
-  ki18n,
-  solid,
-  kcoreaddons,
-  kdeclarative,
-  kcmutils,
-  kpackage,
-  kwindowsystem,
-  wayland,
-  pkg-config,
-  libcec,
-  libcec_platform,
-  libevdev,
-  plasma-workspace,
-  plasma-wayland-protocols,
+{ mkDerivation
+, extra-cmake-modules
+, kconfig
+, knotifications
+, ki18n
+, solid
+, kcoreaddons
+, kdeclarative
+, kcmutils
+, kpackage
+, kwindowsystem
+, wayland
+, pkg-config
+, libcec
+, libcec_platform
+, libevdev
+, plasma-workspace
+, plasma-wayland-protocols
 }:
 mkDerivation {
   pname = "plasma-remotecontrollers";
diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix
index b6ceb37a71ff..ba1def530476 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix
@@ -1,16 +1,14 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-
-  kactivities,
-  plasma-framework,
-  kwindowsystem,
-  networkmanager-qt,
-  libksysguard,
-
-  encfs,
-  cryfs,
-  fuse
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kactivities
+, plasma-framework
+, kwindowsystem
+, networkmanager-qt
+, libksysguard
+, encfs
+, cryfs
+, fuse
 }:
 
 mkDerivation {
@@ -24,7 +22,10 @@ mkDerivation {
   ];
 
   buildInputs = [
-    kactivities plasma-framework kwindowsystem libksysguard
+    kactivities
+    plasma-framework
+    kwindowsystem
+    libksysguard
     networkmanager-qt
   ];
 
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index 8ae136ac78ba..799973c21538 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,4 +1,4 @@
-{ mkDerivation , extra-cmake-modules }:
+{ mkDerivation, extra-cmake-modules }:
 
 mkDerivation {
   pname = "plasma-workspace-wallpapers";
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 27fb2b0c594e..252b6a9fac55 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,23 +1,72 @@
-{
-  mkDerivation, lib,
-
-  extra-cmake-modules, kdoctools,
-
-  coreutils, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
-  libXtst, libXft, pam, wayland, xmessage, xsetroot,
-
-  baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
-  kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
-  kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner,
-  kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
-  kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
-  phonon, plasma-framework, prison, solid, kholidays, kquickcharts,
-  appstream-qt, plasma-wayland-protocols, kpipewire, libkexiv2,
-
-  qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
-  qtwayland, qtx11extras, qqc2-desktop-style, polkit-qt,
-
-  pipewire, libdrm
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kdoctools
+, coreutils
+, gnugrep
+, gnused
+, isocodes
+, libdbusmenu
+, libSM
+, libXcursor
+, libXtst
+, libXft
+, pam
+, wayland
+, xmessage
+, xsetroot
+, baloo
+, breeze-qt5
+, kactivities
+, kactivities-stats
+, kcmutils
+, kconfig
+, kcrash
+, kdbusaddons
+, kdeclarative
+, kdelibs4support
+, kdesu
+, kglobalaccel
+, kidletime
+, kinit
+, kjsembed
+, knewstuff
+, knotifyconfig
+, kpackage
+, kpeople
+, krunner
+, kscreenlocker
+, ktexteditor
+, ktextwidgets
+, kwallet
+, kwayland
+, kwin
+, kxmlrpcclient
+, libkscreen
+, libksysguard
+, libqalculate
+, networkmanager-qt
+, phonon
+, plasma-framework
+, prison
+, solid
+, kholidays
+, kquickcharts
+, appstream-qt
+, plasma-wayland-protocols
+, kpipewire
+, libkexiv2
+, qtgraphicaleffects
+, qtquickcontrols
+, qtquickcontrols2
+, qtscript
+, qttools
+, qtwayland
+, qtx11extras
+, qqc2-desktop-style
+, polkit-qt
+, pipewire
+, libdrm
 }:
 
 let inherit (lib) getBin getLib; in
@@ -28,20 +77,66 @@ mkDerivation {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland
+    isocodes
+    libdbusmenu
+    libSM
+    libXcursor
+    libXtst
+    libXft
+    pam
+    wayland
 
-    baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons
-    kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
-    knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
-    ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
-    libqalculate networkmanager-qt phonon plasma-framework prison solid
-    kholidays kquickcharts appstream-qt plasma-wayland-protocols kpipewire
+    baloo
+    kactivities
+    kactivities-stats
+    kcmutils
+    kconfig
+    kcrash
+    kdbusaddons
+    kdeclarative
+    kdelibs4support
+    kdesu
+    kglobalaccel
+    kidletime
+    kjsembed
+    knewstuff
+    knotifyconfig
+    kpackage
+    kpeople
+    krunner
+    kscreenlocker
+    ktexteditor
+    ktextwidgets
+    kwallet
+    kwayland
+    kwin
+    kxmlrpcclient
+    libkscreen
+    libksysguard
+    libqalculate
+    networkmanager-qt
+    phonon
+    plasma-framework
+    prison
+    solid
+    kholidays
+    kquickcharts
+    appstream-qt
+    plasma-wayland-protocols
+    kpipewire
     libkexiv2
 
-    qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland
-    qtx11extras qqc2-desktop-style polkit-qt
+    qtgraphicaleffects
+    qtquickcontrols
+    qtquickcontrols2
+    qtscript
+    qtwayland
+    qtx11extras
+    qqc2-desktop-style
+    polkit-qt
 
-    pipewire libdrm
+    pipewire
+    libdrm
   ];
   propagatedUserEnvPkgs = [ qtgraphicaleffects ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 82ebf3e31365..3f4387ed5f34 100644
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -1,15 +1,33 @@
-{
-  mkDerivation, lib, extra-cmake-modules,
-  kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
-  kwidgetsaddons, kwindowsystem, polkit-qt, qtbase
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, kcoreaddons
+, kconfig
+, kcrash
+, kdbusaddons
+, ki18n
+, kiconthemes
+, knotifications
+, kwidgetsaddons
+, kwindowsystem
+, polkit-qt
+, qtbase
 }:
 
 mkDerivation {
   pname = "polkit-kde-agent";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
-    kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
-    knotifications kwindowsystem polkit-qt
+    kdbusaddons
+    kwidgetsaddons
+    kcoreaddons
+    kcrash
+    kconfig
+    ki18n
+    kiconthemes
+    knotifications
+    kwindowsystem
+    polkit-qt
   ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index bb511c21ba67..d60f9701dee6 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,17 +1,45 @@
-{
-  mkDerivation,
-  extra-cmake-modules, kdoctools,
-  bluez-qt, kactivities, kauth, kconfig, kdbusaddons,
-  kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen,
-  networkmanager-qt, plasma-workspace, qtx11extras, solid, udev
+{ mkDerivation
+, extra-cmake-modules
+, kdoctools
+, bluez-qt
+, kactivities
+, kauth
+, kconfig
+, kdbusaddons
+, kglobalaccel
+, ki18n
+, kidletime
+, kio
+, knotifyconfig
+, kwayland
+, libkscreen
+, networkmanager-qt
+, plasma-workspace
+, qtx11extras
+, solid
+, udev
 }:
 
 mkDerivation {
   pname = "powerdevil";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
-    kglobalaccel ki18n kio kidletime kwayland libkscreen
-    networkmanager-qt plasma-workspace qtx11extras
+    kconfig
+    kdbusaddons
+    knotifyconfig
+    solid
+    udev
+    bluez-qt
+    kactivities
+    kauth
+    kglobalaccel
+    ki18n
+    kio
+    kidletime
+    kwayland
+    libkscreen
+    networkmanager-qt
+    plasma-workspace
+    qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index c83bbcecf567..94d8f92ac4f9 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,17 +1,48 @@
-{
-  mkDerivation, extra-cmake-modules, kdoctools,
-  kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
-  kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2,
-  kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace
+{ mkDerivation
+, extra-cmake-modules
+, kdoctools
+, kcmutils
+, kconfig
+, kdbusaddons
+, khtml
+, ki18n
+, kiconthemes
+, kio
+, kitemviews
+, kservice
+, kwindowsystem
+, kxmlgui
+, qtquickcontrols
+, qtquickcontrols2
+, kactivities
+, kactivities-stats
+, kirigami2
+, kcrash
+, plasma-workspace
 }:
 
 mkDerivation {
   pname = "systemsettings";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
-    kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
-    kactivities kactivities-stats kirigami2 kcrash plasma-workspace
+    kcmutils
+    kconfig
+    kdbusaddons
+    khtml
+    ki18n
+    kiconthemes
+    kio
+    kitemviews
+    kservice
+    kwindowsystem
+    kxmlgui
+    qtquickcontrols
+    qtquickcontrols2
+    kactivities
+    kactivities-stats
+    kirigami2
+    kcrash
+    plasma-workspace
   ];
   outputs = [ "bin" "dev" "out" ];
 }
diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
index 00533367d4ce..dc5728791b60 100644
--- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
+++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix
@@ -1,19 +1,49 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, gettext, kdoctools,
-  cups, libepoxy, mesa, pcre, pipewire, wayland, wayland-protocols,
-  kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem,
-  kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio,
-  qtbase
+{ mkDerivation
+, lib
+, extra-cmake-modules
+, gettext
+, kdoctools
+, cups
+, libepoxy
+, mesa
+, pcre
+, pipewire
+, wayland
+, wayland-protocols
+, kcoreaddons
+, knotifications
+, kwayland
+, kwidgetsaddons
+, kwindowsystem
+, kirigami2
+, kdeclarative
+, plasma-framework
+, plasma-wayland-protocols
+, kio
+, qtbase
 }:
 
 mkDerivation {
   pname = "xdg-desktop-portal-kde";
   nativeBuildInputs = [ extra-cmake-modules gettext kdoctools ];
   buildInputs = [
-    cups libepoxy mesa pcre pipewire wayland wayland-protocols
+    cups
+    libepoxy
+    mesa
+    pcre
+    pipewire
+    wayland
+    wayland-protocols
 
-    kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem
-    kirigami2 kdeclarative plasma-framework plasma-wayland-protocols
+    kio
+    kcoreaddons
+    knotifications
+    kwayland
+    kwidgetsaddons
+    kwindowsystem
+    kirigami2
+    kdeclarative
+    plasma-framework
+    plasma-wayland-protocols
   ];
 }

From 1a805a718df2360663c686de12a8727de57a90bf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 12 Oct 2022 10:22:13 +0300
Subject: [PATCH 23/56] kde/frameworks: 5.98 -> 5.99

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 664 +++++++++---------
 2 files changed, 333 insertions(+), 333 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index e7704c32122b..168ab3bdf63e 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.98/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.99/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 6b03f50687a2..2c7ae1f8a4b2 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
 
 {
   attica = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/attica-5.98.0.tar.xz";
-      sha256 = "0w1w6w2jia1q32jnn2dhyxmkq64ha1dcbsqj233v4f224rp3aknp";
-      name = "attica-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/attica-5.99.0.tar.xz";
+      sha256 = "1cb3cdn8v68d14l7gax4zdjk0vgqwj6gxmdnzhf9qfvik6rd6nhp";
+      name = "attica-5.99.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/baloo-5.98.0.tar.xz";
-      sha256 = "0x515lnvrzlnsv5i924q17mzi88k00krj90myad17s0g7p5pi1rw";
-      name = "baloo-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/baloo-5.99.0.tar.xz";
+      sha256 = "0spz0sa2lbdbm12d10bswcyawayxpykk3v8yicv5khgf6adpdyq0";
+      name = "baloo-5.99.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/bluez-qt-5.98.0.tar.xz";
-      sha256 = "0h2k2qiskn921cpni5rs7x5ahric6dlllwsrk77akpi4xcsrip2g";
-      name = "bluez-qt-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/bluez-qt-5.99.0.tar.xz";
+      sha256 = "11fg7lk1yxj5dfq7s8z17n9prvnqfvk1hsgyd1ygi1x1d2qipjg7";
+      name = "bluez-qt-5.99.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/breeze-icons-5.98.0.tar.xz";
-      sha256 = "0a3zvmhcfsnxv0jpyjny3sl769p99psadl1872v0qlkax47pvsjp";
-      name = "breeze-icons-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/breeze-icons-5.99.0.tar.xz";
+      sha256 = "1z9wrmb4jj7sfnb7kqmx2ww53vily52ycm7rgycr2b1q0jf6j3s8";
+      name = "breeze-icons-5.99.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/extra-cmake-modules-5.98.0.tar.xz";
-      sha256 = "0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w";
-      name = "extra-cmake-modules-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/extra-cmake-modules-5.99.0.tar.xz";
+      sha256 = "0zl0hwp077b8w338bl0210i6892kwfx2vqpn55qvb3b20sk8m081";
+      name = "extra-cmake-modules-5.99.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/frameworkintegration-5.98.0.tar.xz";
-      sha256 = "1mrangjj8lhm4njpkhqna2zwnidkd9crs23gj6kdlwzmiknypi6q";
-      name = "frameworkintegration-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/frameworkintegration-5.99.0.tar.xz";
+      sha256 = "14dx60xvgcb6nf5d83cgm7y6wc8d7ngxg6aaka6k8996qfkczz9k";
+      name = "frameworkintegration-5.99.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kactivities-5.98.0.tar.xz";
-      sha256 = "0n7r88y1b8mph5al2xh8fbw5ckdzdmdzjipf205y20ib35bskd9i";
-      name = "kactivities-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kactivities-5.99.0.tar.xz";
+      sha256 = "1l7jzj3nscfmbiq105v9gkz4sd0c92vydmhw4j9mjjjn16aqbs39";
+      name = "kactivities-5.99.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kactivities-stats-5.98.0.tar.xz";
-      sha256 = "0zvw3km1wf91wl9xbjvawjia0847kbs3js4nbf3d0z87l5h6rbx8";
-      name = "kactivities-stats-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kactivities-stats-5.99.0.tar.xz";
+      sha256 = "0cr0sjk1rwv3zjvmhs2xc7wfs33r9x6padybc7v2aq751gz5cc4k";
+      name = "kactivities-stats-5.99.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kapidox-5.98.0.tar.xz";
-      sha256 = "1k2qk8ibv5dqdhkn2992n8rlmslpmngz83hxb7zrh3pkphdg8v2n";
-      name = "kapidox-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kapidox-5.99.0.tar.xz";
+      sha256 = "15r8x5z50xwfmh507kf3hsr8yqlfank224hfhcrpyl1vi256jb8c";
+      name = "kapidox-5.99.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/karchive-5.98.0.tar.xz";
-      sha256 = "1ipj7j1iw6g56z0qppji38h6qwbs05piiqqbsw8hdbf96l6cdiq2";
-      name = "karchive-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/karchive-5.99.0.tar.xz";
+      sha256 = "1z4msj6w7g2fy2mp07aadm9f2qv5x4mhjisv7ppl8hrhz355f6ap";
+      name = "karchive-5.99.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kauth-5.98.0.tar.xz";
-      sha256 = "0nzdvx2mibpq1cgzpll9ffjr46vch1qvriaywyqih0iybx6mx5z6";
-      name = "kauth-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kauth-5.99.0.tar.xz";
+      sha256 = "14xz3gh4p7dn0wacjyqwm5x82kiwik3nswx7icmhnq686cvp7fin";
+      name = "kauth-5.99.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kbookmarks-5.98.0.tar.xz";
-      sha256 = "1rpjqz2xnpb2wp2k3pjdclbkb0p96y48x6h8l056nr93alxyrqvi";
-      name = "kbookmarks-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kbookmarks-5.99.0.tar.xz";
+      sha256 = "0vb8q69ki6aqmq8hacqq886dl7kwf9zyw015vb52nsinv8zjvf5m";
+      name = "kbookmarks-5.99.0.tar.xz";
     };
   };
   kcalendarcore = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcalendarcore-5.98.0.tar.xz";
-      sha256 = "16kclspsjzld9n07z1i8li2pc91ihpqhbk46a4s92nsihs2dkayk";
-      name = "kcalendarcore-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcalendarcore-5.99.0.tar.xz";
+      sha256 = "11zcgjkz0q4da3vxis7b4lg07sfvk01z0dgx1ccpa15ardmc8l8r";
+      name = "kcalendarcore-5.99.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcmutils-5.98.0.tar.xz";
-      sha256 = "0jqkg4i16jnxricrhi1cbvv7gjjj7ry3z36mzh11h48ml7rl05qx";
-      name = "kcmutils-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcmutils-5.99.0.tar.xz";
+      sha256 = "1ljaz8xja2z720cr6n8g2lizsb4kw4vlakfv5xhq466am27csyvm";
+      name = "kcmutils-5.99.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcodecs-5.98.0.tar.xz";
-      sha256 = "0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz";
-      name = "kcodecs-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcodecs-5.99.0.tar.xz";
+      sha256 = "0xi0hscwf4kv5cp7hxwialy2wqr6ijdh0syh9p43icwx6c8q1kb2";
+      name = "kcodecs-5.99.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcompletion-5.98.0.tar.xz";
-      sha256 = "191vid00zskvhl6dgj6yz9iyvwdcmg35l5gq68ggjr17cj59acsf";
-      name = "kcompletion-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcompletion-5.99.0.tar.xz";
+      sha256 = "14s7nmslli2vaiwg993rg0wvfqlnfcvxadapl41s92iisf6b4m2b";
+      name = "kcompletion-5.99.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kconfig-5.98.0.tar.xz";
-      sha256 = "15m2bggfr682q68dym7nzmvz7q7pwarzijad1wj0r5cs62l3bkjy";
-      name = "kconfig-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kconfig-5.99.0.tar.xz";
+      sha256 = "19jqsah1x1086sqnv5f4bicmi4c5y8idxrx96ji7jign5z9c7isx";
+      name = "kconfig-5.99.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kconfigwidgets-5.98.0.tar.xz";
-      sha256 = "05bwldqc5k6dlzsxjby5565sch6i0mh7jg5cbyjz24xb1fpj0d7b";
-      name = "kconfigwidgets-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kconfigwidgets-5.99.0.tar.xz";
+      sha256 = "07xzgmx3fvrynzhnnxrdr4536n1v10rwgk2z92q1y1q18cmbwyc5";
+      name = "kconfigwidgets-5.99.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcontacts-5.98.0.tar.xz";
-      sha256 = "0g3lg1i9rg7hjw7xjx9228sy54dy35lgwghcjds5cawszl5yi106";
-      name = "kcontacts-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcontacts-5.99.0.tar.xz";
+      sha256 = "1f3288xll0kd0dyq7namfykq8f9zkg5lm27lk2vfvba4v28hdax5";
+      name = "kcontacts-5.99.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcoreaddons-5.98.0.tar.xz";
-      sha256 = "0lqmyxqsw7w1qgdgmax63v64cy7dwk7n4zi8k53xmrqjmd9jir52";
-      name = "kcoreaddons-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcoreaddons-5.99.0.tar.xz";
+      sha256 = "06qkyk3zjkpjd7zynx5krh6k2qx8nxmggyhkvd4dgcbi74ys6xjs";
+      name = "kcoreaddons-5.99.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kcrash-5.98.0.tar.xz";
-      sha256 = "03ba3x9jgp15dxgwbjnv5s98f5di2z4ncp4hiv1qkyiibqqfx6kf";
-      name = "kcrash-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kcrash-5.99.0.tar.xz";
+      sha256 = "1wn3cwdhipw2ry1qf58cf24vq23jg8rnki33vc6mwbi54qkc95p8";
+      name = "kcrash-5.99.0.tar.xz";
     };
   };
   kdav = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kdav-5.98.0.tar.xz";
-      sha256 = "02474a3k7yqgnb1sbxbnm6l4cahn88y2631jvkq9xlmcx7xs2dzi";
-      name = "kdav-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kdav-5.99.0.tar.xz";
+      sha256 = "1r36nlybwwn5pk6q9hl4zkyhp3vyrqdp75g4fd4jj1a2y88yiwzd";
+      name = "kdav-5.99.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kdbusaddons-5.98.0.tar.xz";
-      sha256 = "0fwdmlnci2xn5pi1ywgia3xka3zsh6gl6xpx1gvql7lczk1y490a";
-      name = "kdbusaddons-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kdbusaddons-5.99.0.tar.xz";
+      sha256 = "1n9j9gf4br0vykbwf1n0zcvwfz727d71ny92ka0g97bid7nwrix0";
+      name = "kdbusaddons-5.99.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kdeclarative-5.98.0.tar.xz";
-      sha256 = "0y5scmcnzhwvyb7x6fdb59xgdhghw8v9i3r05gx1x7g1gfsw0wh6";
-      name = "kdeclarative-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kdeclarative-5.99.0.tar.xz";
+      sha256 = "191s25l07z0blqcap23l6gbzvxa6pcqhsfaqfkf4f3vap48wr2hn";
+      name = "kdeclarative-5.99.0.tar.xz";
     };
   };
   kded = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kded-5.98.0.tar.xz";
-      sha256 = "1k8yxdnihfvvdjmw7lmd62vi5k1hpvjdcwd7njqxz6178iq7dd75";
-      name = "kded-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kded-5.99.0.tar.xz";
+      sha256 = "1kbh921p3n9zszbvsrnrmi32v567s7dqp7dfm13kykmz9lsxih82";
+      name = "kded-5.99.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kdelibs4support-5.98.0.tar.xz";
-      sha256 = "0hyyrxic1rkw2jrr92rnmbk6bqkfrcnpc917vs7xyansk9799b8f";
-      name = "kdelibs4support-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kdelibs4support-5.99.0.tar.xz";
+      sha256 = "074d7qaai4xj2w1534862a13flqfchdr2c6651gdgrw4275cfd85";
+      name = "kdelibs4support-5.99.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kdesignerplugin-5.98.0.tar.xz";
-      sha256 = "17b0javl6k5zcmx04aqzmh3qdgwvzhf62x603m4pg6xbl3zns67g";
-      name = "kdesignerplugin-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kdesignerplugin-5.99.0.tar.xz";
+      sha256 = "0wvx95nx11b25ib1yqmagvzp2ky7yqdrwaxm03cvhb0y92ymmrmf";
+      name = "kdesignerplugin-5.99.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kdesu-5.98.0.tar.xz";
-      sha256 = "15fbb7zifk4lhnlwvqhs9svzb80qwms03zbrjfnsc1n1wyyfk7v2";
-      name = "kdesu-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kdesu-5.99.0.tar.xz";
+      sha256 = "0chwfman5ka1fgbv5ckr21z93xmbhccv527y43mqa9rwa3gdk4xk";
+      name = "kdesu-5.99.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kdewebkit-5.98.0.tar.xz";
-      sha256 = "03bwwgzh1xfj4w7q2cvr7712yrjgf9qhqkqgzypcdb49gpvaq164";
-      name = "kdewebkit-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kdewebkit-5.99.0.tar.xz";
+      sha256 = "1m1x63w6qb4dbr5p9vzg0v5hc0bxk86h2qswm52nx8wagapi1qhp";
+      name = "kdewebkit-5.99.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kdnssd-5.98.0.tar.xz";
-      sha256 = "0wcjq0g1cdjz9npy31i4rqbx85a95f15w71aamhm8x82l8nysv4g";
-      name = "kdnssd-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kdnssd-5.99.0.tar.xz";
+      sha256 = "071ab2gx19vrl5jcm14w4y0rk431wmmmkzcs8mkcr8rwpdclyca7";
+      name = "kdnssd-5.99.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kdoctools-5.98.0.tar.xz";
-      sha256 = "0ygpjasdynsmb3c8rdwnc5jminl5f34cmqnihsig831xsq8z6chs";
-      name = "kdoctools-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kdoctools-5.99.0.tar.xz";
+      sha256 = "19p3lkis641cdbbfpld122n242l3980j5x38mwd6slpl2alyz5f6";
+      name = "kdoctools-5.99.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kemoticons-5.98.0.tar.xz";
-      sha256 = "0f3d0jmpnqkrjn95sbvjzda923rfdgrlxd4k58pmzd0bblxkcxh2";
-      name = "kemoticons-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kemoticons-5.99.0.tar.xz";
+      sha256 = "1fihsp4w9icc47fswnikmdpdwrznrv2zdddc59akd5n308224sys";
+      name = "kemoticons-5.99.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kfilemetadata-5.98.0.tar.xz";
-      sha256 = "1nsvslhs2kiff3r5ji8z931lh6srvjzzvwnv9cs0j74sr46c6rkn";
-      name = "kfilemetadata-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kfilemetadata-5.99.0.tar.xz";
+      sha256 = "15ni3ns6c85a7121nph9c48f9ddna5bfj1134wrn76jwa2scs7vs";
+      name = "kfilemetadata-5.99.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kglobalaccel-5.98.0.tar.xz";
-      sha256 = "1vr6k7lpxsxa6in60ld2wcdqfpaan5xgbmwm3xyr584x6pv737cl";
-      name = "kglobalaccel-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kglobalaccel-5.99.0.tar.xz";
+      sha256 = "0c4wi6kpra34wwvsj12f1bis8jkv4c57jgp9b5k72h04hpnps7a7";
+      name = "kglobalaccel-5.99.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kguiaddons-5.98.0.tar.xz";
-      sha256 = "022qf858khdqklq117i223ihpw8mvdcbcfn8cwqmn2cv9qnfxnqj";
-      name = "kguiaddons-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kguiaddons-5.99.0.tar.xz";
+      sha256 = "0kqvf7h98d0bsgqmcfwasi7ik3025g0bi3brx47wrkd3nxjym1zf";
+      name = "kguiaddons-5.99.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kholidays-5.98.0.tar.xz";
-      sha256 = "0ysw52wiyxrkprn0gis85nphpfl1wdb4439i66dfmg7s9nyqpzp0";
-      name = "kholidays-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kholidays-5.99.0.tar.xz";
+      sha256 = "1k165ksmznhx2d5ycmw1lwly7qkmj50113w1qrfqvg16jl6il4zq";
+      name = "kholidays-5.99.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/khtml-5.98.0.tar.xz";
-      sha256 = "0bflwrp6i2w6a3fq2m2df655495rpnsmqcm7w1f1dzfndc6yd9i5";
-      name = "khtml-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/khtml-5.99.0.tar.xz";
+      sha256 = "0vwkii8x6l3sw0nkxvv960frz9qgjxpkxg6cabxvp3v5gcb3fbzr";
+      name = "khtml-5.99.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/ki18n-5.98.0.tar.xz";
-      sha256 = "0b3r53v2ybhlyqpkjv98dv2w9q49yqqxk9qzbyc4mm7ypq4hvl47";
-      name = "ki18n-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/ki18n-5.99.0.tar.xz";
+      sha256 = "1bgq7saadrh9vvx15hyf03cir1nywad63vlg07qpc8ra01ddsi0m";
+      name = "ki18n-5.99.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kiconthemes-5.98.0.tar.xz";
-      sha256 = "1qmld8xgabmwx2dh5395pll0a0jgirxhlbqv6aph76jg4lvynkqx";
-      name = "kiconthemes-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kiconthemes-5.99.0.tar.xz";
+      sha256 = "019s0wr00s6c8p70jzi3vr2m5wkc3rsnlc44ldn16z4r4x9wl9m4";
+      name = "kiconthemes-5.99.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kidletime-5.98.0.tar.xz";
-      sha256 = "1jdbjkishqnlzz1qrzyg92xnlsl7w89dmrh0zhzaj9bnr5a3icck";
-      name = "kidletime-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kidletime-5.99.0.tar.xz";
+      sha256 = "1wfwhfzhpsy1m5zm2m99dsg0g9hjns33m4v4714sfpyngzqwlggg";
+      name = "kidletime-5.99.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kimageformats-5.98.0.tar.xz";
-      sha256 = "0v4jr1lh2qjk453q8mpz94cd98k4kmjrykn8kxrd7zvrkaa4snfy";
-      name = "kimageformats-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kimageformats-5.99.0.tar.xz";
+      sha256 = "1vmi3mi7gg81f556dm8gk7i3k9izr008swpdpyqd3n03zva3drh6";
+      name = "kimageformats-5.99.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kinit-5.98.0.tar.xz";
-      sha256 = "04654hz3yipnlhy5gz3bkh988fcfl1lv7608k4xa5qnbsxaqh141";
-      name = "kinit-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kinit-5.99.0.tar.xz";
+      sha256 = "0xq1sqyni7xzcnjiaszaxwhv7q2p4zjp6nixkam356iswkbss0i3";
+      name = "kinit-5.99.0.tar.xz";
     };
   };
   kio = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kio-5.98.0.tar.xz";
-      sha256 = "0z1ikpa3an3qmd26h2v48kxxw1jph21i12x4nawvc4x1dp4vkm1d";
-      name = "kio-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kio-5.99.0.tar.xz";
+      sha256 = "0z587zrmdxg2dld6x6qzkpnqbcar7swz76ihhclwhcsjp94vzlpg";
+      name = "kio-5.99.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kirigami2-5.98.0.tar.xz";
-      sha256 = "1l0ggwrprmg5n5y3gxv7h4593fg87d7naxkf30603kkavq0hgks6";
-      name = "kirigami2-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kirigami2-5.99.0.tar.xz";
+      sha256 = "1qh3vpac07582d944zgh3sxsb5i4kn2csa5dj6m52697jfpyp25r";
+      name = "kirigami2-5.99.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kitemmodels-5.98.0.tar.xz";
-      sha256 = "1z9swjmll833jxy2ym63zzgi9vl8ld79mgypndqszsrd4mfsbs16";
-      name = "kitemmodels-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kitemmodels-5.99.0.tar.xz";
+      sha256 = "1z52dkrj5pg0c3avm8jph54j4vjfswsnkcmbdnbg6337qs6rvkip";
+      name = "kitemmodels-5.99.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kitemviews-5.98.0.tar.xz";
-      sha256 = "176gqlinsvdgkbg7kr4qd97mnvcnbymrkcs9kg6hm75qzxcaj8dj";
-      name = "kitemviews-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kitemviews-5.99.0.tar.xz";
+      sha256 = "13gr90sjbpqkzg370d82ji03wn9d3zcnvlhmpkvclbql6knx0q8i";
+      name = "kitemviews-5.99.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kjobwidgets-5.98.0.tar.xz";
-      sha256 = "0f87n5d3h2f9y1z2imfd0jj9108wbcxg7dg4k1c53zar2lrfx4wc";
-      name = "kjobwidgets-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kjobwidgets-5.99.0.tar.xz";
+      sha256 = "1ywqpcw925wl1lcrqpkvdhwj5s4m3n02mghx8pir7w42n36ykxq6";
+      name = "kjobwidgets-5.99.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kjs-5.98.0.tar.xz";
-      sha256 = "03is1a5b1sfh1nd011lchgir9nrywvax06ilg9y7z0vsn0ick7ik";
-      name = "kjs-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kjs-5.99.0.tar.xz";
+      sha256 = "0jsy13gjhyl0yhdx7dxxapaqigr9a06bz555pngnfzf6lia15wa0";
+      name = "kjs-5.99.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kjsembed-5.98.0.tar.xz";
-      sha256 = "0zb4vr0hp73lzc1gfnpq1grwmlpdvnp8awf3ydx4vqjh9n6jbaf2";
-      name = "kjsembed-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kjsembed-5.99.0.tar.xz";
+      sha256 = "0w104v96416bcf18aimxqykmi7d40l2x53g8d91zjclpylxx12gw";
+      name = "kjsembed-5.99.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kmediaplayer-5.98.0.tar.xz";
-      sha256 = "0wcv99xgg9pxijbjl4cmsgmpwb893ira6wd3ys5ihk2nakbvd09x";
-      name = "kmediaplayer-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kmediaplayer-5.99.0.tar.xz";
+      sha256 = "1f2cn1gakjh7m52gsm4294ccn35iwwa35diyd6r8k6fvyf0bn3ny";
+      name = "kmediaplayer-5.99.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/knewstuff-5.98.0.tar.xz";
-      sha256 = "09mxzpv0l1i5ml963gdnji8rskmi8b2f0hp4rn6ibkcj00z48fgy";
-      name = "knewstuff-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/knewstuff-5.99.0.tar.xz";
+      sha256 = "0bd7shvl6m4gry8cql2p64iba8iim12rsj5shaqp31n512mbc928";
+      name = "knewstuff-5.99.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/knotifications-5.98.0.tar.xz";
-      sha256 = "10whr3wjldaxdvbj6i250rqgsy2m1n606ja1yka571f1fz7laqcd";
-      name = "knotifications-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/knotifications-5.99.0.tar.xz";
+      sha256 = "0arhbhf5hrg943zmr9gs6dq3z7jifica72bqnxpv4jgn05l15c9n";
+      name = "knotifications-5.99.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/knotifyconfig-5.98.0.tar.xz";
-      sha256 = "1qlmgr5rifygp8zk8qfjwm6k72kfyj8x6hvqwy2a59lfi3wgbm07";
-      name = "knotifyconfig-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/knotifyconfig-5.99.0.tar.xz";
+      sha256 = "1k0ryay0vdd0slzcdjlvp3kry7q9v3drx06jl1qwamfjs4ak65xp";
+      name = "knotifyconfig-5.99.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kpackage-5.98.0.tar.xz";
-      sha256 = "1234jq9qqhq2z5afkkniz6w5s1ab9r4x9wamq3c9y08nzjq634py";
-      name = "kpackage-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kpackage-5.99.0.tar.xz";
+      sha256 = "05z459mg0l0gv8749sdsgj9xfhwqgsv2cxwfjsqv06nymgq71jyq";
+      name = "kpackage-5.99.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kparts-5.98.0.tar.xz";
-      sha256 = "01gcnywbzrgwlk4cws2rr139r95r201yfal1af3jkd7g2x499vgr";
-      name = "kparts-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kparts-5.99.0.tar.xz";
+      sha256 = "0pkw1r1hr34ppl72blcmsdgp9a37dav7l83nc3dfcfvkhzzj0ch0";
+      name = "kparts-5.99.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kpeople-5.98.0.tar.xz";
-      sha256 = "0wxy8pxkbfqbb4i9v3q912shzck56bk6xra3blhwva82qm9rps0f";
-      name = "kpeople-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kpeople-5.99.0.tar.xz";
+      sha256 = "0gb63gvi61gncmd79i1zdjcgidlmb4xh5ldvp6piydw5kl2z81bz";
+      name = "kpeople-5.99.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kplotting-5.98.0.tar.xz";
-      sha256 = "0hnzyl1x6acv1psdgsa9prpvnm12j71x6w6wbs1b0fl9bv5zw222";
-      name = "kplotting-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kplotting-5.99.0.tar.xz";
+      sha256 = "0yxlzh1ffjs4b3fw7yxkvsxiabm1jw8zgkzzgqvmsjs41h1g8nyq";
+      name = "kplotting-5.99.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kpty-5.98.0.tar.xz";
-      sha256 = "0arxbdxldwnrcg5x1vpvkwdd4hayrpqvn08jz6r7zb4s9h1582ww";
-      name = "kpty-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kpty-5.99.0.tar.xz";
+      sha256 = "0vg8s3minm1p2qmhp7i7d0yxvbkzpxibvb76w9kag1ds3lq8k150";
+      name = "kpty-5.99.0.tar.xz";
     };
   };
   kquickcharts = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kquickcharts-5.98.0.tar.xz";
-      sha256 = "1xll5yf8cjziraxgybmhclnsg1i5lgmvh5bqqnwnzncg8anzijhk";
-      name = "kquickcharts-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kquickcharts-5.99.0.tar.xz";
+      sha256 = "0b60jj9w491amciq3cragsyjfzamzakajhvzfb76xpjw2wvjaqb9";
+      name = "kquickcharts-5.99.0.tar.xz";
     };
   };
   kross = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kross-5.98.0.tar.xz";
-      sha256 = "0yjn66r44jxlrm4vz1nf8s64kcw7lmarjpqz1mcgb1n4jc28hs60";
-      name = "kross-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kross-5.99.0.tar.xz";
+      sha256 = "1ml8fylm66dksnx5d3n2p0mndxwspqb25ak3inlf8m2my6asixvv";
+      name = "kross-5.99.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/krunner-5.98.0.tar.xz";
-      sha256 = "0kch839xw09h1lddqgdcfwniq6rza5wdyyzcx99hcasn7l60nhsj";
-      name = "krunner-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/krunner-5.99.0.tar.xz";
+      sha256 = "1nf8cvzvbgaynimgf5i3lc632w71zzypbdg8a25lyvvc2n5qf895";
+      name = "krunner-5.99.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kservice-5.98.0.tar.xz";
-      sha256 = "0lgwpcdkkbxwq84zp5aymrdwy0iacqxz5ckc89pymcm0bacyhl31";
-      name = "kservice-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kservice-5.99.0.tar.xz";
+      sha256 = "0ra6znqja27g3r4b856h26nchn8h5lzxahazsyx5ndrkx1ranl0s";
+      name = "kservice-5.99.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/ktexteditor-5.98.0.tar.xz";
-      sha256 = "1pazi9rz4v95g31s7d26yla8rcb0cgd08mlmdcasywsaxc8nn7vw";
-      name = "ktexteditor-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/ktexteditor-5.99.0.tar.xz";
+      sha256 = "13462wsc5nd71w6hyn010zgmw83ml02kpximazk0pjf6akamqg8j";
+      name = "ktexteditor-5.99.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/ktextwidgets-5.98.0.tar.xz";
-      sha256 = "14ivmpng7x9rsk3x6kyd86jabzqxgjcdrma1im44wacnvisi4llk";
-      name = "ktextwidgets-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/ktextwidgets-5.99.0.tar.xz";
+      sha256 = "1a39nj96hi6wvzig9khp1rfh32hfd25zgmzb5ybz0rpqagqdzs1i";
+      name = "ktextwidgets-5.99.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kunitconversion-5.98.0.tar.xz";
-      sha256 = "0lhyg1d1k25kqk94lzy8mb06p4c17limmcrzirnsnxjvhjrc6r05";
-      name = "kunitconversion-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kunitconversion-5.99.0.tar.xz";
+      sha256 = "0bx44j94j2zp68n32zkml101j49pi1zq829aqsl8zxdzyj4qm8ny";
+      name = "kunitconversion-5.99.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kwallet-5.98.0.tar.xz";
-      sha256 = "0kwxkxlk0xlxkjgpjpb40xfl2l9hnhpymb4lxw4zwlxjn81r6sab";
-      name = "kwallet-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kwallet-5.99.0.tar.xz";
+      sha256 = "01raw36fzk3bjih72vi9ixyc0pngbqr6amyvwiy3lmkjd1rnpinj";
+      name = "kwallet-5.99.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kwayland-5.98.0.tar.xz";
-      sha256 = "0c0953gm63xhrqb7aspvf28wi7x31mrgaid23dw5gqphkbgis5qw";
-      name = "kwayland-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kwayland-5.99.0.tar.xz";
+      sha256 = "18k5vmlg1ahxv83892937k4d9h5yz7a06nj0v6dfjcx8wcjj3gm7";
+      name = "kwayland-5.99.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kwidgetsaddons-5.98.0.tar.xz";
-      sha256 = "117wki4w2bs1d2pjhi5qpb2b3qhhva6fq9gikba5fb6980kmdayr";
-      name = "kwidgetsaddons-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kwidgetsaddons-5.99.0.tar.xz";
+      sha256 = "0scjrpwbp4p8hkxbvsaamd0y7fx5drq7nl6icfsm5v2v5rpa5kas";
+      name = "kwidgetsaddons-5.99.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kwindowsystem-5.98.0.tar.xz";
-      sha256 = "02l7xmxcilmrxpkkid4m9srl0d8ymqgwpw5j80w3g57p0rahwjl1";
-      name = "kwindowsystem-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kwindowsystem-5.99.0.tar.xz";
+      sha256 = "0xzqlw0nr8icdmwpr6rpi806ryb7wl6pm6cznmdhf19caszkzlgl";
+      name = "kwindowsystem-5.99.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/kxmlgui-5.98.0.tar.xz";
-      sha256 = "08n5l3zgkh0fxaqwrfx5mk4j5wq9ylkpxd37751qcivpag7l0x45";
-      name = "kxmlgui-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/kxmlgui-5.99.0.tar.xz";
+      sha256 = "1p2ay1hfkhm3cfzyb7b31y5i7scq0z3cypysryfcnz75zz7wd4ic";
+      name = "kxmlgui-5.99.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/portingAids/kxmlrpcclient-5.98.0.tar.xz";
-      sha256 = "09apfrkgvvzv8zwxyjbi5qb145a9awirk02nx474bshgypfqslpb";
-      name = "kxmlrpcclient-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/portingAids/kxmlrpcclient-5.99.0.tar.xz";
+      sha256 = "0rma78pj0h3ss28ncz7km0cd5l1rwwf5vraf0h96apb0vh2y115x";
+      name = "kxmlrpcclient-5.99.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/modemmanager-qt-5.98.0.tar.xz";
-      sha256 = "0gk4jy3r1451a2dajhnz6lin4lfawc4qdlxp7n7m43ca4d89h13k";
-      name = "modemmanager-qt-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/modemmanager-qt-5.99.0.tar.xz";
+      sha256 = "0wjcrnkgaxq5kqck6fl2328k220byhmc66ss63x7rmz7y3jir17g";
+      name = "modemmanager-qt-5.99.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/networkmanager-qt-5.98.0.tar.xz";
-      sha256 = "0s1h02v9k8nyl30mw7gayzvpb8bnzzp9crcfqpry7rf02rxv9idw";
-      name = "networkmanager-qt-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/networkmanager-qt-5.99.0.tar.xz";
+      sha256 = "0643dx3jcjrabrhds2d3lh5h9c7dc6q26gg4vb5vrhgwsybqzna9";
+      name = "networkmanager-qt-5.99.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/oxygen-icons5-5.98.0.tar.xz";
-      sha256 = "03wk52hqrgj0r73nb4yiq7rnmdn4rrqzrj3cdzbg3flkw5r7wbbq";
-      name = "oxygen-icons5-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/oxygen-icons5-5.99.0.tar.xz";
+      sha256 = "1pak09dps9fwcs6rcbvjdxvivw8ahcvnmzk175ky7xjq065aprlc";
+      name = "oxygen-icons5-5.99.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/plasma-framework-5.98.0.tar.xz";
-      sha256 = "1bmwvk0pj0bnb8qhcl0bz82r63nls6h7lzzmkfkdwcwmjifmiqg4";
-      name = "plasma-framework-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/plasma-framework-5.99.0.tar.xz";
+      sha256 = "1ax029s0nmcv4cg6pqgv66hgyj5b4djdvvnmpmzb1003l22aivck";
+      name = "plasma-framework-5.99.0.tar.xz";
     };
   };
   prison = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/prison-5.98.0.tar.xz";
-      sha256 = "1ppqm1f06q8fc1ncvzn9a133npmvlh1qxgvvbpwn6m0a8cr7ac6w";
-      name = "prison-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/prison-5.99.0.tar.xz";
+      sha256 = "1wf1fkqgnyrbd8i2mhkb6baynkkg010f2lbiwbz77jkrkv0vkpl4";
+      name = "prison-5.99.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/purpose-5.98.0.tar.xz";
-      sha256 = "0g9ykhsn9dl3y3qp4wm3r7bkdhpl9mcbg671wa26qx3ba8a2jynr";
-      name = "purpose-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/purpose-5.99.0.tar.xz";
+      sha256 = "1bh2rrc3h9r95qv5kn45nhx10vgcfv6y7qfl7r152mrsvas317qy";
+      name = "purpose-5.99.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/qqc2-desktop-style-5.98.0.tar.xz";
-      sha256 = "1af7izd4k220dzngf1nwgcw0bi7vl772lpjrqd9fp9rijh74dx7d";
-      name = "qqc2-desktop-style-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/qqc2-desktop-style-5.99.0.tar.xz";
+      sha256 = "19pykvy9ifnfnhh7587dbb68jnk1bfjyipw3f1gshqr9b9vgjfdx";
+      name = "qqc2-desktop-style-5.99.0.tar.xz";
     };
   };
   solid = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/solid-5.98.0.tar.xz";
-      sha256 = "14bf2k40skhyhrmgyyscg7psm1a8klf4z696pimlwjjhnawjfr06";
-      name = "solid-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/solid-5.99.0.tar.xz";
+      sha256 = "0yyhyqhvb2r374idn70rr74vyjvrgsv604issvx8d8dmvwyldrcb";
+      name = "solid-5.99.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/sonnet-5.98.0.tar.xz";
-      sha256 = "0j4p91xx1scg3jmvq6km7bwfjz5ihafk76yf1byb6aqyw50h3bm3";
-      name = "sonnet-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/sonnet-5.99.0.tar.xz";
+      sha256 = "1r57zhxfcgkp2bh3yqirdyl1s040qjzcsg4jsvvzqp10z408xwgk";
+      name = "sonnet-5.99.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/syndication-5.98.0.tar.xz";
-      sha256 = "04py880hxkvidydsqcyjbkq0wv9cp42d7svkdgf74fmzfyfrmrax";
-      name = "syndication-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/syndication-5.99.0.tar.xz";
+      sha256 = "1lfgm0a2wmsssr4vlw5h4gjvci6g11n78y609mzk5hw51989i672";
+      name = "syndication-5.99.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/syntax-highlighting-5.98.0.tar.xz";
-      sha256 = "092ilbhhs8xaqblc9w1xksapdzvqyazz8lj011wz4762p1nagiq2";
-      name = "syntax-highlighting-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/syntax-highlighting-5.99.0.tar.xz";
+      sha256 = "0yh92dmf6kfannbx1iv90k7g931vlqw82qfvhbk7m8kvggdvy2xy";
+      name = "syntax-highlighting-5.99.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.98.0";
+    version = "5.99.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.98/threadweaver-5.98.0.tar.xz";
-      sha256 = "1pwinpz5kscx64kc7dn4qf76m64kxzp92zjk8j2a2s1mx0s0vk2s";
-      name = "threadweaver-5.98.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.99/threadweaver-5.99.0.tar.xz";
+      sha256 = "1j3vcr2kcmd01byklnly239xb07vs9d74vnd7y37zjbg3yx14ina";
+      name = "threadweaver-5.99.0.tar.xz";
     };
   };
 }

From 6c2e5077f20580baab7d7dd374670b7faf5b42d8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 12 Oct 2022 11:30:41 +0300
Subject: [PATCH 24/56] kidletime: add new Wayland deps

---
 pkgs/development/libraries/kde-frameworks/kidletime.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 6379a5e2e31b..ee6a33a83225 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -1,12 +1,13 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  qtbase, qtx11extras
+  qtbase, qtx11extras,
+  wayland, plasma-wayland-protocols
 }:
 
 mkDerivation {
   pname = "kidletime";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
+  buildInputs = [ qtx11extras wayland plasma-wayland-protocols ];
   propagatedBuildInputs = [ qtbase ];
 }

From 961575f53cd9b3d49afcaf5a8d74c7c17b7b5f5d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 12 Oct 2022 12:56:27 +0300
Subject: [PATCH 25/56] all-packages: don't recurse into libsForQt5_openssl_1_1

The two things that care about it are exposed as top level attributes anyway.
---
 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 cc178cfc73e7..186c66857ea1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21611,10 +21611,10 @@ with pkgs;
       };
     };
   });
-  libsForQt5_openssl_1_1 = recurseIntoAttrs (import ./qt5-packages.nix {
+  libsForQt5_openssl_1_1 = import ./qt5-packages.nix {
     inherit lib pkgs;
     qt5 = qt5_openssl_1_1;
-  });
+  };
 
   # plasma5Packages maps to the Qt5 packages set that is used to build the plasma5 desktop
   plasma5Packages = libsForQt515;

From eb7e4115061f70b1e96c3174239985df5f3f6808 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar@gmail.com>
Date: Wed, 12 Oct 2022 13:06:43 +0400
Subject: [PATCH 26/56] kwin: Fix building on aarch64-linux

Revert this commit to avoid dependency on <span> that is not providede
by GCC 9 that we currently use on aarch64:

https://invent.kde.org/plasma/kwin/-/commit/9a34ebbffc791cbeadc9abafda793ebee654b270

Part of NixOS/nixpkgs#191357
---
 ...1-Revert-x11-Refactor-output-updates.patch | 153 ++++++++++++++++++
 pkgs/desktops/plasma-5/kwin/default.nix       |   3 +
 2 files changed, 156 insertions(+)
 create mode 100644 pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch

diff --git a/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch
new file mode 100644
index 000000000000..ddaa7f76b13b
--- /dev/null
+++ b/pkgs/desktops/plasma-5/kwin/0001-Revert-x11-Refactor-output-updates.patch
@@ -0,0 +1,153 @@
+From 84f020835e3624342a928aae68e62e636bf2cc8c Mon Sep 17 00:00:00 2001
+From: Yuriy Taraday <yorik.sar@gmail.com>
+Date: Wed, 12 Oct 2022 12:07:23 +0400
+Subject: [PATCH] Revert "[x11] Refactor output updates"
+
+This reverts commit 9a34ebbffc791cbeadc9abafda793ebee654b270.
+
+This should fix compilation with older GCC.
+---
+ CMakeLists.txt                                |  2 +-
+ .../standalone/x11_standalone_platform.cpp    | 63 +++++++++++--------
+ 2 files changed, 38 insertions(+), 27 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e7bf700e..6ff24aa5c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -70,7 +70,7 @@ add_definitions(-DMESA_EGL_NO_X11_HEADERS)
+ add_definitions(-DEGL_NO_X11)
+ add_definitions(-DEGL_NO_PLATFORM_SPECIFIC_TYPES)
+ 
+-set(CMAKE_CXX_STANDARD 20)
++set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ 
+ # required frameworks by Core
+diff --git a/src/backends/x11/standalone/x11_standalone_platform.cpp b/src/backends/x11/standalone/x11_standalone_platform.cpp
+index 498d5cbe3..ac0f732b2 100644
+--- a/src/backends/x11/standalone/x11_standalone_platform.cpp
++++ b/src/backends/x11/standalone/x11_standalone_platform.cpp
+@@ -54,8 +54,6 @@
+ #include <QX11Info>
+ #endif
+ 
+-#include <span>
+-
+ namespace KWin
+ {
+ 
+@@ -407,7 +405,8 @@ void X11StandalonePlatform::invertScreen()
+         ScreenResources res((active_client && active_client->window() != XCB_WINDOW_NONE) ? active_client->window() : rootWindow());
+ 
+         if (!res.isNull()) {
+-            for (auto crtc : std::span(res.crtcs(), res->num_crtcs)) {
++            for (int j = 0; j < res->num_crtcs; ++j) {
++                auto crtc = res.crtcs()[j];
+                 CrtcGamma gamma(crtc);
+                 if (gamma.isNull()) {
+                     continue;
+@@ -480,39 +479,54 @@ void X11StandalonePlatform::doUpdateOutputs()
+     if (Xcb::Extensions::self()->isRandrAvailable()) {
+         T resources(rootWindow());
+         if (!resources.isNull()) {
++            xcb_randr_crtc_t *crtcs = resources.crtcs();
++            const xcb_randr_mode_info_t *modes = resources.modes();
++
++            QVector<Xcb::RandR::CrtcInfo> infos(resources->num_crtcs);
++            for (int i = 0; i < resources->num_crtcs; ++i) {
++                infos[i] = Xcb::RandR::CrtcInfo(crtcs[i], resources->config_timestamp);
++            }
+ 
+-            std::span crtcs(resources.crtcs(), resources->num_crtcs);
+-            for (auto crtc : crtcs) {
+-                Xcb::RandR::CrtcInfo info(crtc, resources->config_timestamp);
++            for (int i = 0; i < resources->num_crtcs; ++i) {
++                Xcb::RandR::CrtcInfo info(infos.at(i));
+ 
+                 const QRect geometry = info.rect();
+                 if (!geometry.isValid()) {
+                     continue;
+                 }
+ 
+-                float refreshRate = -1.0f;
++                xcb_randr_output_t *outputs = info.outputs();
++                QVector<Xcb::RandR::OutputInfo> outputInfos(outputs ? resources->num_outputs : 0);
++                QVector<Xcb::RandR::OutputProperty> edids(outputs ? resources->num_outputs : 0);
++                if (outputs) {
++                    for (int i = 0; i < resources->num_outputs; ++i) {
++                        outputInfos[i] = Xcb::RandR::OutputInfo(outputs[i], resources->config_timestamp);
++                        edids[i] = Xcb::RandR::OutputProperty(outputs[i], atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false);
++                    }
++                }
+ 
+-                for (auto mode : std::span(resources.modes(), resources->num_modes)) {
+-                    if (info->mode == mode.id) {
+-                        if (mode.htotal != 0 && mode.vtotal != 0) { // BUG 313996
++                float refreshRate = -1.0f;
++                for (int j = 0; j < resources->num_modes; ++j) {
++                    if (info->mode == modes[j].id) {
++                        if (modes[j].htotal != 0 && modes[j].vtotal != 0) { // BUG 313996
+                             // refresh rate calculation - WTF was wikipedia 1998 when I needed it?
+-                            int dotclock = mode.dot_clock,
+-                                vtotal = mode.vtotal;
+-                            if (mode.mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) {
++                            int dotclock = modes[j].dot_clock,
++                                vtotal = modes[j].vtotal;
++                            if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_INTERLACE) {
+                                 dotclock *= 2;
+                             }
+-                            if (mode.mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) {
++                            if (modes[j].mode_flags & XCB_RANDR_MODE_FLAG_DOUBLE_SCAN) {
+                                 vtotal *= 2;
+                             }
+-                            refreshRate = dotclock / float(mode.htotal * vtotal);
++                            refreshRate = dotclock / float(modes[j].htotal * vtotal);
+                         }
+                         break; // found mode
+                     }
+                 }
+ 
+-                for (auto xcbOutput : std::span(info.outputs(), info->num_outputs)) {
+-                    Xcb::RandR::OutputInfo outputInfo(xcbOutput, resources->config_timestamp);
+-                    if (outputInfo->crtc != crtc) {
++                for (int j = 0; j < info->num_outputs; ++j) {
++                    Xcb::RandR::OutputInfo outputInfo(outputInfos.at(j));
++                    if (outputInfo->crtc != crtcs[i]) {
+                         continue;
+                     }
+ 
+@@ -528,14 +542,12 @@ void X11StandalonePlatform::doUpdateOutputs()
+                     // TODO: Perhaps the output has to save the inherited gamma ramp and
+                     // restore it during tear down. Currently neither standalone x11 nor
+                     // drm platform do this.
+-                    Xcb::RandR::CrtcGamma gamma(crtc);
++                    Xcb::RandR::CrtcGamma gamma(crtcs[i]);
+ 
+                     output->setRenderLoop(m_renderLoop.get());
+-                    output->setCrtc(crtc);
++                    output->setCrtc(crtcs[i]);
+                     output->setGammaRampSize(gamma.isNull() ? 0 : gamma->size);
+-                    auto it = std::find(crtcs.begin(), crtcs.end(), crtc);
+-                    int crtcIndex = std::distance(crtcs.begin(), it);
+-                    output->setXineramaNumber(crtcIndex);
++                    output->setXineramaNumber(i);
+ 
+                     QSize physicalSize(outputInfo->mm_width, outputInfo->mm_height);
+                     switch (info->rotation) {
+@@ -556,10 +568,9 @@ void X11StandalonePlatform::doUpdateOutputs()
+                         .physicalSize = physicalSize,
+                     };
+ 
+-                    auto edidProperty = Xcb::RandR::OutputProperty(xcbOutput, atoms->edid, XCB_ATOM_INTEGER, 0, 100, false, false);
+                     bool ok;
+-                    if (auto data = edidProperty.toByteArray(&ok); ok && !data.isEmpty()) {
+-                        if (auto edid = Edid(data, edidProperty.data()->num_items); edid.isValid()) {
++                    if (auto data = edids[j].toByteArray(&ok); ok && !data.isEmpty()) {
++                        if (auto edid = Edid(data, edids[j].data()->num_items); edid.isValid()) {
+                             information.manufacturer = edid.manufacturerString();
+                             information.model = edid.monitorName();
+                             information.serialNumber = edid.serialNumber();
+-- 
+2.37.2
+
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index f8177c929097..8f69c965ea07 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,4 +1,5 @@
 { mkDerivation
+, stdenv
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -141,6 +142,8 @@ mkDerivation {
       url = "https://invent.kde.org/plasma/kwin/-/commit/9a008b223ad696db3bf5692750f2b74e578e08b8.diff";
       sha256 = "sha256-f35G+g2MVABLDbAkCed3ZmtDWrzYn1rdD08mEx35j4k=";
     })
+  ] ++ lib.optionals stdenv.isAarch64 [
+    ./0001-Revert-x11-Refactor-output-updates.patch
   ];
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''

From 38d712a21898424f8953ec268081a9a6ee4a7004 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 12 Oct 2022 16:44:03 +0000
Subject: [PATCH 27/56] goa: 3.7.6 -> 3.10.0

---
 pkgs/development/tools/goa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix
index e28c6094b37d..bbbdbe5bab75 100644
--- a/pkgs/development/tools/goa/default.nix
+++ b/pkgs/development/tools/goa/default.nix
@@ -5,15 +5,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.7.6";
+  version = "3.10.0";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    sha256 = "sha256-AxMt9XnpUvAwWtjh391ep+MFysF5I/HUeHS8Kq8/fvU=";
+    sha256 = "sha256-Z/J1L6fYuim6LkVh+LDrr3FLTZO7uQwHXRg0YTofkWA=";
   };
-  vendorSha256 = "sha256-eTMqvl7h12GbzEmO5Lo4hdFrbqti3zl9edTz+zS0Xu8=";
+  vendorSha256 = "sha256-r/1huS/6qqS6TuqPQkwqKuYwye5DYQWYfBS1IcXWRgk=";
 
   subPackages = [ "cmd/goa" ];
 

From fd0989d64cd779d287ec6c753a3f22ebfd617090 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 12 Oct 2022 18:46:32 +0200
Subject: [PATCH 28/56] freeimage: fix build on aarch64-darwin

---
 pkgs/development/libraries/freeimage/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                  | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix
index 807e96669c67..dd5056ced93f 100644
--- a/pkgs/development/libraries/freeimage/default.nix
+++ b/pkgs/development/libraries/freeimage/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchsvn, darwin, libtiff
 , libpng, zlib, libwebp, libraw, openexr, openjpeg
 , libjpeg, jxrlib, pkg-config
-, fixDarwinDylibNames }:
+, fixDarwinDylibNames, autoSignDarwinBinariesHook }:
 
 stdenv.mkDerivation {
   pname = "freeimage";
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
   ] ++ lib.optionals stdenv.isDarwin [
     darwin.cctools
     fixDarwinDylibNames
+  ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
+    autoSignDarwinBinariesHook
   ];
   buildInputs = [ libtiff libtiff.dev_private libpng zlib libwebp libraw openexr openjpeg libjpeg libjpeg.dev_private jxrlib ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e7546d684a7..1ef4a95369ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18487,6 +18487,7 @@ with pkgs;
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix {};
 
   freeimage = callPackage ../development/libraries/freeimage {
+    inherit (darwin) autoSignDarwinBinariesHook;
     libraw = libraw_unstable;
   };
 

From 5430715f9ecbe6cb61ee69cbdaf0c4a62d50e3da Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Wed, 12 Oct 2022 18:46:47 +0200
Subject: [PATCH 29/56] perceptualdiff: unbreak on aarch64-darwin

---
 pkgs/tools/graphics/perceptualdiff/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix
index f2281bc5d35f..919b99327110 100644
--- a/pkgs/tools/graphics/perceptualdiff/default.nix
+++ b/pkgs/tools/graphics/perceptualdiff/default.nix
@@ -20,6 +20,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ uri-canva ];
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.system == "aarch64-darwin";
   };
 }

From 37a64594bde38d4b3dda3298f826642b6131bfd9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 12 Oct 2022 20:28:53 +0300
Subject: [PATCH 30/56] nixos/plasma-bigscreen: enable uinput correctly

This is required for plasma-remotecontrollers to actually work.
Make sure to also add your user to the `uinput` group.
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 4 +++-
 nixos/tests/plasma-bigscreen.nix                        | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index aa1359bf3584..44faa19bc22a 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -623,7 +623,9 @@ in
         ];
 
       services.xserver.displayManager.sessionPackages = [ pkgs.plasma5Packages.plasma-bigscreen ];
-      services.udev.packages = [ pkgs.plasma5Packages.plasma-remotecontrollers ];
+
+      # required for plasma-remotecontrollers to work correctly
+      hardware.uinput.enable = true;
     })
   ];
 }
diff --git a/nixos/tests/plasma-bigscreen.nix b/nixos/tests/plasma-bigscreen.nix
index ab459b6bffbe..1c61cafcbff3 100644
--- a/nixos/tests/plasma-bigscreen.nix
+++ b/nixos/tests/plasma-bigscreen.nix
@@ -18,6 +18,8 @@ import ./make-test-python.nix ({ pkgs, ...} :
       enable = true;
       user = "alice";
     };
+
+    users.users.alice.extraGroups = ["uinput"];
   };
 
   testScript = { nodes, ... }: let

From e1d6e67f8e914adb7e3160983121e7bec46f164e Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Sun, 9 Oct 2022 04:18:43 +0800
Subject: [PATCH 31/56] maintainers: add kouyk

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6030ae15c982..47a41b30042f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7330,6 +7330,12 @@
     githubId = 2037002;
     name = "Konstantinos";
   };
+  kouyk = {
+    email = "skykinetic@stevenkou.xyz";
+    github = "kouyk";
+    githubId = 1729497;
+    name = "Steven Kou";
+  };
   kovirobi = {
     email = "kovirobi@gmail.com";
     github = "KoviRobi";

From ca7c98346268ffa16bf0df8f603587a04f978f52 Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Sun, 9 Oct 2022 02:23:22 +0800
Subject: [PATCH 32/56] jetbrains.gateway: init at 223.6646.21

---
 .../editors/jetbrains/default.nix             | 29 +++++++++++++++++++
 .../editors/jetbrains/versions.json           | 27 +++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 47dabbf0cbb9..b2713def5bb8 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -86,6 +86,22 @@ let
       };
     });
 
+  buildGateway = { pname, version, src, license, description, wmClass, ... }:
+    (mkJetBrainsProduct {
+      inherit pname version src wmClass jdk;
+      product = "Gateway";
+      meta = with lib; {
+        homepage = "https://www.jetbrains.com/remote-development/gateway/";
+        inherit description license platforms;
+        longDescription = ''
+          JetBrains Gateway is a lightweight launcher that connects a remote
+          server with your local machine, downloads necessary components on the
+          backend, and opens your project in JetBrains Client.
+        '';
+        maintainers = with maintainers; [ kouyk ];
+      };
+    });
+
   buildGoland = { pname, version, src, license, description, wmClass, ... }:
     (mkJetBrainsProduct {
       inherit pname version src wmClass jdk;
@@ -301,6 +317,19 @@ in
     update-channel = products.datagrip.update-channel;
   };
 
+  gateway = buildGateway rec {
+    pname = "gateway";
+    version = products.gateway.version;
+    description = "Your single entry point to all remote development environments";
+    license = lib.licenses.unfree;
+    src = fetchurl {
+      url = products.gateway.url;
+      sha256 = products.gateway.sha256;
+    };
+    wmClass = "jetbrains-gateway";
+    update-channel = products.gateway.update-channel;
+  };
+
   goland = buildGoland rec {
     pname = "goland";
     version = products.goland.version;
diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json
index 77baa60a0c97..5505c0c61c8f 100644
--- a/pkgs/applications/editors/jetbrains/versions.json
+++ b/pkgs/applications/editors/jetbrains/versions.json
@@ -18,6 +18,15 @@
       "version-major-minor": "2022.1.1",
       "build_number": "222.4345.5"
     },
+    "gateway": {
+      "update-channel": "Gateway EAP",
+      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
+      "version": "2022.3 EAP",
+      "sha256": "4868baed9350065c1db760f07a09badd1473132af640cc19330e20c8a0940d7d",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.tar.gz",
+      "version-major-minor": "2022.3",
+      "build_number": "223.6646.21"
+    },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
@@ -128,6 +137,15 @@
       "version-major-minor": "2022.1.1",
       "build_number": "222.4345.5"
     },
+    "gateway": {
+      "update-channel": "Gateway EAP",
+      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
+      "version": "2022.3 EAP",
+      "sha256": "2db71a052501db41d5cfe142f1a6e3178fe02830f0da127d00fbf93a4629c61b",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21.dmg",
+      "version-major-minor": "2022.3",
+      "build_number": "223.6646.21"
+    },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
@@ -238,6 +256,15 @@
       "version-major-minor": "2022.1.1",
       "build_number": "222.4345.5"
     },
+    "gateway": {
+      "update-channel": "Gateway EAP",
+      "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
+      "version": "2022.3 EAP",
+      "sha256": "513d3a271c5ff20fdc5c22f6e28eb21cfbb283d01ade2d11f33bb7eb79317410",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-223.6646.21-aarch64.dmg",
+      "version-major-minor": "2022.3",
+      "build_number": "223.6646.21"
+    },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",

From 2b387a08ccd110210d9594f142bb30c3ef45bda2 Mon Sep 17 00:00:00 2001
From: Steven Kou <skykinetic@stevenkou.xyz>
Date: Sun, 9 Oct 2022 02:27:38 +0800
Subject: [PATCH 33/56] jetbrains: set JDK for JetBrains Client

---
 pkgs/applications/editors/jetbrains/linux.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/jetbrains/linux.nix b/pkgs/applications/editors/jetbrains/linux.nix
index 3f77f3fae5b1..fde3e52632e8 100644
--- a/pkgs/applications/editors/jetbrains/linux.nix
+++ b/pkgs/applications/editors/jetbrains/linux.nix
@@ -80,6 +80,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec {
       --set-default JDK_HOME "$jdk" \
       --set-default ANDROID_JAVA_HOME "$jdk" \
       --set-default JAVA_HOME "$jdk" \
+      --set-default JETBRAINSCLIENT_JDK "$jdk" \
       --set ${hiName}_JDK "$jdk" \
       --set ${hiName}_VM_OPTIONS ${vmoptsFile}
 

From fefc598f2cd6c1c414b77256b62ce0ab3b05644c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Oct 2022 22:41:53 +0200
Subject: [PATCH 34/56] python310Packages.archinfo: 9.2.21 -> 9.2.22

---
 pkgs/development/python-modules/archinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 8119ac5cdb44..c4c492009a96 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.21";
+  version = "9.2.22";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-29KWlXZ4KrDq4CmTeF6z1CDVDgnO2JyxOdOi5bhl1nI=";
+    hash = "sha256-fqGz8+ZKmeBuwbjxFofspKSMdyG0NLVj+Jq+VPK2A90=";
   };
 
   nativeBuildInputs = [

From 90133e5f7437d5a4413108ff616710a19b6f0ad2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Oct 2022 22:41:59 +0200
Subject: [PATCH 35/56] python310Packages.ailment: 9.2.21 -> 9.2.22

---
 pkgs/development/python-modules/ailment/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 6fdc8b2dd4f2..2c19b714c957 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.21";
+  version = "9.2.22";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-LIqazN7U0pRt9yUsnb5vM6ZOtQOstkwanNr7FufHyUo=";
+    hash = "sha256-mCShbfpIsbIxFs/YDJY21Cvorn6sAB4f+s5zops8MAc=";
   };
 
   nativeBuildInputs = [

From 370cf20988bb4b388629f3a38dd74a750a66b6c6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Oct 2022 22:42:15 +0200
Subject: [PATCH 36/56] python310Packages.pyvex: 9.2.21 -> 9.2.22

---
 pkgs/development/python-modules/pyvex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index eb91d68069c4..87f29704b428 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.21";
+  version = "9.2.22";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uMUK8bnRaig71mdAmTc9rUu4zZnSgbAFZkv2o3hj6G0=";
+    hash = "sha256-yPz4tCZGoeUMv+qP/9J6e3moJpRsJIXddRJlyy5jky4=";
   };
 
   nativeBuildInputs = [

From 6b295a6dbfbc2219371d0a7669d5fb1681f63a67 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Oct 2022 22:42:21 +0200
Subject: [PATCH 37/56] python310Packages.claripy: 9.2.21 -> 9.2.22

---
 pkgs/development/python-modules/claripy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index 60f46431bf9b..992fb0fbc835 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.21";
+  version = "9.2.22";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-4Ql1oYWNxoDKwl6IOrJQ5uMepqtRqrY2cmjsa3w0h9E=";
+    hash = "sha256-ToRQB3JUZrCuuVMF5IK6zBwYpABQrXsBK3WIc/+E+uM=";
   };
 
   nativeBuildInputs = [

From 47a13c0e7492c47e953b01275569c5bff0e09dcd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Oct 2022 22:42:28 +0200
Subject: [PATCH 38/56] python310Packages.cle: 9.2.21 -> 9.2.22

---
 pkgs/development/python-modules/cle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 417e8becf36e..625eab88d76c 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,7 +16,7 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.21";
+  version = "9.2.22";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pVatQJMDocP6RWzCzgyJ1vzmqfdEVYjVFW9m+rS1IoI=";
+    hash = "sha256-Ppxpptgx91kyCiVrpEUa9ZxZLN9rCLnGB/nl1Fj/gDQ=";
   };
 
   nativeBuildInputs = [

From 11533d5056089aecb8d0ad25187969d069b47642 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 12 Oct 2022 22:42:36 +0200
Subject: [PATCH 39/56] python310Packages.angr: 9.2.21 -> 9.2.22

---
 pkgs/development/python-modules/angr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index cc88392d53c8..c9d0b436bbb8 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -46,7 +46,7 @@ in
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.21";
+  version = "9.2.22";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -55,7 +55,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-DOH1yRdWpKpYEjcnQInYU3g2HRm3wj3y8W7Kyuz4i2M=";
+    hash = "sha256-hkFWZHEdIXOQm14t05eyOqFTtWdXdgrQLjh+iVdKiCw=";
   };
 
   propagatedBuildInputs = [

From ff3f76ad3945fa2afa43f3a8d63aa34898ae53eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 23:12:00 +0000
Subject: [PATCH 40/56] build(deps): bump cachix/cachix-action from 10 to 11

Bumps [cachix/cachix-action](https://github.com/cachix/cachix-action) from 10 to 11.
- [Release notes](https://github.com/cachix/cachix-action/releases)
- [Commits](https://github.com/cachix/cachix-action/compare/v10...v11)
---
 .github/workflows/basic-eval.yml       | 2 +-
 .github/workflows/manual-nixos.yml     | 2 +-
 .github/workflows/manual-nixpkgs.yml   | 2 +-
 .github/workflows/manual-rendering.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml
index 2d31392caf45..53e64e422b66 100644
--- a/.github/workflows/basic-eval.yml
+++ b/.github/workflows/basic-eval.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: cachix/install-nix-action@v17
-    - uses: cachix/cachix-action@v10
+    - uses: cachix/cachix-action@v11
       with:
         # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
         name: nixpkgs-ci
diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml
index 86825eb5aef3..ae04b011e215 100644
--- a/.github/workflows/manual-nixos.yml
+++ b/.github/workflows/manual-nixos.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
-      - uses: cachix/cachix-action@v10
+      - uses: cachix/cachix-action@v11
         with:
           # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
           name: nixpkgs-ci
diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml
index 2aebeeeea2ab..0cf9046da995 100644
--- a/.github/workflows/manual-nixpkgs.yml
+++ b/.github/workflows/manual-nixpkgs.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
-      - uses: cachix/cachix-action@v10
+      - uses: cachix/cachix-action@v11
         with:
           # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
           name: nixpkgs-ci
diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml
index 5d2518dffc04..33113cf399fb 100644
--- a/.github/workflows/manual-rendering.yml
+++ b/.github/workflows/manual-rendering.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
-      - uses: cachix/cachix-action@v10
+      - uses: cachix/cachix-action@v11
         with:
           # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
           name: nixpkgs-ci

From d2e6195f5b83e84e176bf9dc16ee93ea209037d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 Oct 2022 23:12:03 +0000
Subject: [PATCH 41/56] build(deps): bump cachix/install-nix-action from 17 to
 18

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 17 to 18.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v17...v18)
---
 .github/workflows/basic-eval.yml                 | 2 +-
 .github/workflows/editorconfig.yml               | 2 +-
 .github/workflows/manual-nixos.yml               | 2 +-
 .github/workflows/manual-nixpkgs.yml             | 2 +-
 .github/workflows/manual-rendering.yml           | 2 +-
 .github/workflows/nixos-manual.yml               | 2 +-
 .github/workflows/update-terraform-providers.yml | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml
index 53e64e422b66..bdd3c6445470 100644
--- a/.github/workflows/basic-eval.yml
+++ b/.github/workflows/basic-eval.yml
@@ -19,7 +19,7 @@ jobs:
     # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback
     steps:
     - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v17
+    - uses: cachix/install-nix-action@v18
     - uses: cachix/cachix-action@v11
       with:
         # This cache is for the nixpkgs repo checks and should not be trusted or used elsewhere.
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml
index 5b57614e1107..081bd6146af1 100644
--- a/.github/workflows/editorconfig.yml
+++ b/.github/workflows/editorconfig.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         # pull_request_target checks out the base branch by default
         ref: refs/pull/${{ github.event.pull_request.number }}/merge
-    - uses: cachix/install-nix-action@v17
+    - uses: cachix/install-nix-action@v18
       with:
         # nixpkgs commit is pinned so that it doesn't break
         # editorconfig-checker 2.4.0
diff --git a/.github/workflows/manual-nixos.yml b/.github/workflows/manual-nixos.yml
index ae04b011e215..450c57d68ad0 100644
--- a/.github/workflows/manual-nixos.yml
+++ b/.github/workflows/manual-nixos.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v18
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/manual-nixpkgs.yml b/.github/workflows/manual-nixpkgs.yml
index 0cf9046da995..4b2f6da72212 100644
--- a/.github/workflows/manual-nixpkgs.yml
+++ b/.github/workflows/manual-nixpkgs.yml
@@ -18,7 +18,7 @@ jobs:
         with:
           # pull_request_target checks out the base branch by default
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v18
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/manual-rendering.yml b/.github/workflows/manual-rendering.yml
index 33113cf399fb..4ea18f3e3d46 100644
--- a/.github/workflows/manual-rendering.yml
+++ b/.github/workflows/manual-rendering.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v18
         with:
           # explicitly enable sandbox
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/nixos-manual.yml b/.github/workflows/nixos-manual.yml
index 5453513a53a6..b7f8c495a03f 100644
--- a/.github/workflows/nixos-manual.yml
+++ b/.github/workflows/nixos-manual.yml
@@ -19,7 +19,7 @@ jobs:
       with:
         # pull_request_target checks out the base branch by default
         ref: refs/pull/${{ github.event.pull_request.number }}/merge
-    - uses: cachix/install-nix-action@v17
+    - uses: cachix/install-nix-action@v18
     - name: Check DocBook files generated from Markdown are consistent
       run: |
         nixos/doc/manual/md-to-db.sh
diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml
index a711ab5db8ff..8580368c3e3b 100644
--- a/.github/workflows/update-terraform-providers.yml
+++ b/.github/workflows/update-terraform-providers.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: cachix/install-nix-action@v17
+      - uses: cachix/install-nix-action@v18
         with:
           nix_path: nixpkgs=channel:nixpkgs-unstable
       - name: setup

From 03229edc43b025b91647b5aa33ea2170a36a143a Mon Sep 17 00:00:00 2001
From: ilkecan <ilkecan@protonmail.com>
Date: Thu, 13 Oct 2022 00:02:57 +0000
Subject: [PATCH 42/56] alacritty: 0.11.0-rc2 -> 0.11.0

---
 pkgs/applications/terminal-emulators/alacritty/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix
index 2b145717fb38..9eff16045637 100644
--- a/pkgs/applications/terminal-emulators/alacritty/default.nix
+++ b/pkgs/applications/terminal-emulators/alacritty/default.nix
@@ -54,16 +54,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "alacritty";
-  version = "0.11.0-rc2";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-svo7DIPgNQy+MkIrRtRQjKQ2ND0CRfofSCiXJqoWby0=";
+    hash = "sha256-2jNE0UdPXfOyAfPPVKhdBpuVVw4IpwWQ+RLQlJNnK0Y=";
   };
 
-  cargoSha256 = "sha256-ClAW7WjnDs4Peu+UqcOwtuDDkWYWACMQU5p39CiIFm0=";
+  cargoSha256 = "sha256-t6ckX0PYI8UHfXhGRpcX8ly3DzE9A6i9P6f3Ny3DBzw=";
 
   nativeBuildInputs = [
     cmake

From 218dfe8eae410c250967fc0fd8671d5f2b111583 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Oct 2022 00:38:00 +0000
Subject: [PATCH 43/56] sickgear: 0.25.44 -> 0.25.46

---
 pkgs/servers/sickbeard/sickgear.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix
index 94f471dd53fe..2f22cf390386 100644
--- a/pkgs/servers/sickbeard/sickgear.nix
+++ b/pkgs/servers/sickbeard/sickgear.nix
@@ -4,13 +4,13 @@ let
   pythonEnv = python3.withPackages(ps: with ps; [ cheetah3 lxml ]);
 in stdenv.mkDerivation rec {
   pname = "sickgear";
-  version = "0.25.44";
+  version = "0.25.46";
 
   src = fetchFromGitHub {
     owner = "SickGear";
     repo = "SickGear";
     rev = "release_${version}";
-    sha256 = "sha256-j9sLIxUru2rjKaL4uV03yQfEdbXpKo1xGunrNZc/t7E=";
+    sha256 = "sha256-oXWnrzi10DrVb8aAn27kDAJzhZ+VTFsmpLGt7AB55jU=";
   };
 
   patches = [

From 707f2016aad8cd52a0814a57ba3e3d28bf06d62b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 13 Oct 2022 05:16:41 +0200
Subject: [PATCH 44/56] kea: build with openssl instead of botan2

Botan is unfortunately lacking behind in TLSv1.3 support and other
distros have also done this swap.
---
 pkgs/tools/networking/kea/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 88a0d0a180f0..1ad67e45f292 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -1,14 +1,20 @@
 { stdenv
 , lib
 , fetchurl
+
+# build time
 , autoreconfHook
 , pkg-config
+
+# runtime
 , boost
-, botan2
 , libmysqlclient
 , log4cplus
+, openssl
 , postgresql
 , python3
+
+# tests
 , nixosTests
 }:
 
@@ -21,7 +27,9 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-2n2QymKncmAtrG535QcxkDhCKJWtaO6xQvFIfWfVMdI=";
   };
 
-  patches = [ ./dont-create-var.patch ];
+  patches = [
+    ./dont-create-var.patch
+  ];
 
   postPatch = ''
     substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
@@ -31,6 +39,7 @@ stdenv.mkDerivation rec {
     "--enable-perfdhcp"
     "--enable-shell"
     "--localstatedir=/var"
+    "--with-openssl=${lib.getDev openssl}"
     "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"
     "--with-pgsql=${postgresql}/bin/pg_config"
   ];
@@ -42,9 +51,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     boost
-    botan2
     libmysqlclient
     log4cplus
+    openssl
     python3
   ];
 

From d2d5d5b22efe38b2d8b9595dcb95479863979305 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 13 Oct 2022 05:17:52 +0200
Subject: [PATCH 45/56] kea: build documentation and manpages

Very easily due to the comforts of the sphinx hook <3
---
 pkgs/tools/networking/kea/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 1ad67e45f292..13540b7e6247 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
     substituteInPlace ./src/bin/keactrl/Makefile.am --replace '@sysconfdir@' "$out/etc"
   '';
 
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+
   configureFlags = [
     "--enable-perfdhcp"
     "--enable-shell"
@@ -47,7 +53,16 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
+  ] ++ (with python3.pkgs; [
+    sphinxHook
+    sphinx-rtd-theme
+  ]);
+
+  sphinxBuilders = [
+    "html"
+    "man"
   ];
+  sphinxRoot = "doc/sphinx";
 
   buildInputs = [
     boost

From d4877de9c9d6f5ae25f5f318057df0507e80d936 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 13 Oct 2022 05:36:07 +0200
Subject: [PATCH 46/56] kea: add prometheus-exporter to passthru tests

And reorganize passthru.tests, due to naming clash between kea and
prometheus-exporters.kea when relying on inherit.
---
 pkgs/tools/networking/kea/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index 13540b7e6247..e03e013f9ba0 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -75,7 +75,9 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   passthru.tests = {
-    inherit (nixosTests) kea systemd-networkd-ipv6-prefix-delegation;
+    kea = nixosTests.kea;
+    prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation;
+    prometheus-exporter = nixosTests.prometheus-exporters.kea;
   };
 
   meta = with lib; {

From cf1e358e04ebda06625f9efcd238e5301838cab5 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 13 Oct 2022 15:41:30 +0800
Subject: [PATCH 47/56] pantheon.elementary-calendar: switch to merged patch

---
 .../apps/elementary-calendar/default.nix      |  9 ++-
 .../partly-revert-pr-301.patch                | 57 -------------------
 2 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch

diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
index 9f5613fcd22e..d90a56af2bb6 100644
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix
@@ -41,9 +41,12 @@ stdenv.mkDerivation rec {
       sha256 = "sha256-xatxoSwAIHiUA03vvBdM8HSW27vhPLvAxEuGK0gLiio=";
     })
 
-    # Workaround for showing date numbers (TODO: should try to fix upstream)
-    # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047
-    ./partly-revert-pr-301.patch
+    # GridDay: Fix day in month in grid with GLib 2.73.1+
+    # https://github.com/elementary/calendar/pull/763
+    (fetchpatch {
+      url = "https://github.com/elementary/calendar/commit/20b0983c85935bedef065b786ec8bbca55ba7d9e.patch";
+      sha256 = "sha256-Tw9uNqqRAC+vOp7EWzZVeDmZxt3hTGl9UIP21FcunqA=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch b/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch
deleted file mode 100644
index 0de31ee6365d..000000000000
--- a/pkgs/desktops/pantheon/apps/elementary-calendar/partly-revert-pr-301.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/src/Grid/Grid.vala b/src/Grid/Grid.vala
-index 61706fc8..9b69fc14 100644
---- a/src/Grid/Grid.vala
-+++ b/src/Grid/Grid.vala
-@@ -215,7 +215,7 @@ public class Grid : Gtk.Grid {
-
-         day.in_current_month = new_date.get_month () == month_start.get_month ();
-
--        day.date = new_date;
-+        day.update_date (new_date);
-         return day;
-     }
-
-diff --git a/src/Grid/GridDay.vala b/src/Grid/GridDay.vala
-index 3e59cb7b..df04fe6f 100644
---- a/src/Grid/GridDay.vala
-+++ b/src/Grid/GridDay.vala
-@@ -35,6 +35,7 @@ public class Maya.View.GridDay : Gtk.EventBox {
-     public bool draw_left_border = true;
-     private VAutoHider event_box;
-     private GLib.HashTable<string, EventButton> event_buttons;
-+    Gtk.Label label;
-
-     public bool in_current_month {
-         set {
-@@ -79,7 +80,7 @@ public class Maya.View.GridDay : Gtk.EventBox {
-         style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-         style_context.add_class ("cell");
-
--        var label = new Gtk.Label ("");
-+        label = new Gtk.Label ("");
-         label.halign = Gtk.Align.END;
-         label.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-         label.margin = EVENT_MARGIN;
-@@ -100,10 +101,6 @@ public class Maya.View.GridDay : Gtk.EventBox {
-
-         Gtk.TargetEntry dnd = {"binary/calendar", 0, 0};
-         Gtk.drag_dest_set (this, Gtk.DestDefaults.MOTION, {dnd}, Gdk.DragAction.MOVE);
--
--        this.notify["date"].connect (() => {
--            label.label = date.get_day_of_month ().to_string ();
--        });
-     }
-
-     public override bool drag_drop (Gdk.DragContext context, int x, int y, uint time_) {
-@@ -174,6 +171,11 @@ public class Maya.View.GridDay : Gtk.EventBox {
-         event_buttons.remove_all ();
-     }
-
-+    public void update_date (DateTime date) {
-+        this.date = date;
-+        label.label = date.get_day_of_month ().to_string ();
-+    }
-+
-     public void set_selected (bool selected) {
-         if (selected) {
-             set_state_flags (Gtk.StateFlags.SELECTED, true);

From 872526f999ad70a9d09206921699da5ff87eb944 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 13 Oct 2022 15:44:25 +0800
Subject: [PATCH 48/56] pantheon.wingpanel-indicator-datetime: switch to merged
 patch

---
 .../wingpanel-indicators/datetime/default.nix | 10 +++--
 .../datetime/partly-revert-pr-150.patch       | 40 -------------------
 2 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch

diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
index c884dd2d247d..b00fdb95d3e0 100644
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
+++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , fetchFromGitHub
+, fetchpatch
 , nix-update-script
 , substituteAll
 , pkg-config
@@ -38,9 +39,12 @@ stdenv.mkDerivation rec {
       elementary_calendar = elementary-calendar;
     })
 
-    # Workaround for showing date numbers (TODO: should try to fix upstream)
-    # https://github.com/elementary/calendar/issues/756#issuecomment-1252400047
-    ./partly-revert-pr-150.patch
+    # GridDay: Do not connect to the notify signal for the property
+    # https://github.com/elementary/wingpanel-indicator-datetime/pull/305
+    (fetchpatch {
+      url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/845ac1345124571fe995ab7138d5dfe4d29847e9.patch";
+      sha256 = "sha256-/wd/FnhjC0c0Y8mCZg8XNoPOYAAmfK+g1F6L6TMEkdM=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch
deleted file mode 100644
index 766c1dda29f7..000000000000
--- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/partly-revert-pr-150.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/calendar/Grid.vala
-index e440306..21a631a 100644
---- a/src/Widgets/calendar/Grid.vala
-+++ b/src/Widgets/calendar/Grid.vala
-@@ -229,7 +229,7 @@ namespace DateTime.Widgets {
-                 day.sensitive_container (false);
-             }
- 
--            day.date = new_date;
-+            day.update_date (new_date);
- 
-             return day;
-         }
-diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala
-index 8602875..7bd6140 100644
---- a/src/Widgets/calendar/GridDay.vala
-+++ b/src/Widgets/calendar/GridDay.vala
-@@ -79,10 +79,6 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox {
-         button_press_event.connect (on_button_press);
-         key_press_event.connect (on_key_press);
- 
--        notify["date"].connect (() => {
--            label.label = date.get_day_of_month ().to_string ();
--        });
--
-         component_dots = new Gee.HashMap<string, Gtk.Widget> ();
-     }
- 
-@@ -124,6 +120,11 @@ public class DateTime.Widgets.GridDay : Gtk.EventBox {
-         }
-     }
- 
-+    public void update_date (GLib.DateTime date) {
-+        this.date = date;
-+        label.label = date.get_day_of_month ().to_string ();
-+    }
-+
-     public void set_selected (bool selected) {
-         if (selected) {
-             set_state_flags (Gtk.StateFlags.SELECTED, true);

From 631a07824d868288b96c470f3fe61810ad9e1eed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Oct 2022 01:01:11 +0000
Subject: [PATCH 49/56] tailscale: 1.30.2 -> 1.32.0

---
 pkgs/servers/tailscale/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix
index b36b5449caef..ecb2108858e4 100644
--- a/pkgs/servers/tailscale/default.nix
+++ b/pkgs/servers/tailscale/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "tailscale";
-  version = "1.30.2";
+  version = "1.32.0";
 
   src = fetchFromGitHub {
     owner = "tailscale";
     repo = "tailscale";
     rev = "v${version}";
-    sha256 = "sha256-xs3LhldFP4gB5ouW1q8eiCZ5nZD6j9QROm/s+qFMA88=";
+    sha256 = "sha256-+pJ7YwJKtlB/UmuvKT4zoWRn1ZBAf75/GcscPbFuA8c=";
   };
-  vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo=";
+  vendorSha256 = "sha256-VW6FvbgLcokVGunTCHUXKuH5+O6T55hGIP2g5kFfBsE=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
 

From a04a0f1bf4c25b0579b05ed473dc439018675815 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Wed, 12 Oct 2022 12:17:14 -0400
Subject: [PATCH 50/56] vault: 1.11.4 -> 1.12.0

---
 pkgs/tools/security/vault/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index fd8f714e2285..e3016eacf714 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.11.4";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "sha256-t7mcnXOBP5fTnYVTLVfA2HOynKri88tQdkyl6p83aFQ=";
+    sha256 = "sha256-c2MIX4uDbHuiuZr12SkUV6jLsx2PS3Q+NngacT7AQO0=";
   };
 
-  vendorSha256 = "sha256-4WbNrFK80uQPUrTvNHBRAYynqpOxAolj1t6XJ0Bb8I4=";
+  vendorSha256 = "sha256-BPIUIy1xEUzbh1ESldiOhDpYp4EdfUi/QkBNqk3U1UY=";
 
   subPackages = [ "." ];
 

From fbcc270b981b3caad3359c807f6c7d5b5773fd9c Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Wed, 12 Oct 2022 12:20:58 -0400
Subject: [PATCH 51/56] vault-bin: 1.11.4 -> 1.12.0

---
 pkgs/tools/security/vault/vault-bin.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix
index ccde88230463..beca57e85ff2 100644
--- a/pkgs/tools/security/vault/vault-bin.nix
+++ b/pkgs/tools/security/vault/vault-bin.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vault-bin";
-  version = "1.11.4";
+  version = "1.12.0";
 
   src =
     let
@@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
         aarch64-darwin = "darwin_arm64";
       };
       sha256 = selectSystem {
-        x86_64-linux = "sha256-+txLeWsk63rj1iWOI3p9oP2aAEY/VYbvMOYtGQ6gHV8=";
-        aarch64-linux = "sha256-py8HF4uydQIIW1zu5W2c1VF6Dtp4yw+hUs8fPjIa7YQ=";
-        i686-linux = "sha256-87dmhr2HEBqjPDd4SrVGH5Fw7Rar9HqWxNRMK8Vg9yY=";
-        x86_64-darwin = "sha256-AsVYI5uM9b5NIaf0Qkb5/zbJ0WYxROBIa0nvbX08OcI=";
-        aarch64-darwin = "sha256-2Fqk5C9who8tV7+OnVODcK5DyJjE6V5akIR4oNhDQlA=";
+        x86_64-linux = "sha256-khDTpgezINAIZ8YFhOGoTSe6qzA6bkyhyX25VgcFAhU=";
+        aarch64-linux = "sha256-XOiuH9KmwXz8sR9FzH+wEIg0xzrMAIZaHVHf3TdJp10=";
+        i686-linux = "sha256-jCXQX04/Q1dHCIEcFlq60ICib/kjM8bE8ZKjF+0YPjE=";
+        x86_64-darwin = "sha256-fQaHI0ySer6lRdaEcNl7GN51IP+F5y/FR99Q66LQl3k=";
+        aarch64-darwin = "sha256-ME1u/g3l5Jqwvk9Qw4tTmbIvHOKkPMRayhRgPbZIYnA=";
       };
     in
     fetchzip {

From 5e166272ab4695dc08dd889ad3ade37b725f4eca Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Wed, 12 Oct 2022 17:11:51 -0400
Subject: [PATCH 52/56] kubernetes-helm: 3.10.0 -> 3.10.1

---
 pkgs/applications/networking/cluster/helm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix
index 55e5c77c733c..5ec74e95e05c 100644
--- a/pkgs/applications/networking/cluster/helm/default.nix
+++ b/pkgs/applications/networking/cluster/helm/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "kubernetes-helm";
-  version = "3.10.0";
+  version = "3.10.1";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "helm";
     rev = "v${version}";
-    sha256 = "sha256-oYM7T0t/U7Y/O4u3t9eDjfoxjVeNFBPJdlPs+p9PXOM=";
+    sha256 = "sha256-OyU97zyN7fZMZAD2BEp8TW2z2E9Rl/yeiVkQaJ1GWZk=";
   };
-  vendorSha256 = "sha256-cyqTed3IZ5JFHYTphrOzSmcAc9xyre2LuMC3p0rfh/Y=";
+  vendorSha256 = "sha256-vyHT/N5lat/vqM2jK4Q+jJOtZpS52YCYGcJqfa5e0KM=";
 
   subPackages = [ "cmd/helm" ];
   ldflags = [

From dfe919cd8e902a0c1002e7ab0328254fba9c2da6 Mon Sep 17 00:00:00 2001
From: Vincent Demeester <vincent@sbr.pm>
Date: Wed, 12 Oct 2022 18:49:51 +0200
Subject: [PATCH 53/56] ko: 0.11.2 -> 0.12.0

- updates the github repository (org moved from google to ko-build)
- updates precheck to make sure tests passes

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
---
 pkgs/development/tools/ko/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix
index f7add96fbad9..490ea3241049 100644
--- a/pkgs/development/tools/ko/default.nix
+++ b/pkgs/development/tools/ko/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "ko";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
-    owner = "google";
+    owner = "ko-build";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-BwK49dSt3D2BrYvluDOBYIH5qEt59HC1hssHl1D2Heg=";
+    sha256 = "sha256-hhPV40e5wB2/VcdigqgjffDW4X1ZDddXTZiCUBijtHQ=";
   };
   vendorSha256 = null;
 
@@ -36,6 +36,10 @@ buildGoModule rec {
     # resolves some complaints from ko
     export GOROOT="$(go env GOROOT)"
     git init
+
+    # ko tests will fail if any of those env are set, as ko tries
+    # to make sure it can build and target multiple GOOS/GOARCH
+    unset GOOS GOARCH GOARM
   '';
 
   postInstall = ''
@@ -46,8 +50,8 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/google/ko";
-    changelog = "https://github.com/google/ko/releases/tag/v${version}";
+    homepage = "https://github.com/ko-build/ko";
+    changelog = "https://github.com/ko-build/ko/releases/tag/v${version}";
     description = "Build and deploy Go applications on Kubernetes";
     longDescription = ''
       ko is a simple, fast container image builder for Go applications.
@@ -56,6 +60,6 @@ buildGoModule rec {
       ko also includes support for simple YAML templating which makes it a powerful tool for Kubernetes applications.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ nickcao jk ];
+    maintainers = with maintainers; [ nickcao jk vdemeester ];
   };
 }

From 1859b8e843e2c88cd62e89ded9c431c2f23cda74 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Wed, 12 Oct 2022 09:36:30 +0200
Subject: [PATCH 54/56] ginkgo: 2.2.0 -> 2.3.1

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/development/tools/ginkgo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index a96e6df37d1a..7c3e71cdda18 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-1qbUnsCy2JM0GJAvM//cG7j3OsJZCnd+7KXol4FsXFI=";
+    sha256 = "sha256-sBO0rJFRG38qAh1svChkbyCv8eJ9KjVPJHgOhxUMuH0=";
   };
-  vendorSha256 = "sha256-QXrRsDaWoPp4mbgS7nV/5c5Z5Ca6PyoDpfrjvtoHK4Q=";
+  vendorSha256 = "sha256-yPzuhM0m+ltkz2z7D+DcFVjZ3OvGkJqQdc6iFidcty8=";
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation

From 3485c3d03fe84c75525d0e11fb21e039ba3c107b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 13 Oct 2022 09:30:24 +0000
Subject: [PATCH 55/56] flow: 0.188.2 -> 0.189.0

---
 pkgs/development/tools/analysis/flow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index edc57ab10b13..f98c623b48cb 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.188.2";
+  version = "0.189.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "sha256-oMiq4NMerhyLWtx4NhvTbK5yt7LhqnGTkFPRb+vwuug=";
+    sha256 = "sha256-sV2O5bFzIRm6ZiBwgDz8Y+NA5y44UztIAyvnIzkup/I=";
   };
 
   makeFlags = [ "FLOW_RELEASE=1" ];

From bb4926cac85130a1306c07fbeefdf9d118f3688f Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Thu, 13 Oct 2022 11:51:36 +0200
Subject: [PATCH 56/56] broot: 1.16.0 -> 1.16.1

https://github.com/Canop/broot/releases/tag/v1.16.1
---
 pkgs/tools/misc/broot/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 0d4919599d93..be80dd4c22a3 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-1R6Q1xRV8FG8IMwZ+u7BJBvIqT1Pgah3emA1oln5hS0=";
+    sha256 = "sha256-OiTZAQYVIMJmQXGQkqcMsUykCImbEOCnYcKmwXwXlpQ=";
   };
 
-  cargoHash = "sha256-+Q5rdOEN7arIyj+2n2JRtr8kRQgXmlxq3jumpuDiYdE=";
+  cargoHash = "sha256-sPJ8NrnwAHuCPLPef8tCbU4nM5J04CzGwf58a9J5Gz4=";
 
   nativeBuildInputs = [
     installShellFiles