From d1b90cf54005e690f30bdf991df05a68ca0762d3 Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Wed, 29 Jun 2022 10:32:52 +0800
Subject: [PATCH 01/10] nixos/caddy: force caddy to reload config in ExecReload

This patch follows an upstream commit[1].

Before this patch, if acme module is used, caddy will still use an old
cert even a new one is available. The cause is that without --force
flag, caddy will not reload an unchanged config.

Refer to that commit[1] message for more information.

[1]: https://github.com/caddyserver/dist/commit/979e498d6d01e1fe7c22db848a3e3bc65369183f
---
 nixos/modules/services/web-servers/caddy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix
index 2b8c6f2e308b..b262313577f1 100644
--- a/nixos/modules/services/web-servers/caddy/default.nix
+++ b/nixos/modules/services/web-servers/caddy/default.nix
@@ -299,7 +299,7 @@ in
         # https://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
         # If the empty string is assigned to this option, the list of commands to start is reset, prior assignments of this option will have no effect.
         ExecStart = [ "" "${cfg.package}/bin/caddy run --config ${cfg.configFile} --adapter ${cfg.adapter} ${optionalString cfg.resume "--resume"}" ];
-        ExecReload = [ "" "${cfg.package}/bin/caddy reload --config ${cfg.configFile} --adapter ${cfg.adapter}" ];
+        ExecReload = [ "" "${cfg.package}/bin/caddy reload --config ${cfg.configFile} --adapter ${cfg.adapter} --force" ];
 
         ExecStartPre = "${cfg.package}/bin/caddy validate --config ${cfg.configFile} --adapter ${cfg.adapter}";
         User = cfg.user;

From 01bbab739bbb50366d103da5c755831eda1cd9c1 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Sun, 3 Jul 2022 10:29:10 -0400
Subject: [PATCH 02/10] kodi.packages.invidious: init at 0.1.0+matrix.1

---
 .../video/kodi/addons/invidious/default.nix   | 32 +++++++++++++++++++
 pkgs/top-level/kodi-packages.nix              |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/video/kodi/addons/invidious/default.nix

diff --git a/pkgs/applications/video/kodi/addons/invidious/default.nix b/pkgs/applications/video/kodi/addons/invidious/default.nix
new file mode 100644
index 000000000000..c2885ba03a0a
--- /dev/null
+++ b/pkgs/applications/video/kodi/addons/invidious/default.nix
@@ -0,0 +1,32 @@
+{ lib, buildKodiAddon, fetchpatch, fetchzip, addonUpdateScript, requests, inputstream-adaptive, inputstreamhelper }:
+
+buildKodiAddon rec {
+  pname = "invidious";
+  namespace = "plugin.video.invidious";
+  version = "0.1.0+matrix.1";
+
+  src = fetchzip {
+    url = "https://mirrors.kodi.tv/addons/matrix/${namespace}/${namespace}-${version}.zip";
+    sha256 = "sha256-4z2/YTso5KV6JHS/DOXll2lKOoVnW1i5MnpmV6ESXbM=";
+  };
+
+  propagatedBuildInputs = [
+    requests
+    inputstream-adaptive
+    inputstreamhelper
+  ];
+
+  passthru = {
+    pythonPath = "resources/lib";
+    updateScript = addonUpdateScript {
+      attrPath = "kodi.packages.invidious";
+    };
+  };
+
+  meta = with lib; {
+    homepage = "https://github.com/TheAssassin/kodi-invidious-plugin";
+    description = "A privacy-friendly way of watching YouTube content";
+    license = licenses.mit;
+    maintainers = teams.kodi.members;
+  };
+}
diff --git a/pkgs/top-level/kodi-packages.nix b/pkgs/top-level/kodi-packages.nix
index 88d3aea46cbe..11dd5270e63d 100644
--- a/pkgs/top-level/kodi-packages.nix
+++ b/pkgs/top-level/kodi-packages.nix
@@ -58,6 +58,8 @@ let self = rec {
 
   iagl = callPackage ../applications/video/kodi/addons/iagl { };
 
+  invidious = callPackage ../applications/video/kodi/addons/invidious { };
+
   libretro = callPackage ../applications/video/kodi/addons/libretro { };
 
   libretro-genplus = callPackage ../applications/video/kodi/addons/libretro-genplus { inherit genesis-plus-gx; };

From cb730cf239b855b1dfab54e0b7598ad294a718ab Mon Sep 17 00:00:00 2001
From: Andrew Childs <lorne@cons.org.nz>
Date: Mon, 4 Jul 2022 17:46:13 +0900
Subject: [PATCH 03/10] nixpkgs-basic-release-checks: check for
 case-insensitive path conflicts

---
 pkgs/top-level/nixpkgs-basic-release-checks.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/nixpkgs-basic-release-checks.nix b/pkgs/top-level/nixpkgs-basic-release-checks.nix
index 28f8cf332977..e2b81b20c5b0 100644
--- a/pkgs/top-level/nixpkgs-basic-release-checks.nix
+++ b/pkgs/top-level/nixpkgs-basic-release-checks.nix
@@ -19,6 +19,14 @@ pkgs.runCommand "nixpkgs-release-checks" { src = nixpkgs; buildInputs = [nix]; }
         exit 1
     fi
 
+    # Make sure that no paths collide on case-preserving or case-insensitive filesysytems.
+    conflictingPaths=$(find $src | awk '{ print $1 " " tolower($1) }' | sort -k2 | uniq -D -f 1 | cut -d ' ' -f 1)
+    if [[ -n $conflictingPaths ]]; then
+        echo "Files in nixpkgs must not vary only by case"
+        echo "The offending paths: $conflictingPaths"
+        exit 1
+    fi
+
     src2=$TMPDIR/foo
     cp -rd $src $src2
 

From 1cb6918b9bdc25641940494682458e1f4157aa3c Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Tue, 21 Jun 2022 00:57:32 +0200
Subject: [PATCH 04/10] invidious: use nix-hash in update script

---
 pkgs/servers/invidious/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/invidious/update.sh b/pkgs/servers/invidious/update.sh
index bf43fbb4b365..4810534cd298 100755
--- a/pkgs/servers/invidious/update.sh
+++ b/pkgs/servers/invidious/update.sh
@@ -60,7 +60,7 @@ info "Running scripts/fetch-player-dependencies.cr..."
 git -C "$git_dir" reset --hard "$new_rev"
 (cd "$git_dir" && crystal run scripts/fetch-player-dependencies.cr -- --minified)
 rm -f "$git_dir/assets/videojs/.gitignore"
-videojs_new_sha256=$(nix hash-path --type sha256 --base32 "$git_dir/assets/videojs")
+videojs_new_sha256=$(nix-hash --type sha256 --base32 "$git_dir/assets/videojs")
 json_set '.videojs.sha256' "$videojs_new_sha256"
 
 if git -C "$git_dir" diff-tree --quiet "${old_rev}..${new_rev}" -- 'shard.lock'; then

From 21dc8ddc411e60fb94c2d5deb999b9d590c6d610 Mon Sep 17 00:00:00 2001
From: schnusch <schnusch@users.noreply.github.com>
Date: Sun, 5 Jun 2022 14:44:58 +0200
Subject: [PATCH 05/10] invidious: unstable-2022-05-11 -> unstable-2022-07-10

Some tests require JSON files from ./mocks/ which is a submodule.
---
 pkgs/servers/invidious/default.nix   | 1 +
 pkgs/servers/invidious/versions.json | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/invidious/default.nix b/pkgs/servers/invidious/default.nix
index adcd694bad94..087683b5785c 100644
--- a/pkgs/servers/invidious/default.nix
+++ b/pkgs/servers/invidious/default.nix
@@ -21,6 +21,7 @@ crystal.buildCrystalPackage rec {
   src = fetchFromGitHub {
     owner = "iv-org";
     repo = pname;
+    fetchSubmodules = true;
     inherit (versions.invidious) rev sha256;
   };
 
diff --git a/pkgs/servers/invidious/versions.json b/pkgs/servers/invidious/versions.json
index 40f8bb04182a..0f7c1431f0ed 100644
--- a/pkgs/servers/invidious/versions.json
+++ b/pkgs/servers/invidious/versions.json
@@ -4,9 +4,9 @@
     "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="
   },
   "invidious": {
-    "rev": "ca27e096f3249533cc7a9b123a8a8378f3312bb7",
-    "sha256": "0xjdzxnw6b5lk8pr82sjj60wfzxqkyamh0gpf2wxby52jvlbdcka",
-    "version": "unstable-2022-05-11"
+    "rev": "cbcf31a4f98706ea675cafb7509b37dc2b0ceace",
+    "sha256": "sha256-RliUNAOsU3ewyUl8hz4hvtlk7ztexW9Bl/N1vKLc6Dg=",
+    "version": "unstable-2022-07-10"
   },
   "lsquic": {
     "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

From edd709dcfc0e15e6b8b50c0dc320a6d16654b6f2 Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Mon, 11 Jul 2022 20:28:29 -0400
Subject: [PATCH 06/10] vector: 0.22.3 -> 0.23.0

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

diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix
index 08617255a23f..0fe8734d4ca7 100644
--- a/pkgs/tools/misc/vector/default.nix
+++ b/pkgs/tools/misc/vector/default.nix
@@ -24,13 +24,13 @@
 , features ? ([ "sinks" "sources" "transforms" "vrl-cli" ]
     # the second feature flag is passed to the rdkafka dependency
     # building on linux fails without this feature flag (both x86_64 and AArch64)
-    ++ lib.optionals enableKafka [ "rdkafka/gssapi-vendored" ]
+    ++ lib.optionals enableKafka [ "rdkafka?/gssapi-vendored" ]
     ++ lib.optional stdenv.targetPlatform.isUnix "unix")
 }:
 
 let
   pname = "vector";
-  version = "0.22.3";
+  version = "0.23.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -39,10 +39,10 @@ rustPlatform.buildRustPackage {
     owner = "vectordotdev";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-62oPttkdahTeMsd9lpd9/tc95kluVJuWxzP94i+gWhA=";
+    sha256 = "sha256-Y1RysuCWvdbqckW54r1uH/K9YTuAZk8T4M3HRGFm0EM=";
   };
 
-  cargoSha256 = "sha256-WWX47pbva7ZmPR6hBstJ5VqOwu3mkhhsHK3LHHqQjDE=";
+  cargoSha256 = "sha256-VBmJfRCwSv3t5DPzVj92ajGYk5Ju8xqr4v7IDU17498=";
   nativeBuildInputs = [ pkg-config cmake perl ];
   buildInputs = [ oniguruma openssl protobuf rdkafka zstd ]
     ++ lib.optionals stdenv.isDarwin [ Security libiconv coreutils CoreServices ];

From d2319f92aa60fb593324510c95a004c0b227ee2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Sat, 9 Jul 2022 14:43:27 -0300
Subject: [PATCH 07/10] kde/frameworks: 5.95 -> 5.96

---
 .../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 e742a5c4f976..d839e142cf6b 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.95/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.96/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 297d9a80e4b7..d707ffdf0d3e 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
 
 {
   attica = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/attica-5.95.0.tar.xz";
-      sha256 = "0g3kbjjvdfry23d6ss79bc1k2f6wijy9n3ymxyq7blmr5cyzjq6n";
-      name = "attica-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/attica-5.96.0.tar.xz";
+      sha256 = "1xlg2sbfd45p9dw0sprpk0fancasp4idxacsf5xksf2ddn2crzp7";
+      name = "attica-5.96.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/baloo-5.95.0.tar.xz";
-      sha256 = "1zg2s4r74mamfl5dj97yg6c6hah3n5snq4wafy0j9w8y4lmajhcd";
-      name = "baloo-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/baloo-5.96.0.tar.xz";
+      sha256 = "1icpxmmxhvgdr6zxpz0wybc82nyy595cmr09067i82kh7v5dj66l";
+      name = "baloo-5.96.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/bluez-qt-5.95.0.tar.xz";
-      sha256 = "051prfbbzrisr9g0dh9rd5js02w36ddl95v7ak1pv64kzp1dybi3";
-      name = "bluez-qt-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/bluez-qt-5.96.0.tar.xz";
+      sha256 = "0yc7mq9bnanp5dfv43vp8wpqw5l8qh4aahqpi9sid7jmd6sbywl2";
+      name = "bluez-qt-5.96.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/breeze-icons-5.95.0.tar.xz";
-      sha256 = "0bx9680pz1ffnzrm2bmcsdb61scdc4hg3h94s6zb3wgcanvpqiqs";
-      name = "breeze-icons-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz";
+      sha256 = "1ij723qy6xfkys8a9vp2ll2z2yp7667hfw559gi8cxn825hjx823";
+      name = "breeze-icons-5.96.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/extra-cmake-modules-5.95.0.tar.xz";
-      sha256 = "0nmdj6n7hsxz88s4w1qqbbd7b1031l79fdvqiqz3an19v44j787z";
-      name = "extra-cmake-modules-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/extra-cmake-modules-5.96.0.tar.xz";
+      sha256 = "1ngxjvf584zgfb93s5sbr5f5nyw0sqc5i0jlbcgbrjg2n83l9ddx";
+      name = "extra-cmake-modules-5.96.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/frameworkintegration-5.95.0.tar.xz";
-      sha256 = "04dzy1acjgjrsryjq05lwrhph25fi363qg09gc45q0zy38zwbi55";
-      name = "frameworkintegration-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/frameworkintegration-5.96.0.tar.xz";
+      sha256 = "19piq6h51qh64nbkqnpy6jg91vbl67vg2sh4hlwzsb2lcrmwxgk9";
+      name = "frameworkintegration-5.96.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kactivities-5.95.0.tar.xz";
-      sha256 = "1mxlmwy1radgklm4mh7rm309v6j7bw1kwfms5jmmv08anrlj5hg3";
-      name = "kactivities-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kactivities-5.96.0.tar.xz";
+      sha256 = "0g16k3v6i20rc6h0js4pk00d6yg236bs0kxj88q21d5c934hbksk";
+      name = "kactivities-5.96.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kactivities-stats-5.95.0.tar.xz";
-      sha256 = "0lyad8rh0d4dxcm4azg4i60mdlcfi3hsgdpss9lgzcqhnama6mjj";
-      name = "kactivities-stats-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kactivities-stats-5.96.0.tar.xz";
+      sha256 = "0lfanv55b7zx5s0a7gh4r41w9yb641j1zjjcvdjfrj7pdh52576s";
+      name = "kactivities-stats-5.96.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kapidox-5.95.0.tar.xz";
-      sha256 = "0f0q0f705adrfhzpq0fkgxqhx6qs8dd0fwsfj0f6764kf2w0xxz5";
-      name = "kapidox-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kapidox-5.96.0.tar.xz";
+      sha256 = "1w5h4xwscix0yjn8d0rcjd7hlmrnbmkjg20diqjabb5wcxsrjiwi";
+      name = "kapidox-5.96.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/karchive-5.95.0.tar.xz";
-      sha256 = "0jfmrndpkg6axci65y89y13y9iczc1wwp0va47m5210xpwhcx30y";
-      name = "karchive-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/karchive-5.96.0.tar.xz";
+      sha256 = "1bra1q225xhh8dilwmzc0jgnj5m3dmi4nkz4y8f42si97b4xxxf5";
+      name = "karchive-5.96.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kauth-5.95.0.tar.xz";
-      sha256 = "0fjgffdw7r637sv5h37h5k8kd128p8bxfrwwgpjdhl9gzkrvc5iy";
-      name = "kauth-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kauth-5.96.0.tar.xz";
+      sha256 = "1hi36504bbr0266wl08kqiq61xysl3dw3kpgjfbgx169m0m3gmx9";
+      name = "kauth-5.96.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kbookmarks-5.95.0.tar.xz";
-      sha256 = "1w2m7bjkn6c1d0jn936qbidkkq80flvzp5jvv8sbxbnr6v3rmykp";
-      name = "kbookmarks-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kbookmarks-5.96.0.tar.xz";
+      sha256 = "131yng8wmxrnf3x1i6gg60q3rrya19yk4jnzi5ylafvaw7q2r8b4";
+      name = "kbookmarks-5.96.0.tar.xz";
     };
   };
   kcalendarcore = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcalendarcore-5.95.0.tar.xz";
-      sha256 = "10194vpkw19by7cl5r6fcj9vv241n1s6xpm15pqgalhgznj6qskq";
-      name = "kcalendarcore-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcalendarcore-5.96.0.tar.xz";
+      sha256 = "181yif830v4gg7nw9s15pvgfm98rmm6xwi2xxy3nxg7nkp14vs5k";
+      name = "kcalendarcore-5.96.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcmutils-5.95.0.tar.xz";
-      sha256 = "0m0b7ymh8xix4psa0l58g7g53b7clzma5chr5bjvwc22fxxhbp8r";
-      name = "kcmutils-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcmutils-5.96.0.tar.xz";
+      sha256 = "0vff93kja9dq8rf1aapxpfgjxsinm75f5nydxqcihskp8girz0c8";
+      name = "kcmutils-5.96.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcodecs-5.95.0.tar.xz";
-      sha256 = "0d4mnfqzixqd91n3cfhis3ppzp9kxfkhgp7v5h6miaknc5ib0yz2";
-      name = "kcodecs-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcodecs-5.96.0.tar.xz";
+      sha256 = "05266wjxmzf3qpb2xwlm40cr9h266l5r9dqww81m8bq856pf8ivi";
+      name = "kcodecs-5.96.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcompletion-5.95.0.tar.xz";
-      sha256 = "1wi8zbjcklc1yzljwpy32lla4jhv0w4vylv93nygqjdcp414kb4f";
-      name = "kcompletion-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcompletion-5.96.0.tar.xz";
+      sha256 = "1jmrd2mfz27qfn6dq1mk6bcqlagmifbf9vnayi1mkqa9jsj4dwdj";
+      name = "kcompletion-5.96.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kconfig-5.95.0.tar.xz";
-      sha256 = "1w9icxfbxa6wkjlc6qs6lj00gjid797s6k20x09blgc7lhqgccpx";
-      name = "kconfig-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kconfig-5.96.0.tar.xz";
+      sha256 = "1xa8xxm2x9783fqb26wyvg1mp6ybjikngznqdhsk9slhaca73yhz";
+      name = "kconfig-5.96.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kconfigwidgets-5.95.0.tar.xz";
-      sha256 = "0llx74g252d4w2j6qdyxwgbkkbsjcm5z5mghz0cx1vpn2hgz7drb";
-      name = "kconfigwidgets-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kconfigwidgets-5.96.0.tar.xz";
+      sha256 = "045j6gkp5sf1lc12zwlkr1dz0fd89yrg5b31j4ybk3dyc8jz90hl";
+      name = "kconfigwidgets-5.96.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcontacts-5.95.0.tar.xz";
-      sha256 = "1jad89h7yhp0ba7w43s6m6fzcclsfc6dmzqmj1zi52jlllh37mqh";
-      name = "kcontacts-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcontacts-5.96.0.tar.xz";
+      sha256 = "075mw7clqf7qycngly21q3m0js3g8pcgqc2x3alp28f4zq3c8m21";
+      name = "kcontacts-5.96.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcoreaddons-5.95.0.tar.xz";
-      sha256 = "04rwqw5b8lspnbvfxl995shdrmm6dqlglk2vc2gh03ykcpj7pkwg";
-      name = "kcoreaddons-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcoreaddons-5.96.0.tar.xz";
+      sha256 = "1n5mzj02si8allg907l6vn77c2i95qdgfvn48gsqgalwlyd4q6nj";
+      name = "kcoreaddons-5.96.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kcrash-5.95.0.tar.xz";
-      sha256 = "1y7rs59h61zsasdas2r5y8q3r1vblvymykzihw0wjf6qnzx8pz74";
-      name = "kcrash-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kcrash-5.96.0.tar.xz";
+      sha256 = "05sw3lh4lw5jgl7gvxvpyl6nims9j4b1hjsn365fa2p48qmsx6v5";
+      name = "kcrash-5.96.0.tar.xz";
     };
   };
   kdav = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kdav-5.95.0.tar.xz";
-      sha256 = "09sg4h1vjsy0ncvaq4wb4m66l71ndx9rh3wrsa3273pp4lyvszbm";
-      name = "kdav-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kdav-5.96.0.tar.xz";
+      sha256 = "1zqib8km4fg9aj4gmhx4hm7n7bbrz62l41qb48nz1pc3qia2x1wl";
+      name = "kdav-5.96.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kdbusaddons-5.95.0.tar.xz";
-      sha256 = "0qx4h365isw8vkbn632gfw39b81gjczvd6ldcwfdfj9ldgwxxzz7";
-      name = "kdbusaddons-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kdbusaddons-5.96.0.tar.xz";
+      sha256 = "1y0fd0a1nwgchsk3vx8hvvkw96f0l0533g57xakq4j4xkvxd8l3y";
+      name = "kdbusaddons-5.96.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kdeclarative-5.95.0.tar.xz";
-      sha256 = "1qm0nnxmnldla8z7wz4sjl5bd5bqgql29qbm982gsbyx1z4c9l64";
-      name = "kdeclarative-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kdeclarative-5.96.0.tar.xz";
+      sha256 = "1x4r231g0l5im4ala21m5fz5q6nixbx0z6lfia5zjinzlp7x5534";
+      name = "kdeclarative-5.96.0.tar.xz";
     };
   };
   kded = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kded-5.95.0.tar.xz";
-      sha256 = "0hdfx8yl66sck6j339q9417s2yvcpr5r27klgw4phz89hca8h6wr";
-      name = "kded-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kded-5.96.0.tar.xz";
+      sha256 = "0x40yvcx2gjb4pngyk2vfrn3z7dbyvksbj1h3ck04fyyma8z3gb3";
+      name = "kded-5.96.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kdelibs4support-5.95.0.tar.xz";
-      sha256 = "0pnm8hw96f2jvcy5fjd2pr8x52d8zmzvm0f4wjb5hcq5jf55596n";
-      name = "kdelibs4support-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kdelibs4support-5.96.0.tar.xz";
+      sha256 = "18f99g1g1z1mrkgq3l8kgxjxi60a632p0sg8d46r67b9n008w9m7";
+      name = "kdelibs4support-5.96.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kdesignerplugin-5.95.0.tar.xz";
-      sha256 = "1zz1jl2cdxs5jwl21hr89c5wgnpdn1wf0ww5hkss4mmgssr32pgw";
-      name = "kdesignerplugin-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kdesignerplugin-5.96.0.tar.xz";
+      sha256 = "0cddad1rdi06l28iiwizfds78dplbvv7j40vphww0ix7cmsh3rh9";
+      name = "kdesignerplugin-5.96.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kdesu-5.95.0.tar.xz";
-      sha256 = "1b63rsb21pjxy0zd2gxarbrm5xsvf8mbf4fnja7ghadck43jnx1f";
-      name = "kdesu-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kdesu-5.96.0.tar.xz";
+      sha256 = "1wjjjwpfjr7sx10x0236zqjx3jrw6mz60724s5qg269dwfbpahvj";
+      name = "kdesu-5.96.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kdewebkit-5.95.0.tar.xz";
-      sha256 = "0b6ykwdb52zvgmcs79drgk8i44gib2si80x6p0sc9adpbk1nwqgj";
-      name = "kdewebkit-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kdewebkit-5.96.0.tar.xz";
+      sha256 = "0l8nnar4s84igxih5w0fhwd9nvccp7zm53jy2gk6lfbj6gqarfbf";
+      name = "kdewebkit-5.96.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kdnssd-5.95.0.tar.xz";
-      sha256 = "10v8w1c7sskf5x956qbfwvca55qwk48jcaa2gv7wrb19bj0dms67";
-      name = "kdnssd-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kdnssd-5.96.0.tar.xz";
+      sha256 = "1d3jq64gyj3bc3sf46gnpbmjrm809hva47z7fkwkk9i2lmnmy70w";
+      name = "kdnssd-5.96.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kdoctools-5.95.0.tar.xz";
-      sha256 = "10isqvlhfqlhl8w46hhn7nmy8yhdi30z99pks8qm75pp3grx0mkg";
-      name = "kdoctools-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kdoctools-5.96.0.tar.xz";
+      sha256 = "04nk87dbmnf9840401s40mxlsfh9is1l1mqky9xi5mcghbp0308b";
+      name = "kdoctools-5.96.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kemoticons-5.95.0.tar.xz";
-      sha256 = "0wpl0bd3xd613wyhl11b2gvrh9dkwvl32ik64hzjmq9c7xik3a1n";
-      name = "kemoticons-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kemoticons-5.96.0.tar.xz";
+      sha256 = "03b5axwvd6ayw1kbl1jv6h04cihp1y1pa835gs3m1qx2ivgj7f75";
+      name = "kemoticons-5.96.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kfilemetadata-5.95.0.tar.xz";
-      sha256 = "018120fygj482capdbl6p30i31b1lhc7zcvdi6l200lcv5n0anvy";
-      name = "kfilemetadata-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kfilemetadata-5.96.0.tar.xz";
+      sha256 = "0sh3malq6007fp5m4hica20ha8z5abqzq5ifcmrpm8zqmm5aa2bq";
+      name = "kfilemetadata-5.96.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kglobalaccel-5.95.0.tar.xz";
-      sha256 = "1jq4b6ln7ch6dkj9ki30pn3aga6q0kbzrmw3xv1xwdy1r931xjlk";
-      name = "kglobalaccel-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kglobalaccel-5.96.0.tar.xz";
+      sha256 = "1sx4fmy8xy22im0i3dw0xdmxrgw2jhnk2wsfy2xw74dsj3adg2iq";
+      name = "kglobalaccel-5.96.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kguiaddons-5.95.0.tar.xz";
-      sha256 = "037j1vn151xp76ylrd690fwavf49nqs3f6jy2zq658n4jyxskwn7";
-      name = "kguiaddons-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kguiaddons-5.96.0.tar.xz";
+      sha256 = "028kn9lcvzv8f8b17a3clki7013dmhhcp1l9svvf6hydv97vkfbv";
+      name = "kguiaddons-5.96.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kholidays-5.95.0.tar.xz";
-      sha256 = "01zdl4l0gnzl4fvxbgzqygffnliy1ldnzf3rf931if7pqpcyffak";
-      name = "kholidays-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kholidays-5.96.0.tar.xz";
+      sha256 = "0rcd8k2x1w6jszxj18pkzimn5q4v2k7zs9x1pfwszn7xl59b3n4k";
+      name = "kholidays-5.96.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/khtml-5.95.0.tar.xz";
-      sha256 = "01iyrgx322wi2sqlcfkij95yxgv54q1mbpxiv3m814xx85iqljsk";
-      name = "khtml-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz";
+      sha256 = "0lc933z4568962xj7grzy44aj97h76s5vvv1cnj351dzwr5qahpx";
+      name = "khtml-5.96.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/ki18n-5.95.0.tar.xz";
-      sha256 = "0va28798xj1xk0agggxc8g96kd1ygigfsi438ni4qb54d7fpxmsx";
-      name = "ki18n-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/ki18n-5.96.0.tar.xz";
+      sha256 = "1jry8bdjgxkcqln7awkj3k8996lh76vya2mf5kwpyxagk6vmr0gy";
+      name = "ki18n-5.96.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kiconthemes-5.95.0.tar.xz";
-      sha256 = "1sy34s7vf915vwnighvfvzdlzk58vwc5pkhjry9hncvkw5wlmrnd";
-      name = "kiconthemes-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kiconthemes-5.96.0.tar.xz";
+      sha256 = "0w9m956xfpfxp7a63a5v2y10lb9zp2gqfjyfvq3ksxfl961g4hsg";
+      name = "kiconthemes-5.96.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kidletime-5.95.0.tar.xz";
-      sha256 = "05wjx19lgwnf5mbw9vx34mf0a2wfg3vkrkv96f5a9hir58j0q3ds";
-      name = "kidletime-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kidletime-5.96.0.tar.xz";
+      sha256 = "13piv607n9hmlbd7kkhl7b1wcxj1jq2b5386c6pxrz5caxjwgnmd";
+      name = "kidletime-5.96.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kimageformats-5.95.0.tar.xz";
-      sha256 = "1zmqvgl768lyysszq8pc00a2m1ipdbra5a2rhmn250n610b02yi5";
-      name = "kimageformats-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kimageformats-5.96.0.tar.xz";
+      sha256 = "0dbl2varirp5f1bd8173jlhmkc3ql16yg0d6w04nc56hy973bkm5";
+      name = "kimageformats-5.96.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kinit-5.95.0.tar.xz";
-      sha256 = "0yzhkfj724lc25cab97lywsshm0180kcmgw1991zzbhikjnyfnyc";
-      name = "kinit-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kinit-5.96.0.tar.xz";
+      sha256 = "1y7x80icm2jv9c8917481w1hs1vm2rvvvnc9drw4q7vrjzfx73dq";
+      name = "kinit-5.96.0.tar.xz";
     };
   };
   kio = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kio-5.95.0.tar.xz";
-      sha256 = "11vnwcfb65a8x2hrb0xp89bvljgapjzm5vffy6q4j4pcbbgz1iwp";
-      name = "kio-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kio-5.96.0.tar.xz";
+      sha256 = "0xmvgq7cp1kkicmngxjj4cmijaah91jmfqdzzxziphq1rl23k64m";
+      name = "kio-5.96.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kirigami2-5.95.0.tar.xz";
-      sha256 = "078fm14y9k0nsdxkci7k25l11zd2zd6r6nbhfmsfhn6hb4dbz77g";
-      name = "kirigami2-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kirigami2-5.96.0.tar.xz";
+      sha256 = "12ir4q9njl60b242j9raj1xsjs0cizsk7bixwb1hssfn6fzpzqkv";
+      name = "kirigami2-5.96.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kitemmodels-5.95.0.tar.xz";
-      sha256 = "1mr2dd7aj1vi1nkm8c93adyj51ins2kynmp0dsh8gzbf0sh338bm";
-      name = "kitemmodels-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kitemmodels-5.96.0.tar.xz";
+      sha256 = "1j6kffvgbd07zzzv0kab8mbwa69fmw4b8jczd0wzvmp56idsfc2v";
+      name = "kitemmodels-5.96.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kitemviews-5.95.0.tar.xz";
-      sha256 = "1zi2vchnxjy9spxg0405lg5616sf4j6c847zckmh66w6vxq41nvj";
-      name = "kitemviews-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kitemviews-5.96.0.tar.xz";
+      sha256 = "1wr62z6jwlg40m8kl9bpiyzkyjmsqx0fhgwc01192k58nl2696lb";
+      name = "kitemviews-5.96.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kjobwidgets-5.95.0.tar.xz";
-      sha256 = "0v8l46wjmkcy1ifbfc3w05qahy5lnpjrhyxziszbs05wc3yglprf";
-      name = "kjobwidgets-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kjobwidgets-5.96.0.tar.xz";
+      sha256 = "1w1h9vnlq1j72812558cl5dlq7f80nnh5i30qmkpbvv49xhhq2dl";
+      name = "kjobwidgets-5.96.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kjs-5.95.0.tar.xz";
-      sha256 = "1g2yg4p32q0s7rdx98ig7hk11f0awn14xzwid0xfi64wvdfz65ss";
-      name = "kjs-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kjs-5.96.0.tar.xz";
+      sha256 = "0jhfjjpv5hzbib3p30ngn6ic023fnrvnr8jrbjdzyacjywj69vvp";
+      name = "kjs-5.96.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kjsembed-5.95.0.tar.xz";
-      sha256 = "1cbvfvp6dnbgh14156gpcl9fds8dxbkxcn9svhkfha4157zwq7xb";
-      name = "kjsembed-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kjsembed-5.96.0.tar.xz";
+      sha256 = "1z8h0n4v1qgs2lsxflrzhdfb91jna3y2dxal1qz7i3szjvrf63h0";
+      name = "kjsembed-5.96.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kmediaplayer-5.95.0.tar.xz";
-      sha256 = "1qxh43qamvcr6wzhj2rnlhvdyp6hkyx98iwbygsr46g41nhc7ygv";
-      name = "kmediaplayer-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kmediaplayer-5.96.0.tar.xz";
+      sha256 = "0qqlah4zi0b7b6yb4009kkjqw7fkp1lgvp2mcpxs8vbbshs3376c";
+      name = "kmediaplayer-5.96.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/knewstuff-5.95.0.tar.xz";
-      sha256 = "0px9di3973bm8vjnikfjhqlfwsj5q4phidzc0s23x941nrv3d0gq";
-      name = "knewstuff-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/knewstuff-5.96.0.tar.xz";
+      sha256 = "0kls40wlqkqirfjhf8kn83saxwahlh4rkm7iypqd81h93gi81fgc";
+      name = "knewstuff-5.96.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/knotifications-5.95.0.tar.xz";
-      sha256 = "0hl1q0rz5g35vzxczaf5lap5pj9h7a8s706220s7b6z89mi8c95x";
-      name = "knotifications-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/knotifications-5.96.0.tar.xz";
+      sha256 = "11fbqylchzvm0pfw8bvy03px5zcg4jbch39vzcvnl6si7vikm4qj";
+      name = "knotifications-5.96.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/knotifyconfig-5.95.0.tar.xz";
-      sha256 = "1s1npl1h22b2pp2r43f0h2jmlrgrlf2sf33zc3acxhalvg9zwgkd";
-      name = "knotifyconfig-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/knotifyconfig-5.96.0.tar.xz";
+      sha256 = "09bcw47zp6rsnk7f83gkmlpylg428a7phn7bbi9mpkdpzc6zvfd2";
+      name = "knotifyconfig-5.96.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kpackage-5.95.0.tar.xz";
-      sha256 = "0pv0zyazf0bawj8wh4jz3m7kny84vana5a6w0s1ff4z2igqib11z";
-      name = "kpackage-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kpackage-5.96.0.tar.xz";
+      sha256 = "0gsxizpqa47apbvchga3f0w86v4jh8z1vyf0kifipz17fay4ws8d";
+      name = "kpackage-5.96.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kparts-5.95.0.tar.xz";
-      sha256 = "097zr2mn2l5rlgv6alhs1gyrig2vzvsgzikv6dspdhh4f3ydz962";
-      name = "kparts-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kparts-5.96.0.tar.xz";
+      sha256 = "0b68kyi7l3ndw798sll2hrzf6qq6w875n48sc11q6882xilzinh2";
+      name = "kparts-5.96.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kpeople-5.95.0.tar.xz";
-      sha256 = "0002yhlzvwmhmdcnx48xc5q577r9yxq5jv978avx7axl4fmxjzi9";
-      name = "kpeople-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kpeople-5.96.0.tar.xz";
+      sha256 = "0q3c0ghxa9km5xcq6h0cwa7swfd18h491jpfafy4qgq3nwp0115b";
+      name = "kpeople-5.96.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kplotting-5.95.0.tar.xz";
-      sha256 = "0jyip5s2razcg8rfg4li3a14bisqbfzh1x6zc2z90vg8cgihqjny";
-      name = "kplotting-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kplotting-5.96.0.tar.xz";
+      sha256 = "1yqx260r3dzcinp8s685yzp5f2ihc0s1csckb9zv7z1bzljkn3h9";
+      name = "kplotting-5.96.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kpty-5.95.0.tar.xz";
-      sha256 = "0pjzb7n8y3frp3b88caqhrnzfckkrgq1rq0j1n298ym78pjq077n";
-      name = "kpty-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kpty-5.96.0.tar.xz";
+      sha256 = "15swvv6qhvc654wyvxzbjbnzrd2vwn0mr4lby1x6x5f4c9br0cip";
+      name = "kpty-5.96.0.tar.xz";
     };
   };
   kquickcharts = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kquickcharts-5.95.0.tar.xz";
-      sha256 = "09fkhxm3vx488xiiqm9wg7vwcqyj7k54rxrgk8pc2gjbg2af22bs";
-      name = "kquickcharts-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kquickcharts-5.96.0.tar.xz";
+      sha256 = "1sd9mfxk72xfa1kz77s7z312scfm0vwvvgmyi4pypb9cs7d9dq3j";
+      name = "kquickcharts-5.96.0.tar.xz";
     };
   };
   kross = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kross-5.95.0.tar.xz";
-      sha256 = "05brnf4dy8vrrqsv1394g26wr593857zf808pjr3mj97pkbgszjm";
-      name = "kross-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kross-5.96.0.tar.xz";
+      sha256 = "03dvg2jh9587kcp2f9nir727z0qvkcywrgxfi1p1hxq1bx6y8fm2";
+      name = "kross-5.96.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/krunner-5.95.0.tar.xz";
-      sha256 = "0w0nc0a0i6bbgsp1l6iky6lixhyyzgq1p8rxas72dbrjbs541lb0";
-      name = "krunner-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/krunner-5.96.0.tar.xz";
+      sha256 = "0wd2nmhw9mb09mm88cnkmirwgxdnvkrkyjvaiqh9k74xqsggnplk";
+      name = "krunner-5.96.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kservice-5.95.0.tar.xz";
-      sha256 = "1rh48ij8vh72q7v9dlawgqb4kwvdgj8xl45hpn9dfx43h2iyjwfw";
-      name = "kservice-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kservice-5.96.0.tar.xz";
+      sha256 = "1zg3a35my8ba5ikmlg9s3wc9r0s5a2x0rggiiv9znhfi3snvi6gd";
+      name = "kservice-5.96.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/ktexteditor-5.95.0.tar.xz";
-      sha256 = "0yrykpangay6jb74hbr6i6m0v88dshy078qxd2myvj4gx8xbdrfm";
-      name = "ktexteditor-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/ktexteditor-5.96.0.tar.xz";
+      sha256 = "071jx26ycyk31bh167cq5fwx8xkr4ldjg8zlhn9dh7wa3rjpp183";
+      name = "ktexteditor-5.96.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/ktextwidgets-5.95.0.tar.xz";
-      sha256 = "0vjyq80nn8g4xxsq6d3z5lphl2ikg64jbl5c59q5vsnkkg4j534x";
-      name = "ktextwidgets-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/ktextwidgets-5.96.0.tar.xz";
+      sha256 = "1vab4qmqq9268bwzx6xia2bcz8rdmiwlgjkbkk8nci2pnmhjrzpj";
+      name = "ktextwidgets-5.96.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kunitconversion-5.95.0.tar.xz";
-      sha256 = "079ljkgmx5nkhs29rinbrld4scy2k69fjnbia2jfwijy0slac00g";
-      name = "kunitconversion-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kunitconversion-5.96.0.tar.xz";
+      sha256 = "1qls3319gwn1nzaq04wrqjhbchk0s0pfx97m4za63yzvapvym73g";
+      name = "kunitconversion-5.96.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kwallet-5.95.0.tar.xz";
-      sha256 = "1gk55ny4zxhwq78gn8da4zwcjxvwf5z9y7dipiam0ybkwjz2pkrd";
-      name = "kwallet-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kwallet-5.96.0.tar.xz";
+      sha256 = "0rj610c7i66fbv1x0i0sfn9mac8fkqir4vwgaq1ad5i9ca36h1jq";
+      name = "kwallet-5.96.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kwayland-5.95.0.tar.xz";
-      sha256 = "0ba71k97qp5czg4d07pp75gfrkp5rgmvd2y9vv7n6mhfrgqsd3rb";
-      name = "kwayland-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kwayland-5.96.0.tar.xz";
+      sha256 = "0dcnsiippwxvwvf1gvp75lx97c4nydzn3x1l8lfy86w9lfslw7zb";
+      name = "kwayland-5.96.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kwidgetsaddons-5.95.0.tar.xz";
-      sha256 = "0b3i47p6495pz9nph85qliscbxsrpq76s9a37bkb8nv1wf3nyyw3";
-      name = "kwidgetsaddons-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kwidgetsaddons-5.96.0.tar.xz";
+      sha256 = "1igbkrn8qaalan0lyn8r2gqv5v3rwbmb3xv3w26yw77vwp0n789r";
+      name = "kwidgetsaddons-5.96.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kwindowsystem-5.95.0.tar.xz";
-      sha256 = "1wxvhi8jwvnvgg5pyj6q6gqs24akzmjdw76g57qcfgq95a9byszi";
-      name = "kwindowsystem-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kwindowsystem-5.96.0.tar.xz";
+      sha256 = "1ilb3zl3mlndfrqz6gi28x6qqqs45l65d0wmy3lk07lppcw3wxzx";
+      name = "kwindowsystem-5.96.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/kxmlgui-5.95.0.tar.xz";
-      sha256 = "16rk1fb8n0ay3g305qmjfhrv6zq7fbilq02386wwgdczg98x8r8h";
-      name = "kxmlgui-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/kxmlgui-5.96.0.tar.xz";
+      sha256 = "1hiz2fgwpc4mgh2zzir0qi18pjsc3052lf888rc1pgql90faxb1k";
+      name = "kxmlgui-5.96.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/portingAids/kxmlrpcclient-5.95.0.tar.xz";
-      sha256 = "1ldykbr4x582k43b8bh01zzxbdfzyz2ckpqd9hpq9iab4njlh6gw";
-      name = "kxmlrpcclient-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/portingAids/kxmlrpcclient-5.96.0.tar.xz";
+      sha256 = "1jrmrzcvnnw7q7pxgfpcz8608jmxqxf89habmgwv71b8kjz3vgaw";
+      name = "kxmlrpcclient-5.96.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/modemmanager-qt-5.95.0.tar.xz";
-      sha256 = "0n9majjny43gic3s73v317wxyfzicf1j2cd7ly7fb1wpm5l9684x";
-      name = "modemmanager-qt-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/modemmanager-qt-5.96.0.tar.xz";
+      sha256 = "1rbiqh1sj328cy7flz9pw6vbvgiy3vyv6xp3fk4xv91sxviz1mhd";
+      name = "modemmanager-qt-5.96.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/networkmanager-qt-5.95.0.tar.xz";
-      sha256 = "0wkk6kblbvazplfr7wwzb552jv3560ng80wp56kihnagxkhch491";
-      name = "networkmanager-qt-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/networkmanager-qt-5.96.0.tar.xz";
+      sha256 = "1gyvgy0wl00asg9bkhjgvqnz32xmazvazcarh3p0640jy2fjrzfz";
+      name = "networkmanager-qt-5.96.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/oxygen-icons5-5.95.0.tar.xz";
-      sha256 = "1993sy7a4zvw5nbzjc9ii67f9wsba683szi39rl3gl6iy17i3lrd";
-      name = "oxygen-icons5-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/oxygen-icons5-5.96.0.tar.xz";
+      sha256 = "1f3fj6zr5iygb3s6f8vq2ayy749gxlx5j9h6v2zmkbf4m96sfmq5";
+      name = "oxygen-icons5-5.96.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/plasma-framework-5.95.0.tar.xz";
-      sha256 = "0px54bymfvwl9cyd31vgnmn1h87w1fwzqmdis3hv4q2yk2anqnsz";
-      name = "plasma-framework-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/plasma-framework-5.96.0.tar.xz";
+      sha256 = "14myvv70pixygb20c136sk7prv5f5dca53fgc74dk6c28hwyldh2";
+      name = "plasma-framework-5.96.0.tar.xz";
     };
   };
   prison = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/prison-5.95.0.tar.xz";
-      sha256 = "0i3gczd1qmxd80m4pra3fgzg1q7xvv6kfmf7c9a24misc02vwvb1";
-      name = "prison-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/prison-5.96.0.tar.xz";
+      sha256 = "1kzl8rbyj9ik83p1qb8jl32vr06vkzzvr1hpasj50sg3ajq8a9xs";
+      name = "prison-5.96.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/purpose-5.95.0.tar.xz";
-      sha256 = "002py7c162991p40hsyiqpafd6zfd5amr2b9khw0bkf72ckj0936";
-      name = "purpose-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/purpose-5.96.0.tar.xz";
+      sha256 = "0gji3dsccbii1gm83dpwry02cqmjrimhj8gnkb6nzvzrnq5xfh3r";
+      name = "purpose-5.96.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/qqc2-desktop-style-5.95.0.tar.xz";
-      sha256 = "04vkwbdlm141zgm46y1h2ypkf5w8lcbj6xbbmrkii6crv8g88ass";
-      name = "qqc2-desktop-style-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/qqc2-desktop-style-5.96.0.tar.xz";
+      sha256 = "0ff9vd34wss9na2m3gzm8wc2bwq0flda6bv6yqygv5iallw2lz88";
+      name = "qqc2-desktop-style-5.96.0.tar.xz";
     };
   };
   solid = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/solid-5.95.0.tar.xz";
-      sha256 = "0vind63kb4kl4741fy0h9rcj7579w80csmkz4ldiik50gl8hjjjc";
-      name = "solid-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/solid-5.96.0.tar.xz";
+      sha256 = "0j64glc1g7mwy2ysaj09w5f7sd2992h91ncknk9gpfsrxhpm814i";
+      name = "solid-5.96.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/sonnet-5.95.0.tar.xz";
-      sha256 = "18praj54sgnmsgqhmwp0w2jvs78k5i9j831dxfjnrzmc2ncgn1aw";
-      name = "sonnet-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/sonnet-5.96.0.tar.xz";
+      sha256 = "0i0gksdkfyl8hfbqgrgklqanbvfm3h9gjnv42p2qq40b0zjj0sh4";
+      name = "sonnet-5.96.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/syndication-5.95.0.tar.xz";
-      sha256 = "0dh8hikdfd7xdvp3rqi453v10gxq0sf5z3hzb0xsgx1y402z9mfc";
-      name = "syndication-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/syndication-5.96.0.tar.xz";
+      sha256 = "1q60dznlkbncqqgjnp3lq3x0f6r7wvz141ajkymmxlgfq3wdpcd4";
+      name = "syndication-5.96.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/syntax-highlighting-5.95.0.tar.xz";
-      sha256 = "00j88xgya0xcwrg1n0kzp5ba2f3ppp8whw66fzpksahzfvcwm71x";
-      name = "syntax-highlighting-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/syntax-highlighting-5.96.0.tar.xz";
+      sha256 = "176prghxfrb7i68jacmq9vkl7j9arsn6gnkzyc2hlkph35js3zqs";
+      name = "syntax-highlighting-5.96.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.95.0";
+    version = "5.96.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.95/threadweaver-5.95.0.tar.xz";
-      sha256 = "0gnxy97az0jy88rl2ly5f858yzwml9la1hkln9nvh8c7q2girc5s";
-      name = "threadweaver-5.95.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.96/threadweaver-5.96.0.tar.xz";
+      sha256 = "0ljjnbwmc2zz4q0q1njqny43cj6xdf976vrvijcsqdsril5wzdbq";
+      name = "threadweaver-5.96.0.tar.xz";
     };
   };
 }

From 1120fa53d87edd1ff13d7621a40a73b0cab13d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Sat, 9 Jul 2022 19:20:08 -0300
Subject: [PATCH 08/10] Revert "kf5/plasma-framework: backport patch to fix
 thumbnails in task manager"

This reverts commit d6b20ea2cf2172eb72edb4f401929a2d7b7a7c14.
---
 .../libraries/kde-frameworks/plasma-framework.nix      | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 83a7cc2546d3..cf118beaabce 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchpatch,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
@@ -9,14 +9,6 @@
 
 mkDerivation {
   pname = "plasma-framework";
-  patches = [
-    # FIXME: remove on kf5.96
-    (fetchpatch {
-      name = "fix-thumbnails-task-manager.patch";
-      url = "https://invent.kde.org/frameworks/plasma-framework/-/commit/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch";
-      sha256 = "sha256-0162bi3J5bl5BmmUSrhxxy8MpLtSXkdHGK8wMcS5BB8=";
-    })
-  ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons

From 92b7ba081fd76b2ab87fb2d1581df24ca4fed16e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 12 Jul 2022 11:46:25 +1000
Subject: [PATCH 09/10] terraform-providers: remove outdated throw

---
 .../networking/cluster/terraform-providers/default.nix          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 464ad345b3a3..8aeb11e9fbc9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -18,7 +18,7 @@ let
      , rev
      , version
      , sha256
-     , vendorSha256 ? throw "vendorSha256 missing: please use `buildGoModule`" /* added 2022/01 */
+     , vendorSha256
      , deleteVendor ? false
      , proxyVendor ? false
      , mkProviderGoModule ? buildGoModule

From 77b2ff803d29a1d86b08333bf228fc751aad477e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 12 Jul 2022 11:47:18 +1000
Subject: [PATCH 10/10] terraform-providers: switch to go_1_18

---
 .../cluster/terraform-providers/default.nix   | 23 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 8aeb11e9fbc9..e89af8de6b62 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , buildGoModule
-, buildGo118Module
+, buildGo117Module
 , fetchFromGitHub
 , callPackage
 , config
@@ -59,13 +59,22 @@ let
   # These are the providers that don't fall in line with the default model
   special-providers =
     {
-      brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; };
-      hcloud = automated-providers.hcloud.override { mkProviderGoModule = buildGo118Module; };
-      # mkisofs needed to create ISOs holding cloud-init data,
-      # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
+      # go-module vendor fails with 1.18
+      buildkite = automated-providers.buildkite.override { mkProviderGoModule = buildGo117Module; };
+      # go-module vendor fails with 1.18
+      checkly = automated-providers.checkly.override { mkProviderGoModule = buildGo117Module; };
+      # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
       libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
-      linode = automated-providers.linode.override { mkProviderGoModule = buildGo118Module; };
-      utils = automated-providers.utils.override { mkProviderGoModule = buildGo118Module; };
+      # fails to build on x86_64-darwin with 1.18
+      lxd = automated-providers.lxd.override { mkProviderGoModule = buildGo117Module; };
+      # fails to build on x86_64-darwin with 1.18
+      netlify = automated-providers.netlify.override { mkProviderGoModule = buildGo117Module; };
+      # fails to build on x86_64-darwin with 1.18
+      pass = automated-providers.pass.override { mkProviderGoModule = buildGo117Module; };
+      # fails to build on x86_64-darwin with 1.18
+      skytap = automated-providers.skytap.override { mkProviderGoModule = buildGo117Module; };
+      # fails to build on x86_64-{darwin,linux} with 1.18
+      tencentcloud = automated-providers.tencentcloud.override { mkProviderGoModule = buildGo117Module; };
     };
 
   # Put all the providers we not longer support in this list.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34f47973d92f..847a1ad4dc0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35224,7 +35224,9 @@ with pkgs;
   terraform-full = terraform.full;
 
   terraform-providers = recurseIntoAttrs (
-    callPackage ../applications/networking/cluster/terraform-providers { }
+    callPackage ../applications/networking/cluster/terraform-providers {
+      buildGoModule = buildGo118Module;
+    }
   );
 
   terraforming = callPackage ../applications/networking/cluster/terraforming { };