From 5a9129160d5cee76c00fbb80a74248013b1d4c66 Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Wed, 2 Jun 2021 23:02:49 -0700
Subject: [PATCH 001/105] terraform-providers.acme: 1.5.0-patched -> 2.4.0

and move to upstream source
---
 .../cluster/terraform-providers/default.nix           | 11 +++++++----
 .../cluster/terraform-providers/providers.json        | 11 ++++++-----
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index d88602d75bae..868f2f06c812 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -2,6 +2,7 @@
 , buildGoModule
 , buildGoPackage
 , fetchFromGitHub
+, fetchpatch
 , callPackage
 }:
 let
@@ -46,10 +47,12 @@ let
   # These are the providers that don't fall in line with the default model
   special-providers = {
     acme = automated-providers.acme.overrideAttrs (attrs: {
-      prePatch = attrs.prePatch or "" + ''
-        substituteInPlace go.mod --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme
-        substituteInPlace main.go --replace terraform-providers/terraform-provider-acme getstackhead/terraform-provider-acme
-      '';
+      patches = attrs.patches or [ ] ++ [
+        (fetchpatch {
+          url = "https://github.com/vancluever/terraform-provider-acme/commit/a5834747aebc3677225c68a08ef784cfd7b35e6c.patch";
+          sha256 = "091484whrpq6ykpgpndc8kc9cbvd9wwr0b51m1yxp31750lydp8m";
+        })
+      ];
     });
 
     # Packages that don't fit the default model
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index b4171aa4da2a..234a9c2bca47 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -7,12 +7,13 @@
     "version": "0.2.3"
   },
   "acme": {
-    "owner": "getstackhead",
-    "provider-source-address": "registry.terraform.io/getstackhead/acme",
+    "owner": "vancluever",
+    "provider-source-address": "registry.terraform.io/vancluever/acme",
     "repo": "terraform-provider-acme",
-    "rev": "v1.5.0-patched",
-    "sha256": "1wdrjpd3l0xadsa3lqhsc9c57g8x2qkwb76q824sk8za1a7lapii",
-    "version": "1.5.0-patched"
+    "rev": "v2.4.0",
+    "sha256": "0r7i55gdscw94b954nfkvgfsrw7piq63gp06vh9smrwax9i2xc2f",
+    "vendorSha256": "09zmw2xm5fwwsa9bqwscq0s67hlxjk2kd3j02ayr4mxzhaagh1z9",
+    "version": "2.4.0"
   },
   "akamai": {
     "owner": "terraform-providers",

From f6ea60666cf8b9a8e32b2de8c5c9d1bdcb62990b Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Thu, 24 Jun 2021 06:49:43 +0000
Subject: [PATCH 002/105] generate-expr-from-tarballs.pl: use nix-shell as
 script interpreter

---
 pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 6ec755171479..ee083afa7453 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -1,10 +1,7 @@
-#! /usr/bin/env perl
-
-# Usage:
-#
-# manually update tarballs.list
-# then run: cat tarballs.list | perl ./generate-expr-from-tarballs.pl
+#!/usr/bin/env nix-shell
+#!nix-shell --pure --keep NIX_PATH -i perl -p cacert nix perl
 
+# Usage: manually update tarballs.list then run: ./generate-expr-from-tarballs.pl tarballs.list
 
 use strict;
 use warnings;

From 7a6ecf8e8938d3b25f6f9b45ae6e7f323d5acb9c Mon Sep 17 00:00:00 2001
From: arcnmx <arcnmx@users.noreply.github.com>
Date: Mon, 28 Jun 2021 09:39:06 -0700
Subject: [PATCH 003/105] terraform-providers.acme: 2.4.0 -> 2.5.2

---
 .../networking/cluster/terraform-providers/default.nix | 10 ----------
 .../cluster/terraform-providers/providers.json         |  8 ++++----
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 868f2f06c812..82906f86729a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -2,7 +2,6 @@
 , buildGoModule
 , buildGoPackage
 , fetchFromGitHub
-, fetchpatch
 , callPackage
 }:
 let
@@ -46,15 +45,6 @@ let
 
   # These are the providers that don't fall in line with the default model
   special-providers = {
-    acme = automated-providers.acme.overrideAttrs (attrs: {
-      patches = attrs.patches or [ ] ++ [
-        (fetchpatch {
-          url = "https://github.com/vancluever/terraform-provider-acme/commit/a5834747aebc3677225c68a08ef784cfd7b35e6c.patch";
-          sha256 = "091484whrpq6ykpgpndc8kc9cbvd9wwr0b51m1yxp31750lydp8m";
-        })
-      ];
-    });
-
     # Packages that don't fit the default model
     ansible = callPackage ./ansible {};
     cloudfoundry = callPackage ./cloudfoundry {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 234a9c2bca47..c40552399fbd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -10,10 +10,10 @@
     "owner": "vancluever",
     "provider-source-address": "registry.terraform.io/vancluever/acme",
     "repo": "terraform-provider-acme",
-    "rev": "v2.4.0",
-    "sha256": "0r7i55gdscw94b954nfkvgfsrw7piq63gp06vh9smrwax9i2xc2f",
-    "vendorSha256": "09zmw2xm5fwwsa9bqwscq0s67hlxjk2kd3j02ayr4mxzhaagh1z9",
-    "version": "2.4.0"
+    "rev": "v2.5.2",
+    "sha256": "0yk5yxx8vdfymxggydpzsb2a0iw4n8010wlprz23qg37gb2p26yf",
+    "vendorSha256": "04zrrn67w30ib0n5s4f31x3nl3h3xz2r522ldkbbx20jy5iabrkk",
+    "version": "2.5.2"
   },
   "akamai": {
     "owner": "terraform-providers",

From de0138305ef59ffbaef328bf0abd60bb1228f3dc Mon Sep 17 00:00:00 2001
From: Igor Kuzmenko <igor@kuzzmi.com>
Date: Wed, 14 Jul 2021 22:44:23 +0300
Subject: [PATCH 004/105] rubik-font: init at 2.200

---
 pkgs/data/fonts/rubik/default.nix | 103 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |   2 +
 2 files changed, 105 insertions(+)
 create mode 100644 pkgs/data/fonts/rubik/default.nix

diff --git a/pkgs/data/fonts/rubik/default.nix b/pkgs/data/fonts/rubik/default.nix
new file mode 100644
index 000000000000..37afebb5cc0b
--- /dev/null
+++ b/pkgs/data/fonts/rubik/default.nix
@@ -0,0 +1,103 @@
+{ stdenv, lib, fetchurl }:
+let
+  # Latest commit touching the rubik tree
+  commit = "054aa9d546cd6308f8ff7139b332490e0967aebe";
+in
+stdenv.mkDerivation {
+  pname = "rubik";
+  version = "2.200";
+
+  srcs = [
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Black.ttf";
+      sha256 = "0h4mxqz0b5as7g964bv98aanaghp4wgs2g5wnf7apxnd2fng14dn";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-BlackItalic.ttf";
+      sha256 = "0x8j3fwavkf1jf7s97ncvs0jk463v1fyajcxqxvv7lpk55sjnbpy";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Bold.ttf";
+      sha256 = "0prjqdbdpnhwr66gjw9mc1590gmjl7fir8wnanzch6arvngmxaj9";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-BoldItalic.ttf";
+      sha256 = "1zyl55fkjr61k6yfvgi0cr2iz4s0kkv3mkjpdmpla9jnk10rd8lm";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-ExtraBold.ttf";
+      sha256 = "0vi01lc2dadgmw5z26nkfzn7vl3lsd0flhqqfp40nn8jvpdkb2mq";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-ExtraBoldItalic.ttf";
+      sha256 = "0ldcszzzrc44gldflman7kcfk38x77grjb3zjvxjvgn875ggwabk";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Italic.ttf";
+      sha256 = "09x7fh6ad4w6027410vhkvisgy8vqm2mzdsc19z3szlrxi0gl0rx";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Light.ttf";
+      sha256 = "19a6k0pprcra6nxk3l0k6wkg9g0qn5h1v71rw2m8im64kyjx4qpf";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-LightItalic.ttf";
+      sha256 = "0r9hbh9xnbp0584vjiiq72583j1ai3dw93gfy823c736y6bk0j2m";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Medium.ttf";
+      sha256 = "01nky9la4qjd80dy200j8l7zl0r2h9zw90k7aghzlb5abk4i3zvf";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-MediumItalic.ttf";
+      sha256 = "1i81x9h2cr65bj85z5b2mki59532nvlbh92wb84zfhfdz97s30cq";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-Regular.ttf";
+      sha256 = "1vk4n6yc4x1vlwfrp26jhagyl5l86jwa4lalccc320crrwqfc521";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-SemiBold.ttf";
+      sha256 = "0blmy1ywsf9hr1a66cl12bjn32i072w6ncvsir0s5smm2c0gksvb";
+    })
+    (fetchurl {
+      url = "https://raw.githubusercontent.com/googlefonts/rubik/${commit}/fonts/ttf/Rubik-SemiBoldItalic.ttf";
+      sha256 = "1sj22d3jrlxl6ka0naf5nby3k0i7pzadk5b8xgdhcslwijwiib3y";
+    })
+  ];
+
+  sourceRoot = "./";
+
+  unpackCmd = ''
+    ttfName=$(basename $(stripHash $curSrc))
+    cp $curSrc ./$ttfName
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp -a *.ttf $out/share/fonts/truetype/
+  '';
+
+  meta = with lib; {
+    homepage = "https://fonts.google.com/specimen/Rubik";
+    description = "Rubik Font - is a 5 weight Roman + Italic family.";
+    longDescription = ''
+      The Rubik Fonts project was initiated as part of the Chrome CubeLab
+      project.
+
+      Rubik is a 5 weight Roman + Italic family.
+
+      Rubik supports the Latin, Cyrillic and Hebrew scripts. The Latin and Cyrillic
+      were designed by Philipp Hubert and Sebastian Fischer at Hubert Fischer.
+
+      The Hebrew was initially designed by Philipp and Sebastian, and then revised by
+      type designer and Hebrew native reader Meir Sadan to adjust proportions,
+      spacing and other design details.
+
+      Cyrillic was initially designed by Philipp and Sebastian, and then revised and
+      expanded by Cyreal Fonts Team (Alexei Vanyashin and Nikita Kanarev). Exising
+      glyphs were improved, and glyph set was expanded to GF Cyrillic Plus.
+    '';
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b9f95610228..69ed90410e67 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22678,6 +22678,8 @@ in
 
   recursive = callPackage ../data/fonts/recursive { };
 
+  rubik = callPackage ../data/fonts/rubik { };
+
   rhodium-libre = callPackage ../data/fonts/rhodium-libre { };
 
   rictydiminished-with-firacode = callPackage ../data/fonts/rictydiminished-with-firacode { };

From 4d2f142eb9276ceac9ecd926961fd2637e2e0319 Mon Sep 17 00:00:00 2001
From: Matthew Leach <dev@mattleach.net>
Date: Sun, 25 Jul 2021 22:18:11 +0100
Subject: [PATCH 005/105] fldigi: 4.1.18 -> 4.1.19

Also fix the build of fldigi on darwin machines.
---
 pkgs/applications/radio/fldigi/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix
index a71e4f4bbd41..c27f0915a4a6 100644
--- a/pkgs/applications/radio/fldigi/default.nix
+++ b/pkgs/applications/radio/fldigi/default.nix
@@ -13,17 +13,20 @@
 , gettext
 , pkg-config
 , alsa-lib
+, udev
 }:
 
 stdenv.mkDerivation rec {
   pname = "fldigi";
-  version = "4.1.18";
+  version = "4.1.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-PH/YSrOoS6RSWyUenVYSDa7mJqODFoSpdP2tR2+QJw0=";
+    sha256 = "0zvfkmvxi31ccbpxvimkcrqrkf3wzr1pgja2ny04srrakl8ff5c7";
   };
 
+  nativeBuildInputs = [ pkg-config ];
+
   buildInputs = [
     libXinerama
     gettext
@@ -34,16 +37,13 @@ stdenv.mkDerivation rec {
     portaudio
     libsndfile
     libsamplerate
-    libpulseaudio
-    pkg-config
-    alsa-lib
-  ];
+  ] ++ lib.optionals (stdenv.isLinux) [ libpulseaudio alsa-lib udev ];
 
   meta = with lib; {
     description = "Digital modem program";
     homepage = "https://sourceforge.net/projects/fldigi/";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ relrod ftrvxmtrx ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 3738eb5534a679b80ea8b8b5bf53a57f18ac5743 Mon Sep 17 00:00:00 2001
From: Heph <srht@mrkeebs.eu>
Date: Mon, 26 Jul 2021 16:58:23 +0200
Subject: [PATCH 006/105] telescope: 0.3.1 -> 0.4.1

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

diff --git a/pkgs/applications/networking/browsers/telescope/default.nix b/pkgs/applications/networking/browsers/telescope/default.nix
index fa9b3853a9d1..a6762e255f43 100644
--- a/pkgs/applications/networking/browsers/telescope/default.nix
+++ b/pkgs/applications/networking/browsers/telescope/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "telescope";
-  version = "0.3.1";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://github.com/omar-polo/telescope/releases/download/${version}/telescope-${version}.tar.gz";
-    sha256 = "11xrsh064ph1idhygh52y4mqapgwn1cqr0l3naj5n2a2p7lcsvvw";
+    sha256 = "086zps4nslv5isfw1b5gvms7vp3fglm7x1a6ks0h0wxarzj350bl";
   };
 
   nativeBuildInputs = [

From 37810bc9a268064bb29faa5012183f729eff4834 Mon Sep 17 00:00:00 2001
From: Babbaj <babbaj45@gmail.com>
Date: Mon, 26 Jul 2021 13:38:42 -0400
Subject: [PATCH 007/105] obs-nvfbc: init at 0.0.3

---
 .../video/obs-studio/plugins/default.nix      |  1 +
 .../video/obs-studio/plugins/obs-nvfbc.nix    | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix

diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix
index ef360487a6b1..58151e4d03ef 100644
--- a/pkgs/applications/video/obs-studio/plugins/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/default.nix
@@ -7,4 +7,5 @@
   obs-ndi = libsForQt5.callPackage ./obs-ndi.nix {};
   wlrobs = callPackage ./wlrobs.nix {};
   looking-glass-obs = callPackage ./looking-glass-obs.nix {};
+  obs-nvfbc = callPackage ./obs-nvfbc.nix {};
 }
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
new file mode 100644
index 000000000000..e64031ce7bbe
--- /dev/null
+++ b/pkgs/applications/video/obs-studio/plugins/obs-nvfbc.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitLab, meson, ninja, pkg-config
+, obs-studio, libGL, libX11
+}:
+
+stdenv.mkDerivation rec {
+  pname = "obs-nvfbc";
+  version = "0.0.3";
+
+  src = fetchFromGitLab {
+    owner = "fzwoch";
+    repo = "obs-nvfbc";
+    rev = "v${version}";
+    sha256 = "0zyvks6gc6fr0a1j5b4y20rcx6ah35v6yiz05f6g3x6bhqi92l33";
+  };
+
+  nativeBuildInputs = [ meson pkg-config ninja ];
+  buildInputs = [ obs-studio libGL libX11 ];
+
+  meta = with lib; {
+    description = "OBS Studio source plugin for NVIDIA FBC API";
+    license = licenses.gpl2Only;
+    maintainers = with maintainers; [ babbaj ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

From 656524c416085135167794bf4ba395be34f05576 Mon Sep 17 00:00:00 2001
From: Angus Trau <me@angus.ws>
Date: Mon, 26 Jul 2021 18:51:53 +1000
Subject: [PATCH 008/105] python3Packages.pyfakewebcam: init at 0.1.0

---
 .../python-modules/pyfakewebcam/default.nix   | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyfakewebcam/default.nix

diff --git a/pkgs/development/python-modules/pyfakewebcam/default.nix b/pkgs/development/python-modules/pyfakewebcam/default.nix
new file mode 100644
index 000000000000..1ef1d2df474d
--- /dev/null
+++ b/pkgs/development/python-modules/pyfakewebcam/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchPypi, numpy, opencv4 }:
+
+buildPythonPackage rec {
+  pname = "pyfakewebcam";
+  version = "0.1.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "152nglscxmv7600i1i2gahny5z0bybnqgq3npak8npb0lsnwxn1a";
+  };
+
+  propagatedBuildInputs = [ numpy opencv4 ];
+
+  # No tests are available
+  doCheck = false;
+  pythonImportsCheck = [ "pyfakewebcam" ];
+
+  meta = with lib; {
+    description = "A library for writing RGB frames to a fake webcam device on Linux";
+    homepage = "https://github.com/jremmons/pyfakewebcam";
+    license = licenses.lgpl3Only;
+    maintainers = with maintainers; [ angustrau ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 80fec6354089..81efeee19b27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5977,6 +5977,8 @@ in {
 
   pyfakefs = callPackage ../development/python-modules/pyfakefs { };
 
+  pyfakewebcam = callPackage ../development/python-modules/pyfakewebcam { };
+
   pyfantom = callPackage ../development/python-modules/pyfantom { };
 
   pyfcm = callPackage ../development/python-modules/pyfcm { };

From bf1998e82f0edf0b60134ed4642fe828c740f06a Mon Sep 17 00:00:00 2001
From: jakobrs <jakobrs100@gmail.com>
Date: Wed, 28 Jul 2021 17:11:51 +0200
Subject: [PATCH 009/105] mold: 0.9.2 -> 0.9.3

---
 pkgs/development/tools/mold/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index ee661e622022..8a8d2ac531da 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -3,7 +3,6 @@
 , lib
 , autoPatchelfHook
 , cmake
-, tbb
 , llvmPackages_latest
 , xxHash
 , zlib
@@ -12,16 +11,16 @@
 
 stdenv.mkDerivation rec {
   pname = "mold";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "rui314";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-2LXOPirhjAifKYPgngUJwEdGrKMYsRySr5TL2x2p8J0=";
+    sha256 = "sha256:1z9i8nvdl9h0zydh1gd9244q96n9x1gh5y90m71bghnh7nws0zmd";
   };
 
-  buildInputs = [ tbb zlib openssl ];
+  buildInputs = [ zlib openssl ];
   nativeBuildInputs = [ autoPatchelfHook cmake xxHash ];
 
   dontUseCmakeConfigure = true;

From 550230b08ee2373d4165b09d9174d3da313e1b5b Mon Sep 17 00:00:00 2001
From: jakobrs <jakobrs100@gmail.com>
Date: Wed, 28 Jul 2021 17:12:17 +0200
Subject: [PATCH 010/105] mold: apply patch: "Intercept all invocations of ld,
 ld.gold or ld.lld"

---
 pkgs/development/tools/mold/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/mold/default.nix b/pkgs/development/tools/mold/default.nix
index 8a8d2ac531da..87cb582417a2 100644
--- a/pkgs/development/tools/mold/default.nix
+++ b/pkgs/development/tools/mold/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , lib
 , autoPatchelfHook
 , cmake
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256:1z9i8nvdl9h0zydh1gd9244q96n9x1gh5y90m71bghnh7nws0zmd";
   };
 
+  patches = [
+    # Intercept all invocations of ld, ld.gold or ld.lld
+    (fetchpatch {
+      url = "https://github.com/rui314/mold/commit/d25c2553ad3cfa39d99043927db1af2c028b5acf.patch";
+      sha256 = "1ic1dyvjcrj6834n6mw9id50l6nymrfn6hws6pjpy8gjk6mqfvnk";
+    })
+  ];
+
   buildInputs = [ zlib openssl ];
   nativeBuildInputs = [ autoPatchelfHook cmake xxHash ];
 

From 39f65ee33dd09350635f2495d200707dd97452b7 Mon Sep 17 00:00:00 2001
From: Johannes Arnold <johannes.arnold@stud.uni-hannover.de>
Date: Mon, 26 Jul 2021 02:05:31 +0200
Subject: [PATCH 011/105] nixos/mlvwm: init at 0.9.3

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/mlvwm.nix    | 41 ++++++++++++++
 .../window-managers/mlvwm/default.nix         | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 97 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/mlvwm.nix
 create mode 100644 pkgs/applications/window-managers/mlvwm/default.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 53285fbce877..d71738ea633f 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -26,6 +26,7 @@ in
     ./leftwm.nix
     ./lwm.nix
     ./metacity.nix
+    ./mlvwm.nix
     ./mwm.nix
     ./openbox.nix
     ./pekwm.nix
diff --git a/nixos/modules/services/x11/window-managers/mlvwm.nix b/nixos/modules/services/x11/window-managers/mlvwm.nix
new file mode 100644
index 000000000000..08dd04020296
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/mlvwm.nix
@@ -0,0 +1,41 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.xserver.windowManager.mlvwm;
+
+in
+{
+
+  options.services.xserver.windowManager.mlvwm = {
+    enable = mkEnableOption "Macintosh-like Virtual Window Manager";
+
+    configFile = mkOption {
+      default = null;
+      type = with types; nullOr path;
+      description = ''
+        Path to the mlvwm configuration file.
+        If left at the default value, $HOME/.mlvwmrc will be used.
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    services.xserver.windowManager.session = [{
+      name = "mlvwm";
+      start = ''
+        ${pkgs.mlvwm}/bin/mlvwm ${optionalString (cfg.configFile != null)
+          "-f /etc/mlvwm/mlvwmrc"
+        } &
+        waitPID=$!
+      '';
+    }];
+
+    environment.etc."mlvwm/mlvwmrc" = mkIf (cfg.configFile != null) {
+      source = cfg.configFile;
+    };
+
+    environment.systemPackages = [ pkgs.mlvwm ];
+  };
+}
diff --git a/pkgs/applications/window-managers/mlvwm/default.nix b/pkgs/applications/window-managers/mlvwm/default.nix
new file mode 100644
index 000000000000..14170be53ac6
--- /dev/null
+++ b/pkgs/applications/window-managers/mlvwm/default.nix
@@ -0,0 +1,53 @@
+{ lib, stdenv, fetchFromGitHub, gccmakedep, libX11, libXext, libXpm, imake, installShellFiles, ... }:
+
+stdenv.mkDerivation rec {
+  pname = "mlvwm";
+  version = "0.9.3";
+
+  src = fetchFromGitHub {
+    owner = "morgant";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-Sps2+XyMTcNuhQTLrW/8vSZIcSzMejoi1m64SK129YI=";
+  };
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  buildInputs = [ gccmakedep libX11 libXext libXpm imake ];
+
+  buildPhase = ''
+    (cd man && xmkmf)
+    (cd sample_rc && xmkmf)
+    (cd mlvwm && xmkmf)
+    xmkmf
+    make
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,etc}
+    cp mlvwm/mlvwm $out/bin
+    cp sample_rc/Mlvwmrc* $out/etc
+    runHook postInstall
+  '';
+
+  postInstall = ''
+    mv man/mlvwm.man man/mlvwm.1
+    installManPage man/mlvwm.1
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/morgant/mlvwm";
+    description = "Macintosh-like Virtual Window Manager";
+    license = licenses.mit;
+    longDescription = ''
+      MLVWM or Macintosh-Like Virtual Window Manager,
+      is an FVWM descendant created by Takashi Hasegawa
+      in 1997 while studying at Nagoya University and
+      was written entirely in the C programming language.
+      As its name implies, it attempts to emulate the
+      pre-Mac OS X Macintosh look and feel in its layout and window design.
+    '';
+    platforms = platforms.linux;
+    maintainers = [ maintainers.j0hax ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 107722e6e102..bc64dec585b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25683,6 +25683,8 @@ in
     ocamlPackages = ocaml-ng.ocamlPackages_4_08;
   };
 
+  mlvwm = callPackage ../applications/window-managers/mlvwm { };
+
   MMA = callPackage ../applications/audio/MMA { };
 
   mmex = callPackage ../applications/office/mmex {

From 44fbafbd7e9bc2d5043b687e86e50eb0dcc5037c Mon Sep 17 00:00:00 2001
From: Kartik Gokte <ksgokte@gmail.com>
Date: Thu, 29 Jul 2021 17:42:16 +0530
Subject: [PATCH 012/105] maintainers: add nukaduka

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8708bf79f540..e45ccd95212c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7832,6 +7832,12 @@
     githubId = 1839979;
     name = "Niklas Thörne";
   };
+  nukaduka = {
+    email = "ksgokte@gmail.com";
+    github = "NukaDuka";
+    githubId = 22592293;
+    name = "Kartik Gokte";
+  };
   nullx76 = {
     email = "nix@xirion.net";
     github = "NULLx76";

From db90da34820fcc2a86cd948d4aa044251b8d7831 Mon Sep 17 00:00:00 2001
From: Kartik Gokte <ksgokte@gmail.com>
Date: Fri, 30 Jul 2021 18:28:14 +0530
Subject: [PATCH 013/105] grafanaPlugins.grafadruid-druid-datasource: init at
 1.2.0

---
 .../plugins/grafadruid-druid-datasource/default.nix | 13 +++++++++++++
 pkgs/servers/monitoring/grafana/plugins/plugins.nix |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix
new file mode 100644
index 000000000000..9f1d501d23fd
--- /dev/null
+++ b/pkgs/servers/monitoring/grafana/plugins/grafadruid-druid-datasource/default.nix
@@ -0,0 +1,13 @@
+{ grafanaPlugin, lib }:
+
+grafanaPlugin rec {
+  pname = "grafadruid-druid-datasource";
+  version = "1.2.0";
+  zipHash = "sha256-DPeyV2jZquSQcSE+HzvxArWEefs9bFNPjZwDFp+dIjg=";
+  meta = with lib; {
+    description = "Connects Grafana to Druid";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nukaduka ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/servers/monitoring/grafana/plugins/plugins.nix b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
index d763f14c75a1..a99a71cffd1c 100644
--- a/pkgs/servers/monitoring/grafana/plugins/plugins.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/plugins.nix
@@ -5,6 +5,7 @@
   grafanaPlugin = callPackage ./grafana-plugin.nix { };
 
   doitintl-bigquery-datasource = callPackage ./doitintl-bigquery-datasource { };
+  grafadruid-druid-datasource = callPackage ./grafadruid-druid-datasource { };
   grafana-clock-panel = callPackage ./grafana-clock-panel { };
   grafana-piechart-panel = callPackage ./grafana-piechart-panel { };
   grafana-polystat-panel = callPackage ./grafana-polystat-panel { };

From fff5923ab5b054a7481772829a6e5e1812571ee7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Jul 2021 19:01:07 +0200
Subject: [PATCH 014/105] python3Packages.httpx: 0.18.0 -> 0.18.2

---
 pkgs/development/python-modules/httpx/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index e5db065defcd..6a9300566d59 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
-, brotli
+, brotlicffi
 , certifi
 , h2
 , httpcore
@@ -11,25 +11,25 @@
 , pytestCheckHook
 , pytest-asyncio
 , pytest-trio
-, pytest-cov
+, typing-extensions
 , trustme
 , uvicorn
 }:
 
 buildPythonPackage rec {
   pname = "httpx";
-  version = "0.18.0";
+  version = "0.18.2";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U=";
+    sha256 = "0rr5b6z96yipvp4riqmmbkbcy0sdyzykcdwf5y9ryh27pxr8q8x4";
   };
 
   propagatedBuildInputs = [
-    brotli
+    brotlicffi
     certifi
     h2
     httpcore
@@ -41,8 +41,8 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-asyncio
     pytest-trio
-    pytest-cov
     trustme
+    typing-extensions
     uvicorn
   ];
 
@@ -62,6 +62,6 @@ buildPythonPackage rec {
     description = "The next generation HTTP client";
     homepage = "https://github.com/encode/httpx";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc fab ];
   };
 }

From cde201489132fba639d22f592af8c93fd8746cb4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Jul 2021 19:14:01 +0200
Subject: [PATCH 015/105] python3Packages.httpx-socks: init at 0.4.1

---
 .../python-modules/httpx-socks/default.nix    | 57 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/python-modules/httpx-socks/default.nix

diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix
new file mode 100644
index 000000000000..f73d81cc6aaa
--- /dev/null
+++ b/pkgs/development/python-modules/httpx-socks/default.nix
@@ -0,0 +1,57 @@
+{ lib
+, async-timeout
+, buildPythonPackage
+, curio
+, fetchFromGitHub
+, flask
+, httpcore
+, httpx
+, pytest-asyncio
+, pytest-trio
+, pytestCheckHook
+, python-socks
+, pythonOlder
+, sniffio
+, trio
+, yarl
+}:
+
+buildPythonPackage rec {
+  pname = "httpx-socks";
+  version = "0.4.1";
+  disabled = pythonOlder "3.6";
+
+  src = fetchFromGitHub {
+    owner = "romis2012";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1rz69z5fcw7d5nzy5q2q0r9gxrsqijgpg70cnyr5br6xnfgy01ar";
+  };
+
+  propagatedBuildInputs = [
+    async-timeout
+    curio
+    httpcore
+    httpx
+    python-socks
+    sniffio
+    trio
+  ];
+
+  checkInputs = [
+    flask
+    pytest-asyncio
+    pytest-trio
+    pytestCheckHook
+    yarl
+  ];
+
+  pythonImportsCheck = [ "httpx_socks" ];
+
+  meta = with lib; {
+    description = "Proxy (HTTP, SOCKS) transports for httpx";
+    homepage = "https://github.com/romis2012/httpx-socks";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1c4e4392b56..7ea7fd92679d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3383,6 +3383,8 @@ in {
 
   httpx = callPackage ../development/python-modules/httpx { };
 
+  httpx-socks = callPackage ../development/python-modules/httpx-socks { };
+
   huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { };
 
   huey = callPackage ../development/python-modules/huey { };

From bd3eb499b8dbca992fd8a0c7a2b41e3a55fd64ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Jul 2021 19:52:05 +0200
Subject: [PATCH 016/105] python3Packages.httpx-ntlm: init at 0.0.10

---
 .../python-modules/httpx-ntlm/default.nix     | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/httpx-ntlm/default.nix

diff --git a/pkgs/development/python-modules/httpx-ntlm/default.nix b/pkgs/development/python-modules/httpx-ntlm/default.nix
new file mode 100644
index 000000000000..b3ac17cf7f07
--- /dev/null
+++ b/pkgs/development/python-modules/httpx-ntlm/default.nix
@@ -0,0 +1,36 @@
+{ lib
+, buildPythonPackage
+, cryptography
+, fetchPypi
+, httpx
+, ntlm-auth
+}:
+
+buildPythonPackage rec {
+  pname = "httpx-ntlm";
+  version = "0.0.10";
+
+  src = fetchPypi {
+    pname = "httpx_ntlm";
+    inherit version;
+    sha256 = "1rar6smz56y8k5qbgrpabpr639nwvf6whdi093hyakf0m3h9cpfz";
+  };
+
+  propagatedBuildInputs = [
+    cryptography
+    httpx
+    ntlm-auth
+  ];
+
+  # https://github.com/ulodciv/httpx-ntlm/issues/5
+  doCheck = false;
+
+  pythonImportsCheck = [ "httpx_ntlm" ];
+
+  meta = with lib; {
+    description = "NTLM authentication support for HTTPX";
+    homepage = "https://github.com/ulodciv/httpx-ntlm";
+    license = licenses.isc;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ea7fd92679d..168ed4d7a484 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3383,6 +3383,8 @@ in {
 
   httpx = callPackage ../development/python-modules/httpx { };
 
+  httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { };
+
   httpx-socks = callPackage ../development/python-modules/httpx-socks { };
 
   huawei-lte-api = callPackage ../development/python-modules/huawei-lte-api { };

From 72dce4c560ae2a6f687d2304ee3bbbc845bfbc11 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 31 Jul 2021 19:53:32 +0200
Subject: [PATCH 017/105] wapiti: 3.0.4 -> 3.0.5

---
 pkgs/tools/security/wapiti/default.nix | 31 +++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix
index 945f78dc5599..cd89d4039e5f 100644
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@@ -5,13 +5,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wapiti";
-  version = "3.0.4";
+  version = "3.0.5";
 
   src = fetchFromGitHub {
     owner = "wapiti-scanner";
     repo = pname;
     rev = version;
-    sha256 = "0wnz4nq1q5y74ksb1kcss9vdih0kbrmnkfbyc2ngd9id1ixfamxb";
+    sha256 = "0663hzpmn6p5xh65d2gk4yk2zh992lfd9lhdwwabhpv3n85nza75";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -21,24 +21,34 @@ python3.pkgs.buildPythonApplication rec {
   propagatedBuildInputs = with python3.pkgs; [
     beautifulsoup4
     browser-cookie3
+    cryptography
     Mako
     markupsafe
     pysocks
-    requests
+    httpx
+    httpx-ntlm
+    httpx-socks
     six
     tld
     yaswfp
   ] ++ lib.optionals (python3.pythonOlder "3.8") [ importlib-metadata ];
 
   checkInputs = with python3.pkgs; [
-    responses
+    respx
+    pytest-asyncio
     pytestCheckHook
   ];
 
   postPatch = ''
-    # Is already fixed in the repo. Will be part of the next release
+    # Ignore pinned versions
     substituteInPlace setup.py \
-      --replace "importlib_metadata==2.0.0" "importlib_metadata"
+      --replace "==" ">="
+    substituteInPlace setup.cfg \
+      --replace " --cov" ""
+  '';
+
+  preCheck = ''
+    export HOME=$(mktemp -d);
   '';
 
   disabledTests = [
@@ -47,6 +57,10 @@ python3.pkgs.buildPythonApplication rec {
     "test_bad_separator_used"
     "test_blind"
     "test_chunked_timeout"
+    "test_cookies"
+    "test_drop_cookies"
+    "test_save_and_restore_state"
+    "test_explorer_extract_links"
     "test_cookies_detection"
     "test_csrf_cases"
     "test_detection"
@@ -63,6 +77,8 @@ python3.pkgs.buildPythonApplication rec {
     "test_no_crash"
     "test_options"
     "test_out_of_band"
+    "test_multi_detection"
+    "test_vulnerabilities"
     "test_partial_tag_name_escape"
     "test_prefix_and_suffix_detection"
     "test_qs_limit"
@@ -85,6 +101,9 @@ python3.pkgs.buildPythonApplication rec {
     "test_xss_with_strong_csp"
     "test_xss_with_weak_csp"
     "test_xxe"
+    # Requires a PHP installation
+    "test_timesql"
+    "test_cookies"
   ];
 
   pythonImportsCheck = [ "wapitiCore" ];

From ec6c669d5ee5fe67693d4826bd8d10879649542d Mon Sep 17 00:00:00 2001
From: wheelsandmetal <jakob@schmutz.co.uk>
Date: Tue, 20 Jul 2021 12:30:03 +0100
Subject: [PATCH 018/105] sentry-native: init at 0.4.11

---
 .../libraries/sentry-native/default.nix       | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/sentry-native/default.nix

diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix
new file mode 100644
index 000000000000..a20cc7d917b5
--- /dev/null
+++ b/pkgs/development/libraries/sentry-native/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub, cmake, curl, breakpad, pkg-config }:
+
+stdenv.mkDerivation rec {
+  pname = "sentry-native";
+  version = "0.4.11";
+
+  src = fetchFromGitHub {
+    owner = "getsentry";
+    repo = "sentry-native";
+    rev = version;
+    sha256 = "sha256-kasZ5OAtl32Oxed4BkxvHXEFqEvBaBwyslHO7Ga5TRY=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ curl breakpad pkg-config ];
+  cmakeFlags = [
+    "-DCMAKE_BUILD_TYPE=RelWithDebInfo"
+    "-DSENTRY_BREAKPAD_SYSTEM=On"
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/getsentry/sentry-native";
+    description = "Sentry SDK for C, C++ and native applications.";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wheelsandmetal ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5024a4d8d3a..8181754eed42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9769,6 +9769,8 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
+  sentry-native = callPackage ../development/libraries/sentry-native { };
+
   vtun = callPackage ../tools/networking/vtun {
     openssl = openssl_1_0_2;
   };

From 7ad795da18399c3e1dc07bef876a8046fcf6a702 Mon Sep 17 00:00:00 2001
From: Enno Richter <enno@nerdworks.de>
Date: Mon, 21 Jun 2021 12:45:59 +0200
Subject: [PATCH 019/105] snmpcheck: init at 1.9

---
 .../ruby-modules/with-packages/Gemfile        |  1 +
 pkgs/tools/networking/snmpcheck/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 pkgs/top-level/ruby-packages.nix              | 10 +++++++
 4 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/networking/snmpcheck/default.nix

diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile
index b3ddb5b13106..a3e7f41a2a09 100644
--- a/pkgs/development/ruby-modules/with-packages/Gemfile
+++ b/pkgs/development/ruby-modules/with-packages/Gemfile
@@ -131,6 +131,7 @@ source 'https://rubygems.org' do
   gem 'sinatra'
   gem 'slop'
   gem 'snappy'
+  gem 'snmp'
   gem 'sqlite3'
   gem 'taglib-ruby'
   gem 'thrift'
diff --git a/pkgs/tools/networking/snmpcheck/default.nix b/pkgs/tools/networking/snmpcheck/default.nix
new file mode 100644
index 000000000000..e27ead59e971
--- /dev/null
+++ b/pkgs/tools/networking/snmpcheck/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, lib, fetchurl, ruby }:
+
+let
+  rubyEnv = ruby.withPackages (ps: [ ps.snmp ]);
+in
+stdenv.mkDerivation rec {
+  pname = "snmpcheck";
+  version = "1.9";
+  src = fetchurl {
+    url = "http://www.nothink.org/codes/snmpcheck/snmpcheck-${version}.rb";
+    sha256 = "sha256-9xkLqbgxU1uykx+M9QsbPAH8OI/Cqn9uw6ALe23Lbq0=";
+    executable = true;
+  };
+
+  dontUnpack = true;
+
+  buildInputs = [ rubyEnv.wrappedRuby ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp $src $out/bin/snmp-check
+  '';
+
+  meta = with lib; {
+    description = "SNMP enumerator";
+    homepage = "http://www.nothink.org/codes/snmpcheck/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ elohmeier ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1fb91e0c20e6..2a7c09a710c1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8944,6 +8944,8 @@ in
     libpng = libpng12;
   };
 
+  snmpcheck = callPackage ../tools/networking/snmpcheck {};
+
   sniffglue = callPackage ../tools/networking/sniffglue { };
 
   snort = callPackage ../applications/networking/ids/snort { };
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 957fe10d48f4..c04c88697d19 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -2522,6 +2522,16 @@
     };
     version = "0.2.0";
   };
+  snmp = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xr7rwfk7mwxzqcgir0glmyy4j27g6yixfaswsbd2qn6r8c980qf";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
   solargraph = {
     dependencies = ["backport" "benchmark" "diff-lcs" "e2mmap" "jaro_winkler" "kramdown" "kramdown-parser-gfm" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"];
     groups = ["default"];

From c925232e679cd639fbb3185fee0d267365e99d39 Mon Sep 17 00:00:00 2001
From: Tom Repetti <trepetti@cs.columbia.edu>
Date: Tue, 27 Jul 2021 17:10:26 -0400
Subject: [PATCH 020/105] lemon-graph: init at 1.3.1

---
 .../libraries/lemon-graph/default.nix         | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/libraries/lemon-graph/default.nix

diff --git a/pkgs/development/libraries/lemon-graph/default.nix b/pkgs/development/libraries/lemon-graph/default.nix
new file mode 100644
index 000000000000..04f0514781bf
--- /dev/null
+++ b/pkgs/development/libraries/lemon-graph/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, stdenv
+, fetchurl
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "lemon-graph";
+  version = "1.3.1";
+
+  src = fetchurl {
+    url = "https://lemon.cs.elte.hu/pub/sources/lemon-${version}.tar.gz";
+    sha256 = "1j6kp9axhgna47cfnmk1m7vnqn01hwh7pf1fp76aid60yhjwgdvi";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+
+  meta = with lib; {
+    homepage = "https://lemon.cs.elte.hu/trac/lemon";
+    description = "Efficient library for combinatorial optimization tasks on graphs and networks";
+    license = licenses.boost;
+    maintainers = with maintainers; [ trepetti ];
+    platforms = platforms.all;
+    broken = stdenv.isAarch64 || stdenv.isDarwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e9edbebedf8..9dc43e1dedc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16109,6 +16109,8 @@ in
 
   lmdbxx = callPackage ../development/libraries/lmdbxx { };
 
+  lemon-graph = callPackage ../development/libraries/lemon-graph { };
+
   levmar = callPackage ../development/libraries/levmar { };
 
   leptonica = callPackage ../development/libraries/leptonica { };

From ddb42a08ae3b41c564033732a8a48949bdbe53a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 2 Aug 2021 22:11:41 +0200
Subject: [PATCH 021/105] python3Packages.python-lsp-server: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/python-lsp-server/default.nix b/pkgs/development/python-modules/python-lsp-server/default.nix
index 90ab506d651f..9c6b8c31e120 100644
--- a/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "python-lsp-server";
-  version = "1.1.0";
+  version = "1.2.0";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "python-lsp";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1akdpfnylqg2mcwpkqmdwcg6j6hab23slp5rfjfidhphig2f2yjv";
+    sha256 = "09wnnbf7lqqni6xkpzzk7nmcqjm5bx49xqzmp5fkb9jk50ivcrdz";
   };
 
   propagatedBuildInputs = [

From 1609a02da6195727e81f4c71a6ba84ee0436b707 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Mon, 2 Aug 2021 23:59:29 +0200
Subject: [PATCH 022/105] win-virtio: deprecate phases

---
 pkgs/applications/virtualization/driver/win-virtio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix
index 7de6498ab5bb..060cc4b4ebf6 100644
--- a/pkgs/applications/virtualization/driver/win-virtio/default.nix
+++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   pname = "win-virtio";
   version = "0.1.196-1";
 
-  phases = [ "buildPhase" "installPhase" ];
+  dontUnpack = true;
 
   src = fetchurl {
     url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-${version}/virtio-win.iso";

From 065ce585eb0fab439230495c4a386f192eeb75b0 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:00:09 +0200
Subject: [PATCH 023/105] win-signed-gplpv-drivers: deprecate phases

---
 .../virtualization/driver/win-signed-gplpv-drivers/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
index c4c5cb807284..e9ad3b863386 100644
--- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
+++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation  {
   name = "gplpv-0.11.0.373";
   version = "0.11.0.373";
 
-  phases = [ "buildPhase" "installPhase" ];
+  dontUnpack = true;
 
   buildPhase = ''
     mkdir -p x86

From 560eac26d02199a0e26775cc3d887fd664ef6fba Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:00:37 +0200
Subject: [PATCH 024/105] win-qemu: deprecate phases

---
 pkgs/applications/virtualization/driver/win-qemu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix
index d8e233e35232..7c1eb0055a30 100644
--- a/pkgs/applications/virtualization/driver/win-qemu/default.nix
+++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation  {
   name = "win-qemu-0.1.105-1";
   version = "0.1.105-1";
 
-  phases = [ "buildPhase" "installPhase" ];
+  dontUnpack = true;
 
   src = fetchurl {
     url = "https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.105-1/virtio-win.iso";

From 0378bdd5cb668ae2d48e6a2a6f2925949bf718a8 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:01:02 +0200
Subject: [PATCH 025/105] webtorrent_desktop: remove phases

---
 pkgs/applications/video/webtorrent_desktop/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 3b486654aeb9..b4f8af61fca5 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -63,7 +63,6 @@
       url = "https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/v${version}/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png";
       sha256 = "00y96w9shbbrdbf6xcjlahqd08154kkrxmqraik7qshiwcqpw7p4";
     };
-    phases = [ "unpackPhase" "installPhase" ];
     nativeBuildInputs = [ dpkg ];
     installPhase = ''
       mkdir -p $out/share/{applications,icons/hicolor/{48x48,256x256}/apps}

From e9f78bd7ff145cec72f08097fbc2bdda9d5aa8ca Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:01:29 +0200
Subject: [PATCH 026/105] epgstation: deprecate phases

---
 pkgs/applications/video/epgstation/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/epgstation/default.nix b/pkgs/applications/video/epgstation/default.nix
index f1f89b109074..3d910ad4c0e8 100644
--- a/pkgs/applications/video/epgstation/default.nix
+++ b/pkgs/applications/video/epgstation/default.nix
@@ -27,7 +27,7 @@ let
     # FIXME: This should be removed when a complete fix is available
     # https://github.com/svanderburg/node2nix/issues/145
     name = "workaround-opencollective-buildfailures";
-    phases = [ "installPhase" ];
+    dontUnpack = true;
     installPhase = ''
       mkdir -p $out/bin
       touch $out/bin/opencollective-postinstall

From 188af2bf8baa0ffbb9b15330b899e670a9e0e06f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:01:56 +0200
Subject: [PATCH 027/105] sublime-merge: deprecate phases

---
 pkgs/applications/version-management/sublime-merge/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix
index e6c83eb55d8c..cb78411527d3 100644
--- a/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/pkgs/applications/version-management/sublime-merge/common.nix
@@ -83,7 +83,7 @@ in stdenv.mkDerivation (rec {
   inherit pname;
   version = buildVersion;
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   ${primaryBinary} = binaryPackage;
 

From 21ba91610cdeaf4b42094de8c265d098b89db26a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:02:22 +0200
Subject: [PATCH 028/105] git-annex-remote-rclone: remove phases

---
 .../git-and-tools/git-annex-remote-rclone/default.nix           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
index 843a8d34881a..cc916baec94d 100644
--- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-rclone/default.nix
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
 
-  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
-
   installPhase = ''
     mkdir -p $out/bin
     cp git-annex-remote-rclone $out/bin

From a1a2c3621a3d664b7d4c9ee5192cecb99fde8c5f Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:02:37 +0200
Subject: [PATCH 029/105] bfg-repo-cleaner: deprecate phases

---
 .../git-and-tools/bfg-repo-cleaner/default.nix                  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
index 036eef1c9c36..42ac2ed4508f 100644
--- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix
@@ -18,7 +18,7 @@ in
     nativeBuildInputs = [ makeWrapper ];
     buildInputs = [ jre ];
 
-    phases = "installPhase";
+    dontUnpack = true;
 
     installPhase = ''
       mkdir -p $out/share/java

From 44cb64dba6006f837b972781dfab73d6768f5de3 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:02:58 +0200
Subject: [PATCH 030/105] quantomatic: deprecate phases

---
 pkgs/applications/science/physics/quantomatic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix
index c1400869a258..8c33a8ae6b1a 100644
--- a/pkgs/applications/science/physics/quantomatic/default.nix
+++ b/pkgs/applications/science/physics/quantomatic/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/libexec/quantomatic

From 7b20eb9e37b297e40b35ebf8a730d350e9cfec87 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:03:12 +0200
Subject: [PATCH 031/105] scilab-bin: remove phases

---
 pkgs/applications/science/math/scilab-bin/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix
index f9abdee2d148..5dea2c7653aa 100644
--- a/pkgs/applications/science/math/scilab-bin/default.nix
+++ b/pkgs/applications/science/math/scilab-bin/default.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation {
     xorg.libXxf86vm
   ];
 
-  phases = [ "unpackPhase" "fixupPhase" "installPhase" ];
-
   fixupPhase = ''
     sed -i 's|\$(/bin/|$(|g' bin/scilab
     sed -i 's|/usr/bin/||g' bin/scilab

From f67a0a37f08dc5648f57d27dcc6af3e0c71c0637 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:03:41 +0200
Subject: [PATCH 032/105] saw-tools: remove phases

---
 pkgs/applications/science/logic/saw-tools/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 3eabc9422e38..df99d067f08c 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -48,8 +48,6 @@ stdenv.mkDerivation {
     done
   '';
 
-  phases = "unpackPhase installPhase fixupPhase";
-
   meta = {
     description = "Tools for software verification and analysis";
     homepage    = "https://saw.galois.com";

From e3dd43360e645aa13e9970ce4ea08a8c2ab58cfb Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:03:58 +0200
Subject: [PATCH 033/105] eagle7: deprecate phases

---
 pkgs/applications/science/electronics/eagle/eagle7.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
index 2804fc3c8d7c..8ea75a3ec486 100644
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ b/pkgs/applications/science/electronics/eagle/eagle7.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       libX11 libXext libXi
     ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   # NOTES:
   # Eagle for Linux comes as a self-extracting shell script with embedded

From 4b883542feb8340e014546cc8c801f52819da962 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:04:16 +0200
Subject: [PATCH 034/105] varscan: deprecate phases

---
 pkgs/applications/science/biology/varscan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix
index 2a232d64693d..7b09f601ad68 100644
--- a/pkgs/applications/science/biology/varscan/default.nix
+++ b/pkgs/applications/science/biology/varscan/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/libexec/varscan

From be219752d275c855bee3e2fd7a0d20a21c456a1c Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:04:29 +0200
Subject: [PATCH 035/105] picard-tools: deprecate phases

---
 pkgs/applications/science/biology/picard-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index ed0d043cd542..979080745ff5 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/libexec/picard

From 5ac283b2374644777c435f1d8187b58deee0c55e Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:04:51 +0200
Subject: [PATCH 036/105] tremc: deprecate phases

---
 pkgs/applications/networking/p2p/tremc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix
index dfbe66ac8562..3518c86790b7 100644
--- a/pkgs/applications/networking/p2p/tremc/default.nix
+++ b/pkgs/applications/networking/p2p/tremc/default.nix
@@ -32,7 +32,8 @@ python3Packages.buildPythonApplication rec {
   ] ++
   lib.optional useGeoIP GeoIP;
 
-  phases = [ "unpackPhase" "installPhase" ];
+  dontBuild = true;
+  doCheck = false;
 
   makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"];
 

From d14ed0c56f9585996f09ee2f5109137a8b69ec8d Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:05:05 +0200
Subject: [PATCH 037/105] freenet: deprecate phases

---
 pkgs/applications/networking/p2p/freenet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix
index 83cc191f1b30..cfb228514cb7 100644
--- a/pkgs/applications/networking/p2p/freenet/default.nix
+++ b/pkgs/applications/networking/p2p/freenet/default.nix
@@ -61,7 +61,7 @@ in stdenv.mkDerivation {
 
   jars = freenet-jars;
 
-  phases = [ "installPhase" ];
+  dontUnpack = true;
 
   installPhase = ''
     mkdir -p $out/bin

From 1d31fb66de6b48837673c6a362bd1744c4bfe1fa Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:05:24 +0200
Subject: [PATCH 038/105] thunderbird-bin: remove phases

---
 .../networking/mailreaders/thunderbird-bin/default.nix          | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index ae4999b4f5f2..5b03f893b4b7 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -75,8 +75,6 @@ stdenv.mkDerivation {
     inherit (source) sha256;
   };
 
-  phases = "unpackPhase installPhase";
-
   libPath = lib.makeLibraryPath
     [ stdenv.cc.cc
       alsa-lib

From f95cb05e201dde6c466a9548c0c6732a4fb84d02 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 3 Aug 2021 00:05:38 +0200
Subject: [PATCH 039/105] firefox-bin: remove phases

---
 pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 5ef510281367..9f4923a7ec5f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -89,8 +89,6 @@ stdenv.mkDerivation {
 
   src = fetchurl { inherit (source) url sha256; };
 
-  phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
-
   libPath = lib.makeLibraryPath
     [ stdenv.cc.cc
       alsa-lib

From 0687032f691a8af5e1ed26a61f00de7ae93c1914 Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Tue, 3 Aug 2021 03:09:58 +0000
Subject: [PATCH 040/105] xorg.xorgserver: 1.20.12 -> 1.20.13

https://lists.x.org/archives/xorg-announce/2021-July/003100.html
---
 pkgs/servers/x11/xorg/default.nix   | 6 +++---
 pkgs/servers/x11/xorg/tarballs.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9a75403cec62..07831027146b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3102,11 +3102,11 @@ lib.makeScope newScope (self: with self; {
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xorgserver = callPackage ({ stdenv, pkg-config, fetchurl, xorgproto, openssl, libX11, libXau, libXaw, libxcb, xcbutil, xcbutilwm, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, libXdmcp, libXfixes, libxkbfile, libXmu, libXpm, libXrender, libXres, libXt }: stdenv.mkDerivation {
     pname = "xorg-server";
-    version = "1.20.12";
+    version = "1.20.13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = "mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz";
-      sha256 = "1b4ckvxaiiiwdxwyfzbbfkr384qqy5qzfsm37z0fr08x8f9w0v9k";
+      url = "mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz";
+      sha256 = "003371ad64bz7i2hx7idnh90yw12dbh116ssy40s70balnb4xaj0";
     };
     hardeningDisable = [ "bindnow" "relro" ];
     nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 42cb2da3a0d6..575a6f316a30 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -218,4 +218,4 @@ mirror://xorg/individual/util/lndir-1.0.3.tar.bz2
 mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2
 mirror://xorg/individual/util/util-macros-1.19.3.tar.bz2
 mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.20.12.tar.xz
+mirror://xorg/individual/xserver/xorg-server-1.20.13.tar.xz

From 6754fbb8b2f376b9b286d9d9ac93b0266c5e39b5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Aug 2021 04:19:50 +0000
Subject: [PATCH 041/105] duckdb: 0.2.7 -> 0.2.8

---
 pkgs/development/libraries/duckdb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index e63f2c3cfd68..92f6accd4262 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "duckdb";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchFromGitHub {
     owner = "cwida";
     repo = "duckdb";
     rev = "v${version}";
-    sha256 = "0cnqq2n1424fqg7gfyvrwkk6nvjal2fm5n08xc8q28ynyhq4sfmj";
+    sha256 = "sha256-X8zk9D7BQQ6iHdfvpaTZ8wS779wt3nRthH7OG4p9bTg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 71691444a68a86e04e23c8c96287ac934ac87218 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 3 Aug 2021 06:38:53 +0000
Subject: [PATCH 042/105] grafana-agent: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix
index 4c9d0437d79f..318b945a5927 100644
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "grafana-agent";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "grafana";
     repo = "agent";
-    sha256 = "sha256-rHJGVQWbvgcvwPzt8e2uWs1n4bbaAZz6lQjyvmqmLZw=";
+    sha256 = "sha256-FUAaM4jYjyYeu5TX5I8icuzjGv80ZzZPWSsNwE5w84U=";
   };
 
-  vendorSha256 = "sha256-jA8M8ZdJWmrGRQb0W1duVV+XwxqJVQ/ek0Yhw6JZvX8=";
+  vendorSha256 = "sha256-xQNsRL0hFuJ/gm1K/1IpzAGIqpyN2CF1EeX/cEfcBBM=";
 
   patches = [
     # https://github.com/grafana/agent/issues/731

From b82d742a875419c56822b6e73f87a9ffce221cb3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 3 Aug 2021 09:54:43 +0200
Subject: [PATCH 043/105] python3Packages.respx: 0.17.0 -> 0.17.1

---
 .../python-modules/respx/default.nix          | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix
index 0a3fa27a8086..0d7f509b4a0e 100644
--- a/pkgs/development/python-modules/respx/default.nix
+++ b/pkgs/development/python-modules/respx/default.nix
@@ -3,40 +3,46 @@
 , fetchFromGitHub
 , httpcore
 , httpx
+, flask
 , pytest-asyncio
-, pytest-cov
 , pytestCheckHook
+, starlette
 , trio
 }:
 
 buildPythonPackage rec {
   pname = "respx";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "lundberg";
     repo = pname;
     rev = version;
-    sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4=";
+    sha256 = "0w8idh6l2iq04ydz7r2qisq9jsxq8wszkx97kx4g3yjwg4ypvc6k";
   };
 
-  # Coverage is under 100 % due to the excluded tests
-  postPatch = ''
-    substituteInPlace setup.cfg --replace "--cov-fail-under 100" ""
-  '';
-
-  propagatedBuildInputs = [ httpx ];
+  propagatedBuildInputs = [
+    httpx
+  ];
 
   checkInputs = [
     httpcore
     httpx
+    flask
     pytest-asyncio
-    pytest-cov
     pytestCheckHook
+    starlette
     trio
   ];
 
-  disabledTests = [ "test_pass_through" ];
+  postPatch = ''
+    sed -i "/--cov/d" setup.cfg
+  '';
+
+  disabledTests = [
+    "test_pass_through"
+  ];
+
   pythonImportsCheck = [ "respx" ];
 
   meta = with lib; {

From f9792e57aaa1b67a4d90ecabc7537e816b4ff836 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Tue, 3 Aug 2021 19:14:25 +0100
Subject: [PATCH 044/105] starboard: 0.10.3 -> 0.11.0

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

diff --git a/pkgs/applications/networking/cluster/starboard/default.nix b/pkgs/applications/networking/cluster/starboard/default.nix
index 121611fd197d..d92518c0b4cc 100644
--- a/pkgs/applications/networking/cluster/starboard/default.nix
+++ b/pkgs/applications/networking/cluster/starboard/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "starboard";
-  version = "0.10.3";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-SJogepww3IJt+NAkJ0G/lLgZ3rMWDTC+jHIrzzkzJGA=";
+    sha256 = "sha256-NV37K5JUfGPK8TwCi/4XY7MQUvp76vzdxsHUNPlYpYk=";
   };
 
-  vendorSha256 = "sha256-vNsYGlcVIj/cDijCFz8fG5Ht/s7koM62GV8zkOyA/fA=";
+  vendorSha256 = "sha256-4CmAf1s+tK7cKxwetgv0YewLLROsZ5g1Zd30FCep5k8=";
 
   # Don't build and check the integration tests
   excludedPackages = "itest";

From b274155579f3acf7093db819e266fea00368ff84 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 4 Aug 2021 13:55:48 +0000
Subject: [PATCH 045/105] byacc: 20210619 -> 20210802

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

diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix
index f71b28d7e127..1b1b31deaedb 100644
--- a/pkgs/development/tools/parsing/byacc/default.nix
+++ b/pkgs/development/tools/parsing/byacc/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "byacc";
-  version = "20210619";
+  version = "20210802";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz"
     ];
-    sha256 = "sha256-rN1ggNz5NXMqCOyOjEwWHGZs1W2MSQc5xtu2JnpJjA4=";
+    sha256 = "sha256-KUnGftE71nkX8Mm8yFx22ZowkNIRBep2cqh6NQLjzPY=";
   };
 
   configureFlags = [

From 5ff54697d04c88243e1246fb4d5111564262485d Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 3 Aug 2021 17:25:25 +0300
Subject: [PATCH 046/105] termius: switch to a snap source

---
 .../networking/termius/default.nix            | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix
index fec775603939..c699781376ac 100644
--- a/pkgs/applications/networking/termius/default.nix
+++ b/pkgs/applications/networking/termius/default.nix
@@ -1,6 +1,6 @@
 { atomEnv
 , autoPatchelfHook
-, dpkg
+, squashfsTools
 , fetchurl
 , makeDesktopItem
 , makeWrapper
@@ -12,13 +12,15 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "7.16.0";
+  version = "7.17.1";
 
   src = fetchurl {
-    # find the latest version by
-    # curl https://deb.termius.com/dists/squeeze/main/binary-amd64/Packages
-    url = "https://deb.termius.com/pool/main/t/termius-app/termius-app_${version}_amd64.deb";
-    sha256 = "013nli61bk4x4hkhr6gcpzm1y8ycmqk3vr7q0w2dn2bfdwjg559v";
+    # find the latest version with
+    # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.version'
+    # and the url with
+    # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_url' -r
+    url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_81.snap";
+    sha256 = "sha256-jNwWQTjUy8nJ8gHlbP9WgDlARWOhTQAA7KAcQNXKhNg=";
   };
 
   desktopItem = makeDesktopItem {
@@ -36,22 +38,33 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
   dontWrapGApps = true;
 
-  nativeBuildInputs = [ autoPatchelfHook dpkg makeWrapper wrapGAppsHook ];
+  nativeBuildInputs = [ autoPatchelfHook squashfsTools makeWrapper wrapGAppsHook ];
 
   buildInputs = atomEnv.packages;
 
-  unpackPhase = "dpkg-deb -x $src .";
+  unpackPhase = ''
+    runHook preUnpack
+    unsquashfs "$src"
+    runHook postUnpack
+  '';
 
   installPhase = ''
     runHook preInstall
+    cd squashfs-root
+    mkdir -p $out/opt/termius
+    cp -r \
+        icudtl.dat \
+        libffmpeg.so \
+        locales \
+        resources \
+        resources.pak \
+        termius-app \
+        v8_context_snapshot.bin \
+        $out/opt/termius
 
-    mkdir -p "$out/bin"
-    cp -R "opt" "$out"
-    cp -R "usr/share" "$out/share"
-    chmod -R g-w "$out"
-    # Desktop file
-    mkdir -p "$out/share/applications"
+    mkdir -p "$out/share/applications" "$out/share/pixmaps/termius-app.png"
     cp "${desktopItem}/share/applications/"* "$out/share/applications"
+    cp meta/gui/icon.png $out/share/pixmaps/termius-app.png
 
     runHook postInstall
   '';
@@ -59,7 +72,7 @@ stdenv.mkDerivation rec {
   runtimeDependencies = [ (lib.getLib udev) ];
 
   postFixup = ''
-    makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \
+    makeWrapper $out/opt/termius/termius-app $out/bin/termius-app \
       "''${gappsWrapperArgs[@]}"
   '';
 

From 18fa487795aaeabce5843d3a3fdcad12d3131903 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Wed, 4 Aug 2021 17:02:31 +0200
Subject: [PATCH 047/105] bibletime: format

---
 pkgs/applications/misc/bibletime/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix
index 30088f52436c..3a0cc8ce44f6 100644
--- a/pkgs/applications/misc/bibletime/default.nix
+++ b/pkgs/applications/misc/bibletime/default.nix
@@ -3,14 +3,11 @@
 , docbook_xsl_ns }:
 
 mkDerivation rec {
-
+  pname = "bibletime";
   version = "3.0.1";
 
-  pname = "bibletime";
-
   src = fetchurl {
-    url =
-      "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";
+    url = "https://github.com/bibletime/bibletime/releases/download/v${version}/${pname}-${version}.tar.xz";
     sha256 = "sha256-ay4o8mfgj/m3BBoBMXVgw0NTlaFgJQvLlNYvEZRXSiA=";
   };
 
@@ -37,11 +34,11 @@ mkDerivation rec {
     "-DBT_DOCBOOK_XSL_PDF_DOCBOOK_XSL=${docbook_xsl_ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"
   ];
 
-  meta = {
+  meta = with lib; {
     description = "A Qt4 Bible study tool";
     homepage = "http://www.bibletime.info/";
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.piotr ];
+    platforms = platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.piotr ];
   };
 }

From a76ce66131b0d0840777e09d63de0b44550f8263 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sun, 25 Jul 2021 08:00:39 +0200
Subject: [PATCH 048/105] python3Packages.embrace: init at 4.0.0

---
 .../python-modules/embrace/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/embrace/default.nix

diff --git a/pkgs/development/python-modules/embrace/default.nix b/pkgs/development/python-modules/embrace/default.nix
new file mode 100644
index 000000000000..414425ed6f2c
--- /dev/null
+++ b/pkgs/development/python-modules/embrace/default.nix
@@ -0,0 +1,25 @@
+{ lib, buildPythonPackage, fetchFromSourcehut, sqlparse, wrapt, pytestCheckHook }:
+
+buildPythonPackage rec {
+  pname = "embrace";
+  version = "4.0.0";
+
+  src = fetchFromSourcehut {
+    vc = "hg";
+    owner = "~olly";
+    repo = "embrace-sql";
+    rev = "v${version}-release";
+    sha256 = "sha256-G/7FeKlMbOWobQOpD7/0JiTFpf8oWZ1TxPpDS9wrKMo=";
+  };
+
+  propagatedBuildInputs = [ sqlparse wrapt ];
+  checkInputs = [ pytestCheckHook ];
+  pythonImportsCheck = [ "embrace" ];
+
+  meta = with lib; {
+    description = "Embrace SQL keeps your SQL queries in SQL files";
+    homepage = "https://pypi.org/project/embrace/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ pacien ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9708579cabc8..bf889b8675d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2288,6 +2288,8 @@ in {
 
   email_validator = callPackage ../development/python-modules/email-validator { };
 
+  embrace = callPackage ../development/python-modules/embrace { };
+
   emcee = callPackage ../development/python-modules/emcee { };
 
   emv = callPackage ../development/python-modules/emv { };

From 4a06e559e14cacc33a457753ea1530cb7907e3cf Mon Sep 17 00:00:00 2001
From: Tom Repetti <trepetti@cs.columbia.edu>
Date: Tue, 3 Aug 2021 16:29:12 -0400
Subject: [PATCH 049/105] python3Packages.pyverilog: init at 1.3.0

---
 .../python-modules/pyverilog/default.nix      | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyverilog/default.nix

diff --git a/pkgs/development/python-modules/pyverilog/default.nix b/pkgs/development/python-modules/pyverilog/default.nix
new file mode 100644
index 000000000000..8e41d26921fa
--- /dev/null
+++ b/pkgs/development/python-modules/pyverilog/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, jinja2
+, ply
+, verilog
+, pytest-pythonpath
+, pytestCheckHook
+}:
+
+buildPythonPackage rec {
+  pname = "pyverilog";
+  version = "1.3.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1a74k8r21swmfwvgv4c014y6nbcyl229fspxw89ygsgb0j83xnar";
+  };
+
+  disabled = pythonOlder "3.7";
+
+  patchPhase = ''
+    # The path to Icarus can still be overridden via an environment variable at runtime.
+    substituteInPlace pyverilog/vparser/preprocessor.py \
+      --replace "iverilog = 'iverilog'" "iverilog = '${verilog}/bin/iverilog'"
+  '';
+
+  propagatedBuildInputs = [
+    jinja2
+    ply
+    verilog
+  ];
+
+  checkInputs = [
+    pytest-pythonpath
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    homepage = "https://github.com/PyHDI/Pyverilog";
+    description = "Python-based Hardware Design Processing Toolkit for Verilog HDL";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ trepetti ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e2d85d8ca674..cc8c0fbb7680 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7307,6 +7307,8 @@ in {
 
   pyvera = callPackage ../development/python-modules/pyvera { };
 
+  pyverilog = callPackage ../development/python-modules/pyverilog { };
+
   pyvesync = callPackage ../development/python-modules/pyvesync { };
 
   pyvex = callPackage ../development/python-modules/pyvex { };

From 45c32f59a58b69ca6db8c8c5fdbe0ea9eee02376 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 4 Aug 2021 21:48:57 +0200
Subject: [PATCH 050/105] ungoogled-chromium: 91.0.4472.164 -> 92.0.4515.131

---
 .../networking/browsers/chromium/common.nix      |  4 +---
 .../browsers/chromium/upstream-info.json         | 16 ++++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index ee506b3faade..a62999d28431 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -136,11 +136,9 @@ let
 
     nativeBuildInputs = [
       ninja pkg-config
-      python2WithPackages perl nodejs
+      python2WithPackages python3WithPackages perl nodejs
       gnutar which
       llvmPackages.bintools
-    ] ++ lib.optionals (chromiumVersionAtLeast "92") [
-      python3WithPackages
     ];
 
     buildInputs = defaultDependencies ++ [
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index 1066d322bad0..d1188d04e9be 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -44,19 +44,19 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "91.0.4472.164",
-    "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4",
-    "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr",
+    "version": "92.0.4515.131",
+    "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n",
+    "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g",
     "deps": {
       "gn": {
-        "version": "2021-04-06",
+        "version": "2021-05-07",
         "url": "https://gn.googlesource.com/gn",
-        "rev": "dba01723a441c358d843a575cb7720d54ddcdf92",
-        "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x"
+        "rev": "39a87c0b36310bdf06b692c098f199a0d97fc810",
+        "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4"
       },
       "ungoogled-patches": {
-        "rev": "91.0.4472.164-1",
-        "sha256": "1vlirqrsliyl1dvm511p5axzvhvqil1m1jlk5zngvl9zfbdjw910"
+        "rev": "92.0.4515.131-1",
+        "sha256": "1nbgknj5ba116y47sxbp7pbma1bp0lmkyi3vk915x837ysaf6mrd"
       }
     }
   }

From 4a37ec77c74be481385999f30589e0f0feae9743 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Aug 2021 21:58:46 +0200
Subject: [PATCH 051/105] python3Packages.pyvicare: 1.1 -> 2.4

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

diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix
index 4c06728a4198..b9b983666a84 100644
--- a/pkgs/development/python-modules/pyvicare/default.nix
+++ b/pkgs/development/python-modules/pyvicare/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyvicare";
-  version = "1.1";
+  version = "2.4";
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "somm15";
     repo = "PyViCare";
     rev = version;
-    sha256 = "1mkbz1gl8bv4j7q82cbc9d3dzx80brzdwrcp8z3kma1b91ig99bk";
+    sha256 = "1lih5hdyc3y0ickvfxd0gdgqv19zmqsfrnlxfwg8aqr73hl3ca8z";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From b2e9932ed8f7c68d62ddb251553f12cdcd1fda4b Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sun, 1 Aug 2021 20:11:18 +0200
Subject: [PATCH 052/105] tools/networking: replace name with pname&version

---
 pkgs/tools/networking/noip/default.nix            |  3 ++-
 pkgs/tools/networking/ntopng/default.nix          |  7 ++++---
 pkgs/tools/networking/nylon/default.nix           |  7 ++++---
 pkgs/tools/networking/pcapfix/default.nix         |  5 +++--
 pkgs/tools/networking/pdnsd/default.nix           |  7 ++++---
 pkgs/tools/networking/pdsh/default.nix            |  5 +++--
 pkgs/tools/networking/polygraph/default.nix       |  5 +++--
 pkgs/tools/networking/srelay/default.nix          |  7 ++++---
 pkgs/tools/networking/surfraw/default.nix         |  7 ++++---
 pkgs/tools/networking/swec/default.nix            | 11 ++++++-----
 pkgs/tools/networking/trickle/default.nix         |  5 +++--
 pkgs/tools/networking/ucspi-tcp/default.nix       |  5 +++--
 pkgs/tools/networking/udptunnel/default.nix       |  7 ++++---
 pkgs/tools/networking/uwimap/default.nix          |  9 +++++----
 pkgs/tools/networking/vde2/default.nix            |  5 +++--
 pkgs/tools/networking/vlan/default.nix            |  7 ++++---
 pkgs/tools/networking/vpnc/default.nix            |  3 ++-
 pkgs/tools/networking/vtun/default.nix            |  5 +++--
 pkgs/tools/networking/wakelan/default.nix         |  5 +++--
 pkgs/tools/networking/webalizer/default.nix       |  7 ++++---
 pkgs/tools/networking/x11-ssh-askpass/default.nix |  7 ++++---
 pkgs/tools/networking/xnbd/default.nix            |  7 ++++---
 22 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix
index 3425d1e3a82e..4b57ef7731ed 100644
--- a/pkgs/tools/networking/noip/default.nix
+++ b/pkgs/tools/networking/noip/default.nix
@@ -1,7 +1,8 @@
 {lib, stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "noip-2.1.9-1";
+  pname = "noip";
+  version = "2.1.9-1";
 
   src = fetchurl {
     url = "https://www.noip.com/client/linux/noip-duc-linux.tar.gz";
diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix
index 2ba373a2c61c..46dd586c0fa1 100644
--- a/pkgs/tools/networking/ntopng/default.nix
+++ b/pkgs/tools/networking/ntopng/default.nix
@@ -7,12 +7,13 @@
 # directory, but we use luajit, zeromq, and rrdtool from nixpkgs
 
 stdenv.mkDerivation rec {
-  name = "ntopng-2.0";
+  pname = "ntopng";
+  version = "2.0";
 
   src = fetchurl {
     urls = [
-      "mirror://sourceforge/project/ntop/ntopng/old/${name}.tar.gz"
-      "mirror://sourceforge/project/ntop/ntopng/${name}.tar.gz"
+      "mirror://sourceforge/project/ntop/ntopng/old/ntopng-${version}.tar.gz"
+      "mirror://sourceforge/project/ntop/ntopng/ntopng-${version}.tar.gz"
     ];
     sha256 = "0l82ivh05cmmqcvs26r6y69z849d28njipphqzvnakf43ggddgrw";
   };
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix
index 840b714fc9f8..b519db4b55b9 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/pkgs/tools/networking/nylon/default.nix
@@ -6,10 +6,11 @@ let
     paths = [ libevent.dev libevent.out ];
   };
 in
-stdenv.mkDerivation {
-  name = "nylon-1.21";
+stdenv.mkDerivation rec {
+  pname = "nylon";
+  version = "1.21";
   src = fetchurl {
-    url = "https://monkey.org/~marius/nylon/nylon-1.21.tar.gz";
+    url = "https://monkey.org/~marius/nylon/nylon-${version}.tar.gz";
     sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4";
   };
 
diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix
index ee5212b97508..bdce32f0813e 100644
--- a/pkgs/tools/networking/pcapfix/default.nix
+++ b/pkgs/tools/networking/pcapfix/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "pcapfix-1.1.4";
+  pname = "pcapfix";
+  version = "1.1.4";
 
   src = fetchurl {
-    url = "https://f00l.de/pcapfix/${name}.tar.gz";
+    url = "https://f00l.de/pcapfix/pcapfix-${version}.tar.gz";
     sha256 = "0m6308ka33wqs568b7cwa1f5q0bv61j2nwfizdyzrazw673lnh6d";
   };
 
diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index a08182394b1f..d797833618cc 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "pdnsd-1.2.9a-par";
+stdenv.mkDerivation rec {
+  pname = "pdnsd";
+  version = "1.2.9a-par";
 
   src = fetchurl {
-    url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz";
+    url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-${version}.tar.gz";
     sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v";
   };
 
diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix
index 87601b0ddf37..d7ac9ad54e6f 100644
--- a/pkgs/tools/networking/pdsh/default.nix
+++ b/pkgs/tools/networking/pdsh/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "pdsh-2.34";
+  pname = "pdsh";
+  version = "2.34";
 
   src = fetchurl {
-    url = "https://github.com/chaos/pdsh/releases/download/${name}/${name}.tar.gz";
+    url = "https://github.com/chaos/pdsh/releases/download/pdsh-${version}/pdsh-${version}.tar.gz";
     sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl";
   };
 
diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix
index 74347ff83957..f4742e660d83 100644
--- a/pkgs/tools/networking/polygraph/default.nix
+++ b/pkgs/tools/networking/polygraph/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, openssl, zlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "polygraph-4.13.0";
+  pname = "polygraph";
+  version = "4.13.0";
 
   src = fetchurl {
-    url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz";
+    url = "http://www.web-polygraph.org/downloads/srcs/polygraph-${version}-src.tgz";
     sha256 = "1rwzci3n7q33hw3spd79adnclzwgwlxcisc9szzjmcjqhbkcpj1a";
   };
 
diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix
index 9ff25d6a17cd..da09395fc7a8 100644
--- a/pkgs/tools/networking/srelay/default.nix
+++ b/pkgs/tools/networking/srelay/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "srelay-0.4.8";
+stdenv.mkDerivation rec {
+  pname = "srelay";
+  version = "0.4.8";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-0.4.8/srelay-0.4.8.tar.gz";
+    url = "mirror://sourceforge/project/socks-relay/socks-relay/srelay-${version}/srelay-${version}.tar.gz";
     sha256 = "1sn6005aqyfvrlkm5445cyyaj6h6wfyskfncfmds55x34hfyxpvl";
   };
 
diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix
index 70bb5453518a..44e8877eb5d1 100644
--- a/pkgs/tools/networking/surfraw/default.nix
+++ b/pkgs/tools/networking/surfraw/default.nix
@@ -1,10 +1,11 @@
 {lib, stdenv, fetchurl, perl}:
 
-stdenv.mkDerivation {
-  name = "surfraw-2.3.0";
+stdenv.mkDerivation rec {
+  pname = "surfraw";
+  version = "2.3.0";
 
   src = fetchurl {
-    url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-2.3.0.tar.gz";
+    url = "https://gitlab.com/surfraw/Surfraw/uploads/2de827b2786ef2fe43b6f07913ca7b7f/surfraw-${version}.tar.gz";
     sha256 = "099nbif0x5cbcf18snc58nx1a3q7z0v9br9p2jiq9pcc7ic2015d";
   };
 
diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix
index c98a3417d1c4..6751b1cf5eb8 100644
--- a/pkgs/tools/networking/swec/default.nix
+++ b/pkgs/tools/networking/swec/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, lib, stdenv, makeWrapper, perlPackages }:
 
 stdenv.mkDerivation rec {
-  name = "swec-0.4";
+  pname = "swec";
+  version = "0.4";
 
   src = fetchurl {
-    url = "http://files.zerodogg.org/swec/${name}.tar.bz2";
+    url = "http://files.zerodogg.org/swec/swec-${version}.tar.bz2";
     sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx";
   };
 
@@ -24,9 +25,9 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install prefix="$out"
 
-    mkdir -p "$out/share/${name}"
-    cp -v default.sdf "$out/share/${name}"
-    sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g"
+    mkdir -p "$out/share/swec-${version}"
+    cp -v default.sdf "$out/share/swec-${version}"
+    sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/swec-${version}/swec'|g"
 
     wrapProgram "$out/bin/swec" \
       --prefix PERL5LIB : ${with perlPackages; makePerlPath [ LWP URI HTMLParser ]}
diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix
index 8a5143d1e3bd..f07bf5bdca3a 100644
--- a/pkgs/tools/networking/trickle/default.nix
+++ b/pkgs/tools/networking/trickle/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, libevent, libtirpc }:
 
 stdenv.mkDerivation rec {
-  name = "trickle-1.07";
+  pname = "trickle";
+  version = "1.07";
 
   src = fetchurl {
-    url = "https://monkey.org/~marius/trickle/${name}.tar.gz";
+    url = "https://monkey.org/~marius/trickle/trickle-${version}.tar.gz";
     sha256 = "0s1qq3k5mpcs9i7ng0l9fvr1f75abpbzfi1jaf3zpzbs1dz50dlx";
   };
 
diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix
index 0d6e0a2f8d96..4b307079266b 100644
--- a/pkgs/tools/networking/ucspi-tcp/default.nix
+++ b/pkgs/tools/networking/ucspi-tcp/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ucspi-tcp-0.88";
+  pname = "ucspi-tcp";
+  version = "0.88";
 
   src = fetchurl {
-    url = "https://cr.yp.to/ucspi-tcp/${name}.tar.gz";
+    url = "https://cr.yp.to/ucspi-tcp/ucspi-tcp-${version}.tar.gz";
     sha256 = "171yl9kfm8w7l17dfxild99mbf877a9k5zg8yysgb1j8nz51a1ja";
   };
 
diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix
index 6063cb38b568..362f6fbbc2cf 100644
--- a/pkgs/tools/networking/udptunnel/default.nix
+++ b/pkgs/tools/networking/udptunnel/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "udptunnel-19";
+stdenv.mkDerivation rec {
+  pname = "udptunnel";
+  version = "19";
 
   src = fetchurl {
-    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r19.tar.gz";
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/udptunnel/udptunnel-r${version}.tar.gz";
     sha256 = "1hkrn153rdyrp9g15z4d5dq44cqlnby2bfplp6z0g3862lnv7m3l";
   };
 
diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index e675268163ac..78480bbc3dff 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, pam, openssl }:
 
-stdenv.mkDerivation ({
-  name = "uw-imap-2007f";
+stdenv.mkDerivation rec {
+  pname = "uw-imap";
+  version = "2007f";
 
   src = fetchurl {
-    url = "ftp://ftp.cac.washington.edu/imap/imap-2007f.tar.gz";
+    url = "ftp://ftp.cac.washington.edu/imap/imap-${version}.tar.gz";
     sha256 = "0a2a00hbakh0640r2wdpnwr8789z59wnk7rfsihh3j0vbhmmmqak";
   };
 
@@ -59,4 +60,4 @@ stdenv.mkDerivation ({
     echo "Cross-compilation, injecting make flags"
     makeFlagsArray+=("ARRC=${stdenv.hostPlatform.config}-ar rc")
   '';
-})
+}
diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix
index 58fae3f9f157..694a2bc02056 100644
--- a/pkgs/tools/networking/vde2/default.nix
+++ b/pkgs/tools/networking/vde2/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, openssl, libpcap, python2, withPython ? false }:
 
 stdenv.mkDerivation rec {
-  name = "vde2-2.3.2";
+  pname = "vde2";
+  version = "2.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/vde/vde2/2.3.1/${name}.tar.gz";
+    url = "mirror://sourceforge/vde/vde2/${version}/vde2-${version}.tar.gz";
     sha256 = "14xga0ib6p1wrv3hkl4sa89yzjxv7f1vfqaxsch87j6scdm59pr2";
   };
 
diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix
index 2d329cb29b06..8ddbb8346347 100644
--- a/pkgs/tools/networking/vlan/default.nix
+++ b/pkgs/tools/networking/vlan/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
-stdenv.mkDerivation {
-  name = "vlan-1.9";
+stdenv.mkDerivation rec {
+  pname = "vlan";
+  version = "1.9";
 
   src = fetchurl {
-    url = "mirror://gentoo/distfiles/vlan.1.9.tar.gz";
+    url = "mirror://gentoo/distfiles/vlan.${version}.tar.gz";
     sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv";
   };
 
diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix
index edb50559fc0f..6928bacd6ce7 100644
--- a/pkgs/tools/networking/vpnc/default.nix
+++ b/pkgs/tools/networking/vpnc/default.nix
@@ -1,7 +1,8 @@
 { lib, stdenv, fetchsvn, nettools, libgcrypt, openssl, openresolv, perl, gawk, makeWrapper }:
 
 stdenv.mkDerivation {
-  name = "vpnc-0.5.3-post-r550";
+  pname = "vpnc";
+  version = "0.5.3-post-r550";
   src = fetchsvn {
     url = "https://svn.unix-ag.uni-kl.de/vpnc";
     rev = "550";
diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix
index 4d79fdc9bc58..61c18af16561 100644
--- a/pkgs/tools/networking/vtun/default.nix
+++ b/pkgs/tools/networking/vtun/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = "vtun-3.0.4";
+  pname = "vtun";
+  version = "3.0.4";
 
   src = fetchurl {
-    url = "mirror://sourceforge/vtun/${name}.tar.gz";
+    url = "mirror://sourceforge/vtun/vtun-${version}.tar.gz";
     sha256 = "1fcqzn2bdjw31j1hvv6lg99v2phhszm29kp2xambxzp32mmxzy5b";
   };
 
diff --git a/pkgs/tools/networking/wakelan/default.nix b/pkgs/tools/networking/wakelan/default.nix
index 96e01141c180..5365e696fadc 100644
--- a/pkgs/tools/networking/wakelan/default.nix
+++ b/pkgs/tools/networking/wakelan/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "wakelan-1.1";
+  pname = "wakelan";
+  version = "1.1";
 
   src = fetchurl {
-    url = "mirror://metalab/system/network/misc/${name}.tar.gz";
+    url = "mirror://metalab/system/network/misc/wakelan-${version}.tar.gz";
     sha256 = "0vydqpf44146ir6k87gmqaq6xy66xhc1gkr3nsd7jj3nhy7ypx9x";
   };
 
diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix
index 332d1cf2867f..200202f9ae26 100644
--- a/pkgs/tools/networking/webalizer/default.nix
+++ b/pkgs/tools/networking/webalizer/default.nix
@@ -1,10 +1,11 @@
 { lib, stdenv, fetchurl, zlib, libpng, gd, geoip, db }:
 
-stdenv.mkDerivation {
-  name = "webalizer-2.23-05";
+stdenv.mkDerivation rec {
+  pname = "webalizer";
+  version = "2.23-05";
 
   src = fetchurl {
-    url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2";
+    url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-${version}-src.tar.bz2";
     sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g";
   };
 
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index d33dd3df12ee..87bd5c77c335 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -1,12 +1,13 @@
 { lib, stdenv, fetchurl, xlibsWrapper, imake, gccmakedep }:
 
-stdenv.mkDerivation {
-  name = "x11-ssh-askpass-1.2.4.1";
+stdenv.mkDerivation rec {
+  pname = "x11-ssh-askpass";
+  version = "1.2.4.1";
 
   outputs = [ "out" "man" ];
 
   src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-${version}.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-${version}.tar.gz";
     sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88";
   };
 
diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix
index 0488fb9fa186..348d557da76d 100644
--- a/pkgs/tools/networking/xnbd/default.nix
+++ b/pkgs/tools/networking/xnbd/default.nix
@@ -1,14 +1,15 @@
 { lib, stdenv, fetchurl, pkg-config, autoreconfHook, glib, jansson }:
 
 stdenv.mkDerivation rec {
-  name = "xnbd-0.4.0";
+  pname = "xnbd";
+  version = "0.4.0";
 
   src = fetchurl {
-    url = "https://bitbucket.org/hirofuchi/xnbd/downloads/${name}.tgz";
+    url = "https://bitbucket.org/hirofuchi/xnbd/downloads/xnbd-${version}.tgz";
     sha256 = "00wkvsa0yaq4mabczcbfpj6rjvp02yahw8vdrq8hgb3wpm80x913";
   };
 
-  sourceRoot = "${name}/trunk";
+  sourceRoot = "xnbd-${version}/trunk";
 
   patches = [ ./0001-Fix-build-for-glibc-2.28.patch ];
 

From 080ecc6419525e23c2b0057663e2090a91ebefd3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 4 Aug 2021 22:52:57 +0200
Subject: [PATCH 053/105] python3Packages.pypykatz: 0.5.0 -> 0.5.2

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

diff --git a/pkgs/development/python-modules/pypykatz/default.nix b/pkgs/development/python-modules/pypykatz/default.nix
index f4eafdcb4fc5..2e2bd7def655 100644
--- a/pkgs/development/python-modules/pypykatz/default.nix
+++ b/pkgs/development/python-modules/pypykatz/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "pypykatz";
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1p8v4Qi0MNqMUpcErWnxveYu4d4N5BUBCDBsw1xX96I=";
+    sha256 = "1lyvypi1g4l9fq1f9q05bdn6vq8y5y9ghmb6ziqdycr0lxn7lfdd";
   };
 
   propagatedBuildInputs = [

From df6d1ee32ac2e0eaf6d0b0d712e9d95e9e95e78f Mon Sep 17 00:00:00 2001
From: Tom <twitchyliquid64@ciphersink.net>
Date: Wed, 4 Aug 2021 13:27:15 -0700
Subject: [PATCH 054/105] maker-panel: init at 0.12.4

---
 pkgs/tools/misc/maker-panel/default.nix | 37 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/tools/misc/maker-panel/default.nix

diff --git a/pkgs/tools/misc/maker-panel/default.nix b/pkgs/tools/misc/maker-panel/default.nix
new file mode 100644
index 000000000000..96c4d6ad61c6
--- /dev/null
+++ b/pkgs/tools/misc/maker-panel/default.nix
@@ -0,0 +1,37 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, go-md2man
+, installShellFiles
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "maker-panel";
+  version = "0.12.4";
+
+  src = fetchFromGitHub {
+    owner = "twitchyliquid64";
+    repo = "maker-panel";
+    rev = version;
+    sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi";
+  };
+
+  cargoSha256 = "1ar62dn0khlbm47chakrsrxd1y76gpq0sql4g9j7dqqrvkavgd7w";
+
+  nativeBuildInputs = [ go-md2man installShellFiles ];
+
+  postBuild = ''
+    go-md2man --in docs/spec-reference.md --out maker-panel.5
+  '';
+
+  postInstall = ''
+    installManPage maker-panel.5
+  '';
+
+  meta = with lib; {
+    description = "Make mechanical PCBs by combining shapes together.";
+    homepage = "https://github.com/twitchyliquid64/maker-panel";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ twitchyliquid64 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e95dbade224..c13509a2a35b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19819,6 +19819,8 @@ in
 
   mailman-web = with python3.pkgs; toPythonApplication mailman-web;
 
+  maker-panel = callPackage ../tools/misc/maker-panel { };
+
   mastodon = callPackage ../servers/mastodon { };
 
   materialize = callPackage ../servers/sql/materialize {

From 5e825f82889f9db243b17e482a91da283ec25159 Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Wed, 4 Aug 2021 23:08:11 +0100
Subject: [PATCH 055/105] nodePackages.beancount-langserver: init at 1.0.0

---
 .../node-packages/node-packages.json          |    1 +
 .../node-packages/node-packages.nix           | 1605 ++++++++++-------
 2 files changed, 981 insertions(+), 625 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0737706d4047..fb704357ff0e 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -17,6 +17,7 @@
 , "aws-azure-login"
 , "balanceofsatoshis"
 , "bash-language-server"
+, "beancount-langserver"
 , "bower"
 , "bower2nix"
 , "browserify"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 2d2202569dfc..7f97e32d4a96 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -220,13 +220,13 @@ let
         sha512 = "GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==";
       };
     };
-    "@apollo/client-3.4.1" = {
+    "@apollo/client-3.4.4" = {
       name = "_at_apollo_slash_client";
       packageName = "@apollo/client";
-      version = "3.4.1";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.1.tgz";
-        sha512 = "CT7ZBSHQD4UG1PDvMS9qOz5ACRIR0b4mBkqjCXEVjteOxA4wpFqUX3dg2bNl+Ok3LwPxFT4b3FwC3+LVcWFa6w==";
+        url = "https://registry.npmjs.org/@apollo/client/-/client-3.4.4.tgz";
+        sha512 = "XuFudJUA/YDBeEbxxkUK80FEhpABaphvOuKu8VPwgvu9681Rrqju9e6tGpsoCBIBtcBjFMrFkEafAai7H+dVNw==";
       };
     };
     "@apollo/protobufjs-1.2.2" = {
@@ -355,6 +355,15 @@ let
         sha512 = "p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw==";
       };
     };
+    "@babel/compat-data-7.15.0" = {
+      name = "_at_babel_slash_compat-data";
+      packageName = "@babel/compat-data";
+      version = "7.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.15.0.tgz";
+        sha512 = "0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==";
+      };
+    };
     "@babel/core-7.10.5" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
@@ -418,6 +427,15 @@ let
         sha512 = "v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==";
       };
     };
+    "@babel/helper-compilation-targets-7.15.0" = {
+      name = "_at_babel_slash_helper-compilation-targets";
+      packageName = "@babel/helper-compilation-targets";
+      version = "7.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz";
+        sha512 = "h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==";
+      };
+    };
     "@babel/helper-create-class-features-plugin-7.14.8" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
@@ -643,6 +661,15 @@ let
         sha512 = "RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ==";
       };
     };
+    "@babel/parser-7.15.0" = {
+      name = "_at_babel_slash_parser";
+      packageName = "@babel/parser";
+      version = "7.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.15.0.tgz";
+        sha512 = "0v7oNOjr6YT9Z2RAOTv4T9aP+ubfx4Q/OhVtAet7PFDt0t9Oy6Jn+/rfC6b8HJ5zEqrQCiMxJfgtHpmIminmJQ==";
+      };
+    };
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5" = {
       name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining";
       packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining";
@@ -1534,6 +1561,15 @@ let
         sha512 = "u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow==";
       };
     };
+    "@babel/types-7.15.0" = {
+      name = "_at_babel_slash_types";
+      packageName = "@babel/types";
+      version = "7.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz";
+        sha512 = "OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==";
+      };
+    };
     "@braintree/sanitize-url-3.1.0" = {
       name = "_at_braintree_slash_sanitize-url";
       packageName = "@braintree/sanitize-url";
@@ -1642,13 +1678,13 @@ let
         sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ==";
       };
     };
-    "@corestore/networker-1.1.0" = {
+    "@corestore/networker-1.2.0" = {
       name = "_at_corestore_slash_networker";
       packageName = "@corestore/networker";
-      version = "1.1.0";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.1.0.tgz";
-        sha512 = "Pj5Cfyfck1OJfVd4diO4UVo8qabW9O/wgDz5HeY6Okuan98KjMxrAJZG8MPk7I+mjRoYDFgFPVgssx9zv420Ag==";
+        url = "https://registry.npmjs.org/@corestore/networker/-/networker-1.2.0.tgz";
+        sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA==";
       };
     };
     "@cronvel/get-pixels-3.4.0" = {
@@ -2254,13 +2290,13 @@ let
         sha512 = "o8iU1VIY+QsqVRWARKiky29fh4KR1xaKSgMClXIi65qkt8EDDhjmlzL0KVDEoDA2GWukwb/1PpaVCWDg4v3cUQ==";
       };
     };
-    "@fluentui/date-time-utilities-8.2.1" = {
+    "@fluentui/date-time-utilities-8.2.2" = {
       name = "_at_fluentui_slash_date-time-utilities";
       packageName = "@fluentui/date-time-utilities";
-      version = "8.2.1";
+      version = "8.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.1.tgz";
-        sha512 = "0AYXaXFQ3bPsOtiOi3bJSihzf+w3L44iQK38EiQgp3uAXei/i36VtDCToHZehYV+eS4s1qb/QGksoL0F4G6WCQ==";
+        url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-8.2.2.tgz";
+        sha512 = "djHrX/38ty+F93qLQjzmRzPzK598CW9g/RPhQH6GyrFBLPSWM1swYKB5TP6E7FrIf+fT4pVqrNUSYZhgi2rrOQ==";
       };
     };
     "@fluentui/dom-utilities-1.1.2" = {
@@ -2272,31 +2308,31 @@ let
         sha512 = "XqPS7l3YoMwxdNlaYF6S2Mp0K3FmVIOIy2K3YkMc+eRxu9wFK6emr2Q/3rBhtG5u/On37NExRT7/5CTLnoi9gw==";
       };
     };
-    "@fluentui/dom-utilities-2.1.3" = {
+    "@fluentui/dom-utilities-2.1.4" = {
       name = "_at_fluentui_slash_dom-utilities";
       packageName = "@fluentui/dom-utilities";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.3.tgz";
-        sha512 = "i2YECSldnkzPAhVmrxksuKSbqBKfMbHrexGqDJm7dy6KoIx+JSilbA5Lz0YNhA7VEgCy1X01GHlWBvqhCNQW8g==";
+        url = "https://registry.npmjs.org/@fluentui/dom-utilities/-/dom-utilities-2.1.4.tgz";
+        sha512 = "+gsAnEjgoKB37o+tsMdSLtgqZ9z2PzpvnHx/2IqhRWjQQd7Xc7MbQsbZaQ5qfkioFHLnWGc/+WORpqKPy/sWrg==";
       };
     };
-    "@fluentui/font-icons-mdl2-8.1.7" = {
+    "@fluentui/font-icons-mdl2-8.1.8" = {
       name = "_at_fluentui_slash_font-icons-mdl2";
       packageName = "@fluentui/font-icons-mdl2";
-      version = "8.1.7";
+      version = "8.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.7.tgz";
-        sha512 = "piTdL/rKTx3cNBaMBc+u7YtluLfKYt9NY7Z341h3gZyYfgzeO8djU4RD7KpSozocPPGjooMjCjfPWDVh3DZqkw==";
+        url = "https://registry.npmjs.org/@fluentui/font-icons-mdl2/-/font-icons-mdl2-8.1.8.tgz";
+        sha512 = "kZkCHM/mP8WWLLExz3x3wK5yQHPP4tAcvlHVqe69TbG8+3fxRGJSMOxzZO/04CFQp2A7/wOskSRtqeIBtaXJfw==";
       };
     };
-    "@fluentui/foundation-legacy-8.1.7" = {
+    "@fluentui/foundation-legacy-8.1.8" = {
       name = "_at_fluentui_slash_foundation-legacy";
       packageName = "@fluentui/foundation-legacy";
-      version = "8.1.7";
+      version = "8.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.7.tgz";
-        sha512 = "hzzgbtMFp0gPi5qG9+Wa2ImYrfEuld3880g3xsxfrjRgVQ5zcRIkNFNc5//YfiLRqi0y9wNUuDrEI08ZMvxSBA==";
+        url = "https://registry.npmjs.org/@fluentui/foundation-legacy/-/foundation-legacy-8.1.8.tgz";
+        sha512 = "m0zbRbZaJbzBjv8Ziv3zpwoGFjuzzPIAmhsn58g66MZvQBd9vN92hFJBNG2bO2+ivlprns4WnLEAiPK8CjoAsA==";
       };
     };
     "@fluentui/keyboard-key-0.2.17" = {
@@ -2308,22 +2344,22 @@ let
         sha512 = "iT1bU56rKrKEOfODoW6fScY11qj3iaYrZ+z11T6fo5+TDm84UGkkXjLXJTE57ZJzg0/gbccHQWYv+chY7bJN8Q==";
       };
     };
-    "@fluentui/keyboard-key-0.3.3" = {
+    "@fluentui/keyboard-key-0.3.4" = {
       name = "_at_fluentui_slash_keyboard-key";
       packageName = "@fluentui/keyboard-key";
-      version = "0.3.3";
+      version = "0.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.3.tgz";
-        sha512 = "3qX1WNCgJlKq7uGH76rLC4cdESgwdLhMH9WjcQUkQNJKtBpL4vs5O99M1keEhd3pfooW7zasr6AcYcWq4BRB4g==";
+        url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.3.4.tgz";
+        sha512 = "pVY2m3IC5+LLmMzsaPApX9eKTzpOzdgQwrR3FNTE6mGx3N/+QWYM7fdF+T1ldZQt87dCRSeQnmAo5kqjtxeA/w==";
       };
     };
-    "@fluentui/merge-styles-8.1.3" = {
+    "@fluentui/merge-styles-8.1.4" = {
       name = "_at_fluentui_slash_merge-styles";
       packageName = "@fluentui/merge-styles";
-      version = "8.1.3";
+      version = "8.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.3.tgz";
-        sha512 = "5vZUyXnbOb9M1rMLzQ7Kj5uadHgSTsp3gv0xDv6bfPvzB9RgQa3dEuJ6TA34tLezw8sFYuA6NnKd57nlb4aXMA==";
+        url = "https://registry.npmjs.org/@fluentui/merge-styles/-/merge-styles-8.1.4.tgz";
+        sha512 = "zCAEjZyALk0CGW1H9YNJU+e/MW0P5sFJfrDvac27K4S/dIQvKnOwMUNOWRkNz3yUEt0R9vo0NtiO3cW04cZq3A==";
       };
     };
     "@fluentui/react-7.174.0" = {
@@ -2353,22 +2389,22 @@ let
         sha512 = "JkLWNDe567lhvbnIhbYv9nUWYDIVN06utc3krs0UZBI+A0YZtQmftBtY0ghXo4PSjgozZocdu9sYkkgZOgyRLg==";
       };
     };
-    "@fluentui/react-focus-8.1.9" = {
+    "@fluentui/react-focus-8.1.10" = {
       name = "_at_fluentui_slash_react-focus";
       packageName = "@fluentui/react-focus";
-      version = "8.1.9";
+      version = "8.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.9.tgz";
-        sha512 = "vYnenLKUj2Uxj5sjuv6AJJ1kYCqq/stM4ZMCQmJWq2qiMm2TpqW3vMpRspuxwD9BqOVbIFNoj9pEWpxAaTCEqw==";
+        url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-8.1.10.tgz";
+        sha512 = "sojXA6epu2QJbFf+XqP1AHOrrWssoQJWJNuzp0MCzQOWCUlLLqRpRUHtUKZzCnrbD9G5MOW8/192m/rSPyM7eA==";
       };
     };
-    "@fluentui/react-hooks-8.2.5" = {
+    "@fluentui/react-hooks-8.2.6" = {
       name = "_at_fluentui_slash_react-hooks";
       packageName = "@fluentui/react-hooks";
-      version = "8.2.5";
+      version = "8.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.5.tgz";
-        sha512 = "8x0sK59kM2naaps88vG++uY5DmYOJX7okGRSHtda8vtgE/03edpGkIgwBGloYJnk3b/EJvcLBjyVlkd1LcbvbQ==";
+        url = "https://registry.npmjs.org/@fluentui/react-hooks/-/react-hooks-8.2.6.tgz";
+        sha512 = "nz0iycSUmGX6eBKsmW23ocmKn/HdV7c8HnMHx5fcGIQbOqOH8Hv4wq8t3RozsZBapIi/nDjpZs2UvB4zDFsg1g==";
       };
     };
     "@fluentui/react-window-provider-1.0.2" = {
@@ -2380,31 +2416,31 @@ let
         sha512 = "fGSgL3Vp/+6t1Ysfz21FWZmqsU+iFVxOigvHnm5uKVyyRPwtaabv/F6kQ2y5isLMI2YmJaUd2i0cDJKu8ggrvw==";
       };
     };
-    "@fluentui/react-window-provider-2.1.3" = {
+    "@fluentui/react-window-provider-2.1.4" = {
       name = "_at_fluentui_slash_react-window-provider";
       packageName = "@fluentui/react-window-provider";
-      version = "2.1.3";
+      version = "2.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.3.tgz";
-        sha512 = "3NWL3Kkqp3elD/aTrUaEufRUrN7K7hYsXEsOY2bDCDjPadLGtZlTGWNYFbUYNsaL/v79gZHhH+voCECP85HqRg==";
+        url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-2.1.4.tgz";
+        sha512 = "RztmJ7ol2eMDr3NCs2OcAA1cQjZdPPUEa4aurgh4Aq+JM/BiY0aK6S4SeFtVD7F8Q7PBOz/xwOG4HlnSMQtlsg==";
       };
     };
-    "@fluentui/set-version-8.1.3" = {
+    "@fluentui/set-version-8.1.4" = {
       name = "_at_fluentui_slash_set-version";
       packageName = "@fluentui/set-version";
-      version = "8.1.3";
+      version = "8.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.3.tgz";
-        sha512 = "QYLFBnwa6xJj0phEy6r+iO5bXWXxkhS1uNngUwfWsHaTskDa4PXDDdjZAXjTVV935xqmoM4GZhZk+Tcoe/OaXA==";
+        url = "https://registry.npmjs.org/@fluentui/set-version/-/set-version-8.1.4.tgz";
+        sha512 = "2otMyJ+s+W+hjBD4BKjwYKKinJUDeIKYKz93qKrrJS0i3fKfftNroy9dHFlIblZ7n747L334plLi3bzQO1bnvA==";
       };
     };
-    "@fluentui/style-utilities-8.2.1" = {
+    "@fluentui/style-utilities-8.2.2" = {
       name = "_at_fluentui_slash_style-utilities";
       packageName = "@fluentui/style-utilities";
-      version = "8.2.1";
+      version = "8.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.1.tgz";
-        sha512 = "+ZSl7Hz/C9DX1dYTZBnmP/57fHPK2qrLr0oTLJTq4uLjmG5Hxyo6gZ9/YCrEnW0h1d3tZlNa4LH5X8rux+D8kg==";
+        url = "https://registry.npmjs.org/@fluentui/style-utilities/-/style-utilities-8.2.2.tgz";
+        sha512 = "PKixlYfY93XOZRPNi+I8Qw9SkcBZsnG/qg2+3IxLGXpCVYKOmP52oR7N5j/nmspQZXdEoHehYa2z/lsKC2xw1w==";
       };
     };
     "@fluentui/theme-1.7.4" = {
@@ -2416,22 +2452,22 @@ let
         sha512 = "o4eo7lstLxxXl1g2RR9yz18Yt8yjQO/LbQuZjsiAfv/4Bf0CRnb+3j1F7gxIdBWAchKj9gzaMpIFijfI98pvYQ==";
       };
     };
-    "@fluentui/theme-2.2.0" = {
+    "@fluentui/theme-2.2.1" = {
       name = "_at_fluentui_slash_theme";
       packageName = "@fluentui/theme";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.0.tgz";
-        sha512 = "LKM2ML05WU22It39iw523wGrpLG5qcvmQkSV7HV5NERSeZkI79TYntmXecaKaKWZjdUFTsZDijuhCOkWypNG5Q==";
+        url = "https://registry.npmjs.org/@fluentui/theme/-/theme-2.2.1.tgz";
+        sha512 = "1G92TftVulrGXklL5upaN/WrrSzY/va39RM1eo0XO/Q3+kAhAajclQAXb7XanqOsVFcAqK1DbVvWayrY9DG2Qg==";
       };
     };
-    "@fluentui/utilities-8.2.1" = {
+    "@fluentui/utilities-8.2.2" = {
       name = "_at_fluentui_slash_utilities";
       packageName = "@fluentui/utilities";
-      version = "8.2.1";
+      version = "8.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.1.tgz";
-        sha512 = "ezRkBUDhHQjrqAWA6H1TwWU3STauW/EjthDAe/upJbmXeP3ynn7tTpx1gpNi/vHjJlRkO1JjNoiSc6P4MZWkYw==";
+        url = "https://registry.npmjs.org/@fluentui/utilities/-/utilities-8.2.2.tgz";
+        sha512 = "aM2/CgoTIssMDs7MoTla+q/VXN5Gkk4s12S8GZNp87cmEzDy008tKkiRpHj6PXZuvJL5bctZco9YQgusO0jZEg==";
       };
     };
     "@google-cloud/paginator-3.0.5" = {
@@ -2560,22 +2596,22 @@ let
         sha512 = "JpbyXOXd8fJXdBh2ta0Q4w8ia6uK5FHzrTNmcvYBvflFuWly2LDTk2abbSl81zKkzswQMEd2UIYghXELRg8eTA==";
       };
     };
-    "@graphql-tools/merge-6.2.16" = {
+    "@graphql-tools/merge-6.2.17" = {
       name = "_at_graphql-tools_slash_merge";
       packageName = "@graphql-tools/merge";
-      version = "6.2.16";
+      version = "6.2.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.16.tgz";
-        sha512 = "KjZ1pppzKcr2Uspgb53p8uw5yhWVuGIL+sEroar7vLsClSsuiGib8OKVICAGWjC9wrCxGaL9SjJGavfXpJMQIg==";
+        url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.17.tgz";
+        sha512 = "G5YrOew39fZf16VIrc49q3c8dBqQDD0ax5LYPiNja00xsXDi0T9zsEWVt06ApjtSdSF6HDddlu5S12QjeN8Tow==";
       };
     };
-    "@graphql-tools/mock-8.1.6" = {
+    "@graphql-tools/mock-8.1.7" = {
       name = "_at_graphql-tools_slash_mock";
       packageName = "@graphql-tools/mock";
-      version = "8.1.6";
+      version = "8.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.6.tgz";
-        sha512 = "ciEFfzAz+Ny/wMq+VRlBAzCVtLcIJiRYbnO7nWE+qFtiUUjmAh9Ahz6UVB1+5Fy6uqaGU6zCMgoDNVFQFtzhJg==";
+        url = "https://registry.npmjs.org/@graphql-tools/mock/-/mock-8.1.7.tgz";
+        sha512 = "6fMxYQGSJrR4XrhncFdmOicXjUhbrVnil4dy15ky9amcwOiAdSIyn+OZHWi99hJjfdyQSamALjUKRFZjRmOXrA==";
       };
     };
     "@graphql-tools/schema-7.1.5" = {
@@ -2587,13 +2623,13 @@ let
         sha512 = "uyn3HSNSckf4mvQSq0Q07CPaVZMNFCYEVxroApOaw802m9DcZPgf9XVPy/gda5GWj9AhbijfRYVTZQgHnJ4CXA==";
       };
     };
-    "@graphql-tools/schema-8.0.1" = {
+    "@graphql-tools/schema-8.0.2" = {
       name = "_at_graphql-tools_slash_schema";
       packageName = "@graphql-tools/schema";
-      version = "8.0.1";
+      version = "8.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.1.tgz";
-        sha512 = "QG2HGLJjmsNc1wcj+rwZTEArgfMp7rsrb8iVq4P8ce1mDYAt6kRV6bLyPVb9q/j8Ik2zBc/B/Y1jPsnAVUHwdA==";
+        url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-8.0.2.tgz";
+        sha512 = "LRO9R4Yi7uBVthdxoBgBTZxRCainfKeTlaBUy8MD/W+u8uUKUmdknrnqeWD4tvNwQjDFcEssm1cKwhvge7OqMA==";
       };
     };
     "@graphql-tools/url-loader-6.10.1" = {
@@ -2623,13 +2659,13 @@ let
         sha512 = "d334r6bo9mxdSqZW6zWboEnnOOFRrAPVQJ7LkU8/6grglrbcu6WhwCLzHb90E94JI3TD3ricC3YGbUqIi9Xg0w==";
       };
     };
-    "@graphql-tools/utils-8.0.1" = {
+    "@graphql-tools/utils-8.0.2" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "8.0.1";
+      version = "8.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.1.tgz";
-        sha512 = "gjQk6sht4b0/hcG+QEVxfMyO8bn5tuU1nIOVhQ4whgFaUmrnb3hx2mwzz1EJzfIOAuHKE8tY0lu6jt3bGTD4yg==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-8.0.2.tgz";
+        sha512 = "gzkavMOgbhnwkHJYg32Adv6f+LxjbQmmbdD5Hty0+CWxvaiuJq+nU6tzb/7VSU4cwhbNLx/lGu2jbCPEW1McZQ==";
       };
     };
     "@graphql-tools/wrap-7.0.8" = {
@@ -3055,13 +3091,13 @@ let
         sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==";
       };
     };
-    "@jcubic/lily-0.1.0" = {
+    "@jcubic/lily-0.2.0" = {
       name = "_at_jcubic_slash_lily";
       packageName = "@jcubic/lily";
-      version = "0.1.0";
+      version = "0.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.1.0.tgz";
-        sha512 = "kIsp4dmIUHn3YHIqFhEylY+mgI988KcYI8f19og7LqmLzkouPZNBip/oL8iemElie0gqx5CeQ5HxZv/SuNkOaA==";
+        url = "https://registry.npmjs.org/@jcubic/lily/-/lily-0.2.0.tgz";
+        sha512 = "KV+CBO6epprxj0AHBDOUI5vfcJZPfhuK5Bdf+AqoJFIVBapSJjuHlZsMGLGLTHCQW48oYvwv8wCC/olzRC/Ndw==";
       };
     };
     "@jest/transform-25.5.1" = {
@@ -3928,13 +3964,13 @@ let
         sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg==";
       };
     };
-    "@netlify/build-17.4.1" = {
+    "@netlify/build-17.9.0" = {
       name = "_at_netlify_slash_build";
       packageName = "@netlify/build";
-      version = "17.4.1";
+      version = "17.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/build/-/build-17.4.1.tgz";
-        sha512 = "g3DdM6AGpqLmJOUKhemkwySybsKS1lvjchRz1PXWZOUFa5npXDuQ4YL9E2fiQrbKB3vc4FhMKonR+iL9CUcphw==";
+        url = "https://registry.npmjs.org/@netlify/build/-/build-17.9.0.tgz";
+        sha512 = "RaDv21H391dkVciAMATG2PkSpcG0qcnAVlwsBSx7Yb1rHrUhynxkY9jTWmn1P4ufWfPoykIDPRG7n/BRVA/Iqg==";
       };
     };
     "@netlify/cache-utils-2.0.0" = {
@@ -3946,13 +3982,13 @@ let
         sha512 = "CnWCssqm0pNCt/92zxpn2tfKaCts0envf4NwL7XgUDpPaKOCSwwi9+1ew8POdPmPaPYY0wFvOgejwNopKGzCOQ==";
       };
     };
-    "@netlify/config-14.1.0" = {
+    "@netlify/config-14.4.1" = {
       name = "_at_netlify_slash_config";
       packageName = "@netlify/config";
-      version = "14.1.0";
+      version = "14.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/config/-/config-14.1.0.tgz";
-        sha512 = "XgBIaKA+itg5uOAYOTt3uZmfyIFtC4t0vKPgf/CoEzWQ323g83fpwxbdqtGkqhw0bYgt0iWPKsoibnLdyoG1vQ==";
+        url = "https://registry.npmjs.org/@netlify/config/-/config-14.4.1.tgz";
+        sha512 = "30H92pQajmBo6dU+LOXDpa0dC7EKVDmncED6itzMME46bn6hySKswrY524fP6ArAF/g+LJD6Uhf4AlWNDnz3Fw==";
       };
     };
     "@netlify/esbuild-0.13.6" = {
@@ -3964,13 +4000,13 @@ let
         sha512 = "tiKmDcHM2riSVN79c0mJY/67EBDafXQAMitHuLiCDAMdtz3kfv+NqdVG5krgf5lWR8Uf8AeZrUW5Q9RP25REvw==";
       };
     };
-    "@netlify/framework-info-5.7.2" = {
+    "@netlify/framework-info-5.8.0" = {
       name = "_at_netlify_slash_framework-info";
       packageName = "@netlify/framework-info";
-      version = "5.7.2";
+      version = "5.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.7.2.tgz";
-        sha512 = "5yO26VRpeXmXorl1kNYbXxgFsJSNcrDaQVnAT9XPqZ5mb7vtjEP/ddEHkNpDsYBj/Y8VBPCvkPhDizg7UPenSw==";
+        url = "https://registry.npmjs.org/@netlify/framework-info/-/framework-info-5.8.0.tgz";
+        sha512 = "gc8K0BT6CSHnYFirLmUWLoKah+AjStWBsGmwa7gbRmeAaRThJhkRcRVE03EhSnrMQkAMO3IIIMklbE8i/9UpEg==";
       };
     };
     "@netlify/functions-utils-2.0.2" = {
@@ -4126,13 +4162,13 @@ let
         sha512 = "tFb7J6+YEtZP0OYpS/b9Rjp1lm02XfhAQR6KRHAaeRlHp98/zgd0hhubfwXUCppP2BLfn+imkeVS0FnANh5B3g==";
       };
     };
-    "@netlify/plugins-list-2.21.0" = {
+    "@netlify/plugins-list-3.2.1" = {
       name = "_at_netlify_slash_plugins-list";
       packageName = "@netlify/plugins-list";
-      version = "2.21.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.21.0.tgz";
-        sha512 = "uo1yeph8fJdldX+7qPIcflw7bEIXdU5repRVcxTfTgGgRrMJ75JDTVoXwujKYNlGNZN9hKj94uDSZ0B5FQq8Tw==";
+        url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-3.2.1.tgz";
+        sha512 = "bmJGfMfXs3byjVUUOoNU78TMiIGx3yD0yl/2B5IKyXpkQw4a4UNgvIx53zmBCDwIub2HC2tTCFUZz9ESpfc3SQ==";
       };
     };
     "@netlify/routing-local-proxy-0.31.0" = {
@@ -4153,13 +4189,13 @@ let
         sha512 = "bfkyaK73zCm5rAaP6ORvuvk7gIN+yeq1SMeshDzga+xNzu1T9yXt4hoiodJXAhhfgHId5m69hnSoFwaCrnOuIA==";
       };
     };
-    "@netlify/zip-it-and-ship-it-4.15.1" = {
+    "@netlify/zip-it-and-ship-it-4.16.0" = {
       name = "_at_netlify_slash_zip-it-and-ship-it";
       packageName = "@netlify/zip-it-and-ship-it";
-      version = "4.15.1";
+      version = "4.16.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.15.1.tgz";
-        sha512 = "YgPzJEGY60zZxSSbaDe3mMO+jYB7pbsWyAVvv4tASod8Sys2x/MuOGJ64KmOTZ+bUqZYvJLOcfVL6fiFRSU9wg==";
+        url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-4.16.0.tgz";
+        sha512 = "DkQemRkLTpAMvwwENRCQ9h5qJDaLrjEa+PpfEh0I64om4hTXVHcTd5+YMHW0wPr4OWABA7JAWlsFOVsZADFxfQ==";
       };
     };
     "@node-red/editor-api-2.0.5" = {
@@ -4513,13 +4549,13 @@ let
         sha512 = "SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==";
       };
     };
-    "@octokit/openapi-types-9.2.0" = {
+    "@octokit/openapi-types-9.4.0" = {
       name = "_at_octokit_slash_openapi-types";
       packageName = "@octokit/openapi-types";
-      version = "9.2.0";
+      version = "9.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.2.0.tgz";
-        sha512 = "c4A1Xm0At+ypvBfEETREu519wLncJYQXvY+dBGg/V5YA51eg5EwdDsPPfcOMG0cuXscqRvsIgIySTmTJUdcTNA==";
+        url = "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-9.4.0.tgz";
+        sha512 = "rKRkXikOJgDNImPl49IJuECLVXjj+t4qOXHhl8SBjMQCGGp1w4m5Ud/0kfdUx+zCpTvBN8vaOUDF4nnboZoOtQ==";
       };
     };
     "@octokit/plugin-enterprise-rest-6.0.1" = {
@@ -4531,13 +4567,13 @@ let
         sha512 = "93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==";
       };
     };
-    "@octokit/plugin-paginate-rest-2.14.0" = {
+    "@octokit/plugin-paginate-rest-2.15.0" = {
       name = "_at_octokit_slash_plugin-paginate-rest";
       packageName = "@octokit/plugin-paginate-rest";
-      version = "2.14.0";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.14.0.tgz";
-        sha512 = "S2uEu2uHeI7Vf+Lvj8tv3O5/5TCAa8GHS0dUQN7gdM7vKA6ZHAbR6HkAVm5yMb1mbedLEbxOuQ+Fa0SQ7tCDLA==";
+        url = "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.0.tgz";
+        sha512 = "/vjcb0w6ggVRtsb8OJBcRR9oEm+fpdo8RJk45khaWw/W0c8rlB2TLCLyZt/knmC17NkX7T9XdyQeEY7OHLSV1g==";
       };
     };
     "@octokit/plugin-request-log-1.0.4" = {
@@ -4549,13 +4585,13 @@ let
         sha512 = "mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==";
       };
     };
-    "@octokit/plugin-rest-endpoint-methods-5.5.2" = {
+    "@octokit/plugin-rest-endpoint-methods-5.7.0" = {
       name = "_at_octokit_slash_plugin-rest-endpoint-methods";
       packageName = "@octokit/plugin-rest-endpoint-methods";
-      version = "5.5.2";
+      version = "5.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.2.tgz";
-        sha512 = "1ArooY7AYQdUd2zyqWLFHQ6gver9PvZSiuM+EPAsDplv1Y6u8zHl6yZ7yGIgaf7xvWupwUkJS2WttGYyb1P0DQ==";
+        url = "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.7.0.tgz";
+        sha512 = "G7sgccWRYQMwcHJXkDY/sDxbXeKiZkFQqUtzBCwmrzCNj2GQf3VygQ4T/BFL2crLVpIbenkE/c0ErhYOte2MPw==";
       };
     };
     "@octokit/request-5.6.0" = {
@@ -4576,22 +4612,22 @@ let
         sha512 = "1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==";
       };
     };
-    "@octokit/rest-18.7.2" = {
+    "@octokit/rest-18.9.0" = {
       name = "_at_octokit_slash_rest";
       packageName = "@octokit/rest";
-      version = "18.7.2";
+      version = "18.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.7.2.tgz";
-        sha512 = "TAedgLqNRS+rdGqS9v00sqBeS6IgyLSoqqCDu6pmoadAB7xSjFHShxzaXUAbxxJjyHtb7mencRGzgH4W/V6Myg==";
+        url = "https://registry.npmjs.org/@octokit/rest/-/rest-18.9.0.tgz";
+        sha512 = "VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA==";
       };
     };
-    "@octokit/types-6.22.0" = {
+    "@octokit/types-6.24.0" = {
       name = "_at_octokit_slash_types";
       packageName = "@octokit/types";
-      version = "6.22.0";
+      version = "6.24.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@octokit/types/-/types-6.22.0.tgz";
-        sha512 = "Y8GR0BJHQDpO09qw/ZQpN+DXrFzCWaE0pvK4frDm3zJ+h99AktsFfBoDazbCtHxiL8d0jD8xRH4BeynlKLeChg==";
+        url = "https://registry.npmjs.org/@octokit/types/-/types-6.24.0.tgz";
+        sha512 = "MfEimJeQ8AV1T2nI5kOfHqsqPHaAnG0Dw3MVoHSEsEq6iLKx2N91o+k2uAgXhPYeSE76LVBqjgTShnFFgNwe0A==";
       };
     };
     "@open-policy-agent/opa-wasm-1.2.0" = {
@@ -5629,13 +5665,13 @@ let
         sha512 = "T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw==";
       };
     };
-    "@snyk/cloud-config-parser-1.9.3" = {
+    "@snyk/cloud-config-parser-1.10.1" = {
       name = "_at_snyk_slash_cloud-config-parser";
       packageName = "@snyk/cloud-config-parser";
-      version = "1.9.3";
+      version = "1.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.9.3.tgz";
-        sha512 = "qv9NsIESPtyC2vKkqA7wEFePNuklksnQWJTWX8Cy3CQoCpZk80XwH50OVpDIU2szgnkWUm1XNSahG/IwVMSbOw==";
+        url = "https://registry.npmjs.org/@snyk/cloud-config-parser/-/cloud-config-parser-1.10.1.tgz";
+        sha512 = "boqO3H4zkGo+Q2C7qyG2l/sQX80ZRSOlPCiRtgN9Xa7u9fM+qFGOaFOgNWfZZtU0wLBy2yDs5ipzdfqvp0ZEjg==";
       };
     };
     "@snyk/cocoapods-lockfile-parser-3.6.2" = {
@@ -5647,13 +5683,13 @@ let
         sha512 = "ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==";
       };
     };
-    "@snyk/code-client-3.9.0" = {
+    "@snyk/code-client-4.0.0" = {
       name = "_at_snyk_slash_code-client";
       packageName = "@snyk/code-client";
-      version = "3.9.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.9.0.tgz";
-        sha512 = "sscrpiODOlQI87B4OFIClnoZmHEHzJ7vULYhikS/R/2KavG4vGPw7Qe2to5rximxR3VFdWQ0wNVFB0RkU2mjPQ==";
+        url = "https://registry.npmjs.org/@snyk/code-client/-/code-client-4.0.0.tgz";
+        sha512 = "x6ZsL6jBz6rDSg1cFVnaqg4fVvQEerRaATem7aeq7l+HiPb8VnorJbq/61MlTgO7gWnA1WijzmzfJK5kAUpO1A==";
       };
     };
     "@snyk/composer-lockfile-parser-1.4.1" = {
@@ -6043,6 +6079,15 @@ let
         sha512 = "xAJ4U/fOL7FoX4bYeYRCsSIeTxFqzKd944AsVxAYrz2ZfKH0TtBSNDDtN22uBEXOrSCCR12Z7QuMcp+URyYWlw==";
       };
     };
+    "@textlint/markdown-to-ast-6.1.7" = {
+      name = "_at_textlint_slash_markdown-to-ast";
+      packageName = "@textlint/markdown-to-ast";
+      version = "6.1.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@textlint/markdown-to-ast/-/markdown-to-ast-6.1.7.tgz";
+        sha512 = "B0QtokeQR4a9+4q0NQr8T9l7A1fFihTN5Ze57tVgqW+3ymzXEouh8DvPHeNQ4T6jEkAThvdjk95mxAMpGRJ79w==";
+      };
+    };
     "@textlint/module-interop-12.0.2" = {
       name = "_at_textlint_slash_module-interop";
       packageName = "@textlint/module-interop";
@@ -6466,13 +6511,13 @@ let
         sha512 = "DIOOg+POSrYl+OlNRHQuIEqCd8DCtynG57H862UCce16nXJX7J8eWxNGgOcf8Eyge8zXeSs27mz1UcFu8L/L7g==";
       };
     };
-    "@types/engine.io-3.1.6" = {
+    "@types/engine.io-3.1.7" = {
       name = "_at_types_slash_engine.io";
       packageName = "@types/engine.io";
-      version = "3.1.6";
+      version = "3.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.6.tgz";
-        sha512 = "uFIEJESFKNNiuKt93ri5PnvRntAHCm/Aw9tTO2L25xXJSLzC/ARGmpDSJkuTCit7sUW5xUxr91Ta+UOiYaO3+A==";
+        url = "https://registry.npmjs.org/@types/engine.io/-/engine.io-3.1.7.tgz";
+        sha512 = "qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ==";
       };
     };
     "@types/eslint-7.28.0" = {
@@ -6799,13 +6844,13 @@ let
         sha512 = "MhCUjojzDhVLnZnxwPwa+rETFRDQ0ffjxYdrqOP6TBO2O0/Z64PV5tNeYApo4bc4y4frbWOrRwv/eEkXlI13Rw==";
       };
     };
-    "@types/json-schema-7.0.8" = {
+    "@types/json-schema-7.0.9" = {
       name = "_at_types_slash_json-schema";
       packageName = "@types/json-schema";
-      version = "7.0.8";
+      version = "7.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.8.tgz";
-        sha512 = "YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==";
+        url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz";
+        sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==";
       };
     };
     "@types/keygrip-1.0.2" = {
@@ -6853,13 +6898,13 @@ let
         sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA==";
       };
     };
-    "@types/lodash-4.14.171" = {
+    "@types/lodash-4.14.172" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.14.171";
+      version = "4.14.172";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz";
-        sha512 = "7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz";
+        sha512 = "/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==";
       };
     };
     "@types/lodash.chunk-4.2.6" = {
@@ -6880,6 +6925,15 @@ let
         sha512 = "KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==";
       };
     };
+    "@types/lodash.pick-4.4.6" = {
+      name = "_at_types_slash_lodash.pick";
+      packageName = "@types/lodash.pick";
+      version = "4.4.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/lodash.pick/-/lodash.pick-4.4.6.tgz";
+        sha512 = "u8bzA16qQ+8dY280z3aK7PoWb3fzX5ATJ0rJB6F+uqchOX2VYF02Aqa+8aYiHiHgPzQiITqCgeimlyKFy4OA6g==";
+      };
+    };
     "@types/lodash.union-4.6.6" = {
       name = "_at_types_slash_lodash.union";
       packageName = "@types/lodash.union";
@@ -7051,13 +7105,13 @@ let
         sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==";
       };
     };
-    "@types/node-14.17.7" = {
+    "@types/node-14.17.9" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "14.17.7";
+      version = "14.17.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-14.17.7.tgz";
-        sha512 = "SYTdMaW47se8499q8m0fYKZZRlmq0RaRv6oYmlVm6DUm31l0fhOl1D03X8hGxohCKTI2Bg6w7W0TiYB51aJzag==";
+        url = "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz";
+        sha512 = "CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==";
       };
     };
     "@types/node-15.12.5" = {
@@ -7069,13 +7123,13 @@ let
         sha512 = "se3yX7UHv5Bscf8f1ERKvQOD6sTyycH3hdaoozvaLxgUiY5lIGEeH37AD0G0Qi9kPqihPn0HOfd2yaIEN9VwEg==";
       };
     };
-    "@types/node-15.14.5" = {
+    "@types/node-15.14.7" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "15.14.5";
+      version = "15.14.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-15.14.5.tgz";
-        sha512 = "6ewfMNmkumZieB/EeJ4cdP1bbJyOlOt5MTwbKMr7WKxyCt2j09H8YWRK6zOd/Jh35Vu/gls39ZUmeu4vHu1WKQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-15.14.7.tgz";
+        sha512 = "FA45p37/mLhpebgbPWWCKfOisTjxGK9lwcHlJ6XVLfu3NgfcazOJHdYUZCWPMK8QX4LhNZdmfo6iMz9FqpUbaw==";
       };
     };
     "@types/node-15.6.1" = {
@@ -7105,13 +7159,13 @@ let
         sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ==";
       };
     };
-    "@types/node-16.4.10" = {
+    "@types/node-16.4.12" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "16.4.10";
+      version = "16.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-16.4.10.tgz";
-        sha512 = "TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ==";
+        url = "https://registry.npmjs.org/@types/node/-/node-16.4.12.tgz";
+        sha512 = "zxrTNFl9Z8boMJXs6ieqZP0wAhvkdzmHSxTlJabM16cf5G9xBc1uPRH5Bbv2omEDDiM8MzTfqTJXBf0Ba4xFWA==";
       };
     };
     "@types/node-6.14.13" = {
@@ -7645,13 +7699,13 @@ let
         sha512 = "fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw==";
       };
     };
-    "@typescript-eslint/eslint-plugin-4.28.5" = {
+    "@typescript-eslint/eslint-plugin-4.29.0" = {
       name = "_at_typescript-eslint_slash_eslint-plugin";
       packageName = "@typescript-eslint/eslint-plugin";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz";
-        sha512 = "m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q==";
+        url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.0.tgz";
+        sha512 = "eiREtqWRZ8aVJcNru7cT/AMVnYd9a2UHsfZT8MR1dW3UUEg6jDv9EQ9Cq4CUPZesyQ58YUpoAADGv71jY8RwgA==";
       };
     };
     "@typescript-eslint/experimental-utils-3.10.1" = {
@@ -7663,13 +7717,13 @@ let
         sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==";
       };
     };
-    "@typescript-eslint/experimental-utils-4.28.5" = {
+    "@typescript-eslint/experimental-utils-4.29.0" = {
       name = "_at_typescript-eslint_slash_experimental-utils";
       packageName = "@typescript-eslint/experimental-utils";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz";
-        sha512 = "bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.0.tgz";
+        sha512 = "FpNVKykfeaIxlArLUP/yQfv/5/3rhl1ov6RWgud4OgbqWLkEq7lqgQU9iiavZRzpzCRQV4XddyFz3wFXdkiX9w==";
       };
     };
     "@typescript-eslint/parser-3.10.1" = {
@@ -7681,22 +7735,22 @@ let
         sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==";
       };
     };
-    "@typescript-eslint/parser-4.28.5" = {
+    "@typescript-eslint/parser-4.29.0" = {
       name = "_at_typescript-eslint_slash_parser";
       packageName = "@typescript-eslint/parser";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz";
-        sha512 = "NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.29.0.tgz";
+        sha512 = "+92YRNHFdXgq+GhWQPT2bmjX09X7EH36JfgN2/4wmhtwV/HPxozpCNst8jrWcngLtEVd/4zAwA6BKojAlf+YqA==";
       };
     };
-    "@typescript-eslint/scope-manager-4.28.5" = {
+    "@typescript-eslint/scope-manager-4.29.0" = {
       name = "_at_typescript-eslint_slash_scope-manager";
       packageName = "@typescript-eslint/scope-manager";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz";
-        sha512 = "PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==";
+        url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.29.0.tgz";
+        sha512 = "HPq7XAaDMM3DpmuijxLV9Io8/6pQnliiXMQUcAdjpJJSR+fdmbD/zHCd7hMkjJn04UQtCQBtshgxClzg6NIS2w==";
       };
     };
     "@typescript-eslint/types-3.10.1" = {
@@ -7708,13 +7762,13 @@ let
         sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==";
       };
     };
-    "@typescript-eslint/types-4.28.5" = {
+    "@typescript-eslint/types-4.29.0" = {
       name = "_at_typescript-eslint_slash_types";
       packageName = "@typescript-eslint/types";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz";
-        sha512 = "MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==";
+        url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.29.0.tgz";
+        sha512 = "2YJM6XfWfi8pgU2HRhTp7WgRw78TCRO3dOmSpAvIQ8MOv4B46JD2chnhpNT7Jq8j0APlIbzO1Bach734xxUl4A==";
       };
     };
     "@typescript-eslint/typescript-estree-3.10.1" = {
@@ -7726,13 +7780,13 @@ let
         sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==";
       };
     };
-    "@typescript-eslint/typescript-estree-4.28.5" = {
+    "@typescript-eslint/typescript-estree-4.29.0" = {
       name = "_at_typescript-eslint_slash_typescript-estree";
       packageName = "@typescript-eslint/typescript-estree";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz";
-        sha512 = "FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==";
+        url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.0.tgz";
+        sha512 = "8ZpNHDIOyqzzgZrQW9+xQ4k5hM62Xy2R4RPO3DQxMc5Rq5QkCdSpk/drka+DL9w6sXNzV5nrdlBmf8+x495QXQ==";
       };
     };
     "@typescript-eslint/visitor-keys-3.10.1" = {
@@ -7744,13 +7798,13 @@ let
         sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==";
       };
     };
-    "@typescript-eslint/visitor-keys-4.28.5" = {
+    "@typescript-eslint/visitor-keys-4.29.0" = {
       name = "_at_typescript-eslint_slash_visitor-keys";
       packageName = "@typescript-eslint/visitor-keys";
-      version = "4.28.5";
+      version = "4.29.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz";
-        sha512 = "dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==";
+        url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.0.tgz";
+        sha512 = "LoaofO1C/jAJYs0uEpYMXfHboGXzOJeV118X4OsZu9f7rG7Pr9B3+4HTU8+err81rADa4xfQmAxnRnPAI2jp+Q==";
       };
     };
     "@uifabric/foundation-7.9.26" = {
@@ -8851,6 +8905,15 @@ let
         sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==";
       };
     };
+    "acorn-import-assertions-1.7.6" = {
+      name = "acorn-import-assertions";
+      packageName = "acorn-import-assertions";
+      version = "1.7.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz";
+        sha512 = "FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==";
+      };
+    };
     "acorn-jsx-3.0.1" = {
       name = "acorn-jsx";
       packageName = "acorn-jsx";
@@ -9328,6 +9391,15 @@ let
         sha512 = "XgQq6ejZHCehUSnZS4V7QJPLIP7S9OAWwQDYl4WTLtsRvc5fCxIwzK/yihzmIW51v9PnyBmrl9dMcqvwfOE8WA==";
       };
     };
+    "anchor-markdown-header-0.5.7" = {
+      name = "anchor-markdown-header";
+      packageName = "anchor-markdown-header";
+      version = "0.5.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/anchor-markdown-header/-/anchor-markdown-header-0.5.7.tgz";
+        sha1 = "045063d76e6a1f9cd327a57a0126aa0fdec371a7";
+      };
+    };
     "ansi-0.3.1" = {
       name = "ansi";
       packageName = "ansi";
@@ -9841,13 +9913,13 @@ let
         sha512 = "lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA==";
       };
     };
-    "apollo-server-core-3.1.1" = {
+    "apollo-server-core-3.1.2" = {
       name = "apollo-server-core";
       packageName = "apollo-server-core";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.1.tgz";
-        sha512 = "MLN6AD8pumdf3c4qYDqXeLkgtJONfvtx0okhvhrbN1DC1YX9W2d1mcTGQa88jTBtgDAXZQS1N5DncS9ctUekDw==";
+        url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-3.1.2.tgz";
+        sha512 = "bFmzPDGBT97vMzdhhjlycL9Ey4YDa0eCVaHjI5TcYQM8Vphzvndd033DvvQFVRPWoZr8uwupeUyVa82Ne/iM6A==";
       };
     };
     "apollo-server-env-3.1.0" = {
@@ -9895,13 +9967,13 @@ let
         sha512 = "A2gF2e85vvDugPlajbhr0A14cDFDIGX0mteNOJ8P3Z3cIM0D4hwrWxJidI+SzobefDIyIHu1dynFedJVhV0euQ==";
       };
     };
-    "apollo-server-express-3.1.1" = {
+    "apollo-server-express-3.1.2" = {
       name = "apollo-server-express";
       packageName = "apollo-server-express";
-      version = "3.1.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.1.tgz";
-        sha512 = "W6VDth39mv1SCaJjnTwc0OmXIWzpELAJ3+/Id4cw+99HXdeRMJXDN5lbMENYEu+1a+pUK8iOoctwlJbikwBPGA==";
+        url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-3.1.2.tgz";
+        sha512 = "GeeQlFjFqugiGfLApBNmgLtyDXGVqacLdGhBccn7GQaxzpJ9YSsREUsoN+Fze6RVQ4/Igaq3QoNgBhrahXwBBQ==";
       };
     };
     "apollo-server-plugin-base-0.13.0" = {
@@ -11272,13 +11344,13 @@ let
         sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg==";
       };
     };
-    "aws-sdk-2.958.0" = {
+    "aws-sdk-2.961.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
-      version = "2.958.0";
+      version = "2.961.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.958.0.tgz";
-        sha512 = "D5/2mW+hl5+CYvAniB209VUN3lFo7ZypCdO0RxyKG49DjoB+h3wvNxJo/BKL3A0sSiMOlrT61vDWsmkeE34S/g==";
+        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.961.0.tgz";
+        sha512 = "71ELXHWd0roRT0FW8CnqGLYGKLksHARa7Yn8LPN3mF70FJt2LuvVAyK49IChoUczTjlzS78p+Y5197Tkky4N8g==";
       };
     };
     "aws-sign2-0.6.0" = {
@@ -13684,13 +13756,13 @@ let
         sha512 = "HI4lPveGKUR0x2StIz+2FXfDk9SfVMrxn6PLh1JeGUwcuoDkdKZebWiyLRJ68iIPDpMI4JLVDf7S7XzslgWOhw==";
       };
     };
-    "browserslist-4.16.6" = {
+    "browserslist-4.16.7" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.16.6";
+      version = "4.16.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz";
-        sha512 = "Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz";
+        sha512 = "7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==";
       };
     };
     "brq-0.1.8" = {
@@ -17392,13 +17464,13 @@ let
         sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
       };
     };
-    "constructs-3.3.111" = {
+    "constructs-3.3.113" = {
       name = "constructs";
       packageName = "constructs";
-      version = "3.3.111";
+      version = "3.3.113";
       src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.111.tgz";
-        sha512 = "RcpVo5LPMcjzZuDSmHUNnQruXkFqmKqdgPQKrP372Cd+PcdxKrQQEwvgXhswrgLX4IFT07fS5RHyQhJhAq/C2w==";
+        url = "https://registry.npmjs.org/constructs/-/constructs-3.3.113.tgz";
+        sha512 = "dy8Nhvihh+rmCr9+Z6omfaaknVwFUIUOkC5zKLc/CyNoVXNc8yvQC6395fQ/t25u42cFGTXedxBkTUx1dwf4uQ==";
       };
     };
     "consume-http-header-1.0.0" = {
@@ -18167,13 +18239,13 @@ let
         sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6";
       };
     };
-    "create-gatsby-1.10.0" = {
+    "create-gatsby-1.11.0" = {
       name = "create-gatsby";
       packageName = "create-gatsby";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.10.0.tgz";
-        sha512 = "EiN8bJepWMN4itheoQ9ul1jNrSWoWy5Cw+kAfF1sN0J7ZWtuYCFfRZX97VRTt6C7bvlHkTw7gew2pUbFS8La+Q==";
+        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-1.11.0.tgz";
+        sha512 = "3FM3YJI5OExHIUUiJSASBibwzo7oBKtQYxHB0YeLC/7U7rkSJWjSbJ+cJllC+NeCGoDIzZ21QTkhczzzz7j1FQ==";
       };
     };
     "create-graphback-1.0.1" = {
@@ -20867,13 +20939,13 @@ let
         sha512 = "VvlVYY+VDJe639yHs5PHISzdWTLL3Aw8rO4cvUtwvoxFd6FHbE4OpHHcde52M6096uYYazAmd4l0o5VuFRO2WA==";
       };
     };
-    "devtools-protocol-0.0.883894" = {
+    "devtools-protocol-0.0.901419" = {
       name = "devtools-protocol";
       packageName = "devtools-protocol";
-      version = "0.0.883894";
+      version = "0.0.901419";
       src = fetchurl {
-        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.883894.tgz";
-        sha512 = "33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg==";
+        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.901419.tgz";
+        sha512 = "4INMPwNm9XRpBukhNbF7OB6fNTTCaI8pzy/fXg0xQzAy5h3zL1P8xT3QazgKqBrb/hAYwIBizqDBZ7GtJE74QQ==";
       };
     };
     "dezalgo-1.0.3" = {
@@ -21344,6 +21416,15 @@ let
         sha512 = "WfJEuXWdVdiarhxJgRlZ9bkMO/9un6dZDz+u3z6AYEXfsH2XRwYqdIvyOqFzaDDP0Hc6pR5rb9FJRSKyo+NuxA==";
       };
     };
+    "doctoc-2.0.1" = {
+      name = "doctoc";
+      packageName = "doctoc";
+      version = "2.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/doctoc/-/doctoc-2.0.1.tgz";
+        sha512 = "JsxnSVZtLCThKehjFPBDhP1+ZLmdfXQynZH/0ABAwrnd1Zf3AV6LigC9oWJyaZ+c6RXCDnlGUNJ7I+1v8VaaRg==";
+      };
+    };
     "doctrine-2.1.0" = {
       name = "doctrine";
       packageName = "doctrine";
@@ -22091,13 +22172,13 @@ let
         sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ==";
       };
     };
-    "electron-to-chromium-1.3.792" = {
+    "electron-to-chromium-1.3.795" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.3.792";
+      version = "1.3.795";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.792.tgz";
-        sha512 = "RM2O2xrNarM7Cs+XF/OE2qX/aBROyOZqqgP+8FXMXSuWuUqCfUUzg7NytQrzZU3aSqk1Qq6zqnVkJsbfMkIatg==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.795.tgz";
+        sha512 = "4TPxrLf9Fzsi4rVgTlDm+ubxoXm3/TN67/LGHx/a4UkVubKILa6L26O6eTnHewixG/knzU9L3lLmfL39eElwlQ==";
       };
     };
     "electrum-client-git://github.com/janoside/electrum-client" = {
@@ -22219,6 +22300,15 @@ let
         sha1 = "c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e";
       };
     };
+    "emoji-regex-6.1.3" = {
+      name = "emoji-regex";
+      packageName = "emoji-regex";
+      version = "6.1.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-6.1.3.tgz";
+        sha1 = "ec79a3969b02d2ecf2b72254279bf99bc7a83932";
+      };
+    };
     "emoji-regex-6.5.1" = {
       name = "emoji-regex";
       packageName = "emoji-regex";
@@ -23164,13 +23254,13 @@ let
         sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==";
       };
     };
-    "eslint-plugin-vue-7.15.0" = {
+    "eslint-plugin-vue-7.15.1" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "7.15.0";
+      version = "7.15.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.0.tgz";
-        sha512 = "br58VTAT8JB4Qe7XJVN7fNBqQgclE+hcsievoyQyGtCZsYprFMQYu+c9yHX9XkP55cMnSVZpW5fRgy3n/wZskA==";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.15.1.tgz";
+        sha512 = "4/r+n/i+ovyeW2gVRRH92kpy4lkpFbyPR4BMxGBTLtGnwqOKKzjSo6EMSaT0RhWPvEjK9uifcY8e7z5n8BIEgw==";
       };
     };
     "eslint-scope-3.7.3" = {
@@ -25009,13 +25099,13 @@ let
         sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA==";
       };
     };
-    "file-type-16.5.2" = {
+    "file-type-16.5.3" = {
       name = "file-type";
       packageName = "file-type";
-      version = "16.5.2";
+      version = "16.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/file-type/-/file-type-16.5.2.tgz";
-        sha512 = "lnHRZj2USLF3v4C5ZY7/vQQeoTVA1YV9TtD6UUCr9z5Cd0uyutqxPBJxkXzM6lufPNuSfefq/yFmnSPz0C3wNw==";
+        url = "https://registry.npmjs.org/file-type/-/file-type-16.5.3.tgz";
+        sha512 = "uVsl7iFhHSOY4bEONLlTK47iAHtNsFHWP5YE4xJfZ4rnX7S1Q3wce09XgqSC7E/xh8Ncv/be1lNoyprlUH/x6A==";
       };
     };
     "file-type-3.9.0" = {
@@ -26602,31 +26692,31 @@ let
         sha1 = "cbed2d20a40c1f5679a35908e2b9415733e78db9";
       };
     };
-    "gatsby-core-utils-2.10.0" = {
+    "gatsby-core-utils-2.11.0" = {
       name = "gatsby-core-utils";
       packageName = "gatsby-core-utils";
-      version = "2.10.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.10.0.tgz";
-        sha512 = "xvVebKSrjHkZQQkeEjuAekCAg17KT2l44d/yn7w2dzBGay244m8hoY8LRtLRdsrSp30ix89QklefuP9frEfhbA==";
+        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-2.11.0.tgz";
+        sha512 = "t5PL1/MvTPSG6IeJn+Yd3Fxp0L3HfLI1vvVsmxXvxEiwDp5MJjjtZbrSnWpST1oylMSKI/UECUEKQUax9UJW+A==";
       };
     };
-    "gatsby-recipes-0.21.0" = {
+    "gatsby-recipes-0.22.0" = {
       name = "gatsby-recipes";
       packageName = "gatsby-recipes";
-      version = "0.21.0";
+      version = "0.22.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.21.0.tgz";
-        sha512 = "oo9ci5G6TiXc5wVnRrTfJhX92ZsjICVa0ldX7aQ/8JR77HelfO3MFfQuIkswla+o0MGcbyxgVoLX45kgzY7aaA==";
+        url = "https://registry.npmjs.org/gatsby-recipes/-/gatsby-recipes-0.22.0.tgz";
+        sha512 = "FQrM59qd64Pwe6UVJmuTAwyZx4IVkj0huwZ1y37IWn49Xuq0Ihhmsrb1BgP99euXZz34c+PWhsFnWvW26skgtw==";
       };
     };
-    "gatsby-telemetry-2.10.0" = {
+    "gatsby-telemetry-2.11.0" = {
       name = "gatsby-telemetry";
       packageName = "gatsby-telemetry";
-      version = "2.10.0";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.10.0.tgz";
-        sha512 = "uon+KRo6NQqkc6Qk/QTw+RmaxIjFFIK7cSU8XXE3y353il2Tk04Kxct2hMHn8Zdl4TYyKla1T5UIvVV/EfpBcg==";
+        url = "https://registry.npmjs.org/gatsby-telemetry/-/gatsby-telemetry-2.11.0.tgz";
+        sha512 = "6GEcZpsY5N/+K+SGGdDHuOknjer6vsYLJsUuUWkz32t8OK9lE1cLvXIdO2eTHdS4rtWFM324a/yFMlizp59SbA==";
       };
     };
     "gauge-1.2.7" = {
@@ -27764,13 +27854,13 @@ let
         sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew==";
       };
     };
-    "google-gax-2.20.0" = {
+    "google-gax-2.21.1" = {
       name = "google-gax";
       packageName = "google-gax";
-      version = "2.20.0";
+      version = "2.21.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.20.0.tgz";
-        sha512 = "V5aaN8cvnE77atybA7CaQTa0tGV6ZqncRGvpObEGpadSps2NIzTPXCtngxgPz7cGz1KhABl1VmSLUlRXGgjX+g==";
+        url = "https://registry.npmjs.org/google-gax/-/google-gax-2.21.1.tgz";
+        sha512 = "hyfau8+yXt75UuYVP3E3n0pKUwsEyiVQXfozfqQn/ZOL36UoZtS/cIzqIm6SYaSLlK5MWWz3JT/o/1ol09gEbA==";
       };
     };
     "google-p12-pem-3.1.1" = {
@@ -29898,13 +29988,13 @@ let
         sha512 = "OcN2zq9DEoArC84q9VCSrf9Hx1QUkR6ineCOwyOwhE4v/8aUTOx87mAk1nyjMOf76DQmF+tl2vnS2FssLx5N+Q==";
       };
     };
-    "hyperdrive-10.20.0" = {
+    "hyperdrive-10.21.0" = {
       name = "hyperdrive";
       packageName = "hyperdrive";
-      version = "10.20.0";
+      version = "10.21.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.20.0.tgz";
-        sha512 = "ejikKQc9L8qUzmmkGe2dk/FGzisY0RTtE1Jw4WfWWXGTun9t/yZ/sV4JfamNBJRd3C0BWV6ZQYeI+1xQDuK3WQ==";
+        url = "https://registry.npmjs.org/hyperdrive/-/hyperdrive-10.21.0.tgz";
+        sha512 = "kvq7aGODR8mcV+c1vTGrqVLhdJKl604/aNYXiOEg6pH6qb3t9AGTm/DKvQrbR+DA5Qq8X9TbQZWeZw4wgJRlXw==";
       };
     };
     "hyperdrive-9.16.0" = {
@@ -33165,13 +33255,13 @@ let
         sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51";
       };
     };
-    "jquery.terminal-2.27.1" = {
+    "jquery.terminal-2.28.1" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.27.1";
+      version = "2.28.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.27.1.tgz";
-        sha512 = "EixPlbZdM0tgtjC/KosdSjhRS2QZqG7qKLZ202og4hBTNLgNgZ4Ke6DP1mhC6IKciMHD6IWNYQgSnzQRbIQjIQ==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.28.1.tgz";
+        sha512 = "2y/MFSTMbEbvUsd8Fq0GLDaI/bsGv5QVs3h+vgQ2BqBQMmIDlnuNTDJbtOFiTLksghlWG0P9iXjovrjMLwcOhQ==";
       };
     };
     "js-base64-2.6.4" = {
@@ -33498,13 +33588,13 @@ let
         sha512 = "NrhHIJ0BNKxpjyvqtqhunIcHhJiA5dhlRSPPuO+EGsCQB+yc94aRj+hZZXYvWj+X1o61kdLVudJLn54sn7ESoQ==";
       };
     };
-    "jsii-srcmak-0.1.313" = {
+    "jsii-srcmak-0.1.315" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.313";
+      version = "0.1.315";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.313.tgz";
-        sha512 = "7050z22Kp6mg58MVBva0OuO6qPa5IK/6i3wDDY+heUQuOCqNeSPsKngYVffYmEFintXsnRIVHpJ6q8rFSHRnIg==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.315.tgz";
+        sha512 = "omRLKVIrhg4yfUPRNJqFM2DDeyHm+ikZ8I3A5zS0PNJHf7LXCpRxVPwoGTLzFDYcd/EnCQPFHPLsH5Jt8p/Egg==";
       };
     };
     "json-bigint-0.2.3" = {
@@ -33813,13 +33903,13 @@ let
         sha512 = "0/4Lv6IenJV0qj2oBdgPIAmFiKKnh8qh7bmLFJ+/ZZHLjSeiL3fKKGX3UryvKPbxFbhV+JcYo9KUC19GJ/Z/4A==";
       };
     };
-    "json2jsii-0.1.283" = {
+    "json2jsii-0.1.285" = {
       name = "json2jsii";
       packageName = "json2jsii";
-      version = "0.1.283";
+      version = "0.1.285";
       src = fetchurl {
-        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.283.tgz";
-        sha512 = "Jzekj3NokX/pSBUxTn4WhIlvmU7lTEIS+WzIEyEl9WrC9MtUt1TCbG5+kkDTMOFB0jzAS+qlt/72J/aM+RciKA==";
+        url = "https://registry.npmjs.org/json2jsii/-/json2jsii-0.1.285.tgz";
+        sha512 = "VzZUg/mZqPPdIPdOwJ58P8CupA4QgHvBAUSFdk4rKW2PVj3jITCQVr8M9STZ/xHuEGtSk5r1wOxBmqMnx5nC5w==";
       };
     };
     "json3-3.2.6" = {
@@ -36685,6 +36775,15 @@ let
         sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b";
       };
     };
+    "lodash.pick-4.4.0" = {
+      name = "lodash.pick";
+      packageName = "lodash.pick";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz";
+        sha1 = "52f05610fff9ded422611441ed1fc123a03001b3";
+      };
+    };
     "lodash.reduce-4.6.0" = {
       name = "lodash.reduce";
       packageName = "lodash.reduce";
@@ -37783,13 +37882,13 @@ let
         sha512 = "34RwOXZT8kyuOJy25oJNJoulO8L0bTHYWXcdZBYZqFnjIy3NgjeoM3FmPXIOFQ26/lSHYMr8oc62B6adxXcb3Q==";
       };
     };
-    "markdown-it-12.1.0" = {
+    "markdown-it-12.2.0" = {
       name = "markdown-it";
       packageName = "markdown-it";
-      version = "12.1.0";
+      version = "12.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.1.0.tgz";
-        sha512 = "7temG6IFOOxfU0SgzhqR+vr2diuMhyO5uUIEZ3C5NbXhqC9uFUHoU41USYuDFoZRsaY7BEIEei874Z20VMLF6A==";
+        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-12.2.0.tgz";
+        sha512 = "Wjws+uCrVQRqOoJvze4HCqkKl1AsSh95iFAeQDwnyfxM09divCBSXlDR1uTvyUP3Grzpn4Ru8GeCxYPM8vkCQg==";
       };
     };
     "markdown-it-8.4.2" = {
@@ -38836,13 +38935,13 @@ let
         sha512 = "TIurLf/ustQNMXi5foClGTcEsRvH6DCvxeAKu68OrwHMOSM/M1pgPXb7qe52Svk1ClvmZuAVpLtP5FWKzPr/sw==";
       };
     };
-    "mermaid-8.11.2" = {
+    "mermaid-8.11.3" = {
       name = "mermaid";
       packageName = "mermaid";
-      version = "8.11.2";
+      version = "8.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.2.tgz";
-        sha512 = "a5aj6hmDfdPGmhB8so4VtwYZjhwGV0OvyQcRTrI3IrlWk5ZxYtEcS1GsIDJVwCX4bJMZbXYh9zbL+lArptCoSg==";
+        url = "https://registry.npmjs.org/mermaid/-/mermaid-8.11.3.tgz";
+        sha512 = "XhfSF+crAX+BhxyKUL28Pf0Of12bby+jK2VQ05xSLZ/pYE6kVfiTuO1mTA5chnqDdz9xpD9A77pTWHv27IbWsg==";
       };
     };
     "meros-1.1.4" = {
@@ -40600,6 +40699,15 @@ let
         sha512 = "M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==";
       };
     };
+    "nan-2.15.0" = {
+      name = "nan";
+      packageName = "nan";
+      version = "2.15.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/nan/-/nan-2.15.0.tgz";
+        sha512 = "8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==";
+      };
+    };
     "nan-2.3.5" = {
       name = "nan";
       packageName = "nan";
@@ -44590,13 +44698,13 @@ let
         sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c";
       };
     };
-    "parse-headers-2.0.3" = {
+    "parse-headers-2.0.4" = {
       name = "parse-headers";
       packageName = "parse-headers";
-      version = "2.0.3";
+      version = "2.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.3.tgz";
-        sha512 = "QhhZ+DCCit2Coi2vmAKbq5RGTRcQUOE2+REgv8vdyu7MnYx2eZztegqtTx99TZ86GTIwqiy3+4nQTWZ2tgmdCA==";
+        url = "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz";
+        sha512 = "psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw==";
       };
     };
     "parse-help-1.0.0" = {
@@ -45337,15 +45445,6 @@ let
         sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==";
       };
     };
-    "peek-readable-3.1.4" = {
-      name = "peek-readable";
-      packageName = "peek-readable";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz";
-        sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg==";
-      };
-    };
     "peek-readable-4.0.1" = {
       name = "peek-readable";
       packageName = "peek-readable";
@@ -48677,13 +48776,13 @@ let
         sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==";
       };
     };
-    "puppeteer-10.1.0" = {
+    "puppeteer-10.2.0" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "10.1.0";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.1.0.tgz";
-        sha512 = "bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg==";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-10.2.0.tgz";
+        sha512 = "OR2CCHRashF+f30+LBOtAjK6sNtz2HEyTr5FqAvhf8lR/qB3uBRoIZOwQKgwoyZnMBsxX7ZdazlyBgGjpnkiMw==";
       };
     };
     "puppeteer-9.1.1" = {
@@ -50234,13 +50333,13 @@ let
         sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==";
       };
     };
-    "redux-4.1.0" = {
+    "redux-4.1.1" = {
       name = "redux";
       packageName = "redux";
-      version = "4.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redux/-/redux-4.1.0.tgz";
-        sha512 = "uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g==";
+        url = "https://registry.npmjs.org/redux/-/redux-4.1.1.tgz";
+        sha512 = "hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==";
       };
     };
     "reflect-metadata-0.1.13" = {
@@ -50585,6 +50684,15 @@ let
         sha512 = "ZssAvH9FjGYlJ/PBVKdSmfyPc3Cz4rTWgZLI4iE/SX8Nt5l3o3oEjv3wwG5VD7xOjktzdwp5coac+kJV9l4jgg==";
       };
     };
+    "remark-frontmatter-1.3.3" = {
+      name = "remark-frontmatter";
+      packageName = "remark-frontmatter";
+      version = "1.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-1.3.3.tgz";
+        sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag==";
+      };
+    };
     "remark-frontmatter-2.0.0" = {
       name = "remark-frontmatter";
       packageName = "remark-frontmatter";
@@ -50657,6 +50765,15 @@ let
         sha512 = "XZgICP2gJ1MHU7+vQaRM+VA9HEL3X253uwUM/BGgx3iv6TH2B3bF3B8q00DKcyP9YrJV+/7WOWEWBFF/u8cIsw==";
       };
     };
+    "remark-parse-5.0.0" = {
+      name = "remark-parse";
+      packageName = "remark-parse";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-5.0.0.tgz";
+        sha512 = "b3iXszZLH1TLoyUzrATcTQUZrwNl1rE70rVdSruJFlDaJ9z5aMkhrG43Pp68OgfHndL/ADz6V69Zow8cTQu+JA==";
+      };
+    };
     "remark-parse-6.0.3" = {
       name = "remark-parse";
       packageName = "remark-parse";
@@ -52151,13 +52268,13 @@ let
         sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg==";
       };
     };
-    "sass-1.37.0" = {
+    "sass-1.37.5" = {
       name = "sass";
       packageName = "sass";
-      version = "1.37.0";
+      version = "1.37.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.37.0.tgz";
-        sha512 = "B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz";
+        sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==";
       };
     };
     "sax-0.5.8" = {
@@ -55265,13 +55382,13 @@ let
         sha512 = "zZ/Q1M+9ZWlrchgh4QauD/MEUFa6eC6H6FYq6T8Of/y82JqsQBLwN6YlzbO09evE7Rx6x0oliXDCnQSjwGwQRA==";
       };
     };
-    "sscaff-1.2.34" = {
+    "sscaff-1.2.36" = {
       name = "sscaff";
       packageName = "sscaff";
-      version = "1.2.34";
+      version = "1.2.36";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.34.tgz";
-        sha512 = "J3tgewePIaRry/KOsdo9N+vl/RmMzrgiPT33B/a+fnqKYFtdcxfyq985e+dlYUXNorB0e4j0OV/hV9pGGwpZ1Q==";
+        url = "https://registry.npmjs.org/sscaff/-/sscaff-1.2.36.tgz";
+        sha512 = "OP8XE492gbcsTFXH/PQy2DNxnqWGWVRC1P8uqjmWInZdfX3lYA+q9jSS7e7lkqkNYsJYMcnCrjnmLCk5jLI6NA==";
       };
     };
     "ssh-config-1.1.6" = {
@@ -55922,13 +56039,13 @@ let
         sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
       };
     };
-    "streamx-2.10.3" = {
+    "streamx-2.11.0" = {
       name = "streamx";
       packageName = "streamx";
-      version = "2.10.3";
+      version = "2.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/streamx/-/streamx-2.10.3.tgz";
-        sha512 = "Ss4rEDWlTAUrIqaQsX6tNBNANHxSmbyrA5PlCji0a6xdJtVzfkEMLLrkVW5OSyr4TshiSb1WA2TqMGMUpGnouQ==";
+        url = "https://registry.npmjs.org/streamx/-/streamx-2.11.0.tgz";
+        sha512 = "Cv8hFlHwVRKg35EXAxCSmRRzCR8Nyphx3v58hkx8nqfRe3GM8kAPfDY16GvpU2V4m/U8Ri9Fdoi+K5X3z8VpMA==";
       };
     };
     "strftime-0.10.0" = {
@@ -56147,6 +56264,15 @@ let
         sha512 = "004ulKKANDuQilQsNxy2lisrpMG0qUJxBU+2YCEF7KziRyNR0Nredm2qk0f1V82nva59H3y9GWeHXE63HzGRFw==";
       };
     };
+    "string2compact-1.3.2" = {
+      name = "string2compact";
+      packageName = "string2compact";
+      version = "1.3.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/string2compact/-/string2compact-1.3.2.tgz";
+        sha512 = "3XUxUgwhj7Eqh2djae35QHZZT4mN3fsO7kagZhSGmhhlrQagVvWSFuuFIWnpxFS0CdTB2PlQcaL16RDi14I8uw==";
+      };
+    };
     "string_decoder-0.10.31" = {
       name = "string_decoder";
       packageName = "string_decoder";
@@ -56543,15 +56669,6 @@ let
         sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa";
       };
     };
-    "strtok3-6.1.3" = {
-      name = "strtok3";
-      packageName = "strtok3";
-      version = "6.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz";
-        sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA==";
-      };
-    };
     "strtok3-6.2.4" = {
       name = "strtok3";
       packageName = "strtok3";
@@ -56966,13 +57083,13 @@ let
         sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA==";
       };
     };
-    "svelte2tsx-0.4.3" = {
+    "svelte2tsx-0.4.4" = {
       name = "svelte2tsx";
       packageName = "svelte2tsx";
-      version = "0.4.3";
+      version = "0.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.3.tgz";
-        sha512 = "bbX1jrqz9Hih7GyeNrMex6HvSNguX+oorW3PPlNZk3hEgz7xXSO6f9Wuu+1dDacKt7GCEJdLjnq0wc1ZhyLqoQ==";
+        url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.4.tgz";
+        sha512 = "BvARagYreupBS9rMSCa7aTH1m6qoU6OXtjouDrZggunW9hpyn9UpU0f1uw8loiCYbdE1LCNAK74Y6B2sIjevug==";
       };
     };
     "sver-compat-1.5.0" = {
@@ -57263,13 +57380,13 @@ let
         sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA==";
       };
     };
-    "systeminformation-5.7.14" = {
+    "systeminformation-5.8.0" = {
       name = "systeminformation";
       packageName = "systeminformation";
-      version = "5.7.14";
+      version = "5.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.14.tgz";
-        sha512 = "T928Nvxy5uA/NQR00gGCm4wnNGPcXYyPXDnZsMR1wG5rk25CwaVcshsSGvl91s0DPUyC87tUfQOWVg4EvNwsOA==";
+        url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.8.0.tgz";
+        sha512 = "l4drbK2PtNynGKblaShY9hDLW/gg1zxUq2+Yk4gTyd6a2JUvFyTGP8PhHV9iOh+MzS25PQa8W1t0kvcIvr9n7Q==";
       };
     };
     "table-3.8.3" = {
@@ -57498,6 +57615,15 @@ let
         sha512 = "EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q==";
       };
     };
+    "tar-6.1.6" = {
+      name = "tar";
+      packageName = "tar";
+      version = "6.1.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-6.1.6.tgz";
+        sha512 = "oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==";
+      };
+    };
     "tar-fs-1.16.3" = {
       name = "tar-fs";
       packageName = "tar-fs";
@@ -58686,13 +58812,13 @@ let
         sha512 = "wnQcqlreS6VjthyHO3Y/kpK/emflxDBNhlNUPfh7wE39KnuDdOituXomIbyI79vBtF0Ninpkh72mcuRHo+RG3Q==";
       };
     };
-    "token-types-3.1.0" = {
+    "token-types-4.1.1" = {
       name = "token-types";
       packageName = "token-types";
-      version = "3.1.0";
+      version = "4.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/token-types/-/token-types-3.1.0.tgz";
-        sha512 = "WhoeIW7UTn7NC7L0t/4x3vU/YYSS1oeUxYgiGXQLd82Kaf1qtlxOex3ETY0+o2QuRgAdyursMlUhQBKDCfMUkQ==";
+        url = "https://registry.npmjs.org/token-types/-/token-types-4.1.1.tgz";
+        sha512 = "hD+QyuUAyI2spzsI0B7gf/jJ2ggR4RjkAo37j3StuePhApJUwcWDjnHDOFdIWYSwNR28H14hpwm4EI+V1Ted1w==";
       };
     };
     "toml-2.3.6" = {
@@ -58974,6 +59100,24 @@ let
         sha512 = "MAqFo2oJJ39zmxq3xETx0nMAgZw2z6pnJPjIAehEcrDaeePDhBBTshAlyhCDtezMDTIu1Av+vGE501xN3Sh8VA==";
       };
     };
+    "tree-sitter-0.17.2" = {
+      name = "tree-sitter";
+      packageName = "tree-sitter";
+      version = "0.17.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tree-sitter/-/tree-sitter-0.17.2.tgz";
+        sha512 = "bxFEolb9xMxBdbwh4wqT730J8fu10J15EL8lM+iGr8LcKbhuQ7KHA0pPsmNPIpZlr6vyDKFojJnD45JtIBIV0w==";
+      };
+    };
+    "tree-sitter-beancount-1.0.0" = {
+      name = "tree-sitter-beancount";
+      packageName = "tree-sitter-beancount";
+      version = "1.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tree-sitter-beancount/-/tree-sitter-beancount-1.0.0.tgz";
+        sha512 = "I+QbnbfSA7+ePEhIHRwq+X2ZrTQS5VoZ47kPTsn5FEiAGGo87mhLK4O3vCaFUHQ8Ibm8eXESEKf1dl0QmA9CHQ==";
+      };
+    };
     "treeify-1.1.0" = {
       name = "treeify";
       packageName = "treeify";
@@ -59136,13 +59280,13 @@ let
         sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA==";
       };
     };
-    "ts-invariant-0.9.0" = {
+    "ts-invariant-0.9.1" = {
       name = "ts-invariant";
       packageName = "ts-invariant";
-      version = "0.9.0";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.0.tgz";
-        sha512 = "+JqhKqywk+ue5JjAC6eTWe57mOIxYXypMUkBDStkAzvnlfkDJ1KGyeMuNRMwOt6GXzHSC1UT9JecowpZDmgXqA==";
+        url = "https://registry.npmjs.org/ts-invariant/-/ts-invariant-0.9.1.tgz";
+        sha512 = "hSeYibh29ULlHkuEfukcoiyTct+s2RzczMLTv4x3NWC/YrBy7x7ps5eYq/b4Y3Sb9/uAlf54+/5CAEMVxPhuQw==";
       };
     };
     "ts-loader-8.0.4" = {
@@ -59325,6 +59469,15 @@ let
         sha512 = "mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==";
       };
     };
+    "tsyringe-4.6.0" = {
+      name = "tsyringe";
+      packageName = "tsyringe";
+      version = "4.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.6.0.tgz";
+        sha512 = "BMQAZamSfEmIQzH8WJeRu1yZGQbPSDuI9g+yEiKZFIcO46GPZuMOC2d0b52cVBdw1d++06JnDSIIZvEnogMdAw==";
+      };
+    };
     "ttl-1.3.1" = {
       name = "ttl";
       packageName = "ttl";
@@ -60099,6 +60252,15 @@ let
         sha512 = "nrXZwwXrD/T/JXeygJqdCO6NZZ1L66HrxM/Z7mIq2oPanoN0F1nLx3lwJMu6AwJY69hdixaFQOuoYsMjE5/C2A==";
       };
     };
+    "underscore-1.12.1" = {
+      name = "underscore";
+      packageName = "underscore";
+      version = "1.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.12.1.tgz";
+        sha512 = "hEQt0+ZLDVUMhebKxL4x1BTtDY7bavVofhZ9KZ4aI26X9SRaE+Y3m83XUL1UP2jn8ynjndwCCpEHdUG+9pP1Tw==";
+      };
+    };
     "underscore-1.13.1" = {
       name = "underscore";
       packageName = "underscore";
@@ -60954,6 +61116,15 @@ let
         sha512 = "ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==";
       };
     };
+    "update-section-0.3.3" = {
+      name = "update-section";
+      packageName = "update-section";
+      version = "0.3.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/update-section/-/update-section-0.3.3.tgz";
+        sha1 = "458f17820d37820dc60e20b86d94391b00123158";
+      };
+    };
     "upnp-device-client-1.0.2" = {
       name = "upnp-device-client";
       packageName = "upnp-device-client";
@@ -63286,6 +63457,15 @@ let
         sha512 = "n1CfuJcJ+dynIx/fmavB6haPx37N3GZvY5HIGIselymDiSwNRC+8pAxOzoB4eVwUBJnbP3+aA8vWttrAZbgs7A==";
       };
     };
+    "web-tree-sitter-0.17.1" = {
+      name = "web-tree-sitter";
+      packageName = "web-tree-sitter";
+      version = "0.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.17.1.tgz";
+        sha512 = "QgaeV+wmlB1Qaw9rS5a0ZDBt8GRcKkF+hGNSVxQ/HLm1lPCow3BKOhoILaXkYm7YozCcL7TjppRADBwFJugbuA==";
+      };
+    };
     "web3-utils-1.5.0" = {
       name = "web3-utils";
       packageName = "web3-utils";
@@ -63385,13 +63565,13 @@ let
         sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ==";
       };
     };
-    "webpack-5.47.1" = {
+    "webpack-5.48.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "5.47.1";
+      version = "5.48.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.47.1.tgz";
-        sha512 = "cW+Mzy9SCDapFV4OrkHuP6EFV2mAsiQd+gOa3PKtHNoKg6qPqQXZzBlHH+CnQG1osplBCqwsJZ8CfGO6XWah0g==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz";
+        sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A==";
       };
     };
     "webpack-bundle-analyzer-3.9.0" = {
@@ -65981,7 +66161,7 @@ in
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
       sources."symbol-observable-4.0.0"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."through-2.3.8"
       sources."tmp-0.0.33"
       sources."tough-cookie-2.5.0"
@@ -66528,7 +66708,7 @@ in
       sha512 = "YWis7dhbGR5LkGYj7rV3BA/gUusfuugze3LIQUeoggPdF2rdeOZXewSPUydM3UBfsptt0qyw0bPQS+fKT0KDVw==";
     };
     dependencies = [
-      sources."@corestore/networker-1.1.0"
+      sources."@corestore/networker-1.2.0"
       sources."@hyperspace/client-1.18.0"
       sources."@hyperspace/migration-tool-1.2.1"
       sources."@hyperspace/rpc-1.15.1"
@@ -66537,7 +66717,7 @@ in
       sources."@hyperswarm/hypersign-2.1.1"
       sources."@hyperswarm/network-2.1.0"
       sources."@leichtgewicht/ip-codec-2.0.3"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."abstract-extension-3.1.1"
       sources."abstract-leveldown-6.2.3"
       sources."ansi-colors-3.2.3"
@@ -66707,7 +66887,7 @@ in
         ];
       })
       sources."hypercore-streams-1.0.1"
-      sources."hyperdrive-10.20.0"
+      sources."hyperdrive-10.21.0"
       sources."hyperdrive-schemas-2.0.0"
       sources."hyperspace-3.19.0"
       (sources."hyperspace-mirroring-service-1.0.7" // {
@@ -66924,7 +67104,7 @@ in
       sources."stream-collector-1.0.1"
       sources."stream-equal-1.1.1"
       sources."stream-shift-1.0.1"
-      sources."streamx-2.10.3"
+      sources."streamx-2.11.0"
       (sources."string-width-2.1.1" // {
         dependencies = [
           sources."ansi-regex-3.0.0"
@@ -67068,8 +67248,8 @@ in
       sources."@types/eslint-7.28.0"
       sources."@types/eslint-scope-3.7.1"
       sources."@types/estree-0.0.50"
-      sources."@types/json-schema-7.0.8"
-      sources."@types/node-16.4.10"
+      sources."@types/json-schema-7.0.9"
+      sources."@types/node-16.4.12"
       sources."@types/parse-json-4.0.0"
       sources."@webassemblyjs/ast-1.11.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
@@ -67104,7 +67284,7 @@ in
       sources."bl-4.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
       sources."callsites-3.1.0"
@@ -67135,7 +67315,7 @@ in
       sources."cross-spawn-7.0.3"
       sources."deepmerge-4.2.2"
       sources."defaults-1.0.3"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       (sources."enhanced-resolve-5.8.2" // {
@@ -67544,7 +67724,7 @@ in
       sources."@types/long-4.0.1"
       sources."@types/mime-1.3.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/qs-6.9.7"
       sources."@types/range-parser-1.2.4"
@@ -67667,7 +67847,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-2.3.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -67815,7 +67995,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -68826,7 +69006,7 @@ in
       sources."async-3.2.0"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."caniuse-lite-1.0.30001248"
       sources."chalk-2.4.2"
       sources."color-convert-1.9.3"
@@ -68838,7 +69018,7 @@ in
       sources."convert-source-map-1.8.0"
       sources."debug-4.3.2"
       sources."ejs-3.1.6"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."ensure-posix-path-1.1.1"
       sources."escalade-3.1.1"
       sources."escape-string-regexp-1.0.5"
@@ -68932,7 +69112,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.4"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."chromium-pickle-js-0.2.0"
@@ -68966,10 +69146,10 @@ in
       sha512 = "L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A==";
     };
     dependencies = [
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."caniuse-lite-1.0.30001248"
       sources."colorette-1.2.2"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."escalade-3.1.1"
       sources."fraction.js-4.1.1"
       sources."node-releases-1.1.73"
@@ -68996,14 +69176,14 @@ in
     };
     dependencies = [
       sources."@tootallnate/once-1.1.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/yauzl-2.9.2"
       sources."agent-base-6.0.2"
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
       sources."ast-types-0.13.4"
-      (sources."aws-sdk-2.958.0" // {
+      (sources."aws-sdk-2.961.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -69043,7 +69223,7 @@ in
       sources."defaults-1.0.3"
       sources."degenerator-2.2.0"
       sources."depd-1.1.2"
-      sources."devtools-protocol-0.0.883894"
+      sources."devtools-protocol-0.0.901419"
       sources."dom-serializer-1.3.2"
       sources."domelementtype-2.2.0"
       sources."domhandler-4.2.0"
@@ -69132,7 +69312,7 @@ in
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
       sources."punycode-1.3.2"
-      (sources."puppeteer-10.1.0" // {
+      (sources."puppeteer-10.2.0" // {
         dependencies = [
           sources."debug-4.3.1"
         ];
@@ -69223,7 +69403,7 @@ in
       sources."@cto.af/textdecoder-0.0.0"
       (sources."@grpc/grpc-js-1.3.2" // {
         dependencies = [
-          sources."@types/node-16.4.10"
+          sources."@types/node-16.4.12"
         ];
       })
       sources."@grpc/proto-loader-0.6.2"
@@ -69699,7 +69879,7 @@ in
       })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.6"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."negotiator-0.6.2"
       sources."node-addon-api-2.0.2"
       sources."node-fetch-2.6.1"
@@ -69766,7 +69946,7 @@ in
       sources."process-nextick-args-2.0.1"
       (sources."protobufjs-6.11.2" // {
         dependencies = [
-          sources."@types/node-16.4.10"
+          sources."@types/node-16.4.12"
         ];
       })
       sources."proxy-addr-2.0.7"
@@ -70093,6 +70273,169 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
+  beancount-langserver = nodeEnv.buildNodePackage {
+    name = "beancount-langserver";
+    packageName = "beancount-langserver";
+    version = "1.0.0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/beancount-langserver/-/beancount-langserver-1.0.0.tgz";
+      sha512 = "cwi9b6H7pMWDFcUNsAt2DDStOmd9DCgWUQ5olAe+PHe+dwxqeRJVaCQLMiDwJBOHEPuRhaXh8V/7JEtgQPgoPQ==";
+    };
+    dependencies = [
+      sources."@textlint/ast-node-types-4.4.3"
+      sources."@textlint/markdown-to-ast-6.1.7"
+      sources."anchor-markdown-header-0.5.7"
+      sources."ansi-regex-2.1.1"
+      sources."aproba-1.2.0"
+      sources."are-we-there-yet-1.1.5"
+      sources."bail-1.0.5"
+      sources."base64-js-1.5.1"
+      (sources."bl-4.1.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
+      sources."boundary-1.0.1"
+      sources."buffer-5.7.1"
+      sources."character-entities-1.2.4"
+      sources."character-entities-legacy-1.1.4"
+      sources."character-reference-invalid-1.1.4"
+      sources."chownr-1.1.4"
+      sources."code-point-at-1.1.0"
+      sources."collapse-white-space-1.0.6"
+      sources."commander-6.2.1"
+      sources."console-control-strings-1.1.0"
+      sources."core-util-is-1.0.2"
+      sources."debug-4.3.2"
+      sources."decompress-response-4.2.1"
+      sources."deep-extend-0.6.0"
+      sources."delegates-1.0.0"
+      sources."detect-libc-1.0.3"
+      sources."doctoc-2.0.1"
+      (sources."dom-serializer-1.3.2" // {
+        dependencies = [
+          sources."domhandler-4.2.0"
+        ];
+      })
+      sources."domelementtype-2.2.0"
+      sources."domhandler-3.3.0"
+      (sources."domutils-2.7.0" // {
+        dependencies = [
+          sources."domhandler-4.2.0"
+        ];
+      })
+      sources."emoji-regex-6.1.3"
+      sources."end-of-stream-1.4.4"
+      sources."entities-2.2.0"
+      sources."expand-template-2.0.3"
+      sources."extend-3.0.2"
+      sources."fault-1.0.4"
+      sources."format-0.2.2"
+      sources."fs-constants-1.0.0"
+      sources."gauge-2.7.4"
+      sources."github-from-package-0.0.0"
+      sources."has-unicode-2.0.1"
+      sources."htmlparser2-4.1.0"
+      sources."ieee754-1.2.1"
+      sources."inherits-2.0.4"
+      sources."ini-1.3.8"
+      sources."is-alphabetical-1.0.4"
+      sources."is-alphanumerical-1.0.4"
+      sources."is-buffer-1.1.6"
+      sources."is-decimal-1.0.4"
+      sources."is-fullwidth-code-point-1.0.0"
+      sources."is-hexadecimal-1.0.4"
+      sources."is-plain-obj-1.1.0"
+      sources."is-whitespace-character-1.0.4"
+      sources."is-word-character-1.0.4"
+      sources."isarray-1.0.0"
+      sources."markdown-escapes-1.0.4"
+      sources."mimic-response-2.1.0"
+      sources."minimist-1.2.5"
+      sources."mkdirp-classic-0.5.3"
+      sources."ms-2.1.2"
+      sources."nan-2.15.0"
+      sources."napi-build-utils-1.0.2"
+      sources."node-abi-2.30.0"
+      sources."noop-logger-0.1.1"
+      sources."npmlog-4.1.2"
+      sources."number-is-nan-1.0.1"
+      sources."object-assign-4.1.1"
+      sources."once-1.4.0"
+      sources."parse-entities-1.2.2"
+      sources."prebuild-install-5.3.6"
+      sources."process-nextick-args-2.0.1"
+      sources."pump-3.0.0"
+      sources."rc-1.2.8"
+      sources."readable-stream-2.3.7"
+      sources."reflect-metadata-0.1.13"
+      sources."remark-frontmatter-1.3.3"
+      sources."remark-parse-5.0.0"
+      sources."repeat-string-1.6.1"
+      sources."replace-ext-1.0.0"
+      sources."safe-buffer-5.1.2"
+      sources."semver-5.7.1"
+      sources."set-blocking-2.0.0"
+      sources."signal-exit-3.0.3"
+      sources."simple-concat-1.0.1"
+      sources."simple-get-3.1.0"
+      sources."state-toggle-1.0.3"
+      sources."string-width-1.0.2"
+      sources."string_decoder-1.1.1"
+      sources."strip-ansi-3.0.1"
+      sources."strip-json-comments-2.0.1"
+      sources."structured-source-3.0.2"
+      sources."tar-fs-2.1.1"
+      (sources."tar-stream-2.2.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.0"
+        ];
+      })
+      sources."traverse-0.6.6"
+      sources."tree-sitter-0.17.2"
+      sources."tree-sitter-beancount-1.0.0"
+      sources."trim-0.0.1"
+      sources."trim-trailing-lines-1.1.4"
+      sources."trough-1.0.5"
+      sources."tslib-1.14.1"
+      sources."tsyringe-4.6.0"
+      sources."tunnel-agent-0.6.0"
+      sources."underscore-1.12.1"
+      sources."unherit-1.1.3"
+      sources."unified-6.2.0"
+      sources."unist-util-is-3.0.0"
+      sources."unist-util-remove-position-1.1.4"
+      sources."unist-util-stringify-position-1.1.2"
+      sources."unist-util-visit-1.4.1"
+      sources."unist-util-visit-parents-2.1.2"
+      sources."update-section-0.3.3"
+      sources."util-deprecate-1.0.2"
+      sources."vfile-2.3.0"
+      sources."vfile-location-2.0.6"
+      sources."vfile-message-1.1.1"
+      sources."vscode-jsonrpc-6.0.0"
+      sources."vscode-languageserver-7.0.0"
+      sources."vscode-languageserver-protocol-3.16.0"
+      sources."vscode-languageserver-textdocument-1.0.1"
+      sources."vscode-languageserver-types-3.16.0"
+      sources."vscode-uri-2.1.2"
+      sources."web-tree-sitter-0.17.1"
+      sources."which-pm-runs-1.0.0"
+      sources."wide-align-1.1.3"
+      sources."wrappy-1.0.2"
+      sources."x-is-string-0.1.0"
+      sources."xtend-4.0.2"
+    ];
+    buildInputs = globalBuildInputs;
+    meta = {
+      description = "A Language Server Protocol (LSP) for beancount files";
+      homepage = "https://github.com/bryall/beancount-language-server#readme";
+      license = "MIT";
+    };
+    production = true;
+    bypassCache = true;
+    reconstructLock = true;
+  };
   bower = nodeEnv.buildNodePackage {
     name = "bower";
     packageName = "bower";
@@ -70720,7 +71063,7 @@ in
       sources."lodash-4.17.21"
       sources."lru-cache-6.0.0"
       sources."map-obj-4.2.1"
-      (sources."markdown-it-12.1.0" // {
+      (sources."markdown-it-12.2.0" // {
         dependencies = [
           sources."argparse-2.0.1"
           sources."entities-2.1.0"
@@ -70755,7 +71098,7 @@ in
       })
       sources."ms-2.0.0"
       sources."mv-2.1.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."ncp-2.0.0"
       sources."negotiator-0.6.2"
       sources."normalize-package-data-3.0.2"
@@ -70948,7 +71291,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."addr-to-ip-port-1.5.4"
       sources."airplay-js-0.2.16"
       sources."ajv-6.12.6"
@@ -71354,10 +71697,10 @@ in
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
-    version = "1.0.0-beta.34";
+    version = "1.0.0-beta.35";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.34.tgz";
-      sha512 = "a46brzT/snqVY0abj4qv+HLY7poqpc9VFlE/E7wHQzSR1BLAr+ysudLfn33YJt6fNvHRlfhIIqh1zXL0JelvPA==";
+      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-1.0.0-beta.35.tgz";
+      sha512 = "gmIhIZyAJyEi/2GV6wmLF/HGswJK+pxWijH1jS/WPgcJHRaeaIMysrdsCWpucVA6Zz/OwgrmG1Fp09gZAKdskw==";
     };
     dependencies = [
       sources."@jsii/spec-1.32.0"
@@ -71382,7 +71725,7 @@ in
       sources."color-name-1.1.4"
       sources."colors-1.4.0"
       sources."commonmark-0.29.3"
-      sources."constructs-3.3.111"
+      sources."constructs-3.3.113"
       sources."date-format-3.0.0"
       sources."debug-4.3.2"
       sources."decamelize-5.0.0"
@@ -71456,13 +71799,13 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.313" // {
+      (sources."jsii-srcmak-0.1.315" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
       })
       sources."json-schema-0.3.0"
-      sources."json2jsii-0.1.283"
+      sources."json2jsii-0.1.285"
       sources."jsonfile-6.1.0"
       sources."jsonschema-1.4.0"
       sources."locate-path-5.0.0"
@@ -71498,7 +71841,7 @@ in
       sources."snake-case-3.0.4"
       sources."sort-json-2.0.0"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.34"
+      sources."sscaff-1.2.36"
       (sources."streamroller-2.2.4" // {
         dependencies = [
           sources."date-format-2.1.0"
@@ -71553,7 +71896,7 @@ in
       sha512 = "53HldFlYJdptaQ9yZyx8xuN0pxmBwI7yaVImmPwGmauoOYWsO89YrAjyPIiAaR+GWI8avbQeg3jz5Z1Q+MoIGA==";
     };
     dependencies = [
-      sources."@apollo/client-3.4.1"
+      sources."@apollo/client-3.4.4"
       (sources."@apollo/protobufjs-1.2.2" // {
         dependencies = [
           sources."@types/node-10.17.60"
@@ -71594,19 +71937,19 @@ in
           sources."tslib-2.2.0"
         ];
       })
-      (sources."@graphql-tools/merge-6.2.16" // {
+      (sources."@graphql-tools/merge-6.2.17" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.0.1"
+          sources."@graphql-tools/utils-8.0.2"
         ];
       })
-      (sources."@graphql-tools/mock-8.1.6" // {
+      (sources."@graphql-tools/mock-8.1.7" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.0.1"
+          sources."@graphql-tools/utils-8.0.2"
         ];
       })
-      (sources."@graphql-tools/schema-8.0.1" // {
+      (sources."@graphql-tools/schema-8.0.2" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.0.1"
+          sources."@graphql-tools/utils-8.0.2"
         ];
       })
       (sources."@graphql-tools/utils-7.10.0" // {
@@ -71640,7 +71983,7 @@ in
       sources."@types/express-serve-static-core-4.17.24"
       sources."@types/long-4.0.1"
       sources."@types/mime-1.3.2"
-      sources."@types/node-14.17.7"
+      sources."@types/node-14.17.9"
       sources."@types/node-fetch-2.5.12"
       sources."@types/qs-6.9.7"
       sources."@types/range-parser-1.2.4"
@@ -71669,16 +72012,14 @@ in
       sources."apollo-graphql-0.9.3"
       sources."apollo-reporting-protobuf-3.0.0"
       sources."apollo-server-caching-3.0.1"
-      (sources."apollo-server-core-3.1.1" // {
+      (sources."apollo-server-core-3.1.2" // {
         dependencies = [
-          sources."@graphql-tools/schema-7.1.5"
-          sources."tslib-2.2.0"
-          sources."value-or-promise-1.0.6"
+          sources."@graphql-tools/utils-8.0.2"
         ];
       })
       sources."apollo-server-env-4.0.3"
       sources."apollo-server-errors-3.0.1"
-      sources."apollo-server-express-3.1.1"
+      sources."apollo-server-express-3.1.2"
       sources."apollo-server-plugin-base-3.1.1"
       sources."apollo-server-types-3.1.1"
       sources."archiver-5.3.0"
@@ -71761,7 +72102,7 @@ in
         ];
       })
       sources."concat-map-0.0.1"
-      sources."constructs-3.3.111"
+      sources."constructs-3.3.113"
       (sources."content-disposition-0.5.3" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
@@ -71960,7 +72301,7 @@ in
           sources."yargs-16.2.0"
         ];
       })
-      (sources."jsii-srcmak-0.1.313" // {
+      (sources."jsii-srcmak-0.1.315" // {
         dependencies = [
           sources."fs-extra-9.1.0"
         ];
@@ -72118,7 +72459,7 @@ in
       sources."sort-json-2.0.0"
       sources."source-map-0.5.7"
       sources."spdx-license-list-6.4.0"
-      sources."sscaff-1.2.34"
+      sources."sscaff-1.2.36"
       (sources."stack-utils-2.0.3" // {
         dependencies = [
           sources."escape-string-regexp-2.0.0"
@@ -72157,7 +72498,7 @@ in
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      sources."ts-invariant-0.9.0"
+      sources."ts-invariant-0.9.1"
       sources."tslib-2.3.0"
       sources."type-fest-0.15.1"
       sources."type-is-1.6.18"
@@ -72460,10 +72801,10 @@ in
   coc-explorer = nodeEnv.buildNodePackage {
     name = "coc-explorer";
     packageName = "coc-explorer";
-    version = "0.18.11";
+    version = "0.18.12";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.11.tgz";
-      sha512 = "L16wPMe5iDrprv5JNlTBtTd3WmRM+kLN9u+lQTDFpj0t6WxE16WzCm2Ktl1jzgpGY+xcdGakbZAL2y9bLXaJqg==";
+      url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.18.12.tgz";
+      sha512 = "zVTZb+SUwBt6ZljFG+u+vBMj+DLr4IEDqjpBsgnZ+tOldKSbPUtsvbeXOR/PxkLN4unxKxaZBkG1BaP34YrYpw==";
     };
     dependencies = [
       sources."@sindresorhus/df-3.1.1"
@@ -72913,7 +73254,7 @@ in
       sources."string_decoder-1.1.1"
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."traverse-0.3.9"
       sources."tslib-2.3.0"
       sources."unbox-primitive-1.0.1"
@@ -72985,7 +73326,7 @@ in
       sources."@mrmlnc/readdir-enhanced-2.2.1"
       sources."@nodelib/fs.stat-1.1.3"
       sources."@types/eslint-visitor-keys-1.0.0"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@typescript-eslint/experimental-utils-3.10.1"
       sources."@typescript-eslint/parser-3.10.1"
       sources."@typescript-eslint/types-3.10.1"
@@ -73149,7 +73490,7 @@ in
       sources."domutils-1.7.0"
       sources."dot-prop-5.3.0"
       sources."duplexer3-0.1.4"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
@@ -74156,7 +74497,7 @@ in
         ];
       })
       sources."braces-3.0.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
@@ -74198,7 +74539,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -74644,7 +74985,7 @@ in
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-4.0.0"
       sources."eslint-7.32.0"
-      (sources."eslint-plugin-vue-7.15.0" // {
+      (sources."eslint-plugin-vue-7.15.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -75574,7 +75915,7 @@ in
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
       sources."systeminformation-4.34.23"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."term-size-2.2.1"
       sources."through-2.3.8"
       sources."tmp-0.2.1"
@@ -75665,7 +76006,7 @@ in
       sources."@types/glob-7.1.4"
       sources."@types/minimatch-3.0.5"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."aggregate-error-3.1.0"
       sources."ansi-styles-3.2.1"
@@ -76036,7 +76377,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -76696,7 +77037,7 @@ in
       sources."multistream-2.1.1"
       sources."mute-stream-0.0.8"
       sources."mutexify-1.3.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanoassert-1.1.0"
       sources."nanobus-4.5.0"
       sources."nanoguard-1.3.0"
@@ -76734,7 +77075,7 @@ in
       sources."os-homedir-1.0.2"
       sources."p-finally-1.0.0"
       sources."package-json-4.0.1"
-      sources."parse-headers-2.0.3"
+      sources."parse-headers-2.0.4"
       sources."pascalcase-0.1.1"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
@@ -77155,7 +77496,7 @@ in
     dependencies = [
       sources."@fast-csv/format-4.3.5"
       sources."@fast-csv/parse-4.3.6"
-      sources."@types/node-14.17.7"
+      sources."@types/node-14.17.9"
       sources."JSONStream-1.3.5"
       sources."ajv-6.12.6"
       sources."asn1-0.2.4"
@@ -77354,7 +77695,7 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/responselike-1.0.0"
       sources."@types/yauzl-2.9.2"
       sources."abbrev-1.1.1"
@@ -77852,7 +78193,7 @@ in
       sources."sudo-prompt-9.2.1"
       sources."sumchecker-3.0.1"
       sources."supports-color-7.2.0"
-      (sources."tar-6.1.2" // {
+      (sources."tar-6.1.6" // {
         dependencies = [
           sources."chownr-2.0.0"
           sources."fs-minipass-2.1.0"
@@ -78007,7 +78348,7 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/responselike-1.0.0"
       sources."@types/yoga-layout-1.9.2"
@@ -78026,7 +78367,7 @@ in
       sources."auto-bind-4.0.0"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."cacheable-lookup-5.0.4"
       (sources."cacheable-request-7.0.2" // {
         dependencies = [
@@ -78079,7 +78420,7 @@ in
       })
       sources."defer-to-connect-2.0.1"
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."emojilib-2.4.0"
       sources."end-of-stream-1.4.4"
@@ -78363,14 +78704,14 @@ in
       sources."@types/caseless-0.12.2"
       sources."@types/chart.js-2.9.24"
       sources."@types/connect-3.4.35"
-      sources."@types/engine.io-3.1.6"
+      sources."@types/engine.io-3.1.7"
       sources."@types/express-4.17.8"
       sources."@types/express-serve-static-core-4.17.24"
       sources."@types/fancy-log-1.3.0"
       sources."@types/glob-7.1.4"
       sources."@types/hls.js-0.13.1"
       sources."@types/js-yaml-3.12.5"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@types/lodash-4.14.161"
       sources."@types/material-design-lite-1.1.16"
       sources."@types/mime-1.3.2"
@@ -78589,7 +78930,7 @@ in
           sources."minizlib-2.1.2"
           sources."p-map-4.0.0"
           sources."rimraf-3.0.2"
-          sources."tar-6.1.2"
+          sources."tar-6.1.6"
         ];
       })
       sources."cache-base-1.0.1"
@@ -79297,7 +79638,7 @@ in
           sources."string_decoder-1.1.1"
         ];
       })
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       (sources."needle-2.8.0" // {
         dependencies = [
@@ -79601,7 +79942,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safe-regex-1.1.0"
       sources."safer-buffer-2.1.2"
-      (sources."sass-1.37.0" // {
+      (sources."sass-1.37.5" // {
         dependencies = [
           sources."anymatch-3.1.2"
           sources."binary-extensions-2.2.0"
@@ -80343,10 +80684,10 @@ in
   esy = nodeEnv.buildNodePackage {
     name = "esy";
     packageName = "esy";
-    version = "0.6.10";
+    version = "0.6.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/esy/-/esy-0.6.10.tgz";
-      sha512 = "O+mWNPB9NJqDr3CA1PUbWUO1ZSy53ksZWivGrvbquATR5INlp3CYguwkq4BzZACg1s1bVYyhr7byjB/l1nuGRA==";
+      url = "https://registry.npmjs.org/esy/-/esy-0.6.11.tgz";
+      sha512 = "LyrQWS/c7FYwjmgSlmYcj7w7as40iVuF6aCSHKMAZq1xgmdpjorQ7OEqg35ZUf8+xpUgKnDx4HrA3scdnfRTnA==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -80380,7 +80721,7 @@ in
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.14.5"
       (sources."@babel/helper-compilation-targets-7.14.5" // {
         dependencies = [
-          sources."browserslist-4.16.6"
+          sources."browserslist-4.16.7"
           sources."semver-6.3.0"
         ];
       })
@@ -80672,7 +81013,7 @@ in
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-3.0.1"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@types/keyv-3.1.2"
       sources."@types/minimatch-3.0.5"
       sources."@types/node-9.6.61"
@@ -81029,7 +81370,7 @@ in
       sources."core-js-2.6.12"
       (sources."core-js-compat-3.16.0" // {
         dependencies = [
-          sources."browserslist-4.16.6"
+          sources."browserslist-4.16.7"
           sources."semver-7.0.0"
         ];
       })
@@ -81161,7 +81502,7 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -81726,7 +82067,7 @@ in
       sources."multicast-dns-service-types-1.1.0"
       sources."mv-2.1.1"
       sources."mz-2.7.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."ncp-2.0.0"
       (sources."needle-2.8.0" // {
@@ -82440,7 +82781,7 @@ in
       })
       sources."symbol-observable-1.2.0"
       sources."tapable-1.1.3"
-      (sources."tar-6.1.2" // {
+      (sources."tar-6.1.6" // {
         dependencies = [
           sources."minipass-3.1.3"
           sources."mkdirp-1.0.4"
@@ -82883,7 +83224,7 @@ in
       sources."@babel/traverse-7.14.9"
       sources."@babel/types-7.14.9"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/yauzl-2.9.2"
       sources."@types/yoga-layout-1.9.2"
@@ -82902,7 +83243,7 @@ in
       sources."base64-js-1.5.1"
       sources."bl-4.1.0"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-crc32-0.2.13"
       sources."caller-callsite-2.0.0"
@@ -82935,7 +83276,7 @@ in
       })
       sources."delay-5.0.0"
       sources."devtools-protocol-0.0.869402"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -83786,10 +84127,10 @@ in
       sources."@types/archiver-5.3.0"
       sources."@types/duplexify-3.6.0"
       sources."@types/glob-7.1.4"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@types/long-4.0.1"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."JSONStream-1.3.5"
       sources."abbrev-1.1.1"
       sources."abort-controller-3.0.0"
@@ -83879,7 +84220,7 @@ in
       (sources."cacache-15.2.0" // {
         dependencies = [
           sources."mkdirp-1.0.4"
-          sources."tar-6.1.2"
+          sources."tar-6.1.6"
         ];
       })
       (sources."cacheable-request-6.1.0" // {
@@ -84138,7 +84479,7 @@ in
       sources."glob-slasher-1.0.1"
       sources."global-dirs-2.1.0"
       sources."google-auth-library-6.1.6"
-      (sources."google-gax-2.20.0" // {
+      (sources."google-gax-2.21.1" // {
         dependencies = [
           sources."google-auth-library-7.4.1"
         ];
@@ -84331,7 +84672,7 @@ in
       })
       sources."ms-2.1.2"
       sources."mute-stream-0.0.7"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       (sources."nash-3.0.0" // {
         dependencies = [
           sources."async-1.5.2"
@@ -84348,7 +84689,7 @@ in
         dependencies = [
           sources."mkdirp-1.0.4"
           sources."semver-7.3.5"
-          sources."tar-6.1.2"
+          sources."tar-6.1.6"
           sources."which-2.0.2"
         ];
       })
@@ -84895,7 +85236,7 @@ in
     dependencies = [
       sources."@types/atob-2.1.2"
       sources."@types/inquirer-6.5.0"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/through-0.0.30"
       sources."ajv-6.12.6"
       sources."ansi-escapes-4.3.2"
@@ -85019,7 +85360,7 @@ in
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
-      sources."parse-headers-2.0.3"
+      sources."parse-headers-2.0.4"
       sources."path-exists-4.0.0"
       sources."performance-now-2.1.0"
       sources."process-0.11.10"
@@ -85324,7 +85665,7 @@ in
       })
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       (sources."nconf-0.6.9" // {
         dependencies = [
@@ -85579,10 +85920,10 @@ in
   gatsby-cli = nodeEnv.buildNodePackage {
     name = "gatsby-cli";
     packageName = "gatsby-cli";
-    version = "3.10.0";
+    version = "3.11.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.10.0.tgz";
-      sha512 = "RgHTA2qdxhdUugoi+S6BCv6LFDYxuV7P8QfbG0QRmmIAybtmpgfse6oLspWgtXwR4liRDZh/hRgwVA4y48JmlA==";
+      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-3.11.0.tgz";
+      sha512 = "jrC1VqQHCR4N++if2bZm+iVUpdCazfZgVK0FPnmTb6Uq3xqEqS5agZR9HeE/FV8ebQ1h6/4MfFt9XsSG4Z6TFw==";
     };
     dependencies = [
       (sources."@ardatan/aggregate-error-0.0.6" // {
@@ -85669,7 +86010,7 @@ in
       sources."@sideway/pinpoint-2.0.0"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@tokenizer/token-0.1.1"
+      sources."@tokenizer/token-0.3.0"
       sources."@turist/fetch-7.1.7"
       sources."@turist/time-0.0.1"
       sources."@types/common-tags-1.8.1"
@@ -85677,7 +86018,7 @@ in
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/json-patch-0.0.30"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/node-fetch-2.5.12"
       sources."@types/unist-2.0.6"
       sources."@types/yargs-15.0.14"
@@ -85732,7 +86073,7 @@ in
       })
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."bytes-3.1.0"
       (sources."cacheable-request-6.1.0" // {
         dependencies = [
@@ -85805,7 +86146,7 @@ in
       sources."cookie-0.4.0"
       sources."cookie-signature-1.0.6"
       sources."cors-2.8.5"
-      sources."create-gatsby-1.10.0"
+      sources."create-gatsby-1.11.0"
       (sources."cross-spawn-6.0.5" // {
         dependencies = [
           sources."semver-5.7.1"
@@ -85840,7 +86181,7 @@ in
       sources."dotenv-8.6.0"
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-7.0.3"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
@@ -85892,7 +86233,7 @@ in
       })
       sources."fast-copy-2.1.1"
       sources."figures-3.2.0"
-      sources."file-type-16.5.2"
+      sources."file-type-16.5.3"
       sources."fill-range-7.0.1"
       sources."filter-obj-1.1.0"
       (sources."finalhandler-1.1.2" // {
@@ -85911,13 +86252,13 @@ in
       sources."fs.realpath-1.0.0"
       sources."fsevents-2.3.2"
       sources."function-bind-1.1.1"
-      sources."gatsby-core-utils-2.10.0"
-      (sources."gatsby-recipes-0.21.0" // {
+      sources."gatsby-core-utils-2.11.0"
+      (sources."gatsby-recipes-0.22.0" // {
         dependencies = [
           sources."strip-ansi-6.0.0"
         ];
       })
-      sources."gatsby-telemetry-2.10.0"
+      sources."gatsby-telemetry-2.11.0"
       sources."gensync-1.0.0-beta.2"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.1.1"
@@ -86111,7 +86452,7 @@ in
       sources."path-key-2.0.1"
       sources."path-parse-1.0.7"
       sources."path-to-regexp-0.1.7"
-      sources."peek-readable-3.1.4"
+      sources."peek-readable-4.0.1"
       sources."picomatch-2.3.0"
       sources."pkg-dir-4.2.0"
       sources."prepend-http-2.0.0"
@@ -86146,7 +86487,7 @@ in
       sources."readable-stream-3.6.0"
       sources."readable-web-to-node-stream-3.0.2"
       sources."readdirp-3.6.0"
-      sources."redux-4.1.0"
+      sources."redux-4.1.1"
       sources."regenerator-runtime-0.13.9"
       sources."registry-auth-token-4.2.1"
       sources."registry-url-5.1.0"
@@ -86241,7 +86582,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."strip-indent-3.0.0"
       sources."strip-json-comments-2.0.1"
-      sources."strtok3-6.1.3"
+      sources."strtok3-6.2.4"
       sources."style-to-object-0.3.0"
       sources."supports-color-5.5.0"
       sources."term-size-2.2.1"
@@ -86251,7 +86592,7 @@ in
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
-      sources."token-types-3.1.0"
+      sources."token-types-4.1.1"
       sources."trim-0.0.1"
       sources."trim-trailing-lines-1.1.4"
       sources."trough-1.0.5"
@@ -86599,10 +86940,10 @@ in
   gitmoji-cli = nodeEnv.buildNodePackage {
     name = "gitmoji-cli";
     packageName = "gitmoji-cli";
-    version = "4.2.0";
+    version = "4.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.2.0.tgz";
-      sha512 = "tpmDCrNmPrb1z5hauKtxXxYdHaV4+K4AjZqkzyQzDcV6tpUSBwYMGu66pFpw7g0Ux4QnE0pYSsdh3efDfYv1Pg==";
+      url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-4.4.1.tgz";
+      sha512 = "+T6OUPejA5b1c+fuZ0yjdVVBhj0Js6rAieAtgi3ZLtJ0QpNzVI2rvNOiSaDyip3GpiLMTuNmH83G5mcOzrU+8w==";
     };
     dependencies = [
       sources."@babel/code-frame-7.14.5"
@@ -87027,15 +87368,15 @@ in
         ];
       })
       sources."@graphql-tools/load-6.2.4"
-      (sources."@graphql-tools/merge-6.2.16" // {
+      (sources."@graphql-tools/merge-6.2.17" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.0.1"
+          sources."@graphql-tools/utils-8.0.2"
           sources."tslib-2.3.0"
         ];
       })
-      (sources."@graphql-tools/schema-8.0.1" // {
+      (sources."@graphql-tools/schema-8.0.2" // {
         dependencies = [
-          sources."@graphql-tools/utils-8.0.1"
+          sources."@graphql-tools/utils-8.0.2"
           sources."tslib-2.3.0"
         ];
       })
@@ -87066,7 +87407,7 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/parse-json-4.0.0"
       sources."@types/websocket-1.0.2"
       sources."abort-controller-3.0.0"
@@ -87812,7 +88153,7 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."systeminformation-5.7.14"
+      sources."systeminformation-5.8.0"
       sources."term-canvas-0.0.5"
       sources."type-fest-0.21.3"
       sources."wordwrap-0.0.3"
@@ -88099,7 +88440,7 @@ in
       })
       sources."ms-2.0.0"
       sources."mute-stdout-1.0.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."next-tick-1.0.0"
       sources."normalize-package-data-2.5.0"
@@ -89303,7 +89644,7 @@ in
       })
       sources."moment-2.29.1"
       sources."mv-2.1.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."ncp-2.0.0"
       sources."once-1.4.0"
       sources."optimist-0.6.1"
@@ -89368,7 +89709,7 @@ in
       sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA==";
     };
     dependencies = [
-      sources."@jcubic/lily-0.1.0"
+      sources."@jcubic/lily-0.2.0"
       sources."@types/jquery-3.5.6"
       sources."@types/sizzle-2.3.3"
       sources."ansidec-0.3.4"
@@ -89397,7 +89738,7 @@ in
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
       sources."jquery-3.6.0"
-      sources."jquery.terminal-2.27.1"
+      sources."jquery.terminal-2.28.1"
       sources."jsonfile-2.4.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."line-reader-0.4.0"
@@ -90268,7 +90609,7 @@ in
       sources."async-mutex-0.1.4"
       sources."asynckit-0.4.0"
       sources."atob-2.1.2"
-      (sources."aws-sdk-2.958.0" // {
+      (sources."aws-sdk-2.961.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -90298,7 +90639,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
       sources."builtin-modules-3.2.0"
@@ -90465,7 +90806,7 @@ in
         ];
       })
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       (sources."emphasize-1.5.0" // {
         dependencies = [
@@ -90822,7 +91163,7 @@ in
       sources."md5-file-4.0.0"
       sources."mdurl-1.0.1"
       sources."merge2-1.4.1"
-      sources."mermaid-8.11.2"
+      sources."mermaid-8.11.3"
       sources."micromatch-4.0.4"
       sources."mime-db-1.49.0"
       sources."mime-types-2.1.32"
@@ -92106,7 +92447,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -92688,7 +93029,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."accepts-1.3.7"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-4.3.0"
@@ -93834,19 +94175,19 @@ in
         ];
       })
       sources."@octokit/graphql-4.6.4"
-      sources."@octokit/openapi-types-9.2.0"
+      sources."@octokit/openapi-types-9.4.0"
       sources."@octokit/plugin-enterprise-rest-6.0.1"
-      sources."@octokit/plugin-paginate-rest-2.14.0"
+      sources."@octokit/plugin-paginate-rest-2.15.0"
       sources."@octokit/plugin-request-log-1.0.4"
-      sources."@octokit/plugin-rest-endpoint-methods-5.5.2"
+      sources."@octokit/plugin-rest-endpoint-methods-5.7.0"
       (sources."@octokit/request-5.6.0" // {
         dependencies = [
           sources."is-plain-object-5.0.0"
         ];
       })
       sources."@octokit/request-error-2.1.0"
-      sources."@octokit/rest-18.7.2"
-      sources."@octokit/types-6.22.0"
+      sources."@octokit/rest-18.9.0"
+      sources."@octokit/types-6.24.0"
       sources."@tootallnate/once-1.1.2"
       sources."@types/minimatch-3.0.5"
       sources."@types/minimist-1.2.2"
@@ -94386,7 +94727,7 @@ in
       sources."strip-indent-3.0.0"
       sources."strong-log-transformer-2.1.0"
       sources."supports-color-7.2.0"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."temp-dir-1.0.0"
       (sources."temp-write-4.0.0" // {
         dependencies = [
@@ -94710,7 +95051,7 @@ in
       sources."mixin-deep-1.3.2"
       sources."morgan-1.10.0"
       sources."ms-2.0.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."negotiator-0.6.2"
       sources."normalize-path-3.0.0"
@@ -95111,7 +95452,7 @@ in
         ];
       })
       sources."ms-2.0.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -95502,8 +95843,8 @@ in
       sources."@types/istanbul-lib-coverage-2.0.3"
       sources."@types/istanbul-lib-report-3.0.0"
       sources."@types/istanbul-reports-1.1.2"
-      sources."@types/json-schema-7.0.8"
-      sources."@types/node-16.4.10"
+      sources."@types/json-schema-7.0.9"
+      sources."@types/node-16.4.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/resolve-0.0.8"
       sources."@types/yargs-15.0.14"
@@ -95660,7 +96001,7 @@ in
         ];
       })
       sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."bser-2.1.1"
       sources."buffer-5.2.1"
       sources."buffer-from-1.1.2"
@@ -95800,7 +96141,7 @@ in
       sources."duplexer2-0.1.4"
       sources."duplexify-3.7.1"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -96083,7 +96424,7 @@ in
         ];
       })
       sources."ms-2.1.2"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."ncp-2.0.0"
       sources."neo-async-2.6.2"
@@ -97146,7 +97487,7 @@ in
       sources."@percy/config-1.0.0-beta.62"
       sources."@percy/logger-1.0.0-beta.62"
       sources."@percy/migrate-0.10.0"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/parse-json-4.0.0"
       sources."@types/yauzl-2.9.2"
       sources."agent-base-6.0.2"
@@ -97178,7 +97519,7 @@ in
       sources."bl-4.1.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.2"
@@ -97272,10 +97613,10 @@ in
       sources."defaults-1.0.3"
       sources."define-properties-1.1.3"
       sources."define-property-2.0.2"
-      sources."devtools-protocol-0.0.883894"
+      sources."devtools-protocol-0.0.901419"
       sources."dir-glob-3.0.1"
       sources."dompurify-2.3.0"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
@@ -97442,7 +97783,7 @@ in
       sources."map-cache-0.2.2"
       sources."map-visit-1.0.0"
       sources."merge2-1.4.1"
-      sources."mermaid-8.11.2"
+      sources."mermaid-8.11.3"
       sources."micromatch-4.0.4"
       sources."mimic-fn-2.1.0"
       sources."minimatch-3.0.4"
@@ -97503,7 +97844,7 @@ in
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
       sources."punycode-2.1.1"
-      sources."puppeteer-10.1.0"
+      sources."puppeteer-10.2.0"
       sources."queue-microtask-1.2.3"
       sources."readable-stream-3.6.0"
       (sources."recast-0.20.5" // {
@@ -97671,20 +98012,20 @@ in
       sha512 = "seHSVEn7JJbOEuYD8T8UmqZcYT1iLCFp2mMA/+UyhcpRICLzClF9uQX3beAuHCZUymO3FBwdEjN4Ky5qd2kbHw==";
     };
     dependencies = [
-      sources."@fluentui/date-time-utilities-8.2.1"
-      sources."@fluentui/dom-utilities-2.1.3"
-      sources."@fluentui/font-icons-mdl2-8.1.7"
-      sources."@fluentui/foundation-legacy-8.1.7"
-      sources."@fluentui/keyboard-key-0.3.3"
-      sources."@fluentui/merge-styles-8.1.3"
+      sources."@fluentui/date-time-utilities-8.2.2"
+      sources."@fluentui/dom-utilities-2.1.4"
+      sources."@fluentui/font-icons-mdl2-8.1.8"
+      sources."@fluentui/foundation-legacy-8.1.8"
+      sources."@fluentui/keyboard-key-0.3.4"
+      sources."@fluentui/merge-styles-8.1.4"
       sources."@fluentui/react-8.23.8"
-      sources."@fluentui/react-focus-8.1.9"
-      sources."@fluentui/react-hooks-8.2.5"
-      sources."@fluentui/react-window-provider-2.1.3"
-      sources."@fluentui/set-version-8.1.3"
-      sources."@fluentui/style-utilities-8.2.1"
-      sources."@fluentui/theme-2.2.0"
-      sources."@fluentui/utilities-8.2.1"
+      sources."@fluentui/react-focus-8.1.10"
+      sources."@fluentui/react-hooks-8.2.6"
+      sources."@fluentui/react-window-provider-2.1.4"
+      sources."@fluentui/set-version-8.1.4"
+      sources."@fluentui/style-utilities-8.2.2"
+      sources."@fluentui/theme-2.2.1"
+      sources."@fluentui/utilities-8.2.2"
       sources."@microsoft/load-themed-styles-1.10.197"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
@@ -98273,10 +98614,10 @@ in
   netlify-cli = nodeEnv.buildNodePackage {
     name = "netlify-cli";
     packageName = "netlify-cli";
-    version = "5.4.1";
+    version = "6.0.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-5.4.1.tgz";
-      sha512 = "Eoc/5wAH6D1sAWOhfdbim3H0IQNDcQDmXzxWqKkaa3TuOIvImysEbQz0Qr5njQUKwTvVoQ4zSnmdim8uK0SkJg==";
+      url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-6.0.3.tgz";
+      sha512 = "cm07sqQpSYmHjk1j//geep75fc3NRX0KO7Jr0S8H43OZyFrdY4G8VfAfukMBwVXie/aEfFw1CcgA8yiFMq+7pw==";
     };
     dependencies = [
       sources."@babel/code-frame-7.14.5"
@@ -98410,18 +98751,25 @@ in
       sources."@dabh/diagnostics-2.0.2"
       sources."@jest/types-24.9.0"
       sources."@mrmlnc/readdir-enhanced-2.2.1"
-      (sources."@netlify/build-17.4.1" // {
+      (sources."@netlify/build-17.9.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
-          sources."boxen-4.2.0"
-          sources."chalk-3.0.0"
+          (sources."boxen-4.2.0" // {
+            dependencies = [
+              sources."chalk-3.0.0"
+            ];
+          })
           sources."execa-3.4.0"
           sources."is-plain-obj-2.1.0"
           sources."locate-path-5.0.0"
           sources."resolve-2.0.0-next.3"
           sources."semver-6.3.0"
           sources."type-fest-0.8.1"
-          sources."update-notifier-4.1.3"
+          (sources."update-notifier-4.1.3" // {
+            dependencies = [
+              sources."chalk-3.0.0"
+            ];
+          })
         ];
       })
       (sources."@netlify/cache-utils-2.0.0" // {
@@ -98432,10 +98780,8 @@ in
           sources."slash-3.0.0"
         ];
       })
-      (sources."@netlify/config-14.1.0" // {
+      (sources."@netlify/config-14.4.1" // {
         dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."chalk-3.0.0"
           sources."dot-prop-5.3.0"
           sources."execa-3.4.0"
           sources."find-up-4.1.0"
@@ -98444,7 +98790,7 @@ in
         ];
       })
       sources."@netlify/esbuild-0.13.6"
-      (sources."@netlify/framework-info-5.7.2" // {
+      (sources."@netlify/framework-info-5.8.0" // {
         dependencies = [
           sources."p-limit-3.1.0"
           sources."p-locate-5.0.0"
@@ -98477,17 +98823,17 @@ in
       sources."@netlify/open-api-2.5.0"
       (sources."@netlify/plugin-edge-handlers-1.11.22" // {
         dependencies = [
-          sources."@types/node-14.17.7"
+          sources."@types/node-14.17.9"
         ];
       })
-      sources."@netlify/plugins-list-2.21.0"
+      sources."@netlify/plugins-list-3.2.1"
       sources."@netlify/routing-local-proxy-0.31.0"
       (sources."@netlify/run-utils-2.0.0" // {
         dependencies = [
           sources."execa-3.4.0"
         ];
       })
-      (sources."@netlify/zip-it-and-ship-it-4.15.1" // {
+      (sources."@netlify/zip-it-and-ship-it-4.16.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
           sources."cliui-7.0.4"
@@ -98614,18 +98960,18 @@ in
         ];
       })
       sources."@octokit/graphql-4.6.4"
-      sources."@octokit/openapi-types-9.2.0"
-      sources."@octokit/plugin-paginate-rest-2.14.0"
+      sources."@octokit/openapi-types-9.4.0"
+      sources."@octokit/plugin-paginate-rest-2.15.0"
       sources."@octokit/plugin-request-log-1.0.4"
-      sources."@octokit/plugin-rest-endpoint-methods-5.5.2"
+      sources."@octokit/plugin-rest-endpoint-methods-5.7.0"
       (sources."@octokit/request-5.6.0" // {
         dependencies = [
           sources."is-plain-object-5.0.0"
         ];
       })
       sources."@octokit/request-error-2.1.0"
-      sources."@octokit/rest-18.7.2"
-      sources."@octokit/types-6.22.0"
+      sources."@octokit/rest-18.9.0"
+      sources."@octokit/types-6.24.0"
       sources."@rollup/plugin-babel-5.3.0"
       (sources."@rollup/plugin-commonjs-18.1.0" // {
         dependencies = [
@@ -98662,7 +99008,7 @@ in
       sources."@types/istanbul-reports-1.1.2"
       sources."@types/keyv-3.1.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/node-fetch-2.5.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/resolve-1.17.1"
@@ -98670,8 +99016,8 @@ in
       sources."@types/semver-7.3.8"
       sources."@types/yargs-13.0.12"
       sources."@types/yargs-parser-20.2.1"
-      sources."@typescript-eslint/types-4.28.5"
-      (sources."@typescript-eslint/typescript-estree-4.28.5" // {
+      sources."@typescript-eslint/types-4.29.0"
+      (sources."@typescript-eslint/typescript-estree-4.29.0" // {
         dependencies = [
           sources."@nodelib/fs.stat-2.0.5"
           sources."array-union-2.1.0"
@@ -98688,7 +99034,7 @@ in
           sources."to-regex-range-5.0.1"
         ];
       })
-      sources."@typescript-eslint/visitor-keys-4.28.5"
+      sources."@typescript-eslint/visitor-keys-4.29.0"
       sources."@ungap/from-entries-0.2.1"
       sources."accepts-1.3.7"
       sources."acorn-8.4.1"
@@ -98791,7 +99137,7 @@ in
           sources."extend-shallow-2.0.1"
         ];
       })
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -99086,7 +99432,7 @@ in
       })
       sources."duplexer3-0.1.4"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."elegant-spinner-1.0.1"
       sources."elf-cam-0.1.1"
       sources."emoji-regex-8.0.0"
@@ -100361,7 +100707,7 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
       sources."util-deprecate-1.0.2"
@@ -100544,7 +100890,7 @@ in
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
       sources."ms-2.0.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."negotiator-0.6.2"
       (sources."node-pre-gyp-0.6.39" // {
         dependencies = [
@@ -100815,7 +101161,7 @@ in
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
@@ -101344,7 +101690,7 @@ in
         ];
       })
       sources."strip-ansi-3.0.1"
-      (sources."tar-6.1.2" // {
+      (sources."tar-6.1.6" // {
         dependencies = [
           sources."mkdirp-1.0.4"
         ];
@@ -101575,7 +101921,7 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/normalize-package-data-2.4.1"
       sources."@types/parse-json-4.0.0"
       sources."@types/responselike-1.0.0"
@@ -102400,7 +102746,7 @@ in
       sources."strip-ansi-3.0.1"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
       sources."tough-cookie-2.5.0"
@@ -102923,7 +103269,7 @@ in
           sources."pako-1.0.11"
         ];
       })
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       (sources."buffer-4.9.2" // {
         dependencies = [
           sources."isarray-1.0.0"
@@ -103078,7 +103424,7 @@ in
       sources."duplexer2-0.1.4"
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -103324,7 +103670,7 @@ in
       })
       sources."mkdirp-0.5.5"
       sources."ms-2.1.2"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."define-property-2.0.2"
@@ -103869,7 +104215,7 @@ in
       sources."ms-2.0.0"
       sources."msgpack5-3.6.1"
       sources."mv-2.1.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."ncp-2.0.0"
       sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
       sources."neo-async-2.6.2"
@@ -105126,7 +105472,7 @@ in
       sources."statuses-1.5.0"
       sources."string_decoder-0.10.31"
       sources."supports-color-7.2.0"
-      sources."systeminformation-5.7.14"
+      sources."systeminformation-5.8.0"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.0"
       sources."tslib-2.3.0"
@@ -106318,9 +106664,9 @@ in
       sources."@reach/router-1.3.4"
       sources."@sindresorhus/is-0.7.0"
       sources."@types/glob-7.1.4"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/parse-json-4.0.0"
       sources."@types/q-1.5.5"
       sources."@webassemblyjs/ast-1.9.0"
@@ -106474,7 +106820,7 @@ in
         ];
       })
       sources."browserify-zlib-0.1.4"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-5.7.1"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
@@ -106737,7 +107083,7 @@ in
       sources."duplexify-3.7.1"
       sources."ee-first-1.1.1"
       sources."ejs-2.7.4"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       (sources."elliptic-6.5.4" // {
         dependencies = [
           sources."bn.js-4.12.0"
@@ -107162,7 +107508,7 @@ in
       sources."multicast-dns-service-types-1.1.0"
       sources."mutation-observer-1.0.3"
       sources."mute-stream-0.0.7"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."negotiator-0.6.2"
       sources."neo-async-2.6.2"
@@ -108128,12 +108474,12 @@ in
       sources."@redocly/ajv-8.6.2"
       (sources."@redocly/openapi-core-1.0.0-beta.54" // {
         dependencies = [
-          sources."@types/node-14.17.7"
+          sources."@types/node-14.17.9"
         ];
       })
       sources."@redocly/react-dropdown-aria-2.0.12"
-      sources."@types/json-schema-7.0.8"
-      sources."@types/node-15.14.5"
+      sources."@types/json-schema-7.0.9"
+      sources."@types/node-15.14.7"
       sources."ansi-regex-5.0.0"
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.2"
@@ -108661,20 +109007,20 @@ in
       sources."@tootallnate/once-1.1.2"
       sources."@types/estree-0.0.39"
       sources."@types/glob-7.1.4"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@types/minimatch-3.0.5"
       sources."@types/mocha-8.2.3"
-      sources."@types/node-14.17.7"
+      sources."@types/node-14.17.9"
       sources."@types/node-fetch-2.5.12"
       sources."@types/resolve-1.17.1"
       sources."@types/vscode-1.58.1"
-      sources."@typescript-eslint/eslint-plugin-4.28.5"
-      sources."@typescript-eslint/experimental-utils-4.28.5"
-      sources."@typescript-eslint/parser-4.28.5"
-      sources."@typescript-eslint/scope-manager-4.28.5"
-      sources."@typescript-eslint/types-4.28.5"
-      sources."@typescript-eslint/typescript-estree-4.28.5"
-      sources."@typescript-eslint/visitor-keys-4.28.5"
+      sources."@typescript-eslint/eslint-plugin-4.29.0"
+      sources."@typescript-eslint/experimental-utils-4.29.0"
+      sources."@typescript-eslint/parser-4.29.0"
+      sources."@typescript-eslint/scope-manager-4.29.0"
+      sources."@typescript-eslint/types-4.29.0"
+      sources."@typescript-eslint/typescript-estree-4.29.0"
+      sources."@typescript-eslint/visitor-keys-4.29.0"
       sources."@ungap/promise-all-settled-1.1.2"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.2"
@@ -109143,10 +109489,10 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.37.0";
+    version = "1.37.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.37.0.tgz";
-      sha512 = "B+Tu6cSAG8ffs/cqsZl/bgSH2pCmavDaPTYAoW8QA1qNHh/RqndNfVKuABKYkLjUQ5aq/BnCENVpE80cqdSM1w==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.37.5.tgz";
+      sha512 = "Cx3ewxz9QB/ErnVIiWg2cH0kiYZ0FPvheDTVC6BsiEGBTZKKZJ1Gq5Kq6jy3PKtL6+EJ8NIoaBW/RSd2R6cZOA==";
     };
     dependencies = [
       sources."anymatch-3.1.2"
@@ -109316,10 +109662,10 @@ in
   serverless = nodeEnv.buildNodePackage {
     name = "serverless";
     packageName = "serverless";
-    version = "2.52.1";
+    version = "2.53.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/serverless/-/serverless-2.52.1.tgz";
-      sha512 = "aDMJiSyCxqbJCt7011L0rMsxkd1lHSz8HotUiQWE8dFFqm3txZ1MpEy01bOLx4n35Qnyj1F8g+jmT9x+WnI2ZQ==";
+      url = "https://registry.npmjs.org/serverless/-/serverless-2.53.0.tgz";
+      sha512 = "2srJa55dQY4kx+aNGkevvZbJ/8j/C1TLD3AvZdpqgrRPNG41yfl1B3V/pXMmq5sfdpx09Fr8JOeNRgUgJUq7Aw==";
     };
     dependencies = [
       sources."2-thenable-1.0.0"
@@ -109404,14 +109750,14 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@tencent-sdk/capi-1.1.8"
-      sources."@tokenizer/token-0.1.1"
+      sources."@tokenizer/token-0.3.0"
       sources."@types/cacheable-request-6.0.2"
       sources."@types/caseless-0.12.2"
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
-      sources."@types/lodash-4.14.171"
+      sources."@types/lodash-4.14.172"
       sources."@types/long-4.0.1"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/request-2.48.7"
       sources."@types/request-promise-native-1.0.18"
       sources."@types/responselike-1.0.0"
@@ -109472,7 +109818,7 @@ in
       sources."async-2.6.3"
       sources."asynckit-0.4.0"
       sources."at-least-node-1.0.0"
-      (sources."aws-sdk-2.958.0" // {
+      (sources."aws-sdk-2.961.0" // {
         dependencies = [
           sources."buffer-4.9.2"
           sources."ieee754-1.1.13"
@@ -109701,7 +110047,7 @@ in
       sources."fd-slicer-1.1.0"
       sources."fecha-4.2.1"
       sources."figures-3.2.0"
-      sources."file-type-16.5.2"
+      sources."file-type-16.5.3"
       sources."file-uri-to-path-1.0.0"
       sources."filename-reserved-regex-2.0.0"
       sources."filenamify-4.3.0"
@@ -109899,7 +110245,7 @@ in
       sources."mkdirp-0.5.5"
       sources."ms-2.0.0"
       sources."mute-stream-0.0.8"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanoid-2.1.11"
       sources."napi-build-utils-1.0.2"
       sources."native-promise-only-0.8.1"
@@ -109947,7 +110293,7 @@ in
       sources."path-loader-1.0.10"
       sources."path-type-4.0.0"
       sources."path2-0.1.0"
-      sources."peek-readable-3.1.4"
+      sources."peek-readable-4.0.1"
       sources."pend-1.2.0"
       sources."performance-now-2.1.0"
       sources."picomatch-2.3.0"
@@ -110058,7 +110404,7 @@ in
       sources."strip-dirs-2.1.0"
       sources."strip-json-comments-2.0.1"
       sources."strip-outer-1.0.1"
-      sources."strtok3-6.1.3"
+      sources."strtok3-6.2.4"
       (sources."superagent-3.8.3" // {
         dependencies = [
           sources."debug-3.2.7"
@@ -110090,7 +110436,7 @@ in
           sources."untildify-3.0.3"
         ];
       })
-      (sources."tar-6.1.2" // {
+      (sources."tar-6.1.6" // {
         dependencies = [
           sources."chownr-2.0.0"
           sources."mkdirp-1.0.4"
@@ -110119,7 +110465,7 @@ in
       sources."to-buffer-1.1.1"
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
-      sources."token-types-3.1.0"
+      sources."token-types-4.1.1"
       sources."tough-cookie-2.5.0"
       sources."traverse-0.6.6"
       sources."trim-repeated-1.0.0"
@@ -110730,7 +111076,7 @@ in
       sources."minimist-1.2.5"
       sources."mkdirp-0.5.5"
       sources."mv-2.1.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."ncp-2.0.0"
       sources."negotiator-0.5.3"
       sources."node-uuid-1.4.8"
@@ -110827,10 +111173,10 @@ in
   snyk = nodeEnv.buildNodePackage {
     name = "snyk";
     packageName = "snyk";
-    version = "1.673.0";
+    version = "1.675.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/snyk/-/snyk-1.673.0.tgz";
-      sha512 = "qu6UpvUaC+NbHCvdA6COYHzb/S5fPiJrPDMQP7q1lEVAi0JnXASJrYuUVheAz+Uh8G4SPiQCAu5EimuPUf8fkg==";
+      url = "https://registry.npmjs.org/snyk/-/snyk-1.675.0.tgz";
+      sha512 = "J5ZvEiaAIRdyFrIjS1OnfQs5vKLG0SNPJmeg/GuTA9z8L/gqtTXUsnCrnmpQ8Y2y7L3LRyjh9VXx7G0QC9rlWA==";
     };
     dependencies = [
       sources."@arcanis/slice-ansi-1.0.2"
@@ -110843,9 +111189,14 @@ in
       sources."@sindresorhus/is-4.0.1"
       sources."@snyk/child-process-0.3.1"
       sources."@snyk/cli-interface-2.11.0"
-      sources."@snyk/cloud-config-parser-1.9.3"
+      sources."@snyk/cloud-config-parser-1.10.1"
       sources."@snyk/cocoapods-lockfile-parser-3.6.2"
-      sources."@snyk/code-client-3.9.0"
+      (sources."@snyk/code-client-4.0.0" // {
+        dependencies = [
+          sources."debug-3.2.7"
+          sources."needle-2.8.0"
+        ];
+      })
       sources."@snyk/composer-lockfile-parser-1.4.1"
       (sources."@snyk/dep-graph-1.28.1" // {
         dependencies = [
@@ -110863,11 +111214,13 @@ in
       (sources."@snyk/fix-pipenv-pipfile-0.5.4" // {
         dependencies = [
           sources."debug-4.3.1"
+          sources."ms-2.1.2"
         ];
       })
       (sources."@snyk/fix-poetry-0.7.2" // {
         dependencies = [
           sources."debug-4.3.1"
+          sources."ms-2.1.2"
         ];
       })
       sources."@snyk/gemfile-1.2.0"
@@ -110917,9 +111270,10 @@ in
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/js-yaml-3.12.7"
       sources."@types/keyv-3.1.2"
-      sources."@types/lodash-4.14.171"
+      sources."@types/lodash-4.14.172"
       sources."@types/lodash.chunk-4.2.6"
       sources."@types/lodash.omit-4.5.6"
+      sources."@types/lodash.pick-4.4.6"
       sources."@types/lodash.union-4.6.6"
       sources."@types/minimatch-3.0.5"
       sources."@types/ms-0.7.31"
@@ -110982,7 +111336,6 @@ in
       sources."asap-2.0.6"
       sources."asn1-0.2.4"
       sources."async-3.2.0"
-      sources."axios-0.21.1"
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
       sources."bcrypt-pbkdf-1.0.2"
@@ -111046,7 +111399,11 @@ in
         ];
       })
       sources."crypto-random-string-2.0.0"
-      sources."debug-4.3.2"
+      (sources."debug-4.3.2" // {
+        dependencies = [
+          sources."ms-2.1.2"
+        ];
+      })
       (sources."decompress-response-6.0.0" // {
         dependencies = [
           sources."mimic-response-3.1.0"
@@ -111100,7 +111457,6 @@ in
       sources."fastq-1.11.1"
       sources."figures-3.2.0"
       sources."fill-range-7.0.1"
-      sources."follow-redirects-1.14.1"
       sources."fs-constants-1.0.0"
       sources."fs-minipass-2.1.0"
       sources."fs.realpath-1.0.0"
@@ -111212,6 +111568,7 @@ in
       sources."lodash.merge-4.6.2"
       sources."lodash.omit-4.5.0"
       sources."lodash.orderby-4.6.0"
+      sources."lodash.pick-4.4.0"
       sources."lodash.reduce-4.6.0"
       sources."lodash.set-4.3.2"
       sources."lodash.size-4.2.0"
@@ -111246,7 +111603,7 @@ in
       sources."minipass-3.1.3"
       sources."minizlib-2.1.2"
       sources."mkdirp-1.0.4"
-      sources."ms-2.1.2"
+      sources."ms-2.1.3"
       sources."multimatch-5.0.0"
       sources."mute-stream-0.0.8"
       (sources."needle-2.6.0" // {
@@ -111483,7 +111840,7 @@ in
       sources."strip-eof-1.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."tar-stream-2.2.0"
       sources."temp-dir-2.0.0"
       (sources."tempy-1.0.1" // {
@@ -111572,7 +111929,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."accepts-1.3.7"
       sources."base64-arraybuffer-0.1.4"
       sources."base64id-2.0.0"
@@ -112192,7 +112549,7 @@ in
           sources."rimraf-2.4.5"
         ];
       })
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       (sources."nanomatch-1.2.13" // {
         dependencies = [
           sources."arr-diff-4.0.0"
@@ -112773,7 +113130,7 @@ in
       sources."async-1.5.2"
       sources."async-limiter-1.0.1"
       sources."asynckit-0.4.0"
-      (sources."aws-sdk-2.958.0" // {
+      (sources."aws-sdk-2.961.0" // {
         dependencies = [
           sources."uuid-3.3.2"
         ];
@@ -112900,7 +113257,7 @@ in
       sources."drange-1.1.1"
       (sources."dtrace-provider-0.8.8" // {
         dependencies = [
-          sources."nan-2.14.2"
+          sources."nan-2.15.0"
         ];
       })
       sources."ecc-jsbn-0.1.2"
@@ -113556,10 +113913,10 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.14.5"
-      sources."@babel/compat-data-7.14.9"
+      sources."@babel/compat-data-7.15.0"
       sources."@babel/core-7.14.8"
       sources."@babel/generator-7.14.9"
-      sources."@babel/helper-compilation-targets-7.14.5"
+      sources."@babel/helper-compilation-targets-7.15.0"
       sources."@babel/helper-function-name-7.14.5"
       sources."@babel/helper-get-function-arity-7.14.5"
       sources."@babel/helper-hoist-variables-7.14.5"
@@ -113578,10 +113935,10 @@ in
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.14.9"
+      sources."@babel/parser-7.15.0"
       sources."@babel/template-7.14.5"
       sources."@babel/traverse-7.14.9"
-      sources."@babel/types-7.14.9"
+      sources."@babel/types-7.15.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -113607,7 +113964,7 @@ in
         ];
       })
       sources."braces-3.0.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
@@ -113649,7 +114006,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -113882,16 +114239,16 @@ in
   svelte-language-server = nodeEnv.buildNodePackage {
     name = "svelte-language-server";
     packageName = "svelte-language-server";
-    version = "0.14.4";
+    version = "0.14.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.4.tgz";
-      sha512 = "ldw4/YQR/gpI29Sgv+u/zkHTIMKn2ohpSvfORmDm2H85fNa/Dw8fUoqK080GbVol32sYO8ThzNKkheBjUT0mCw==";
+      url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.5.tgz";
+      sha512 = "oHbbJx5x25ztVm+EIyXwWB2rCb+fgfNV7izSb/hjlI6jHXpmcHcu6pIXGxx9JI3PWj18nLyzvKfTE/Nr6p8mpw==";
     };
     dependencies = [
       sources."@emmetio/abbreviation-2.2.2"
       sources."@emmetio/css-abbreviation-2.1.4"
       sources."@emmetio/scanner-1.0.0"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/pug-2.0.5"
       sources."@types/sass-1.16.1"
       sources."anymatch-3.1.2"
@@ -113934,7 +114291,7 @@ in
       sources."strip-indent-3.0.0"
       sources."svelte-3.38.3"
       sources."svelte-preprocess-4.7.4"
-      sources."svelte2tsx-0.4.3"
+      sources."svelte2tsx-0.4.4"
       sources."to-regex-range-5.0.1"
       sources."tslib-2.3.0"
       sources."typescript-4.3.5"
@@ -113967,13 +114324,13 @@ in
   svelte-check = nodeEnv.buildNodePackage {
     name = "svelte-check";
     packageName = "svelte-check";
-    version = "2.2.3";
+    version = "2.2.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.3.tgz";
-      sha512 = "mqe/lgF0Ew+54YI4bPW5D26sMolh+MofQiz41U0c1GvUsP3bKsLLH0mjs4P4Xc+ajUFJtvGBo5PWaf0dd46sIQ==";
+      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-2.2.4.tgz";
+      sha512 = "eGEuZ3UEanOhlpQhICLjKejDxcZ9uYJlGnBGKAPW7uugolaBE6HpEBIiKFZN/TMRFFHQUURgGvsVn8/HJUBfeQ==";
     };
     dependencies = [
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/pug-2.0.5"
       sources."@types/sass-1.16.1"
       sources."ansi-styles-4.3.0"
@@ -114428,7 +114785,7 @@ in
       sources."ms-2.0.0"
       sources."multer-1.4.2"
       sources."mute-stream-0.0.5"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."native-promise-only-0.8.1"
       sources."neo-async-2.6.2"
@@ -116121,7 +116478,7 @@ in
       sources."@types/cacheable-request-6.0.2"
       sources."@types/http-cache-semantics-4.0.1"
       sources."@types/keyv-3.1.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/responselike-1.0.0"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -116560,10 +116917,10 @@ in
   three = nodeEnv.buildNodePackage {
     name = "three";
     packageName = "three";
-    version = "0.131.1";
+    version = "0.131.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/three/-/three-0.131.1.tgz";
-      sha512 = "1vojiLBfH7e2GZDEzFBfmzU0b/5uraxdg630PcVCRdzgGOttGe6HmG+n71lLCZZnPOxU9f7UVPiSkKPMsyiB/A==";
+      url = "https://registry.npmjs.org/three/-/three-0.131.3.tgz";
+      sha512 = "VkZAv8ZTJqiE/fyEmoWLxcNHImpVcjqW7RO0GzMu3tRpwO0KUvK9pjTmJzJcAbc51BOeB2G38zh80yjHTbP8gQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -116795,7 +117152,7 @@ in
       sources."mooremachine-2.3.0"
       sources."mute-stream-0.0.8"
       sources."mv-2.1.1"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."ncp-2.0.0"
       sources."once-1.3.2"
       sources."path-is-absolute-1.0.1"
@@ -117136,7 +117493,7 @@ in
       sources."@types/component-emitter-1.2.10"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-14.17.7"
+      sources."@types/node-14.17.9"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.7"
       sources."ansi-regex-5.0.0"
@@ -117496,7 +117853,7 @@ in
       sources."minizlib-2.1.2"
       sources."mkdirp-1.0.4"
       sources."ms-2.1.2"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."node-fetch-2.6.1"
       sources."nopt-5.0.0"
       sources."npmlog-4.1.2"
@@ -117521,7 +117878,7 @@ in
       sources."string-width-1.0.2"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-3.0.1"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       sources."topojson-client-3.1.0"
       sources."util-deprecate-1.0.2"
       sources."vega-5.20.2"
@@ -117705,7 +118062,7 @@ in
       sources."enquirer-2.3.6"
       sources."escape-string-regexp-4.0.0"
       sources."eslint-7.32.0"
-      (sources."eslint-plugin-vue-7.15.0" // {
+      (sources."eslint-plugin-vue-7.15.1" // {
         dependencies = [
           sources."semver-6.3.0"
         ];
@@ -118014,7 +118371,7 @@ in
       sources."@types/eslint-7.28.0"
       sources."@types/eslint-scope-3.7.1"
       sources."@types/estree-0.0.50"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."@types/mocha-7.0.2"
       sources."@types/node-8.10.66"
       sources."@types/vscode-1.58.1"
@@ -118041,6 +118398,7 @@ in
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-8.4.1"
+      sources."acorn-import-assertions-1.7.6"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
       sources."ansi-colors-4.1.1"
@@ -118056,7 +118414,7 @@ in
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.2"
       sources."browser-stdout-1.3.1"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-crc32-0.2.13"
       sources."buffer-from-1.1.2"
       sources."call-bind-1.0.2"
@@ -118101,7 +118459,7 @@ in
       sources."domelementtype-2.2.0"
       sources."domhandler-4.2.0"
       sources."domutils-2.7.0"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."emoji-regex-8.0.0"
       sources."emojis-list-3.0.0"
       sources."enhanced-resolve-5.8.2"
@@ -118310,7 +118668,7 @@ in
       sources."vscode-debugadapter-testsupport-1.48.0"
       sources."vscode-debugprotocol-1.48.0"
       sources."watchpack-2.2.0"
-      sources."webpack-5.47.1"
+      sources."webpack-5.48.0"
       (sources."webpack-cli-4.7.2" // {
         dependencies = [
           sources."commander-7.2.0"
@@ -118667,7 +119025,7 @@ in
       sources."@starptech/rehype-webparser-0.10.0"
       sources."@starptech/webparser-0.10.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/unist-2.0.6"
       sources."@types/vfile-3.0.2"
       sources."@types/vfile-message-2.0.0"
@@ -119709,7 +120067,7 @@ in
       sources."minizlib-2.1.2"
       sources."mkdirp-1.0.4"
       sources."ms-2.1.2"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."node-fetch-2.6.1"
       sources."nopt-5.0.0"
       sources."npmlog-4.1.2"
@@ -119749,7 +120107,7 @@ in
       sources."svg-pathdata-5.0.5"
       sources."svg2img-0.9.3"
       sources."symbol-tree-3.2.4"
-      sources."tar-6.1.2"
+      sources."tar-6.1.6"
       (sources."tough-cookie-4.0.0" // {
         dependencies = [
           sources."universalify-0.1.2"
@@ -119839,7 +120197,7 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/yauzl-2.9.1"
       sources."acorn-7.4.1"
       sources."acorn-jsx-5.3.2"
@@ -120180,7 +120538,7 @@ in
         ];
       })
       sources."mz-2.7.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanoid-3.1.23"
       sources."natural-compare-1.4.0"
       sources."natural-compare-lite-1.4.0"
@@ -120392,17 +120750,17 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.47.1";
+    version = "5.48.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.47.1.tgz";
-      sha512 = "cW+Mzy9SCDapFV4OrkHuP6EFV2mAsiQd+gOa3PKtHNoKg6qPqQXZzBlHH+CnQG1osplBCqwsJZ8CfGO6XWah0g==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.48.0.tgz";
+      sha512 = "CGe+nfbHrYzbk7SKoYITCgN3LRAG0yVddjNUecz9uugo1QtYdiyrVD8nP1PhkNqPfdxC2hknmmKpP355Epyn6A==";
     };
     dependencies = [
       sources."@types/eslint-7.28.0"
       sources."@types/eslint-scope-3.7.1"
       sources."@types/estree-0.0.50"
-      sources."@types/json-schema-7.0.8"
-      sources."@types/node-16.4.10"
+      sources."@types/json-schema-7.0.9"
+      sources."@types/node-16.4.12"
       sources."@webassemblyjs/ast-1.11.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
       sources."@webassemblyjs/helper-api-error-1.11.1"
@@ -120421,15 +120779,16 @@ in
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."acorn-8.4.1"
+      sources."acorn-import-assertions-1.7.6"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.16.6"
+      sources."browserslist-4.16.7"
       sources."buffer-from-1.1.2"
       sources."caniuse-lite-1.0.30001248"
       sources."chrome-trace-event-1.0.3"
       sources."colorette-1.2.2"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.3.792"
+      sources."electron-to-chromium-1.3.795"
       sources."enhanced-resolve-5.8.2"
       sources."es-module-lexer-0.7.1"
       sources."escalade-3.1.1"
@@ -120566,7 +120925,7 @@ in
     dependencies = [
       sources."@types/glob-7.1.4"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."accepts-1.3.7"
       sources."ajv-6.12.6"
       sources."ajv-errors-1.0.1"
@@ -120857,7 +121216,7 @@ in
       sources."ms-2.0.0"
       sources."multicast-dns-6.2.3"
       sources."multicast-dns-service-types-1.1.0"
-      sources."nan-2.14.2"
+      sources."nan-2.15.0"
       sources."nanomatch-1.2.13"
       sources."negotiator-0.6.2"
       sources."nice-try-1.0.5"
@@ -121148,7 +121507,7 @@ in
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@types/json-schema-7.0.8"
+      sources."@types/json-schema-7.0.9"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
       sources."array-union-2.1.0"
@@ -121220,7 +121579,7 @@ in
       sources."@protobufjs/pool-1.1.0"
       sources."@protobufjs/utf8-1.1.0"
       sources."@types/long-4.0.1"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."addr-to-ip-port-1.5.4"
       sources."airplay-js-0.3.0"
       sources."ansi-regex-5.0.0"
@@ -121472,13 +121831,9 @@ in
       sources."stream-to-blob-2.0.1"
       sources."stream-to-blob-url-3.0.2"
       sources."stream-with-known-length-to-buffer-1.0.4"
-      sources."streamx-2.10.3"
+      sources."streamx-2.11.0"
       sources."string-width-4.2.2"
-      (sources."string2compact-1.3.0" // {
-        dependencies = [
-          sources."ipaddr.js-1.9.1"
-        ];
-      })
+      sources."string2compact-1.3.2"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-6.0.0"
       sources."supports-color-7.2.0"
@@ -121698,7 +122053,7 @@ in
       sources."@tootallnate/once-1.1.2"
       sources."@types/expect-1.20.4"
       sources."@types/minimatch-3.0.5"
-      sources."@types/node-15.14.5"
+      sources."@types/node-15.14.7"
       sources."@types/vinyl-2.0.5"
       sources."abbrev-1.1.1"
       (sources."agent-base-6.0.2" // {
@@ -122404,7 +122759,7 @@ in
         ];
       })
       sources."taketalk-1.0.0"
-      (sources."tar-6.1.2" // {
+      (sources."tar-6.1.6" // {
         dependencies = [
           sources."mkdirp-1.0.4"
         ];
@@ -122587,7 +122942,7 @@ in
     dependencies = [
       sources."@types/fs-extra-9.0.12"
       sources."@types/minimist-1.2.2"
-      sources."@types/node-16.4.10"
+      sources."@types/node-16.4.12"
       sources."@types/node-fetch-2.5.12"
       sources."ansi-styles-4.3.0"
       sources."asynckit-0.4.0"

From bcc7a902d58555306065f62032be9fb991f906e3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 3 Aug 2021 23:04:48 +0200
Subject: [PATCH 056/105] nixos postgresql-backup: add `compression` option

This option allows basic configuration of the compression technique
used in the backup script. Specifically it adds `none` and `zstd` as
new alternatives, keeping `gzip` as the default.
---
 .../services/backup/postgresql-backup.nix     | 45 +++++++++++++++----
 nixos/tests/postgresql.nix                    | 36 ++++++++++++---
 2 files changed, 67 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix
index f658eb756f7b..bcc135005e16 100644
--- a/nixos/modules/services/backup/postgresql-backup.nix
+++ b/nixos/modules/services/backup/postgresql-backup.nix
@@ -7,28 +7,49 @@ let
   cfg = config.services.postgresqlBackup;
 
   postgresqlBackupService = db: dumpCmd:
-    {
+    let
+      compressSuffixes = {
+        "none" = "";
+        "gzip" = ".gz";
+        "zstd" = ".zstd";
+      };
+      compressSuffix = getAttr cfg.compression compressSuffixes;
+
+      compressCmd = getAttr cfg.compression {
+        "none" = "cat";
+        "gzip" = "${pkgs.gzip}/bin/gzip -c";
+        "zstd" = "${pkgs.zstd}/bin/zstd -c";
+      };
+
+      mkSqlPath = prefix: suffix: "${cfg.location}/${db}${prefix}.sql${suffix}";
+      curFile = mkSqlPath "" compressSuffix;
+      prevFile = mkSqlPath ".prev" compressSuffix;
+      prevFiles = map (mkSqlPath ".prev") (attrValues compressSuffixes);
+      inProgressFile = mkSqlPath ".in-progress" compressSuffix;
+    in {
       enable = true;
 
       description = "Backup of ${db} database(s)";
 
       requires = [ "postgresql.service" ];
 
-      path = [ pkgs.coreutils pkgs.gzip config.services.postgresql.package ];
+      path = [ pkgs.coreutils config.services.postgresql.package ];
 
       script = ''
         set -e -o pipefail
 
         umask 0077 # ensure backup is only readable by postgres user
 
-        if [ -e ${cfg.location}/${db}.sql.gz ]; then
-          mv ${cfg.location}/${db}.sql.gz ${cfg.location}/${db}.prev.sql.gz
+        if [ -e ${curFile} ]; then
+          rm -f ${toString prevFiles}
+          mv ${curFile} ${prevFile}
         fi
 
-        ${dumpCmd} | \
-          gzip -c > ${cfg.location}/${db}.in-progress.sql.gz
+        ${dumpCmd} \
+          | ${compressCmd} \
+          > ${inProgressFile}
 
-        mv ${cfg.location}/${db}.in-progress.sql.gz ${cfg.location}/${db}.sql.gz
+        mv ${inProgressFile} ${curFile}
       '';
 
       serviceConfig = {
@@ -87,7 +108,7 @@ in {
         default = "/var/backup/postgresql";
         type = types.path;
         description = ''
-          Location to put the gzipped PostgreSQL database dumps.
+          Path of directory where the PostgreSQL database dumps will be placed.
         '';
       };
 
@@ -101,6 +122,14 @@ in {
           when no databases where specified.
         '';
       };
+
+      compression = mkOption {
+        type = types.enum ["none" "gzip" "zstd"];
+        default = "gzip";
+        description = ''
+          The type of compression to use on the generated database dump.
+        '';
+      };
     };
 
   };
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
index 0369a0707190..4e5f92169671 100644
--- a/nixos/tests/postgresql.nix
+++ b/nixos/tests/postgresql.nix
@@ -43,6 +43,7 @@ let
     testScript = let
       backupName = if backup-all then "all" else "postgres";
       backupService = if backup-all then "postgresqlBackup" else "postgresqlBackup-postgres";
+      backupFileBase = "/var/backup/postgresql/${backupName}";
     in ''
       def check_count(statement, lines):
           return 'test $(sudo -u postgres psql postgres -tAc "{}"|wc -l) -eq {}'.format(
@@ -72,9 +73,32 @@ let
       with subtest("Backup service works"):
           machine.succeed(
               "systemctl start ${backupService}.service",
-              "zcat /var/backup/postgresql/${backupName}.sql.gz | grep '<test>ok</test>'",
+              "zcat ${backupFileBase}.sql.gz | grep '<test>ok</test>'",
               "ls -hal /var/backup/postgresql/ >/dev/console",
-              "stat -c '%a' /var/backup/postgresql/${backupName}.sql.gz | grep 600",
+              "stat -c '%a' ${backupFileBase}.sql.gz | grep 600",
+          )
+      with subtest("Backup service removes prev files"):
+          machine.succeed(
+              # Create dummy prev files.
+              "touch ${backupFileBase}.prev.sql{,.gz,.zstd}",
+              "chown postgres:postgres ${backupFileBase}.prev.sql{,.gz,.zstd}",
+
+              # Run backup.
+              "systemctl start ${backupService}.service",
+              "ls -hal /var/backup/postgresql/ >/dev/console",
+
+              # Since nothing has changed in the database, the cur and prev files
+              # should match.
+              "zcat ${backupFileBase}.sql.gz | grep '<test>ok</test>'",
+              "cmp ${backupFileBase}.sql.gz ${backupFileBase}.prev.sql.gz",
+
+              # The prev files with unused suffix should be removed.
+              "[ ! -f '${backupFileBase}.prev.sql' ]",
+              "[ ! -f '${backupFileBase}.prev.sql.zstd' ]",
+
+              # Both cur and prev file should only be accessible by the postgres user.
+              "stat -c '%a' ${backupFileBase}.sql.gz | grep 600",
+              "stat -c '%a' '${backupFileBase}.prev.sql.gz' | grep 600",
           )
       with subtest("Backup service fails gracefully"):
           # Sabotage the backup process
@@ -84,8 +108,8 @@ let
           )
           machine.succeed(
               "ls -hal /var/backup/postgresql/ >/dev/console",
-              "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
-              "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
+              "zcat ${backupFileBase}.prev.sql.gz | grep '<test>ok</test>'",
+              "stat ${backupFileBase}.in-progress.sql.gz",
           )
           # In a previous version, the second run would overwrite prev.sql.gz,
           # so we test a second run as well.
@@ -93,8 +117,8 @@ let
               "systemctl start ${backupService}.service",
           )
           machine.succeed(
-              "stat /var/backup/postgresql/${backupName}.in-progress.sql.gz",
-              "zcat /var/backup/postgresql/${backupName}.prev.sql.gz | grep '<test>ok</test>'",
+              "stat ${backupFileBase}.in-progress.sql.gz",
+              "zcat ${backupFileBase}.prev.sql.gz | grep '<test>ok</test>'",
           )
 
 

From 02b32550db7521eb1616175e8bb0c82968c412bb Mon Sep 17 00:00:00 2001
From: Atkins Chang <atkinschang@gmail.com>
Date: Thu, 5 Aug 2021 06:33:21 +0800
Subject: [PATCH 057/105] cargo-tarpaulin: support darwin

Signed-off-by: Atkins Chang <atkinschang@gmail.com>
---
 pkgs/development/tools/analysis/cargo-tarpaulin/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                             | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
index ebbfa619fed3..338c711e5274 100644
--- a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
+++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkg-config, rustPlatform, fetchFromGitHub, openssl }:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, pkg-config, curl, openssl, Security }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tarpaulin";
@@ -14,7 +14,8 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     pkg-config
   ];
-  buildInputs = [ openssl ];
+  buildInputs = [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ curl Security ];
 
   cargoSha256 = "sha256-1lFGczzcN4QPsIpEVQiSmNS7L+9rlSfxi+gopt2E7Ec=";
   #checkFlags = [ "--test-threads" "1" ];
@@ -25,6 +26,5 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/xd009642/tarpaulin";
     license = with licenses; [ mit /* or */ asl20 ];
     maintainers = with maintainers; [ hugoreeves ];
-    platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7766eb1f26f..3785ffbc08c5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12151,7 +12151,9 @@ in
     inherit (darwin.apple_sdk.frameworks) Security;
   };
   cargo-rr = callPackage ../development/tools/rust/cargo-rr { };
-  cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { };
+  cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
   cargo-update = callPackage ../tools/package-management/cargo-update {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 5dde5ea73e532d8dcfb134abc8d98d0f47813cde Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 4 Aug 2021 09:52:49 +1000
Subject: [PATCH 058/105] tarsum: init

- move from dockerTools.tarsum
- remove go from runtime closure
---
 pkgs/build-support/docker/default.nix | 21 ++------------
 pkgs/build-support/docker/tarsum.nix  | 42 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  1 +
 3 files changed, 45 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/build-support/docker/tarsum.nix

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 4bda09670abf..86422a760bfd 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -5,7 +5,6 @@
   callPackage,
   closureInfo,
   coreutils,
-  docker,
   e2fsprogs,
   fakeroot,
   findutils,
@@ -17,6 +16,7 @@
   moreutils,
   nix,
   pigz,
+  pkgs,
   rsync,
   runCommand,
   runtimeShell,
@@ -123,24 +123,7 @@ rec {
 
   # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash.
   # And we cannot untar it, because then we cannot preserve permissions etc.
-  tarsum = runCommand "tarsum" {
-    nativeBuildInputs = [ go ];
-  } ''
-    mkdir tarsum
-    cd tarsum
-
-    cp ${./tarsum.go} tarsum.go
-    export GOPATH=$(pwd)
-    export GOCACHE="$TMPDIR/go-cache"
-    export GO111MODULE=off
-    mkdir -p src/github.com/docker/docker/pkg
-    ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
-    go build
-
-    mkdir -p $out/bin
-
-    cp tarsum $out/bin/
-  '';
+  tarsum = pkgs.tarsum;
 
   # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM
   mergeDrvs = {
diff --git a/pkgs/build-support/docker/tarsum.nix b/pkgs/build-support/docker/tarsum.nix
new file mode 100644
index 000000000000..734c6b3d5aeb
--- /dev/null
+++ b/pkgs/build-support/docker/tarsum.nix
@@ -0,0 +1,42 @@
+{ stdenv, go, docker, nixosTests }:
+
+stdenv.mkDerivation {
+  name = "tarsum";
+
+  nativeBuildInputs = [ go ];
+  disallowedReferences = [ go ];
+
+  dontUnpack = true;
+
+  CGO_ENABLED = 0;
+  GOFLAGS = "-trimpath";
+  GO111MODULE = "off";
+
+  buildPhase = ''
+    runHook preBuild
+    mkdir tarsum
+    cd tarsum
+    cp ${./tarsum.go} tarsum.go
+    export GOPATH=$(pwd)
+    export GOCACHE="$TMPDIR/go-cache"
+    mkdir -p src/github.com/docker/docker/pkg
+    ln -sT ${docker.moby-src}/pkg/tarsum src/github.com/docker/docker/pkg/tarsum
+    go build
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp tarsum $out/bin/
+    runHook postInstall
+  '';
+
+  passthru = {
+    tests = {
+      dockerTools = nixosTests.docker-tools;
+    };
+  };
+
+  meta.platforms = go.meta.platforms;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 412985e644a5..31e7e1cf1175 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -369,6 +369,7 @@ in
   dockerTools = callPackage ../build-support/docker {
     writePython3 = buildPackages.writers.writePython3;
   };
+  tarsum = callPackage ../build-support/docker/tarsum.nix { };
 
   snapTools = callPackage ../build-support/snap { };
 

From 202b9e653658a7b77ebd41c7858cd57b8e8655dc Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 4 Aug 2021 23:42:13 +0000
Subject: [PATCH 059/105] linux: 4.4.277 -> 4.4.278

---
 pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 9f0f566494d1..e74cd257d28d 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,13 +1,13 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.4.277";
+  version = "4.4.278";
   extraMeta.branch = "4.4";
   extraMeta.broken = stdenv.isAarch64;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1m5zkssh523f15fvy80rcvfwqzdkldz3jhny6vbaj8q0zvk3w5r5";
+    sha256 = "1r2sbxn8finzcg72ds5dyh4578vv2s5zwylq3b3xyw3hzr4swn4f";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_4 ];

From aea5caaeab20f2991593c4ccde0bf5d540e8394b Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 4 Aug 2021 23:42:21 +0000
Subject: [PATCH 060/105] linux: 4.9.277 -> 4.9.278

---
 pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix
index 5d3a556da3d3..d88479ee18cf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@@ -1,13 +1,13 @@
 { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.9.277";
+  version = "4.9.278";
   extraMeta.branch = "4.9";
   extraMeta.broken = stdenv.isAarch64;
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pkjcz9llc7hkmzfyjcx20b5njnqbkwlzyy1ncc8na71nn6rvsg6";
+    sha256 = "04byav6cbga3jqkppygm5zj73d9v44xyvx6hbrhwr22lsk282dz7";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_9 ];

From ba2b85dbbb72f34dcdce87f1a1d8fe376d5a5e2b Mon Sep 17 00:00:00 2001
From: TredwellGit <tredwell@tutanota.com>
Date: Wed, 4 Aug 2021 23:42:35 +0000
Subject: [PATCH 061/105] linux: 5.13.7 -> 5.13.8

---
 pkgs/os-specific/linux/kernel/linux-5.13.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-5.13.nix b/pkgs/os-specific/linux/kernel/linux-5.13.nix
index 2f2dc1516b21..efa1329153c3 100644
--- a/pkgs/os-specific/linux/kernel/linux-5.13.nix
+++ b/pkgs/os-specific/linux/kernel/linux-5.13.nix
@@ -3,7 +3,7 @@
 with lib;
 
 buildLinux (args // rec {
-  version = "5.13.7";
+  version = "5.13.8";
 
   # modDirVersion needs to be x.y.z, will automatically add .0 if needed
   modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,7 +13,7 @@ buildLinux (args // rec {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
-    sha256 = "0fg41dv62vsnv2hywym15zz0n08rhdzwqvcarspm9r5gac85c7pr";
+    sha256 = "0a54r71mcyqvq7c8kff817vh6zfj0bdzmp6ql4az84wq9nwc526h";
   };
 
   kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_13 ];

From 9b48ee703d0f15f06029fc77c89f89a5765ee7e0 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Aug 2021 22:00:11 -0500
Subject: [PATCH 062/105] pg_tileserv: 1.0.7 -> 1.0.8

https://github.com/CrunchyData/pg_tileserv/releases/tag/v1.0.8
---
 pkgs/servers/pg_tileserv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/pg_tileserv/default.nix b/pkgs/servers/pg_tileserv/default.nix
index d9ba4e8e6fa0..b7f1fa0c1c9d 100644
--- a/pkgs/servers/pg_tileserv/default.nix
+++ b/pkgs/servers/pg_tileserv/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pg_tileserv";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "CrunchyData";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-PHF8n0rjxvajyC/y2sFcdvxQdDFXkxcDZOkYT10UsE4=";
+    sha256 = "07xj807cbggnh8k7d2i7h326p4wjb8sz5ng0hbdnznvyc4sb2cdw";
   };
 
   vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E=";

From 725ef07e543a6f60b534036c684d44e57bb8d5de Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 5 Aug 2021 04:14:34 +0000
Subject: [PATCH 063/105] chamber: 2.10.1 -> 2.10.2

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

diff --git a/pkgs/tools/admin/chamber/default.nix b/pkgs/tools/admin/chamber/default.nix
index 4a26603a1341..524970925ddc 100644
--- a/pkgs/tools/admin/chamber/default.nix
+++ b/pkgs/tools/admin/chamber/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "chamber";
-  version = "2.10.1";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "segmentio";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-nIIoU+iz2uOglNaqGIhQ2kUjpFOyOx+flXXwu02UG6Y=";
+    sha256 = "sha256-JPc57s5FIoZJNKNpd5OO4vZ3j7bPTQSBcJUeNhGvOgk=";
   };
 
   CGO_ENABLED = 0;

From 868501bc9b3372a8cd0ec268f69c13964ad1595a Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 2 Aug 2021 20:39:07 +0200
Subject: [PATCH 064/105] pdfmixtool: init at 1.0.2

---
 .../office/pdfmixtool/default.nix             | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/office/pdfmixtool/default.nix

diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix
new file mode 100644
index 000000000000..7d874015dc24
--- /dev/null
+++ b/pkgs/applications/office/pdfmixtool/default.nix
@@ -0,0 +1,42 @@
+{ lib
+, mkDerivation
+, fetchFromGitLab
+, cmake
+, pkg-config
+, qtbase
+, qttools
+, qpdf
+, podofo
+}:
+
+mkDerivation rec {
+  pname = "pdfmixtool";
+  version = "1.0.2";
+
+  src = fetchFromGitLab {
+    owner = "scarpetta";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "066ap1w05gj8n0kvilyhlr1fzwrmlczx3lax7mbw0rfid9qh3467";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    qtbase
+    qttools
+    qpdf
+    podofo
+  ];
+
+  meta = with lib; {
+    description = "An application to split, merge, rotate and mix PDF files";
+    homepage = "https://gitlab.com/scarpetta/pdfmixtool";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ onny ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8db6277f18bb..51baeb5e30dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26159,6 +26159,8 @@ in
 
   pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
 
+  pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { };
+
   pig = callPackage ../applications/networking/cluster/pig { };
 
   pijul = callPackage ../applications/version-management/pijul { };

From c7b2a9d1ba191af593754169fa098b8d4cfd12f0 Mon Sep 17 00:00:00 2001
From: polynomialspace <45617594+polynomialspace@users.noreply.github.com>
Date: Wed, 4 Aug 2021 23:33:54 -0600
Subject: [PATCH 065/105] google-cloud-sdk: bump 351.0.0, add i686- and
 aarch64-linux systems

i dident test thsi : )
---
 pkgs/tools/admin/google-cloud-sdk/default.nix | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 924c6c745ce7..7e4316bf52e6 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -21,23 +21,33 @@ let
   sources = name: system: {
     x86_64-darwin = {
       url = "${baseUrl}/${name}-darwin-x86_64.tar.gz";
-      sha256 = "0gln8v1yyyis9sd8hldw4g1hdx1022iqqacq3lca5mfhp2j9bffk";
+      sha256 = "1a17bbvimdqq4k25lprqk9cq3lpfchd65hzjf23ha4imndpbjgqr";
     };
 
     aarch64-darwin = {
       url = "${baseUrl}/${name}-darwin-arm.tar.gz";
-      sha256 = "1wzi81a2p5wj547nb2i60iz76c78iv2pbynjb266a53i8d1ldxla";
+      sha256 = "184k1kv10g4zzzxgmwpakvg5ffxhz01dd01kb5h32mf1j5fid1zh";
     };
 
     x86_64-linux = {
       url = "${baseUrl}/${name}-linux-x86_64.tar.gz";
-      sha256 = "1vlcwab68d8rpzkjcwj83qn35bq0awsl15p35x5qpsymmvf046l6";
+      sha256 = "0hhaq5hf5nvaah06h6v8q2hpn8hc815ihsi74dpwg6pmg9h266pr";
+    };
+
+    i686-linux = {
+      url = "${baseUrl}/${name}-linux-x86.tar.gz";
+      sha256 = "14z1nzwc0j3qhbw2ldrskd8zjsslwgsw7pxxq3v0ypc1rjibsql5";
+    };
+
+    aarch64-linux = {
+      url = "${baseUrl}/${name}-linux-arm.tar.gz";
+      sha256 = "0f6xrij2wbx57s4897bi12l9fz3flj1wyibbk7jjg0l5332h4yhr";
     };
   }.${system};
 
 in stdenv.mkDerivation rec {
   pname = "google-cloud-sdk";
-  version = "350.0.0";
+  version = "351.0.0";
 
   src = fetchurl (sources "${pname}-${version}" stdenv.hostPlatform.system);
 
@@ -114,6 +124,6 @@ in stdenv.mkDerivation rec {
     license = licenses.free;
     homepage = "https://cloud.google.com/sdk/";
     maintainers = with maintainers; [ iammrinal0 pradyuman stephenmw zimbatm ];
-    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ];
   };
 }

From a1de1fc28b27da87a84a0b4c9128972ac4a48193 Mon Sep 17 00:00:00 2001
From: Mikolaj Galkowski <mikolaj.galkowski@gmail.com>
Date: Thu, 5 Aug 2021 08:17:58 +0200
Subject: [PATCH 066/105] unityhub: add missing dependency (cacert)

---
 pkgs/development/tools/unityhub/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix
index 27453ed5988a..e60e0b77331b 100644
--- a/pkgs/development/tools/unityhub/default.nix
+++ b/pkgs/development/tools/unityhub/default.nix
@@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec {
     libX11 libXcursor libXdamage libXfixes libXrender libXi
     libXcomposite libXext libXrandr libXtst libSM libICE libxcb
 
-    libselinux pciutils libpulseaudio libxml2 icu clang
+    libselinux pciutils libpulseaudio libxml2 icu clang cacert
   ]);
 
   profile = ''

From 6dc0549183672acd39d735a465098ca9deeff6ad Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 4 Aug 2021 19:42:47 -0500
Subject: [PATCH 067/105] syncthing: 1.18.0 -> 1.18.1

https://github.com/syncthing/syncthing/releases/tag/v1.18.1
---
 pkgs/applications/networking/syncthing/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 9db0abd0cb01..a0ab6304e34a 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -4,13 +4,13 @@ let
   common = { stname, target, postInstall ? "" }:
     buildGoModule rec {
       pname = stname;
-      version = "1.18.0";
+      version = "1.18.1";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "0hrdlc1dxbxvqxylk0i2f110c6bfp9azsnzqzmjj2b29xxbrmwca";
+        sha256 = "1sm4d0pjgk0spz9pddqb3i8hli10pibd5xs18mhcwrhnxj2xky1y";
       };
 
       vendorSha256 = "1qqpxm4s1s2yp1zmi4m25y1a6r7kxc5rmvfsg50jmqsfnwligpz6";

From 9ec1f8f88f7818aacce7df23ad3d775e8d9f8ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 5 Aug 2021 07:24:13 +0200
Subject: [PATCH 068/105] Partial revert "Convert phases that contain ":" to
 dont* = true"

This reverts commit dc48d23a0f578d069f10d13671abe552d85a2050.

This deactivated custom build phases in many vim plugins overrides.
Also we could change our overrides it may break out-of-tree usage.
---
 pkgs/misc/vim-plugins/build-vim-plugin.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/misc/vim-plugins/build-vim-plugin.nix
index c490f943d435..3c623f08a169 100644
--- a/pkgs/misc/vim-plugins/build-vim-plugin.nix
+++ b/pkgs/misc/vim-plugins/build-vim-plugin.nix
@@ -54,7 +54,8 @@ rec {
     }));
 
   buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
-    dontBuild = true;
-    dontConfigure = true;
+    # vim plugins may override this
+    buildPhase = ":";
+    configurePhase =":";
   } // attrs);
 }

From e5cb1134cddea2eb30acbb4bc46cf084a1075f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 5 Aug 2021 08:58:50 +0200
Subject: [PATCH 069/105] vim-plugins: remove workaround

---
 pkgs/misc/vim-plugins/overrides.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 086877dd5a10..af0c6d4c806c 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -501,10 +501,7 @@ self: super: {
 
   telescope-fzf-native-nvim = super.telescope-fzf-native-nvim.overrideAttrs (old: {
     dependencies = with self; [ telescope-nvim ];
-
-    dontBuild = false;
     buildPhase = "make";
-
     meta.platforms = lib.platforms.all;
   });
 

From 59538cea8265f3df929388098c2204754776ab6a Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Thu, 5 Aug 2021 15:04:33 +0800
Subject: [PATCH 070/105] osu-lazer: remove temper detection bypass patch

See #132610
---
 .../osu-lazer/bypass-tamper-detection.patch   | 23 -------------------
 pkgs/games/osu-lazer/default.nix              |  3 ---
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/games/osu-lazer/bypass-tamper-detection.patch

diff --git a/pkgs/games/osu-lazer/bypass-tamper-detection.patch b/pkgs/games/osu-lazer/bypass-tamper-detection.patch
deleted file mode 100644
index 576f83a96c57..000000000000
--- a/pkgs/games/osu-lazer/bypass-tamper-detection.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
-index 98f60d52d..a27ce47ca 100644
---- a/osu.Game/OsuGameBase.cs
-+++ b/osu.Game/OsuGameBase.cs
-@@ -135,17 +135,7 @@ public OsuGameBase()
-         [BackgroundDependencyLoader]
-         private void load()
-         {
--            try
--            {
--                using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location))
--                    VersionHash = str.ComputeMD5Hash();
--            }
--            catch
--            {
--                // special case for android builds, which can't read DLLs from a packed apk.
--                // should eventually be handled in a better way.
--                VersionHash = $"{Version}-{RuntimeInfo.OS}".ComputeMD5Hash();
--            }
-+            VersionHash = "253aa3a3a356a71295bf5b018cd4fda1";
- 
-             Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly));
- 
diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix
index 55f9bfb75c30..99f188c74760 100644
--- a/pkgs/games/osu-lazer/default.nix
+++ b/pkgs/games/osu-lazer/default.nix
@@ -25,9 +25,6 @@ in stdenv.mkDerivation rec {
     sha256 = "I7UkbyH2i218d5RCq4al9Gr1C0MX339jFOeyKrKQ3b0=";
   };
 
-  patches = [ ./bypass-tamper-detection.patch ];
-  patchFlags = [ "--binary" "-p1" ];
-
   nativeBuildInputs = [
     dotnet-sdk dotnetPackages.Nuget makeWrapper
     # FIXME: Without `cacert`, we will suffer from https://github.com/NuGet/Announcements/issues/49

From 44651f96f3d723f8e1270f157b48ee42289e0c1f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 5 Aug 2021 15:20:31 +0800
Subject: [PATCH 071/105] olifant: drop package

---
 pkgs/applications/misc/olifant/default.nix | 69 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 pkgs/applications/misc/olifant/default.nix

diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix
deleted file mode 100644
index 48fe90423a95..000000000000
--- a/pkgs/applications/misc/olifant/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ lib, stdenv
-, fetchFromGitHub
-, nix-update-script
-, fetchpatch
-, vala
-, meson
-, ninja
-, pkg-config
-, python3
-, libgee
-, gsettings-desktop-schemas
-, gnome
-, pantheon
-, wrapGAppsHook
-, gtk3
-, json-glib
-, glib
-, glib-networking
-}:
-
-stdenv.mkDerivation rec {
-  pname = "olifant";
-  version = "0.2.1-beta6";
-
-  src = fetchFromGitHub {
-    owner = "cleac";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-3hnEa4Q1dH0R8Jp+Ew0+dH1PEm3F+56jYwqhJ+vll4M=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    python3
-    vala
-    wrapGAppsHook
-  ];
-
-  buildInputs = [
-    glib
-    glib-networking
-    gnome.libsoup
-    gsettings-desktop-schemas
-    gtk3
-    json-glib
-    libgee
-    pantheon.granite
-  ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
-  passthru = {
-    updateScript = nix-update-script {
-      attrPath = pname;
-    };
-  };
-
-  meta = with lib; {
-    description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey";
-    homepage = "https://github.com/cleac/olifant";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ ] ++ teams.pantheon.members;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3f977123d29e..704320f9362b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -538,6 +538,7 @@ mapAliases ({
   oblogout = throw "oblogout has been removed from nixpkgs, as it's archived upstream."; # added 2019-12-10
   octoprint-plugins = throw "octoprint-plugins are now part of the octoprint.python.pkgs package set."; # added 2021-01-24
   ofp = throw "ofp is not compatible with odp-dpdk";
+  olifant = throw "olifant has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
   opencl-icd = ocl-icd; # added 2017-01-20
   openconnect_pa = throw "openconnect_pa fork has been discontinued, support for GlobalProtect is now available in openconnect"; # added 2021-05-21
   openexr_ctl = ctl; # added 2018-04-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8db6277f18bb..bc0e34823d2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27891,8 +27891,6 @@ in
   neovim-qt-unwrapped = libsForQt5.callPackage ../applications/editors/neovim/neovim-qt.nix { };
   neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
 
-  olifant = callPackage ../applications/misc/olifant { };
-
   gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim {
     gtk = pkgs.gtk3;
   };

From 380b350fb3b1dc3c0751a8aab88706d8366b4796 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Thu, 5 Aug 2021 09:20:41 +0200
Subject: [PATCH 072/105] jre-minimal: remove unnecessary test file

Looks like we meant to move this file to `tests/test_jre_minimal.nix` but
somehow we accidentally duplicated it.
---
 .../compilers/openjdk/jre_minimal_test1.nix      | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 pkgs/development/compilers/openjdk/jre_minimal_test1.nix

diff --git a/pkgs/development/compilers/openjdk/jre_minimal_test1.nix b/pkgs/development/compilers/openjdk/jre_minimal_test1.nix
deleted file mode 100644
index eebd11fb2fdf..000000000000
--- a/pkgs/development/compilers/openjdk/jre_minimal_test1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ runCommand
-, callPackage
-, jdk
-, jre_minimal
-}:
-
-let
-  hello = callPackage tests/hello.nix {
-    jdk = jdk;
-    jre = jre_minimal;
-  };
-in
-  runCommand "test" {} ''
-    ${hello}/bin/hello | grep "Hello, world!"
-    touch $out
-  ''

From 39e7ea6b4751458cc9ba957502332fd95e867a44 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien@users.noreply.github.com>
Date: Thu, 5 Aug 2021 07:26:28 +0000
Subject: [PATCH 073/105] qtkeychain: 0.9.1 -> 0.12.0 (#132457)

---
 .../0001-Fixes-build-with-Qt4.patch           | 25 -------------------
 .../libraries/qtkeychain/default.nix          | 23 +++++++----------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/qt5-packages.nix               |  2 +-
 5 files changed, 11 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch

diff --git a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch b/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
deleted file mode 100644
index 4cd7214e61e2..000000000000
--- a/pkgs/development/libraries/qtkeychain/0001-Fixes-build-with-Qt4.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f72e5b67ee1137a0ccd57db5d077a197b01b3cdc Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Tue, 4 Sep 2018 23:19:29 -0400
-Subject: [PATCH] Fixes build with Qt4.
-
----
- keychain_unix.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/keychain_unix.cpp b/keychain_unix.cpp
-index 30b26c3..b27ebef 100644
---- a/keychain_unix.cpp
-+++ b/keychain_unix.cpp
-@@ -91,7 +91,7 @@ static bool isKwallet5Available()
-     // a wallet can be opened.
- 
-     iface.setTimeout(500);
--    QDBusMessage reply = iface.call(QStringLiteral("networkWallet"));
-+    QDBusMessage reply = iface.call("networkWallet");
-     return reply.type() == QDBusMessage::ReplyMessage;
- }
- 
--- 
-2.16.4
-
diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 3da0587210d8..0d3528e92f8a 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -1,27 +1,22 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qt4 ? null
-, withQt5 ? false, qtbase ? null, qttools ? null
-, darwin ? null
+{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, qtbase, qttools
+, CoreFoundation, Security
 , libsecret
 }:
 
-assert withQt5 -> qtbase != null;
-assert withQt5 -> qttools != null;
-assert stdenv.isDarwin -> darwin != null;
-
 stdenv.mkDerivation rec {
-  name = "qtkeychain-${if withQt5 then "qt5" else "qt4"}-${version}";
-  version = "0.9.1";            # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
+  pname = "qtkeychain";
+  version = "0.12.0";            # verify after nix-build with `grep -R "set(PACKAGE_VERSION " result/`
 
   src = fetchFromGitHub {
     owner = "frankosterfeld";
     repo = "qtkeychain";
     rev = "v${version}";
-    sha256 = "0h4wgngn2yl35hapbjs24amkjfbzsvnna4ixfhn87snjnq5lmjbc"; # v0.9.1
+    sha256 = "0gi1nx4bcc1vwfw41cif3xi2i59229vy0kc2r5959d8n6yv31kfr"; # v0.9.1
   };
 
   dontWrapQtApps = true;
 
-  patches = (if withQt5 then [] else [ ./0001-Fixes-build-with-Qt4.patch ]) ++ (if stdenv.isDarwin then [ ./0002-Fix-install-name-Darwin.patch ] else []);
+  patches = [ ./0002-Fix-install-name-Darwin.patch ];
 
   cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=share/qt/translations" ];
 
@@ -30,10 +25,10 @@ stdenv.mkDerivation rec {
   ;
 
   buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]
-    ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ])
-    ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
+    ++ [ qtbase qttools ]
+    ++ lib.optionals stdenv.isDarwin [
       CoreFoundation Security
-    ])
+    ]
   ;
 
   meta = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3f977123d29e..bf8154233b88 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -686,6 +686,7 @@ mapAliases ({
   qvim = throw "qvim has been removed."; # added 2020-08-31
   qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08
   qwt6 = libsForQt5.qwt;  # added 2015-12-19
+  qtkeychain = throw "the qtkeychain attribute (qt4 version) has been removes, use the qt5 version: libsForQt5.qtkeychain"; # added 2021-08-04
   qtcurve = libsForQt5.qtcurve;  # added 2020-11-07
   qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26
   quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ca7c456ad1b..b294ad778e72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18278,8 +18278,6 @@ in
   qtEnv = qt5.env;
   qt5Full = qt5.full;
 
-  qtkeychain = callPackage ../development/libraries/qtkeychain { };
-
   qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
 
   quesoglc = callPackage ../development/libraries/quesoglc { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 4c3518436de8..b98cbd083062 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -183,7 +183,7 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeGear // qt5 // {
   qtinstaller = callPackage ../development/libraries/qtinstaller { };
 
   qtkeychain = callPackage ../development/libraries/qtkeychain {
-    withQt5 = true;
+    inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
   qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { };

From 6af58863a951101aa6e4b12184264061d6bdb98a Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 5 Aug 2021 15:51:06 +0800
Subject: [PATCH 074/105] aesop: drop package

---
 pkgs/applications/office/aesop/default.nix | 53 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 pkgs/top-level/all-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 pkgs/applications/office/aesop/default.nix

diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix
deleted file mode 100644
index 0e151f3adbe9..000000000000
--- a/pkgs/applications/office/aesop/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ lib, stdenv, vala, fetchFromGitHub, nix-update-script, pantheon, pkg-config, meson, ninja, python3, gtk3
-, desktop-file-utils, json-glib, libsoup, libgee, poppler, wrapGAppsHook, fetchpatch }:
-
-stdenv.mkDerivation rec {
-  pname = "aesop";
-  version = "1.2.5";
-
-  src = fetchFromGitHub {
-    owner = "lainsce";
-    repo = pname;
-    rev = version;
-    sha256 = "1zxyyxl959rqhyz871dyyccqga2ydybkfcpyjq4vmvdn2g9mvmb0";
-  };
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    meson
-    ninja
-    pkg-config
-    python3
-    vala
-    wrapGAppsHook
-  ];
-
-  buildInputs = [
-    pantheon.elementary-icon-theme
-    libgee
-    pantheon.granite
-    gtk3
-    json-glib
-    libsoup
-    poppler
-  ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-  '';
-
-  passthru = {
-    updateScript = nix-update-script {
-      attrPath = pname;
-    };
-  };
-
-  meta = with lib; {
-    description = "The simplest PDF viewer around";
-    homepage = "https://github.com/lainsce/aesop";
-    license = licenses.gpl2Plus;
-    maintainers = pantheon.maintainers;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3f977123d29e..1c9b4561eec7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -38,6 +38,7 @@ mapAliases ({
   accounts-qt = libsForQt5.accounts-qt; # added 2015-12-19
   adobeReader = adobe-reader; # added 2013-11-04
   adobe_flex_sdk = apache-flex-sdk; # added 2018-06-01
+  aesop = throw "aesop has been removed from nixpkgs, as it was unmaintained."; # added 2021-08-05
   ag = silver-searcher; # added 2018-04-25
   aircrackng = aircrack-ng; # added 2016-01-14
   aleth = throw "aleth (previously packaged as cpp_ethereum) has been removed; abandoned upstream."; # added 2020-11-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8db6277f18bb..9f4f84358fc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23321,8 +23321,6 @@ in
 
   autopanosiftc = callPackage ../applications/graphics/autopanosiftc { };
 
-  aesop = callPackage ../applications/office/aesop { };
-
   AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { };
 
   avidemux = libsForQt5.callPackage ../applications/video/avidemux { };

From 3198bfe23b2535ad7cd3d8078dc72d03f724560a Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:28:49 +0300
Subject: [PATCH 075/105] kde-frameworks: 5.81 -> 5.83

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../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 55c1e02a955d..06b491056531 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.81/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.83/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index 3d5ad663dd32..a679fefa6daf 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
 
 {
   attica = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/attica-5.81.0.tar.xz";
-      sha256 = "0x1ga3y0kmr2ybgvsmns7imd0agfd5bfc2lf0010ks5s1v50whqr";
-      name = "attica-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/attica-5.83.0.tar.xz";
+      sha256 = "1vmb0ril1z5f5zfazm2py9mjj7g95m98km9h7xl1cp4zkmllgj26";
+      name = "attica-5.83.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/baloo-5.81.0.tar.xz";
-      sha256 = "0mnm282mc1yph9x08fkrycb22gsah4km8r7yk3kz20vnrs0wgljy";
-      name = "baloo-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/baloo-5.83.0.tar.xz";
+      sha256 = "0ahhs07s2q64c1ybqyy2l539awjj36v4rhkr2jxlj4j3m89smbss";
+      name = "baloo-5.83.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/bluez-qt-5.81.0.tar.xz";
-      sha256 = "13wy3nzbq26616s7pa0sx0jrq81v3bvf6a6dlmp1zzycvbk06jp3";
-      name = "bluez-qt-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/bluez-qt-5.83.0.tar.xz";
+      sha256 = "0fvdac35niy96sn2rbprn8g7can452q9q9n5cf4kma7wznndmf8v";
+      name = "bluez-qt-5.83.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/breeze-icons-5.81.0.tar.xz";
-      sha256 = "1844jyair0kjflfq98cakis7xfgbdn7an383f02hp4072kjg127g";
-      name = "breeze-icons-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/breeze-icons-5.83.0.tar.xz";
+      sha256 = "1r3g03mam24g490r87qg5dpxzrf9vlg9bvqg38513nfg1i21k0dj";
+      name = "breeze-icons-5.83.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/extra-cmake-modules-5.81.0.tar.xz";
-      sha256 = "10svwghxf5vhbfwz7lza7xid2n1mj6r1n1amv6c616q68fwf8msz";
-      name = "extra-cmake-modules-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/extra-cmake-modules-5.83.0.tar.xz";
+      sha256 = "07pqw3c86qzrlja0ykwjr9d82r9szaq0410gy7zhhckzj6rz7dvj";
+      name = "extra-cmake-modules-5.83.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/frameworkintegration-5.81.0.tar.xz";
-      sha256 = "0vcbm0364zwkyp33nvcl42px6i9hgnp4wl3lg913qvxv1f7pd61v";
-      name = "frameworkintegration-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/frameworkintegration-5.83.0.tar.xz";
+      sha256 = "1axkysrycxw0y3a152n8r4mbnv9vsafdqfdalndqrmpn5szp2ynj";
+      name = "frameworkintegration-5.83.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kactivities-5.81.0.tar.xz";
-      sha256 = "0sskfpc8yfic2s8hvzf7cjk92pxd0idd0xl0azrjnn28ci5kvzvq";
-      name = "kactivities-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kactivities-5.83.0.tar.xz";
+      sha256 = "0yqp75v05dyv5p3zs9qn3cvqhqxq781m8pfip0syhc97x8pckins";
+      name = "kactivities-5.83.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kactivities-stats-5.81.0.tar.xz";
-      sha256 = "0839g6y101qr5mr98ynfm74f554lxx7srnwm3anh7nj6zrlyxrq2";
-      name = "kactivities-stats-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kactivities-stats-5.83.0.tar.xz";
+      sha256 = "1l9gnl3zwlk0z3g5wc6h50nlplxw3kmc4zd18rczm48330v1zgr2";
+      name = "kactivities-stats-5.83.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kapidox-5.81.0.tar.xz";
-      sha256 = "1wq4py1djmcnqf51l52cij43qw44n5fafz00qslxjb0rdakrvzs2";
-      name = "kapidox-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kapidox-5.83.0.tar.xz";
+      sha256 = "0ixgnm2akays9wiv25snr87358wc0ygnfydhlq0cflqqbyzplqs6";
+      name = "kapidox-5.83.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/karchive-5.81.0.tar.xz";
-      sha256 = "1flnylyglc2jdb9lfk3dl56wzxdliaaqpg2rzrlclzj14lz3l9hy";
-      name = "karchive-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/karchive-5.83.0.tar.xz";
+      sha256 = "0yg3larnhmfjng7cxbxbmyf3l40ypj5wpyjcq1czfy57a4wrbaaw";
+      name = "karchive-5.83.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kauth-5.81.0.tar.xz";
-      sha256 = "1gf93wk95x1fmi4w3ybkj7acwrv7rlz9nw7f1n4nd1w3w7pn403y";
-      name = "kauth-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kauth-5.83.0.tar.xz";
+      sha256 = "1z46695aj7mh4sy6sd1gixwr1xgs3xhbqlxcl63i036n37s7sqfb";
+      name = "kauth-5.83.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kbookmarks-5.81.0.tar.xz";
-      sha256 = "0bqgl3vhr5lngajxz7v4l325kcyylj3d1qznaa946dcbsn2wrgzm";
-      name = "kbookmarks-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kbookmarks-5.83.0.tar.xz";
+      sha256 = "0cp733hpxrhmdjng949215p86kjz64fm30sv386j223iys32h3am";
+      name = "kbookmarks-5.83.0.tar.xz";
     };
   };
   kcalendarcore = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcalendarcore-5.81.0.tar.xz";
-      sha256 = "0a8m8l94cni1fv38sa9wa1mx1m7bnd7qb66wrjrhdd57cfrjij5s";
-      name = "kcalendarcore-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcalendarcore-5.83.0.tar.xz";
+      sha256 = "07xgjb4l5nsswkjlw352yaqzdfxfj0qyasb6zqlx09sws88fkjzb";
+      name = "kcalendarcore-5.83.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcmutils-5.81.0.tar.xz";
-      sha256 = "15q2wvnz8s1g508jbssszzfcgssamdsp7s1vply1677ga8pcspmj";
-      name = "kcmutils-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcmutils-5.83.0.tar.xz";
+      sha256 = "0r86g01mx9mjmqflvdsw93d1dzzg4rixi5nkxxswqa5dlm4ybqaf";
+      name = "kcmutils-5.83.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcodecs-5.81.0.tar.xz";
-      sha256 = "0r757k1rbz1bjk7mc0b2m0ybixai4qfidrs5wvbci971lfsaz4j3";
-      name = "kcodecs-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcodecs-5.83.0.tar.xz";
+      sha256 = "0nc3a4z5wfvkfp5czjq5fz8zg2i0pvc5l7dk8g4ch0kasymjqd82";
+      name = "kcodecs-5.83.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcompletion-5.81.0.tar.xz";
-      sha256 = "15bw6g4ag1s0s3x6390r05i299kl279jrfajna9fxgq3fbjigb7p";
-      name = "kcompletion-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcompletion-5.83.0.tar.xz";
+      sha256 = "0jlysdbkmkny7m82hhyx4im2hm3dlj385w99cb7wzcx7wxzrmfwg";
+      name = "kcompletion-5.83.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kconfig-5.81.0.tar.xz";
-      sha256 = "13xfy3mhi73na4mv0a8l75ba5c8ddnkkdssmsnxp5kj084w9xpqx";
-      name = "kconfig-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kconfig-5.83.0.tar.xz";
+      sha256 = "1s7fhi7yhw5i4igfimbl0ls095nkl1rnxi2z33bjnam215ba113w";
+      name = "kconfig-5.83.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kconfigwidgets-5.81.0.tar.xz";
-      sha256 = "1v7xxn6cd17z71cpdyw2qzfqw4vkzy96wwr1zn9dylnvl8mh4xg0";
-      name = "kconfigwidgets-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kconfigwidgets-5.83.0.tar.xz";
+      sha256 = "1hs0zpggfp08dnra1fdzh652ilgas6c69bck31mglwg0bdrn0cnp";
+      name = "kconfigwidgets-5.83.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcontacts-5.81.0.tar.xz";
-      sha256 = "15wkspgxqj6zh2pr3f7xqcahihbhf45qnqay1v56ry3vl42gncg4";
-      name = "kcontacts-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcontacts-5.83.0.tar.xz";
+      sha256 = "0qy04j860944s7hx0x35wjwbj55l2gr8h0p5yvsw2df9rcwl5b94";
+      name = "kcontacts-5.83.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcoreaddons-5.81.0.tar.xz";
-      sha256 = "1nzyijd8753p9n9fqfb14q30jid2k1j7cvwjqv99l5fxhwbcn35c";
-      name = "kcoreaddons-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcoreaddons-5.83.0.tar.xz";
+      sha256 = "0mwakqbnf97d45xgys9jzalm9p5gp2xaqmjaxxq6r7qm7jv9jg3j";
+      name = "kcoreaddons-5.83.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kcrash-5.81.0.tar.xz";
-      sha256 = "1irw9blm1xsn26mcyaimd8xnygkdpaqh9m8gpf5gpn2s19iz4f81";
-      name = "kcrash-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kcrash-5.83.0.tar.xz";
+      sha256 = "1ix4rzg72l32rs78scv3jicymapwf59gwginp5dvwhymxdrh5vr9";
+      name = "kcrash-5.83.0.tar.xz";
     };
   };
   kdav = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kdav-5.81.0.tar.xz";
-      sha256 = "0cxiif5pb8frz0dpqx0f9j7g29iaspx13alwzvzavbmi0bwzs00b";
-      name = "kdav-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kdav-5.83.0.tar.xz";
+      sha256 = "0fd07yiyzq1xzz911sh8nz39hfwai84mykf0zwjafrxsff4165q0";
+      name = "kdav-5.83.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kdbusaddons-5.81.0.tar.xz";
-      sha256 = "0gbrmgpd8x16zapbqbyh2ipbvysz3z07qk1fc0cmx5x84x1j7xa9";
-      name = "kdbusaddons-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kdbusaddons-5.83.0.tar.xz";
+      sha256 = "01a9jw8xm23f97a54hjqbpq77bb71pc2gsmd6fzcdqq4l71h83qa";
+      name = "kdbusaddons-5.83.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kdeclarative-5.81.0.tar.xz";
-      sha256 = "0s6kal2ppw0vskv7baxvbqfip4hzh8s3399c1j7rahdw67nf9k3x";
-      name = "kdeclarative-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kdeclarative-5.83.0.tar.xz";
+      sha256 = "0h6amiq6hpsi0iyfca7q3m6fm0bf1grn236ypj4r2bs1mjxprals";
+      name = "kdeclarative-5.83.0.tar.xz";
     };
   };
   kded = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kded-5.81.0.tar.xz";
-      sha256 = "1100jrccadj50blq5wmr83wdc3ry46rn86y28dfy4h97cvn1nfsi";
-      name = "kded-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kded-5.83.0.tar.xz";
+      sha256 = "0fwvl08mkci10y1z57chamiq22krhhs97j3gwjg0ihc7qmmrwcb9";
+      name = "kded-5.83.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kdelibs4support-5.81.0.tar.xz";
-      sha256 = "1ck3i46k8sjkqgnaygy5pjqbw1np35sc6nhgxxcm7q84q3cdj536";
-      name = "kdelibs4support-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kdelibs4support-5.83.0.tar.xz";
+      sha256 = "0cp4a37sb0mgshvnvhsxv5s925ksy95z86wv9ng65vkgwd87w6pa";
+      name = "kdelibs4support-5.83.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kdesignerplugin-5.81.0.tar.xz";
-      sha256 = "1rgnj6bns9dnn0g53xk374knc69ajpprjhyb50ffr0dn7cfcs1s3";
-      name = "kdesignerplugin-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kdesignerplugin-5.83.0.tar.xz";
+      sha256 = "138c9834xiqa20c6w1ad15lznn6if278wsa2sjc681vwkncg2gr0";
+      name = "kdesignerplugin-5.83.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kdesu-5.81.0.tar.xz";
-      sha256 = "176531kcvpmb4sklrqpvx4msna1radd2ki410700yvk0l2v4l2yy";
-      name = "kdesu-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kdesu-5.83.0.tar.xz";
+      sha256 = "1qqznk92054hivk68l3yx81jnivmz34s9pjafxcazwkpknzxkvwy";
+      name = "kdesu-5.83.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kdewebkit-5.81.0.tar.xz";
-      sha256 = "022dpmw8r5wkb3pr87fycrybv9j5k2wy8d39rilhjvkqk8s65277";
-      name = "kdewebkit-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kdewebkit-5.83.0.tar.xz";
+      sha256 = "13i5l5q7xz362jvvdbb3zdg70qaz2n3dw95yzzk03yyv6phz4079";
+      name = "kdewebkit-5.83.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kdnssd-5.81.0.tar.xz";
-      sha256 = "1hl49w55r57abnnwdf4hvyjk7566zbqa24bai3zsq24a4nnm6vii";
-      name = "kdnssd-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kdnssd-5.83.0.tar.xz";
+      sha256 = "1192a0gijzpdmbwwai1iyij24bnbrzxnvxy6dgjdhxvxv7j51xbg";
+      name = "kdnssd-5.83.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kdoctools-5.81.0.tar.xz";
-      sha256 = "11qayqx47h4h1y2yqzbm8bysdd7xwb2qjmkk59jxpih7xbmpg1ir";
-      name = "kdoctools-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kdoctools-5.83.0.tar.xz";
+      sha256 = "0nrrksl5ckmpsk4rl2zhq2b05c1ygm5a2nxa53rgyj03bh6ym96k";
+      name = "kdoctools-5.83.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kemoticons-5.81.0.tar.xz";
-      sha256 = "17zv96cfmqg9fxrgm91pn8xwp4f03644g2203c3s7iq3bh8ig3gc";
-      name = "kemoticons-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kemoticons-5.83.0.tar.xz";
+      sha256 = "1h74x9khac7ppj8dpzg1wipva7c2kafvym4vllbaphpbiakg0hww";
+      name = "kemoticons-5.83.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kfilemetadata-5.81.0.tar.xz";
-      sha256 = "0cba7lsjk563ql0hw2rcjxn2khadx1rz7hx4agjb40145f7x931i";
-      name = "kfilemetadata-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kfilemetadata-5.83.0.tar.xz";
+      sha256 = "13h9jiayh8d3g2jjwvq41jj3kjsr6f79znp6phiyidvyvq7gypfn";
+      name = "kfilemetadata-5.83.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kglobalaccel-5.81.0.tar.xz";
-      sha256 = "0adqlfmpfsbbfjiljvbyi4f4blx77qp18anx7npkwh5gjn32hczz";
-      name = "kglobalaccel-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kglobalaccel-5.83.0.tar.xz";
+      sha256 = "1zmg60hjzmvkacdndn5dfc2rgr68q2c9k4hqrx0rf5hnxsxyc1dl";
+      name = "kglobalaccel-5.83.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kguiaddons-5.81.0.tar.xz";
-      sha256 = "1q9yrbbsjh98xl3k4yss5h39fd8nz8y5v9sd7vqjmy49mqsyxxz3";
-      name = "kguiaddons-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kguiaddons-5.83.0.tar.xz";
+      sha256 = "1fga0ri62ib6prm7pfx32103zwl4jg87ikxq2b7m6kq87xcjxxij";
+      name = "kguiaddons-5.83.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kholidays-5.81.0.tar.xz";
-      sha256 = "1pcqzwpmyl6jp9w4xvlgj81iyzbazz2kd07g82cjybz0z3jcxs2c";
-      name = "kholidays-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kholidays-5.83.0.tar.xz";
+      sha256 = "1i4qvbfn1rlg0x09fv4pviibjlrq8515056wr71mb6vqxyjirhr2";
+      name = "kholidays-5.83.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/khtml-5.81.0.tar.xz";
-      sha256 = "0ag23xwl2f9hiwxnwxvwiz3xr07dxpin49li3q98vqq1qzaj1ngp";
-      name = "khtml-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/khtml-5.83.0.tar.xz";
+      sha256 = "04zjjgaq7m6wxbi5p1fijvx8sz7imr6x0bjc5cm4i30xgdwa108y";
+      name = "khtml-5.83.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/ki18n-5.81.0.tar.xz";
-      sha256 = "12m7ddyzw80y9y5gqyr7jgdyc5a0fmxa8zzsd41l7418i2sdajrc";
-      name = "ki18n-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/ki18n-5.83.0.tar.xz";
+      sha256 = "0ppg9gxcpgbizg7fchb006ii8fb9r5j164rlvxi38394cdky9gfi";
+      name = "ki18n-5.83.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kiconthemes-5.81.0.tar.xz";
-      sha256 = "053a7zdig796zc3rnwdlkscylg6wldn1dk0dxqzn14cb8vkbwizw";
-      name = "kiconthemes-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kiconthemes-5.83.0.tar.xz";
+      sha256 = "08dys6g9jyw46kba7jqk4bchyg33r84nd0mll2v6v5a9lhk16zws";
+      name = "kiconthemes-5.83.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kidletime-5.81.0.tar.xz";
-      sha256 = "12zrd9k27hx8ncywd9ahhbcv5xrn7rrw82pcvdkjmyniz0nazrqv";
-      name = "kidletime-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kidletime-5.83.0.tar.xz";
+      sha256 = "13n9hqzkkk5pspv97f478a4541aqhgddh7g07d78jqsgj8krc3ik";
+      name = "kidletime-5.83.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kimageformats-5.81.0.tar.xz";
-      sha256 = "0kl68dy1v4p403f52y7igv2w3wq6q2pb7n0r7fbnwz2113bs0cm3";
-      name = "kimageformats-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kimageformats-5.83.0.tar.xz";
+      sha256 = "05w9iprmij05sif3jygwsmxa4ih9bf13vsmsifvl4alzpzpnaffw";
+      name = "kimageformats-5.83.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kinit-5.81.0.tar.xz";
-      sha256 = "1wv8qyv4mayi80vczf47mdxxa6km4v7r2kz2j483w53nck5hjz4j";
-      name = "kinit-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kinit-5.83.0.tar.xz";
+      sha256 = "12lck3646llymcsbkhc6130qhq024lkc9rzm6kv6kc2hcggyhr61";
+      name = "kinit-5.83.0.tar.xz";
     };
   };
   kio = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kio-5.81.0.tar.xz";
-      sha256 = "0zn0xh07hajcj3h1v5246a167ffm113k8j36p2xn7lbq368sway6";
-      name = "kio-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kio-5.83.0.tar.xz";
+      sha256 = "1hai5w3k77wnaw576gnhv6db90vng8k4npq2ljbp3jycw0csb9gs";
+      name = "kio-5.83.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kirigami2-5.81.0.tar.xz";
-      sha256 = "1bcc2mfb2s4w67q9q35k04mc9154dx1x03vqzclh9ipzdvyjqmyn";
-      name = "kirigami2-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kirigami2-5.83.0.tar.xz";
+      sha256 = "0cpwnqg44j3qb8yqlypkrgjf7fj2nmm90bs0dvmc0jg395z6d3jv";
+      name = "kirigami2-5.83.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kitemmodels-5.81.0.tar.xz";
-      sha256 = "0vs75q08x9yi1953rihk3y234wcsjawdxb3g5xb597f961y634w0";
-      name = "kitemmodels-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kitemmodels-5.83.0.tar.xz";
+      sha256 = "1kyjnqg53s8yn9jglwyx0jqqys5y5m3a49iw1v2ck67wi3vyl3b5";
+      name = "kitemmodels-5.83.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kitemviews-5.81.0.tar.xz";
-      sha256 = "0nmhc675bmilqah9fwwzy4p8rksib90cv8iihxd5c9d9snykk01n";
-      name = "kitemviews-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kitemviews-5.83.0.tar.xz";
+      sha256 = "10p6gpp7mh9cpr1ahg2gh0zq8scd7n856bw899hykdxzajcm06xw";
+      name = "kitemviews-5.83.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kjobwidgets-5.81.0.tar.xz";
-      sha256 = "1gl8ia858jbmj2i9wp4x0mw27p42xm6mg84nj1a8yvvvbazs3hpa";
-      name = "kjobwidgets-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kjobwidgets-5.83.0.tar.xz";
+      sha256 = "1rxmjpxps50wdyvihj5k0sn8flap51ljx3w0x9h5l97ffwd3gfgk";
+      name = "kjobwidgets-5.83.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kjs-5.81.0.tar.xz";
-      sha256 = "049aplmp1nlxshwaw0lfhfr09aazxh4vazvb78429gs84j8ir9xr";
-      name = "kjs-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kjs-5.83.0.tar.xz";
+      sha256 = "1fncc9kaqinm7j60hm0nprxl8wcrj31xqzyiasf5wjcx7sykgg58";
+      name = "kjs-5.83.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kjsembed-5.81.0.tar.xz";
-      sha256 = "0zkazfcrmd0gklzda0hbb4mc493ihsd3dafnmyj6cmgk4lz2w3q9";
-      name = "kjsembed-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kjsembed-5.83.0.tar.xz";
+      sha256 = "0adcihgpgyps5816z4g3hbjaci2z1rkpyzbqz1133cvbcfc41brs";
+      name = "kjsembed-5.83.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kmediaplayer-5.81.0.tar.xz";
-      sha256 = "0z1ji717kwq84i6b2ay9wjhgc4vdkgn1jvwpzgpc1hqs9zly278b";
-      name = "kmediaplayer-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kmediaplayer-5.83.0.tar.xz";
+      sha256 = "02qz56201xz0jns91hfsv6aggl201vja1v136qnp96v8dib8wl1m";
+      name = "kmediaplayer-5.83.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/knewstuff-5.81.0.tar.xz";
-      sha256 = "0wmf86nndnxs1850bjzbwaag6kjdabz0si7b0p1r6hnwm2km9bnk";
-      name = "knewstuff-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/knewstuff-5.83.0.tar.xz";
+      sha256 = "11z65hvc5r3522zk2a3fdx2wpf78lbq2dbi4lnxcxbgcbss5qfqc";
+      name = "knewstuff-5.83.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/knotifications-5.81.0.tar.xz";
-      sha256 = "04yfrhd098asr45swslnfkzxkb9892izvyam5rf0h93pw78ggmqs";
-      name = "knotifications-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/knotifications-5.83.0.tar.xz";
+      sha256 = "01cdf99cz6v04icqwc5h69j7nzlmm46xkp370zkkhg3k0fzskhic";
+      name = "knotifications-5.83.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/knotifyconfig-5.81.0.tar.xz";
-      sha256 = "0xrd9771g1x0s796pw6wkhl9jj9607pffmlxrj171c8n8hdfyjbs";
-      name = "knotifyconfig-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/knotifyconfig-5.83.0.tar.xz";
+      sha256 = "18z42q7bkzi6izfqkh8wygpz04l7cily35rl225jpnlx3zibhrpx";
+      name = "knotifyconfig-5.83.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kpackage-5.81.0.tar.xz";
-      sha256 = "1r1yv5y2swll38l88w559d8q0n4xizwgjp4qd8bh0vvsn24l65ka";
-      name = "kpackage-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kpackage-5.83.0.tar.xz";
+      sha256 = "07l0nyyxqx4dq82xq7a2m492p8hh2a8xv608gig9whk6pa1h15dc";
+      name = "kpackage-5.83.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kparts-5.81.0.tar.xz";
-      sha256 = "1gjqmwg5pjj41vwfsdffvr1gfbkbm12f77rlyfn9gg4z6bjdx47b";
-      name = "kparts-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kparts-5.83.0.tar.xz";
+      sha256 = "1bhs69g4ywss2wvfvhb58rnw1hcbn0xs5ws0677xld87pazpn25y";
+      name = "kparts-5.83.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kpeople-5.81.0.tar.xz";
-      sha256 = "1a63s8c946wrivqs8n680jpmcys8iafyy9j3isl4z5n88df2nnih";
-      name = "kpeople-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kpeople-5.83.0.tar.xz";
+      sha256 = "127079gmdg8gn3jizynnr3avd87zys71mkra47p8sg4ji3is2jrp";
+      name = "kpeople-5.83.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kplotting-5.81.0.tar.xz";
-      sha256 = "1s368amqfqjmr99bz4xc0xfm2sf29s99z3zpwbx2lbjvqh3p5yyb";
-      name = "kplotting-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kplotting-5.83.0.tar.xz";
+      sha256 = "0hcnf4cr9w98sswk1n8qn4fbwnk8b7xcq4w53979zcccls52fj8j";
+      name = "kplotting-5.83.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kpty-5.81.0.tar.xz";
-      sha256 = "0la3jpkki1hskxg12nf3r59fw7r9q8n3sc7wcdik9r9c9rhlyjpk";
-      name = "kpty-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kpty-5.83.0.tar.xz";
+      sha256 = "10da18l2w5wx62j79cyd20ph9ayp968c6d6n9g9f9y54afkivzm5";
+      name = "kpty-5.83.0.tar.xz";
     };
   };
   kquickcharts = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kquickcharts-5.81.0.tar.xz";
-      sha256 = "00w2m0pwilldip873w97l9hvgm6gfy1aj6blyzcxn7x1688lv1jz";
-      name = "kquickcharts-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kquickcharts-5.83.0.tar.xz";
+      sha256 = "0mm3kxdp69zi6y8abakgb637313hwadyna9h4qpfmb41lyqa2ak6";
+      name = "kquickcharts-5.83.0.tar.xz";
     };
   };
   kross = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kross-5.81.0.tar.xz";
-      sha256 = "02jsyarn7ihv547b3vv5xwjm1bs58x5lhdnb74v02cwsgb82wlm3";
-      name = "kross-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kross-5.83.0.tar.xz";
+      sha256 = "1n0d730zvhdg94f8ibjqcscg67m22lm8lvlqfzfbibc355hdf4db";
+      name = "kross-5.83.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/krunner-5.81.0.tar.xz";
-      sha256 = "1yf04qw82hmz8g9hddyalh73b2dxk492n8g856d5m6ccq89c7ga5";
-      name = "krunner-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/krunner-5.83.0.tar.xz";
+      sha256 = "02nvnjlxma0z9dvn9vrqv1q85723i7in4jqxb1v8m9yxmi04di52";
+      name = "krunner-5.83.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kservice-5.81.0.tar.xz";
-      sha256 = "1kb6wz8d879b57hpfi4ybpc9d3r67b205xdjmp3bhz21894haszc";
-      name = "kservice-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kservice-5.83.0.tar.xz";
+      sha256 = "18i9awfkrbx750qfnr3vlpp9w2wrqxrdk9cf6nldmbl0iahr1myc";
+      name = "kservice-5.83.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/ktexteditor-5.81.0.tar.xz";
-      sha256 = "1pbxkkqzk4l8n9am5r6w2s1smqwwcc2wagy9in0k80gbyszp9rvm";
-      name = "ktexteditor-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/ktexteditor-5.83.0.tar.xz";
+      sha256 = "17h36aj0m38igr4bfabjzkd66cwj0mxf0s1j7nylmdmpf5g9jck2";
+      name = "ktexteditor-5.83.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/ktextwidgets-5.81.0.tar.xz";
-      sha256 = "04mn22xmhkxqb138b9wf6jxz39dfp8rigdg3pzr5llx6gmrln9y8";
-      name = "ktextwidgets-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/ktextwidgets-5.83.0.tar.xz";
+      sha256 = "16bknjpn574b0xnc8fr8yxg6gc8mnl4f3rh808j4hbs5127xg00a";
+      name = "ktextwidgets-5.83.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kunitconversion-5.81.0.tar.xz";
-      sha256 = "1g9i253f3qjpcmfiy12zmbi41gld9fxy89d742b44xc88fhj3z1y";
-      name = "kunitconversion-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kunitconversion-5.83.0.tar.xz";
+      sha256 = "01bic73a5l3avqrq7dyfkn2y8xwkq4l6zscj91ddmjan881g10kf";
+      name = "kunitconversion-5.83.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kwallet-5.81.0.tar.xz";
-      sha256 = "1i05j20847bb9b7348f85fln6spqnkp3c9ysr7yvnm8wfyzrd1gz";
-      name = "kwallet-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kwallet-5.83.0.tar.xz";
+      sha256 = "1sczaykjh15pq7ra4vx4y0vhc71zzjdqr3ab12d1p3ni34smfbzw";
+      name = "kwallet-5.83.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kwayland-5.81.0.tar.xz";
-      sha256 = "1a23zcf6aax1fyq4d6y88flyap8wwkbwnq4vkbybpbnxnkbwl8ny";
-      name = "kwayland-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kwayland-5.83.0.tar.xz";
+      sha256 = "1fgs7m2nimqi5y6yd7jy12klb7vf18qhfzdzikm0ff7rcgrp3k4c";
+      name = "kwayland-5.83.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kwidgetsaddons-5.81.0.tar.xz";
-      sha256 = "0hmnlda1hgk6zwx6wnjzqc0b2awv835736sjyczrxcfaxlkfj99g";
-      name = "kwidgetsaddons-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kwidgetsaddons-5.83.0.tar.xz";
+      sha256 = "07a1yk35ss7vayi52hrm0mqkar0yd8w33v5jijga8r69rmmd68s5";
+      name = "kwidgetsaddons-5.83.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kwindowsystem-5.81.0.tar.xz";
-      sha256 = "11ma5vhq8z570danzq9vdwwcq5n6drsm9m3rpvc1vd3kn2mslls7";
-      name = "kwindowsystem-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kwindowsystem-5.83.0.tar.xz";
+      sha256 = "0qfd9js8dy68h5drl62sm61m453vssgfgyzdq33drx1jp16k3bv9";
+      name = "kwindowsystem-5.83.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/kxmlgui-5.81.0.tar.xz";
-      sha256 = "1l3a9qzc1x1ai2g1g551w05n2jxshxr03rcy0n8m8lbf518288yv";
-      name = "kxmlgui-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/kxmlgui-5.83.0.tar.xz";
+      sha256 = "1mn3ywmmbggbjf09gpbkrbchmppfixkyq2a4lra3g85dv5yhpr8v";
+      name = "kxmlgui-5.83.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/portingAids/kxmlrpcclient-5.81.0.tar.xz";
-      sha256 = "15q3w6wdn5ynhyv5244irq51qbm66bl7799zfs964c0y6dmmm3hg";
-      name = "kxmlrpcclient-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/portingAids/kxmlrpcclient-5.83.0.tar.xz";
+      sha256 = "1pf4sl42f1jhwv42bimvs718bdw1vsbhrs50av4hvrsl7cj8qvwi";
+      name = "kxmlrpcclient-5.83.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/modemmanager-qt-5.81.0.tar.xz";
-      sha256 = "01rr4j09xqsja7h699yk58xif7qrlbszd0mim4cncy7pkgwn43h6";
-      name = "modemmanager-qt-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/modemmanager-qt-5.83.0.tar.xz";
+      sha256 = "0gbppx9pda881mizx4nddhsakpx2cg0rry1lyv51z3wgrxxy4rjy";
+      name = "modemmanager-qt-5.83.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/networkmanager-qt-5.81.0.tar.xz";
-      sha256 = "1j26ja4r6ry7134yh8i6rkf6dy6kapnrjap9476mr78ig0d6r2if";
-      name = "networkmanager-qt-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/networkmanager-qt-5.83.0.tar.xz";
+      sha256 = "0vb88fs33szlpg74zf0pa3v08dl5j33lcfvs515y9p1qhkkdg3v1";
+      name = "networkmanager-qt-5.83.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/oxygen-icons5-5.81.0.tar.xz";
-      sha256 = "1s0gvicrfw6dl164cccj05rfhp627mqa9ml0j4dvgvknnrgip6hz";
-      name = "oxygen-icons5-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/oxygen-icons5-5.83.0.tar.xz";
+      sha256 = "04768vbwmaajniqpy3vgp6rdkmanv78pvhn8w92hf40k089sv28p";
+      name = "oxygen-icons5-5.83.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/plasma-framework-5.81.0.tar.xz";
-      sha256 = "0g36a632kafsvhamk33w46cafg1gyir3kkx12fkhyqll2vlpn0v7";
-      name = "plasma-framework-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/plasma-framework-5.83.0.tar.xz";
+      sha256 = "0p8lizkb09rpjin9rzxjah8y5gzn874jk8z74rba9xpcsxvmzpvs";
+      name = "plasma-framework-5.83.0.tar.xz";
     };
   };
   prison = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/prison-5.81.0.tar.xz";
-      sha256 = "1mrrwhg98br4r9g7lj6gn3w1z2gfh9kr7ycispssjalyp6bdf4yg";
-      name = "prison-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/prison-5.83.0.tar.xz";
+      sha256 = "1j72c7asbzb3n34wgp3w628lyc65d4dx0vd9dfhmb807dgcfryba";
+      name = "prison-5.83.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/purpose-5.81.0.tar.xz";
-      sha256 = "0188wxxy6rg6sm722db02nzhmlv3c540zs2qh6h9fbbf1k4h82jf";
-      name = "purpose-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/purpose-5.83.0.tar.xz";
+      sha256 = "0s830i3vqkyraa1ck8ml2c95fp2c31198jm535czxfsfd8w1ml02";
+      name = "purpose-5.83.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/qqc2-desktop-style-5.81.0.tar.xz";
-      sha256 = "1ac4jc6yi6fwndyivc11brlaz3sncxyxzwrfdak8gg579z67zjx5";
-      name = "qqc2-desktop-style-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/qqc2-desktop-style-5.83.0.tar.xz";
+      sha256 = "18gkr34bkqi9z1njm35kz3gsnlll7f7n9f4fink1pvy93plvs361";
+      name = "qqc2-desktop-style-5.83.0.tar.xz";
     };
   };
   solid = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/solid-5.81.0.tar.xz";
-      sha256 = "0w144jdhspjgqpv0xyxr6l6bnh2bazn9jfbw5iim8fj4q5dyr6c1";
-      name = "solid-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/solid-5.83.0.tar.xz";
+      sha256 = "1ijqligf2xxaw833gk0mlywkzsa6n9b9x38ifk4g48i1259sddbk";
+      name = "solid-5.83.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/sonnet-5.81.0.tar.xz";
-      sha256 = "0kin6xngk4bxxn7y06q1pm0vk5s66gh6riv58l051px27m6lwz2a";
-      name = "sonnet-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/sonnet-5.83.0.tar.xz";
+      sha256 = "0bshjqgcb2kl3bfl0zy0f656x47carfg6a25ccdcp6jczby49n5a";
+      name = "sonnet-5.83.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/syndication-5.81.0.tar.xz";
-      sha256 = "1fxdhnd8kl0q13434vbkmjan9dakhn9bdrad9d4vd3x11c77ggkn";
-      name = "syndication-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/syndication-5.83.0.tar.xz";
+      sha256 = "0pz2886zsyfs0y4qbrhr58qrxh75qa0b051h3b1vgi23vlcsipsz";
+      name = "syndication-5.83.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/syntax-highlighting-5.81.0.tar.xz";
-      sha256 = "0paazw8y8kdvwg2waa45az5qgyxi2w5nkfbjg84v1is7yhb065yb";
-      name = "syntax-highlighting-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/syntax-highlighting-5.83.0.tar.xz";
+      sha256 = "0plybipbmxx5f3w7kb1446wiazfzawwa69aplzrdpjhns7n88c2m";
+      name = "syntax-highlighting-5.83.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.81.0";
+    version = "5.83.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.81/threadweaver-5.81.0.tar.xz";
-      sha256 = "03mz4zibvmriaa9qxvqsnp3ahjnhylzjj80w5c6nc4jjywmi89af";
-      name = "threadweaver-5.81.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.83/threadweaver-5.83.0.tar.xz";
+      sha256 = "12h9nahhgws5f9ng11nc0cxp3phhlsi68r57vlgyq78glkgcw3jl";
+      name = "threadweaver-5.83.0.tar.xz";
     };
   };
 }

From ad874fdff11b38a9898e299b52dbce45a0587d3e Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:29:13 +0300
Subject: [PATCH 076/105] baloo: fix outputs

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/development/libraries/kde-frameworks/baloo.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index 8497ec73a3a1..7b092653a327 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -12,5 +12,6 @@ mkDerivation {
     kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
     solid
   ];
+  outputs = [ "dev" "out" ];
   propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
 }

From 80a81926499ab966d5e15b8de1263540bf619149 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:29:51 +0300
Subject: [PATCH 077/105] kwindowsystem: upgrade patch

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../kwindowsystem/0001-platform-plugins-path.patch              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch
index 609376e33e44..0093eb556bfd 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch
@@ -16,7 +16,7 @@ index a255d83..9699b08 100644
      QStringList ret;
      const auto paths = QCoreApplication::libraryPaths();
 -    for (const QString &path : paths) {
--        static const QStringList searchFolders {
+-        static const QStringList searchFolders{
 -            QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
 -            QStringLiteral("/kf5/kwindowsystem"),
 -        };

From 19a4317dd043adcc08445919134884ff46968c79 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:30:07 +0300
Subject: [PATCH 078/105] kpackage: upgrade patches

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../0002-QDirIterator-follow-symlinks.patch   | 31 ++++++-------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch
index 5967bdaccf54..1edf2a1c63c8 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/0002-QDirIterator-follow-symlinks.patch
@@ -12,28 +12,15 @@ diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp
 index f03d882..d5aee56 100644
 --- a/src/kpackage/packageloader.cpp
 +++ b/src/kpackage/packageloader.cpp
-@@ -234,7 +234,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
-         } else {
-             qCDebug(KPACKAGE_LOG) << "kpluginindex: Not cached" << plugindir;
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")};
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp
-index 3eed307..dd6ca6e 100644
---- a/src/kpackage/private/packagejobthread.cpp
-+++ b/src/kpackage/private/packagejobthread.cpp
-@@ -108,7 +108,7 @@ bool indexDirectory(const QString &dir, const QString &dest)
- 
-     QJsonArray plugins;
- 
--    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
+@@ -210,7 +210,7 @@ QList<KPluginMetaData> PackageLoader::listPackages(const QString &packageFormat,
+     }
+
+     for (auto const &plugindir : qAsConst(paths)) {
+-        const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
++        const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
+         const QStringList nameFilters = {QStringLiteral("metadata.json"), QStringLiteral("metadata.desktop")};
+
+         QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
 -- 
 2.30.1
 

From 0173e48ae46c9426fd8a0db6891de4537684f7cf Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:30:29 +0300
Subject: [PATCH 079/105] plasma-wayland-protocols: 1.2.1 -> 1.3.0

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../libraries/plasma-wayland-protocols/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
index ea02eb428db1..fff25d5bb44f 100644
--- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix
+++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix
@@ -5,11 +5,11 @@
 
 mkDerivation rec {
   pname = "plasma-wayland-protocols";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${pname}-v${version}.tar.xz";
-    sha256 = "sha256-KHuQkD+afzlMdedcsYdCaGLq9kqS8b5+LvaOmf2Muqo=";
+    url = "mirror://kde/stable/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-DaojYvLg0V954OAG6NfxkI6I43tcUgi0DJyw1NbcqbU=";
   };
 
   nativeBuildInputs = [ extra-cmake-modules ];

From a5cf968a5f7f0c93dcb375aefd4e8f90fec4b215 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:31:05 +0300
Subject: [PATCH 080/105] plasma5: 5.21.5 -> 5.22.0

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 426 ++++++++++++++++----------------
 2 files changed, 218 insertions(+), 210 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index f281e11544d2..8877cceddbcd 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.21.5/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.0/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 90d70bb8a708..1fd19d103340 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,419 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/bluedevil-5.21.5.tar.xz";
-      sha256 = "12b23xr919lb9hjy0rd9hbcz0x0im2i879affdyjxz4px53kgc16";
-      name = "bluedevil-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/bluedevil-5.22.0.tar.xz";
+      sha256 = "0fnza3scslhr4y7fi6bmhqjvmqblds9svcm4x9p9d4n2ncy5lxyc";
+      name = "bluedevil-5.22.0.tar.xz";
     };
   };
   breeze = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/breeze-5.21.5.tar.xz";
-      sha256 = "034qfnqfhmvszjd4rc41av61qfk60bh5hlzq2r8w8lbxvaawcx4p";
-      name = "breeze-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/breeze-5.22.0.tar.xz";
+      sha256 = "1vwn5w7syi69f6v5nhvc1kh54yj4i76hj22ldzxprzmspw02sg8v";
+      name = "breeze-5.22.0.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/breeze-grub-5.21.5.tar.xz";
-      sha256 = "1vqdq2kxzyrdy31c2xjp200b40892mvgzmlp7ndc9yp3zj6cj9z7";
-      name = "breeze-grub-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/breeze-grub-5.22.0.tar.xz";
+      sha256 = "1hzdhn3ylsp2gn9z7dlf6prsxrzwf3fqirm8cwr2vq82siwa4402";
+      name = "breeze-grub-5.22.0.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/breeze-gtk-5.21.5.tar.xz";
-      sha256 = "06f7y19xrn9lr7ra5fszhs69dkpdna7sn0apwl6xyivl4cphbaqg";
-      name = "breeze-gtk-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/breeze-gtk-5.22.0.tar.xz";
+      sha256 = "03v159m7wz7dmcwdwxfbwyqg24kl3zy39synk95nz15kghnzkq9c";
+      name = "breeze-gtk-5.22.0.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/breeze-plymouth-5.21.5.tar.xz";
-      sha256 = "0rjbbvmngy4m073z9dyy59cdcvkjbxlqg55n19k8m0f6k0r2ibgk";
-      name = "breeze-plymouth-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/breeze-plymouth-5.22.0.tar.xz";
+      sha256 = "18cx829hpnpyb03j7a82jigh78pxjky7zz1rf71p85lz8cn3pvpi";
+      name = "breeze-plymouth-5.22.0.tar.xz";
     };
   };
   discover = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/discover-5.21.5.tar.xz";
-      sha256 = "112g5xigfpazkh5m8pvd8dhiq44g1vnx7md4789pp6axl88dbf19";
-      name = "discover-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/discover-5.22.0.tar.xz";
+      sha256 = "04m8hrqz40cijqjhlqdk00n32a48gjzm8rm3m56n0p7ksbwx61d6";
+      name = "discover-5.22.0.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/drkonqi-5.21.5.tar.xz";
-      sha256 = "1bn69i964467k3967934wkkypkzchdmnkxk5nqxs6md835sfb5a0";
-      name = "drkonqi-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/drkonqi-5.22.0.tar.xz";
+      sha256 = "10r805k7lzd8hds3fls8x3qcic3gfjqmwmz2s2l7l2p5gk1fb8mk";
+      name = "drkonqi-5.22.0.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kactivitymanagerd-5.21.5.tar.xz";
-      sha256 = "1j7hkqlbhiq3hc2yb250x7zdidi4wndpnbm0x9aqrmi7mr63kdbp";
-      name = "kactivitymanagerd-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kactivitymanagerd-5.22.0.tar.xz";
+      sha256 = "0l19zhnwc63kk499h4c4mykhh3jcvxxl2c0i39z4psc641wjp25q";
+      name = "kactivitymanagerd-5.22.0.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kde-cli-tools-5.21.5.tar.xz";
-      sha256 = "0j8yv814qbyl5d5iyzcw5q6w08gkwhsvbdc19nmlbk9zldvy37rn";
-      name = "kde-cli-tools-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kde-cli-tools-5.22.0.tar.xz";
+      sha256 = "1r27p8bslbsfb3i71xaz6nmz2ka5l3aryadp8p0818caimcwpgi8";
+      name = "kde-cli-tools-5.22.0.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kdecoration-5.21.5.tar.xz";
-      sha256 = "0k6mhwkv4r5q57bm7jc9wf51gdk8h8zwafmkfqp7ddg5zmxhnmdw";
-      name = "kdecoration-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kdecoration-5.22.0.tar.xz";
+      sha256 = "1d6mar9kxasdrlq6wqdmjb6m3p2i6r4x6yvgc11fg6fq49mk49sy";
+      name = "kdecoration-5.22.0.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kde-gtk-config-5.21.5.tar.xz";
-      sha256 = "07gc8rydqnvsyrjvgy99ggl5imklzzrmhc36q7kdkp5zkjm7i4gk";
-      name = "kde-gtk-config-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kde-gtk-config-5.22.0.tar.xz";
+      sha256 = "0zmigwj2rsa40pxmvk6yq90w8b7pbkqhmz21laic0ps2sfyvll0z";
+      name = "kde-gtk-config-5.22.0.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kdeplasma-addons-5.21.5.tar.xz";
-      sha256 = "0zbxc58z4v3hl2m9p8gc035k4bmimwv1k0y6gsdviclvdhkdfv9w";
-      name = "kdeplasma-addons-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kdeplasma-addons-5.22.0.tar.xz";
+      sha256 = "1v436mrnf5hbqy6fyaljkcv4k2ihx0n5881fmbqrx5sg5cs9kqs2";
+      name = "kdeplasma-addons-5.22.0.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kgamma5-5.21.5.tar.xz";
-      sha256 = "1qaqcns4xnlxw6pjn7h3gdmwly8w94p9l03bnar7gb75ir342jz6";
-      name = "kgamma5-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kgamma5-5.22.0.tar.xz";
+      sha256 = "0b4k2k4fabpcs80xxai7s2byckfdnq48hpix8pxp6x2bj587cvir";
+      name = "kgamma5-5.22.0.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/khotkeys-5.21.5.tar.xz";
-      sha256 = "04wwz6ji4pna4jd8ps14i9r1s86fdmm7dh8qfy3qz4jzf2gjjn1d";
-      name = "khotkeys-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/khotkeys-5.22.0.tar.xz";
+      sha256 = "169nvlqyk02jwk7pfl3bzvgb69bw4ylsrfshyrdmjg7kbmh9m6k8";
+      name = "khotkeys-5.22.0.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kinfocenter-5.21.5.tar.xz";
-      sha256 = "177llrwhk54s91f69ny5v17w1kvqizap55h40kc1a5bndlgqfnki";
-      name = "kinfocenter-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kinfocenter-5.22.0.tar.xz";
+      sha256 = "08lsaps5654d1gc2am4z5hr31j31m0hj77yhc7lv9d6s9a33r18z";
+      name = "kinfocenter-5.22.0.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kmenuedit-5.21.5.tar.xz";
-      sha256 = "0yzdx80jgjiaw7nk897m151pg67q11qyww2j8r8rx22bz06rfi70";
-      name = "kmenuedit-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kmenuedit-5.22.0.tar.xz";
+      sha256 = "0gwz5p3qk2n5a0d4a28ixl5jjnyc3hjpij0za8gwci8vcqszq3l1";
+      name = "kmenuedit-5.22.0.tar.xz";
     };
   };
   kscreen = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kscreen-5.21.5.tar.xz";
-      sha256 = "1nl43888jib16z0djzy3mck6h9rahdwwdwk76y1hp3nhbbaqnsa6";
-      name = "kscreen-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kscreen-5.22.0.tar.xz";
+      sha256 = "17si6l1rimxlyczkkmqgxg9kn5wvkkj85xfjm7vw37r67f6mx02z";
+      name = "kscreen-5.22.0.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kscreenlocker-5.21.5.tar.xz";
-      sha256 = "0drnj3xdza9cbw8124ja2bic8y37k8q1p7mwfxvhgqciqyvpdb8x";
-      name = "kscreenlocker-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kscreenlocker-5.22.0.tar.xz";
+      sha256 = "0xfw1yrv3razj7yin5jk5i7pa9rrfafk63mvwqwx0jxn8yjczslz";
+      name = "kscreenlocker-5.22.0.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/ksshaskpass-5.21.5.tar.xz";
-      sha256 = "06gi254yq4cr8f5rl83aprsvvham9h5q4jk6cfd67ghwk6ln7yd2";
-      name = "ksshaskpass-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/ksshaskpass-5.22.0.tar.xz";
+      sha256 = "15zldgdkfqyciw2r94rnj8iq6vyfnrfrxcaz52rpzprk71hmdy31";
+      name = "ksshaskpass-5.22.0.tar.xz";
     };
   };
-  ksysguard = {
-    version = "5.21.5";
+  ksystemstats = {
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/ksysguard-5.21.5.tar.xz";
-      sha256 = "1c0vr85j3b1pshyd4w12w9i57bg21gkpvdh1rgqimsnj7yw38fqh";
-      name = "ksysguard-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/ksystemstats-5.22.0.tar.xz";
+      sha256 = "01whxn1jckc20m9mpkazlx2ncd5swh28hbqlbyvyd0s98qd2ywp0";
+      name = "ksystemstats-5.22.0.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kwallet-pam-5.21.5.tar.xz";
-      sha256 = "0svf0iabgfm0sizgar1cbxn2577r04nxh91fznq7jp5zj3lk0gxz";
-      name = "kwallet-pam-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kwallet-pam-5.22.0.tar.xz";
+      sha256 = "0mfn2ib3vx0d7aflyl80xbgci252fyvfk64nhci44lqx5yxh2726";
+      name = "kwallet-pam-5.22.0.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kwayland-integration-5.21.5.tar.xz";
-      sha256 = "1wh44hy1mmrn4kg8jppqvxk9zzfrbiyqzc2i6lfnzic4llz7275x";
-      name = "kwayland-integration-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kwayland-integration-5.22.0.tar.xz";
+      sha256 = "0jb9a6nn9yykp2i8hw59jvwrlcrkbzrhgvbi9l4qxcqaa8z56j13";
+      name = "kwayland-integration-5.22.0.tar.xz";
     };
   };
   kwayland-server = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kwayland-server-5.21.5.tar.xz";
-      sha256 = "1j91iqzrip5ady4cz5ipiirs0dhvib05wwa8h7dqa7ysidpc3krg";
-      name = "kwayland-server-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kwayland-server-5.22.0.tar.xz";
+      sha256 = "150nxf6y4xz0pr9847rgpg84zlfszhmsha178rh50zkzqiqphqc4";
+      name = "kwayland-server-5.22.0.tar.xz";
     };
   };
   kwin = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kwin-5.21.5.tar.xz";
-      sha256 = "0cc3h1n6g902ff50aj3w631cmg6gjaqfvqsfa5jkbxrvl7xfv1m2";
-      name = "kwin-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kwin-5.22.0.tar.xz";
+      sha256 = "008frh2kkhn4686pmmzjw8wvlqycx22c8nhccph1wns47piczrjn";
+      name = "kwin-5.22.0.tar.xz";
     };
   };
   kwrited = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/kwrited-5.21.5.tar.xz";
-      sha256 = "0ki9j44ccgrnm7nh8ddwwkv0144yn2ygfijf0yjyyzb5p5391rz1";
-      name = "kwrited-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/kwrited-5.22.0.tar.xz";
+      sha256 = "0683k1361jkg12fg1hvnn27rl29906c4vy94hm5kz8n8v1syp7h6";
+      name = "kwrited-5.22.0.tar.xz";
+    };
+  };
+  layer-shell-qt = {
+    version = "5.22.0";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.22.0/layer-shell-qt-5.22.0.tar.xz";
+      sha256 = "1xyamll4r3mfh2b8m4mj0x5yxy8y8hlzn6rg7wxa8nl82sbz623y";
+      name = "layer-shell-qt-5.22.0.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/libkscreen-5.21.5.tar.xz";
-      sha256 = "1fkw3rykpj4vvc1iw19kcjhvdbbll6bag91icaxznpir3bvry18k";
-      name = "libkscreen-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/libkscreen-5.22.0.tar.xz";
+      sha256 = "1sws54375yfzjp8dx40q5118dzc2rgr3z32h9nkppz0xzwfwlc06";
+      name = "libkscreen-5.22.0.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/libksysguard-5.21.5.tar.xz";
-      sha256 = "1s7b336ljvnyjsqfn6f6jqbr7k9l4afh2b5rqj7d4ifjm63wdy2z";
-      name = "libksysguard-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/libksysguard-5.22.0.tar.xz";
+      sha256 = "1a874rbdvy14i15xyldqqskfkm1x3343winxnqf4lp3xmwx9glx2";
+      name = "libksysguard-5.22.0.tar.xz";
     };
   };
   milou = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/milou-5.21.5.tar.xz";
-      sha256 = "061vd1slk1h0m4l22sxzkzliag4f8bmrv6cbfhdhhk5a90xxph1i";
-      name = "milou-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/milou-5.22.0.tar.xz";
+      sha256 = "1zag6nbvg2ylf4k4k4b4v3094k6891ay2828hy890p8fyrz4cf7f";
+      name = "milou-5.22.0.tar.xz";
     };
   };
   oxygen = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/oxygen-5.21.5.tar.xz";
-      sha256 = "0j9nv00fxy7l62w7486410ivn8hyfnv736740dqqpl1q4jvd62mc";
-      name = "oxygen-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/oxygen-5.22.0.tar.xz";
+      sha256 = "0id7smj7i4m84zzn7mcig8m2239sp56nly1c5056sphfsxnh37hs";
+      name = "oxygen-5.22.0.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-browser-integration-5.21.5.tar.xz";
-      sha256 = "16v43m5nd48if8j2rbrkklk3w1rg6icggx9hdcw6765q0h1251ab";
-      name = "plasma-browser-integration-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-browser-integration-5.22.0.tar.xz";
+      sha256 = "1lkg76l5y1dd34r9wkkvi39adhhldgwhdgs8dcw9n9vasfh31i88";
+      name = "plasma-browser-integration-5.22.0.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-desktop-5.21.5.tar.xz";
-      sha256 = "09qsnc7dck4j54aj19g94jrd2ifgs7gbxql1ccidj8c0bhq7wl6y";
-      name = "plasma-desktop-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-desktop-5.22.0.tar.xz";
+      sha256 = "1afqq30vlbdiy4fiqhgf11a4ap6lpf4g309ilnmq8zhm6q09iy7l";
+      name = "plasma-desktop-5.22.0.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-disks-5.21.5.tar.xz";
-      sha256 = "1850ms6nmff4mlfshdbbjlf77siv9h6isldhxk36n555mrrq4791";
-      name = "plasma-disks-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-disks-5.22.0.tar.xz";
+      sha256 = "0q7b7y9llk9mbnpnwyac73bddg6s85ha9frd94r2aqkzal61yncb";
+      name = "plasma-disks-5.22.0.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-firewall-5.21.5.tar.xz";
-      sha256 = "1wal8izrwhm20jkjiqf55y6pk2l3ljk16racb8isr73m568ii6ak";
-      name = "plasma-firewall-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-firewall-5.22.0.tar.xz";
+      sha256 = "05fnncdnl9qgikj4bscc9k68mmwqgcl4li5wyc4k23hh98cb0byb";
+      name = "plasma-firewall-5.22.0.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-integration-5.21.5.tar.xz";
-      sha256 = "0x8chc6r3ibv4xxmgi27c0mkr5ym9imw8zzxl596llm4r5q5ax0y";
-      name = "plasma-integration-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-integration-5.22.0.tar.xz";
+      sha256 = "13ih5riybd1vw4zz1x22dw5hj70sp8cs35v27nlvnb48dcz8gxs8";
+      name = "plasma-integration-5.22.0.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-nano-5.21.5.tar.xz";
-      sha256 = "04irqa41y6j4582035inkgwy1q27w0fq7fckfj7pbbjz4p9wqx26";
-      name = "plasma-nano-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-nano-5.22.0.tar.xz";
+      sha256 = "0srg6fw8rhqg379qdnc63xz4q1v8496snc2bpyca4i7y561hkwir";
+      name = "plasma-nano-5.22.0.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-nm-5.21.5.tar.xz";
-      sha256 = "18qbf2n08qcdw6pshhipnpr7sab8nmhj7bfr3qb23s4ildhfd64h";
-      name = "plasma-nm-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-nm-5.22.0.tar.xz";
+      sha256 = "0xd96z37a03x5lxijghngydvs066rkgy3nwvjx1s5jlmsnlz010v";
+      name = "plasma-nm-5.22.0.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-pa-5.21.5.tar.xz";
-      sha256 = "00lhr8j5aj1xhyfsdzvm67d1bhqihrp3ki4zl0bqgvy89fi1xvzn";
-      name = "plasma-pa-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-pa-5.22.0.tar.xz";
+      sha256 = "0ha7kpny7iwdszai1azm00d6a880w54cdhy8l87n8vrw62i3nvvd";
+      name = "plasma-pa-5.22.0.tar.xz";
     };
   };
   plasma-phone-components = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-phone-components-5.21.5.tar.xz";
-      sha256 = "0sg78n5fr38n629h0mf66d61hh43hq2r1ag69krb5g0cdycdj6w1";
-      name = "plasma-phone-components-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-phone-components-5.22.0.tar.xz";
+      sha256 = "1bz1pgvn72y704wcb993jblgzghrnjkx80pn7dsyhix6l5jw29li";
+      name = "plasma-phone-components-5.22.0.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-sdk-5.21.5.tar.xz";
-      sha256 = "15ay8jiyyg2h25w4lnvxjnl606bqjk5j3asgnzjkz3n9ny9c1ah1";
-      name = "plasma-sdk-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-sdk-5.22.0.tar.xz";
+      sha256 = "0lkmnzm7zm2vs8a0z955p1sf50zzqqf6z1gkk609rqch00clqdlh";
+      name = "plasma-sdk-5.22.0.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-systemmonitor-5.21.5.tar.xz";
-      sha256 = "1kwfk3b0y2ssj90qwv3diazl5bpf75aigxy7wvp6izbjsjn7yk9w";
-      name = "plasma-systemmonitor-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-systemmonitor-5.22.0.tar.xz";
+      sha256 = "1jkmwg7h64nh9aggmn9lvfc7a89mbs6kjhvxmgjprxal0wpw583g";
+      name = "plasma-systemmonitor-5.22.0.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-tests-5.21.5.tar.xz";
-      sha256 = "107a0rq220mjhd2g77xaxgs9k29iyzfg5s64rbxrqs8kjzb0h90k";
-      name = "plasma-tests-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-tests-5.22.0.tar.xz";
+      sha256 = "09mc7zlxypwx6igamjgd3jzn5zxscxqqk3yyrgiv25qji33dklf5";
+      name = "plasma-tests-5.22.0.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-thunderbolt-5.21.5.tar.xz";
-      sha256 = "161c94haajs7vnbb0lk94h4mb9kd0by7jai1f8lj0zksk6g5vf51";
-      name = "plasma-thunderbolt-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-thunderbolt-5.22.0.tar.xz";
+      sha256 = "1y1dp591qpqk4m3agka4qyyjdk8vi3h9pwnkg2cpdlkbcsklg47s";
+      name = "plasma-thunderbolt-5.22.0.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-vault-5.21.5.tar.xz";
-      sha256 = "16wpv37jvcbl0p3s3jh15rsjf81bblpc4vxn508mg7z543dba6bm";
-      name = "plasma-vault-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-vault-5.22.0.tar.xz";
+      sha256 = "1awn5rhvlvg95bn2kyanyzxclq0ki07h55384y2qxf19bsyblfqz";
+      name = "plasma-vault-5.22.0.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-workspace-5.21.5.tar.xz";
-      sha256 = "02p931b0iz7gak8i7bhig3j9p7xs6fam7k6hhb5f1bd9pks6xccw";
-      name = "plasma-workspace-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-5.22.0.tar.xz";
+      sha256 = "0z5ppf5sq7hp6zslwqgaazdga25k9vl0xyilcxcgg1wd40q1mm0y";
+      name = "plasma-workspace-5.22.0.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plasma-workspace-wallpapers-5.21.5.tar.xz";
-      sha256 = "0jj0092mhnf45qk84zbisqbndvwg0c160dnra73p5qp1dldwv6km";
-      name = "plasma-workspace-wallpapers-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-wallpapers-5.22.0.tar.xz";
+      sha256 = "056g8924sqqp3zk99xlc00n5gd1fvdg7pqyg5sgzagi9vqw7s18x";
+      name = "plasma-workspace-wallpapers-5.22.0.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/plymouth-kcm-5.21.5.tar.xz";
-      sha256 = "1janrgz8934pzz83npk02p63vxasbmr3dy39x36qr4qmk9b8qzv0";
-      name = "plymouth-kcm-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/plymouth-kcm-5.22.0.tar.xz";
+      sha256 = "03nxl6k2s3w4k50dvda09f7wm7ybar7qx0ayhdhfx9f96j2dg1mr";
+      name = "plymouth-kcm-5.22.0.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.21.5";
+    version = "1-5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/polkit-kde-agent-1-5.21.5.tar.xz";
-      sha256 = "1bc9sqg77xywly7yllzrr81agny96hj5as7gi8n0ji4i9l4av2z6";
-      name = "polkit-kde-agent-1-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/polkit-kde-agent-1-5.22.0.tar.xz";
+      sha256 = "0h6jyc6yrbf7jc7vr2a4ly7wa63fyrak8lix2r9bmsz260sg5jl3";
+      name = "polkit-kde-agent-1-5.22.0.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/powerdevil-5.21.5.tar.xz";
-      sha256 = "18yxs115qk9mgq0mi2ycaqs43c2m9rha7wz245yz2ib3axdk1c7x";
-      name = "powerdevil-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/powerdevil-5.22.0.tar.xz";
+      sha256 = "1h9vfs0adgharcmb66kr54myshzikp7ahbhdqv05rv6jrahc3and";
+      name = "powerdevil-5.22.0.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/qqc2-breeze-style-5.21.5.tar.xz";
-      sha256 = "01z91xr2m9j2ch2d3g10vqy60lflvzp8x9wa7p0nsjm5h3fd9jiy";
-      name = "qqc2-breeze-style-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/qqc2-breeze-style-5.22.0.tar.xz";
+      sha256 = "0vq2n0nd3ppmg3z8f0s3xyrlcav5bfahjazjd301v19fakxj74p6";
+      name = "qqc2-breeze-style-5.22.0.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/sddm-kcm-5.21.5.tar.xz";
-      sha256 = "0v9drq9dlgrv5lkxj3sr2a7ky2h2cqghkq2csh43h8v7a7kwi02j";
-      name = "sddm-kcm-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/sddm-kcm-5.22.0.tar.xz";
+      sha256 = "0kcd717byx4791z17sirp88vwzfx4lbar1i2696q6nciv49w3zn1";
+      name = "sddm-kcm-5.22.0.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/systemsettings-5.21.5.tar.xz";
-      sha256 = "1kbsk37fmin0afw5wrn70504bn0cd5pm7i0bppmpi5y81mplwy4m";
-      name = "systemsettings-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/systemsettings-5.22.0.tar.xz";
+      sha256 = "1vyrp6pln3j9vwd4q0wd77d6qsc1rhrl4v3r7qywhzazrkp6k3k6";
+      name = "systemsettings-5.22.0.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.21.5";
+    version = "5.22.0";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.21.5/xdg-desktop-portal-kde-5.21.5.tar.xz";
-      sha256 = "11c2ndmb432j4gwnvmyliycmd0fqyxj76ywki9hi66cv1lifm9xh";
-      name = "xdg-desktop-portal-kde-5.21.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.0/xdg-desktop-portal-kde-5.22.0.tar.xz";
+      sha256 = "1j6s8jg7viqlmclz6c7wg428qrwiy0c19h38drrrrbalxxl0z4sv";
+      name = "xdg-desktop-portal-kde-5.22.0.tar.xz";
     };
   };
 }

From 85dcd8d3ed9826d09aacc68b2212b366c266e882 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:32:56 +0300
Subject: [PATCH 081/105] ksysguard: replace with throw alias

It was deprecated in favour of system-monitor

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../services/x11/desktop-managers/plasma5.nix   |  1 -
 pkgs/desktops/plasma-5/default.nix              |  3 ++-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix     |  4 ++--
 pkgs/desktops/plasma-5/ksysguard.nix            | 17 -----------------
 .../plasma-5/plasma-desktop/default.nix         |  4 ++--
 pkgs/top-level/aliases.nix                      |  2 +-
 6 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5/ksysguard.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index b6be524aea66..e02e3e6f71ce 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -271,7 +271,6 @@ in
           kmenuedit
           kscreen
           kscreenlocker
-          ksysguard
           kwayland
           kwin
           kwrited
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 9252aa7b39ba..5530d188df01 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -123,12 +123,13 @@ let
       kscreen = callPackage ./kscreen.nix {};
       kscreenlocker = callPackage ./kscreenlocker.nix {};
       ksshaskpass = callPackage ./ksshaskpass.nix {};
-      ksysguard = callPackage ./ksysguard.nix {};
+      ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
       kwallet-pam = callPackage ./kwallet-pam.nix {};
       kwayland-integration = callPackage ./kwayland-integration.nix {};
       kwayland-server = callPackage ./kwayland-server {};
       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 {};
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 94cf73084bfa..77e3cad8d487 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -2,7 +2,7 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kcoreaddons, kcmutils, kholidays,
-  kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard,
+  kio, knewstuff, kpurpose, kross, krunner, kservice,
   kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative,
   qtwebengine, qtx11extras
 }:
@@ -12,7 +12,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kholidays kio
-    knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus
+    knewstuff kpurpose kross krunner kservice kunitconversion ibus
     plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
deleted file mode 100644
index 2c376b537503..000000000000
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules, kdoctools,
-  libcap, libpcap, lm_sensors,
-  kconfig, kcoreaddons, ki18n, kiconthemes, kinit, kitemviews,
-  knewstuff, libksysguard, qtbase,
-  networkmanager-qt, libnl
-}:
-
-mkDerivation {
-  name = "ksysguard";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kconfig kcoreaddons kitemviews kinit kiconthemes knewstuff libksysguard
-    ki18n libcap libpcap lm_sensors networkmanager-qt libnl
-  ];
-}
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index e6b161a07232..aea3c468d7ca 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -12,7 +12,7 @@
   attica, baloo, kaccounts-integration, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
   kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
-  kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon,
+  kpeople, krunner, kscreenlocker, kwallet, kwin, phonon,
   plasma-framework, plasma-workspace, qqc2-desktop-style, xf86inputlibinput
 }:
 
@@ -28,7 +28,7 @@ mkDerivation {
     attica baloo kaccounts-integration kactivities kactivities-stats kauth
     kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons
     kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig
-    kpeople krunner kscreenlocker ksysguard kwallet kwin plasma-framework
+    kpeople krunner kscreenlocker kwallet kwin plasma-framework
     plasma-workspace qqc2-desktop-style
   ];
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bf8154233b88..913878c91789 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1120,7 +1120,7 @@ mapAliases ({
     kgamma5
     kinfocenter
     kmenuedit
-    kscreen kscreenlocker ksshaskpass ksysguard
+    kscreen kscreenlocker ksshaskpass
     kwallet-pam kwayland-integration kwin kwrited
     milou
     oxygen

From 473525a9f25c15ea51f00a7d9e526642fa063372 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:33:28 +0300
Subject: [PATCH 082/105] kwin: upgrade patches

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 ...NixOS-Unwrap-executable-name-for-.desktop-search.patch | 8 ++++----
 pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch    | 8 ++++----
 pkgs/desktops/plasma-5/kwin/0002-xwayland.patch           | 8 ++++----
 .../kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
index 7216f54b6c87..d273e262226f 100644
--- a/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
+++ b/pkgs/desktops/plasma-5/kwin/0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch
@@ -9,13 +9,13 @@ file in-use according to the kernel!
 
 Wrappers cannot affect the `/proc/.../exe` symlink!
 ---
- service_utils.h | 28 +++++++++++++++++++++++++++-
+ src/service_utils.h | 28 +++++++++++++++++++++++++++-
  1 file changed, 27 insertions(+), 1 deletion(-)
 
-diff --git a/service_utils.h b/service_utils.h
+diff --git a/src/service_utils.h b/src/service_utils.h
 index 8a70c1fad..6674f553b 100644
---- a/service_utils.h
-+++ b/service_utils.h
+--- a/src/service_utils.h
++++ b/src/service_utils.h
 @@ -26,8 +26,34 @@ namespace KWin
  const static QString s_waylandInterfaceName = QStringLiteral("X-KDE-Wayland-Interfaces");
  const static QString s_dbusRestrictedInterfaceName = QStringLiteral("X-KDE-DBUS-Restricted-Interfaces");
diff --git a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
index 06b3653acee4..efde4f4dcf04 100644
--- a/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
+++ b/pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch
@@ -4,13 +4,13 @@ Date: Mon, 27 Jan 2020 05:31:13 -0600
 Subject: [PATCH 1/3] follow symlinks
 
 ---
- plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
+ src/plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
+diff --git a/src/plugins/kdecorations/aurorae/src/aurorae.cpp b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
 index 5242cb7..2e4ddae 100644
---- a/plugins/kdecorations/aurorae/src/aurorae.cpp
-+++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
+--- a/src/plugins/kdecorations/aurorae/src/aurorae.cpp
++++ b/src/plugins/kdecorations/aurorae/src/aurorae.cpp
 @@ -201,7 +201,7 @@ void Helper::init()
      // so let's try to locate our plugin:
      QString pluginPath;
diff --git a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
index 312daa093848..9e37d51c4996 100644
--- a/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/0002-xwayland.patch
@@ -4,13 +4,13 @@ Date: Mon, 27 Jan 2020 05:31:23 -0600
 Subject: [PATCH 2/3] xwayland
 
 ---
- xwl/xwayland.cpp | 2 +-
+ src/xwl/xwayland.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
+diff --git a/src/xwl/xwayland.cpp b/src/xwl/xwayland.cpp
 index 57efdde..a211a58 100644
---- a/xwl/xwayland.cpp
-+++ b/xwl/xwayland.cpp
+--- a/src/xwl/xwayland.cpp
++++ b/src/xwl/xwayland.cpp
 @@ -124,7 +124,7 @@ void Xwayland::start()
  
      m_xwaylandProcess = new Process(this);
diff --git a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
index eaffaf591875..50c7cef3f8cd 100644
--- a/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
+++ b/pkgs/desktops/plasma-5/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch
@@ -5,13 +5,13 @@ Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper
 
 Signed-off-by: Yaroslav  Bolyukin <iam@lach.pw>
 ---
- plugins/qpa/main.cpp | 2 +-
+ src/plugins/qpa/main.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/plugins/qpa/main.cpp b/plugins/qpa/main.cpp
+diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp
 index efd236b..a69c046 100644
---- a/plugins/qpa/main.cpp
-+++ b/plugins/qpa/main.cpp
+--- a/src/plugins/qpa/main.cpp
++++ b/src/plugins/qpa/main.cpp
 @@ -23,7 +23,7 @@ public:
  QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList &paramList)
  {

From 96e567cbfebf9f9cb863fd83f155d604586e0186 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:33:45 +0300
Subject: [PATCH 083/105] layer-shell-qt: init

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/layer-shell-qt.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 pkgs/desktops/plasma-5/layer-shell-qt.nix

diff --git a/pkgs/desktops/plasma-5/layer-shell-qt.nix b/pkgs/desktops/plasma-5/layer-shell-qt.nix
new file mode 100644
index 000000000000..9e18bbb4bff5
--- /dev/null
+++ b/pkgs/desktops/plasma-5/layer-shell-qt.nix
@@ -0,0 +1,10 @@
+{ mkDerivation, lib
+, extra-cmake-modules
+, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, wayland-scanner, wayland, wayland-protocols
+}:
+
+mkDerivation {
+  name = "layer-shell-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase wayland-scanner wayland wayland-protocols ];
+}

From b0fb5a4d99a953c9900f018405a4e08bf4d0dad7 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:34:08 +0300
Subject: [PATCH 084/105] kscreenlocker: add layer-shell-qt dependency

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/kscreenlocker.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index f9b8bb5cfc1d..e6c70f8e8cc2 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kglobalaccel, kidletime,
   kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras,
-  wayland,
+  wayland, layer-shell-qt,
 }:
 
 mkDerivation {
@@ -12,6 +12,7 @@ mkDerivation {
   buildInputs = [
     kcmutils kcrash kdeclarative kglobalaccel kidletime kwayland
     libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
+    layer-shell-qt
   ];
   outputs = [ "out" "dev" ];
 }

From f24259a5e4e5dc47df6d29e93cab32fcb5bd8b09 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:34:28 +0300
Subject: [PATCH 085/105] libksysguard: add libnl dependency

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/libksysguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index e291bc5c4c40..ee9237a318c1 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules,
   kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
   knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework,
-  qtbase, qtscript, qtwebengine, qtx11extras
+  qtbase, qtscript, qtwebengine, qtx11extras, libnl
 }:
 
 mkDerivation {
@@ -15,7 +15,7 @@ mkDerivation {
   buildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
     kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
-    qtwebengine knewstuff
+    qtwebengine knewstuff libnl
   ];
   outputs = [ "bin" "dev" "out" ];
 }

From f8394adae9d13ef63f565459b646bb2c53a73728 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Fri, 18 Jun 2021 21:34:54 +0300
Subject: [PATCH 086/105] plasma-desktop: fix synaptics include

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/plasma-desktop/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index aea3c468d7ca..d8ca0ddfdec3 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -41,11 +41,11 @@ mkDerivation {
   '';
   CXXFLAGS = [
     "-I${lib.getDev xorgserver}/include/xorg"
+    "-I${lib.getDev xf86inputsynaptics}/include/xorg"
     ''-DNIXPKGS_HWCLOCK=\"${lib.getBin util-linux}/sbin/hwclock\"''
   ];
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
-    "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg"
     "-DXORGLIBINPUT_INCLUDE_DIRS=${lib.getDev xf86inputlibinput}/include/xorg"
   ];
   postInstall = ''

From 27b3921a864bad94540bbb8b0e802e0447c6d410 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 19 Jun 2021 05:58:21 +0300
Subject: [PATCH 087/105] kde-frameworks: mark as broken for qt < 5.15

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/development/libraries/kde-frameworks/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 94d403b9e343..a5b0bfdae8de 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -28,7 +28,7 @@ existing packages here and modify it as necessary.
 
 let
 
-  minQtVersion = "5.14";
+  minQtVersion = "5.15";
   broken = lib.versionOlder libsForQt5.qtbase.version minQtVersion;
   maintainers = with lib.maintainers; [ ttuegel nyanloutre ];
   license = with lib.licenses; [

From ebdbf67c0ce13cb69ddb14993379beb849528a00 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 19 Jun 2021 06:03:58 +0300
Subject: [PATCH 088/105] plasma-vault: upgrade patch

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../plasma-5/plasma-vault/encfs-path.patch      | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
index e1c325e16934..14f593ea60a8 100644
--- a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch
@@ -2,21 +2,18 @@ diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/
 index 628af7b..6edd38e 100644
 --- a/kded/engine/backends/encfs/encfsbackend.cpp
 +++ b/kded/engine/backends/encfs/encfsbackend.cpp
-@@ -137,7 +137,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
+@@ -100,12 +100,12 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
      auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE);
      KConfigGroup backendConfig(config, "EncfsBackend");
- 
--    return process("encfs",
-+    return process(NIXPKGS_ENCFS,
-                    arguments + backendConfig.readEntry("extraMountOptions", QStringList{}),
-                    {});
+
+-    return process("encfs", arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
++    return process(NIXPKGS_ENCFS, arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), {});
  }
-@@ -146,7 +146,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const
- 
+
  QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const
  {
 -    return process("encfsctl", arguments, {});
 +    return process(NIXPKGS_ENCFSCTL, arguments, {});
  }
- 
- 
+
+ } // namespace PlasmaVault

From f3ea3444fcc1eea84de9d7945d79b0801cf8efe2 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 19 Jun 2021 06:32:37 +0300
Subject: [PATCH 089/105] calligra: fix missing fontconfig dependency

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/applications/office/calligra/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix
index e54a3cbad4cd..2ecc334c3d20 100644
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@@ -8,7 +8,7 @@
 , kcontacts, akonadi, akonadi-calendar, akonadi-contacts
 , eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen
 , librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon
-, poppler, pstoedit, qca-qt5, vc
+, poppler, pstoedit, qca-qt5, vc, fontconfig
 # TODO: package Spnav, m2mml LibEtonyek, Libqgit2
 }:
 
@@ -32,6 +32,7 @@ mkDerivation rec {
     kcontacts akonadi akonadi-calendar akonadi-contacts
     eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge
     libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc
+    fontconfig
   ];
 
   propagatedUserEnvPkgs = [ kproperty ];

From b0f1caf52230dd792655e11f72d6710c85227335 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Thu, 24 Jun 2021 09:14:41 +0300
Subject: [PATCH 090/105] ksystemstats: init at 5.22.0

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../modules/services/x11/desktop-managers/plasma5.nix |  1 +
 pkgs/desktops/plasma-5/default.nix                    |  1 +
 pkgs/desktops/plasma-5/ksystemstats.nix               | 11 +++++++++++
 3 files changed, 13 insertions(+)
 create mode 100644 pkgs/desktops/plasma-5/ksystemstats.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index e02e3e6f71ce..81a6bd65265a 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -271,6 +271,7 @@ in
           kmenuedit
           kscreen
           kscreenlocker
+          ksystemstats
           kwayland
           kwin
           kwrited
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 5530d188df01..7e1bb2b1092b 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -124,6 +124,7 @@ let
       kscreenlocker = callPackage ./kscreenlocker.nix {};
       ksshaskpass = callPackage ./ksshaskpass.nix {};
       ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
+      ksystemstats = callPackage ./ksystemstats.nix {};
       kwallet-pam = callPackage ./kwallet-pam.nix {};
       kwayland-integration = callPackage ./kwayland-integration.nix {};
       kwayland-server = callPackage ./kwayland-server {};
diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix
new file mode 100644
index 000000000000..e41f56c764ef
--- /dev/null
+++ b/pkgs/desktops/plasma-5/ksystemstats.nix
@@ -0,0 +1,11 @@
+{ mkDerivation, lib
+, extra-cmake-modules
+, libksysguard, libnl, lm_sensors, networkmanager-qt
+}:
+
+mkDerivation {
+  name = "ksystemstats";
+  NIX_CFLAGS_COMPILE = [ "-I${libksysguard.bin}/share" ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ];
+}

From b7e79637baadf7fccdd06003afc3f58ac3962b9d Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Thu, 24 Jun 2021 09:15:40 +0300
Subject: [PATCH 091/105] plasma5: install plasma-systemmonitor by default

As ksysguard was replaced, and it was installed by default

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 81a6bd65265a..aac905fea437 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -278,6 +278,7 @@ in
           libkscreen
           libksysguard
           milou
+          plasma-systemmonitor
           plasma-browser-integration
           plasma-integration
           polkit-kde-agent

From fce55cfb60740366fc509b9cc91fd7aa812e3aed Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Thu, 24 Jun 2021 09:27:52 +0300
Subject: [PATCH 092/105] plasma5: 5.22.0 -> 5.22.2

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 424 ++++++++++++++++----------------
 2 files changed, 213 insertions(+), 213 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 8877cceddbcd..559700ee86ad 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.22.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 1fd19d103340..aa369f8d9d3d 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/bluedevil-5.22.0.tar.xz";
-      sha256 = "0fnza3scslhr4y7fi6bmhqjvmqblds9svcm4x9p9d4n2ncy5lxyc";
-      name = "bluedevil-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/bluedevil-5.22.2.1.tar.xz";
+      sha256 = "1ipv6afc40a4q6gifzi8hp723p0p81a41f7mxz5xwzqcxxrdr90l";
+      name = "bluedevil-5.22.2.1.tar.xz";
     };
   };
   breeze = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/breeze-5.22.0.tar.xz";
-      sha256 = "1vwn5w7syi69f6v5nhvc1kh54yj4i76hj22ldzxprzmspw02sg8v";
-      name = "breeze-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/breeze-5.22.2.1.tar.xz";
+      sha256 = "02hi5jx366imbwcmql82da73jrsf64pmlfgh9c8bz3kqrlw5kqnl";
+      name = "breeze-5.22.2.1.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/breeze-grub-5.22.0.tar.xz";
-      sha256 = "1hzdhn3ylsp2gn9z7dlf6prsxrzwf3fqirm8cwr2vq82siwa4402";
-      name = "breeze-grub-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/breeze-grub-5.22.2.1.tar.xz";
+      sha256 = "0vial16xp9s1s9vsaa4pyxnj5n94cym7ylcxnkhmqzl7z9mrykd3";
+      name = "breeze-grub-5.22.2.1.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/breeze-gtk-5.22.0.tar.xz";
-      sha256 = "03v159m7wz7dmcwdwxfbwyqg24kl3zy39synk95nz15kghnzkq9c";
-      name = "breeze-gtk-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/breeze-gtk-5.22.2.1.tar.xz";
+      sha256 = "1vc8lxbkaax12d4dx4wnyjnd4pfs484p04w7fpx884k84r06ldl2";
+      name = "breeze-gtk-5.22.2.1.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/breeze-plymouth-5.22.0.tar.xz";
-      sha256 = "18cx829hpnpyb03j7a82jigh78pxjky7zz1rf71p85lz8cn3pvpi";
-      name = "breeze-plymouth-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/breeze-plymouth-5.22.2.1.tar.xz";
+      sha256 = "1k0xpjr7gg13gxxmla6s7rnlyajps6y6wiwyiddfqj3rl98x3ib4";
+      name = "breeze-plymouth-5.22.2.1.tar.xz";
     };
   };
   discover = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/discover-5.22.0.tar.xz";
-      sha256 = "04m8hrqz40cijqjhlqdk00n32a48gjzm8rm3m56n0p7ksbwx61d6";
-      name = "discover-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/discover-5.22.2.1.tar.xz";
+      sha256 = "15vwhg37656vhjvl58fxy0gl9yc6f8wlrryplvpxm1yb9pz3b81k";
+      name = "discover-5.22.2.1.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/drkonqi-5.22.0.tar.xz";
-      sha256 = "10r805k7lzd8hds3fls8x3qcic3gfjqmwmz2s2l7l2p5gk1fb8mk";
-      name = "drkonqi-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/drkonqi-5.22.2.1.tar.xz";
+      sha256 = "03fk2m6m0w33xgxzcppjrrpg0mrgg1xyjj2674ad0dnmjyp82c3d";
+      name = "drkonqi-5.22.2.1.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kactivitymanagerd-5.22.0.tar.xz";
-      sha256 = "0l19zhnwc63kk499h4c4mykhh3jcvxxl2c0i39z4psc641wjp25q";
-      name = "kactivitymanagerd-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kactivitymanagerd-5.22.2.1.tar.xz";
+      sha256 = "1sd09xy8sxprmfnkh9n2xzzm4ny4qmsiw8sycn52fjwpnj69b2cr";
+      name = "kactivitymanagerd-5.22.2.1.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kde-cli-tools-5.22.0.tar.xz";
-      sha256 = "1r27p8bslbsfb3i71xaz6nmz2ka5l3aryadp8p0818caimcwpgi8";
-      name = "kde-cli-tools-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kde-cli-tools-5.22.2.1.tar.xz";
+      sha256 = "1hlhrj0a5hf9z86m6flj1qzsvl3wbdpb7zmvagrkpjj67xysczgk";
+      name = "kde-cli-tools-5.22.2.1.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kdecoration-5.22.0.tar.xz";
-      sha256 = "1d6mar9kxasdrlq6wqdmjb6m3p2i6r4x6yvgc11fg6fq49mk49sy";
-      name = "kdecoration-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kdecoration-5.22.2.1.tar.xz";
+      sha256 = "1avdz2rvrdfdb5hk82vmgh2grbnyz5av63a1lcinjklrpafn1nj6";
+      name = "kdecoration-5.22.2.1.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kde-gtk-config-5.22.0.tar.xz";
-      sha256 = "0zmigwj2rsa40pxmvk6yq90w8b7pbkqhmz21laic0ps2sfyvll0z";
-      name = "kde-gtk-config-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kde-gtk-config-5.22.2.1.tar.xz";
+      sha256 = "0absshw3p105yr1m38sd79gmzdz54q711ydqbcqglyh7r6h1jhx8";
+      name = "kde-gtk-config-5.22.2.1.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kdeplasma-addons-5.22.0.tar.xz";
-      sha256 = "1v436mrnf5hbqy6fyaljkcv4k2ihx0n5881fmbqrx5sg5cs9kqs2";
-      name = "kdeplasma-addons-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kdeplasma-addons-5.22.2.1.tar.xz";
+      sha256 = "08q0l9p2bgyv3w5022g0g7nlkbhy3nm9nf8rl9mzjmzxrmdnm1yv";
+      name = "kdeplasma-addons-5.22.2.1.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kgamma5-5.22.0.tar.xz";
-      sha256 = "0b4k2k4fabpcs80xxai7s2byckfdnq48hpix8pxp6x2bj587cvir";
-      name = "kgamma5-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kgamma5-5.22.2.1.tar.xz";
+      sha256 = "1h7mrfv17wcgyl7qxm90n8ad1wahrkribrdfk24q4x1hls4qv6bi";
+      name = "kgamma5-5.22.2.1.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/khotkeys-5.22.0.tar.xz";
-      sha256 = "169nvlqyk02jwk7pfl3bzvgb69bw4ylsrfshyrdmjg7kbmh9m6k8";
-      name = "khotkeys-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/khotkeys-5.22.2.1.tar.xz";
+      sha256 = "1wdhxljyw7ax461ih7qrscsf9i034wyc0fswybnrbmnr9pwckf5z";
+      name = "khotkeys-5.22.2.1.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kinfocenter-5.22.0.tar.xz";
-      sha256 = "08lsaps5654d1gc2am4z5hr31j31m0hj77yhc7lv9d6s9a33r18z";
-      name = "kinfocenter-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kinfocenter-5.22.2.1.tar.xz";
+      sha256 = "0l0smj8jbz8nmjb6hh8r4zqamns7vqv3pxxxgk3wa037175k1iil";
+      name = "kinfocenter-5.22.2.1.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kmenuedit-5.22.0.tar.xz";
-      sha256 = "0gwz5p3qk2n5a0d4a28ixl5jjnyc3hjpij0za8gwci8vcqszq3l1";
-      name = "kmenuedit-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kmenuedit-5.22.2.1.tar.xz";
+      sha256 = "0q7zpmy50adsl6swmr3ynnds00gg5bc4c5w7ajph86vy87paa5jn";
+      name = "kmenuedit-5.22.2.1.tar.xz";
     };
   };
   kscreen = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kscreen-5.22.0.tar.xz";
-      sha256 = "17si6l1rimxlyczkkmqgxg9kn5wvkkj85xfjm7vw37r67f6mx02z";
-      name = "kscreen-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kscreen-5.22.2.1.tar.xz";
+      sha256 = "1nrabgml1wyk9kp5dnn6i4kq55fhm5k62a7n4xky3xj8009fb59k";
+      name = "kscreen-5.22.2.1.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kscreenlocker-5.22.0.tar.xz";
-      sha256 = "0xfw1yrv3razj7yin5jk5i7pa9rrfafk63mvwqwx0jxn8yjczslz";
-      name = "kscreenlocker-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kscreenlocker-5.22.2.1.tar.xz";
+      sha256 = "0il32gs3688xvy27y816p3g0i773s5zgi0lwc43s7j5a64bcjg2f";
+      name = "kscreenlocker-5.22.2.1.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/ksshaskpass-5.22.0.tar.xz";
-      sha256 = "15zldgdkfqyciw2r94rnj8iq6vyfnrfrxcaz52rpzprk71hmdy31";
-      name = "ksshaskpass-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/ksshaskpass-5.22.2.1.tar.xz";
+      sha256 = "1qymxy84mg956sjlcxl3ql4nk1xvn0pjci8vs83h4spiysj3ilrl";
+      name = "ksshaskpass-5.22.2.1.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/ksystemstats-5.22.0.tar.xz";
-      sha256 = "01whxn1jckc20m9mpkazlx2ncd5swh28hbqlbyvyd0s98qd2ywp0";
-      name = "ksystemstats-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/ksystemstats-5.22.2.1.tar.xz";
+      sha256 = "15zjiiczxp7pv9q4jql5k8mbd8fpsvhjfg84z878l62562i9dwxw";
+      name = "ksystemstats-5.22.2.1.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kwallet-pam-5.22.0.tar.xz";
-      sha256 = "0mfn2ib3vx0d7aflyl80xbgci252fyvfk64nhci44lqx5yxh2726";
-      name = "kwallet-pam-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kwallet-pam-5.22.2.1.tar.xz";
+      sha256 = "0dsgmifbd6jvydpmlhhf58gwajwbp5sw7ih7hinrxd96i70nj20n";
+      name = "kwallet-pam-5.22.2.1.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kwayland-integration-5.22.0.tar.xz";
-      sha256 = "0jb9a6nn9yykp2i8hw59jvwrlcrkbzrhgvbi9l4qxcqaa8z56j13";
-      name = "kwayland-integration-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kwayland-integration-5.22.2.1.tar.xz";
+      sha256 = "1s4i87axlfxvgpwdfjx5cklqvwc2nbbak343gw3bjijv2s5awikk";
+      name = "kwayland-integration-5.22.2.1.tar.xz";
     };
   };
   kwayland-server = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kwayland-server-5.22.0.tar.xz";
-      sha256 = "150nxf6y4xz0pr9847rgpg84zlfszhmsha178rh50zkzqiqphqc4";
-      name = "kwayland-server-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kwayland-server-5.22.2.1.tar.xz";
+      sha256 = "1ri5fc8znn2wissyxx6jrkk7d4bryidp7xkn7m5pz2bjjm9bywcd";
+      name = "kwayland-server-5.22.2.1.tar.xz";
     };
   };
   kwin = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kwin-5.22.0.tar.xz";
-      sha256 = "008frh2kkhn4686pmmzjw8wvlqycx22c8nhccph1wns47piczrjn";
-      name = "kwin-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kwin-5.22.2.1.tar.xz";
+      sha256 = "0rh1ys4mjjam1gprp54w5acj2hwrm7737mrqxm1kkj0lygn70x68";
+      name = "kwin-5.22.2.1.tar.xz";
     };
   };
   kwrited = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/kwrited-5.22.0.tar.xz";
-      sha256 = "0683k1361jkg12fg1hvnn27rl29906c4vy94hm5kz8n8v1syp7h6";
-      name = "kwrited-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/kwrited-5.22.2.1.tar.xz";
+      sha256 = "07lyi83x2slwgqhgn1llyq49wn4xlcm2wbglr0bsd3nj5n0qsx2j";
+      name = "kwrited-5.22.2.1.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/layer-shell-qt-5.22.0.tar.xz";
-      sha256 = "1xyamll4r3mfh2b8m4mj0x5yxy8y8hlzn6rg7wxa8nl82sbz623y";
-      name = "layer-shell-qt-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/layer-shell-qt-5.22.2.1.tar.xz";
+      sha256 = "053f4kssp67f9mh87klkq73f3x7khc0vml6wphvbiv02rviac8cm";
+      name = "layer-shell-qt-5.22.2.1.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/libkscreen-5.22.0.tar.xz";
-      sha256 = "1sws54375yfzjp8dx40q5118dzc2rgr3z32h9nkppz0xzwfwlc06";
-      name = "libkscreen-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/libkscreen-5.22.2.1.tar.xz";
+      sha256 = "195s6slxnq91dyvhci22hchqdb4clmzq938hmviz2vfyzcdssarq";
+      name = "libkscreen-5.22.2.1.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/libksysguard-5.22.0.tar.xz";
-      sha256 = "1a874rbdvy14i15xyldqqskfkm1x3343winxnqf4lp3xmwx9glx2";
-      name = "libksysguard-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/libksysguard-5.22.2.1.tar.xz";
+      sha256 = "11s95p99jdg0shy3kzzazl1nhss18hvrdagd3pqzdx5cjimcs2gr";
+      name = "libksysguard-5.22.2.1.tar.xz";
     };
   };
   milou = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/milou-5.22.0.tar.xz";
-      sha256 = "1zag6nbvg2ylf4k4k4b4v3094k6891ay2828hy890p8fyrz4cf7f";
-      name = "milou-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/milou-5.22.2.1.tar.xz";
+      sha256 = "13qgalqv0dkjwzgh7i909v9dkzpwgzilzh2p5a537sykdyb2sn2d";
+      name = "milou-5.22.2.1.tar.xz";
     };
   };
   oxygen = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/oxygen-5.22.0.tar.xz";
-      sha256 = "0id7smj7i4m84zzn7mcig8m2239sp56nly1c5056sphfsxnh37hs";
-      name = "oxygen-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/oxygen-5.22.2.1.tar.xz";
+      sha256 = "08sc04sxm8hjv2z7dji5k67p70j9cbw6khznx5s3ivkjwvr7rawx";
+      name = "oxygen-5.22.2.1.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-browser-integration-5.22.0.tar.xz";
-      sha256 = "1lkg76l5y1dd34r9wkkvi39adhhldgwhdgs8dcw9n9vasfh31i88";
-      name = "plasma-browser-integration-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-browser-integration-5.22.2.1.tar.xz";
+      sha256 = "0gkw0mcxmc5vghg63n5jppci1dkm2z27cq8knbvjn33rilswg2yj";
+      name = "plasma-browser-integration-5.22.2.1.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-desktop-5.22.0.tar.xz";
-      sha256 = "1afqq30vlbdiy4fiqhgf11a4ap6lpf4g309ilnmq8zhm6q09iy7l";
-      name = "plasma-desktop-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-desktop-5.22.2.1.tar.xz";
+      sha256 = "0j2jkx2alcl4z3kj3hhfwzd0p8pls9xl5slvcwmhwsgdfzbcqmab";
+      name = "plasma-desktop-5.22.2.1.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-disks-5.22.0.tar.xz";
-      sha256 = "0q7b7y9llk9mbnpnwyac73bddg6s85ha9frd94r2aqkzal61yncb";
-      name = "plasma-disks-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-disks-5.22.2.1.tar.xz";
+      sha256 = "0i5wadi6s4l5afprgpxb5wv9x5v1cafi2mqx14l4l7k3sa5vxdd0";
+      name = "plasma-disks-5.22.2.1.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-firewall-5.22.0.tar.xz";
-      sha256 = "05fnncdnl9qgikj4bscc9k68mmwqgcl4li5wyc4k23hh98cb0byb";
-      name = "plasma-firewall-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-firewall-5.22.2.1.tar.xz";
+      sha256 = "1svr6q36wcjx0ccihh44akzwm5cvy7294hys28xv5yjdg6x2n8wy";
+      name = "plasma-firewall-5.22.2.1.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-integration-5.22.0.tar.xz";
-      sha256 = "13ih5riybd1vw4zz1x22dw5hj70sp8cs35v27nlvnb48dcz8gxs8";
-      name = "plasma-integration-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-integration-5.22.2.1.tar.xz";
+      sha256 = "01hv0qkmn6w0v40maxjglql6w2k4kclm99j4k9bapl9knsg0281z";
+      name = "plasma-integration-5.22.2.1.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-nano-5.22.0.tar.xz";
-      sha256 = "0srg6fw8rhqg379qdnc63xz4q1v8496snc2bpyca4i7y561hkwir";
-      name = "plasma-nano-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-nano-5.22.2.1.tar.xz";
+      sha256 = "05cizgh98x13h3z29cvkq4qvy4mq9q0g0rj9asspjki3qm1hibpf";
+      name = "plasma-nano-5.22.2.1.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-nm-5.22.0.tar.xz";
-      sha256 = "0xd96z37a03x5lxijghngydvs066rkgy3nwvjx1s5jlmsnlz010v";
-      name = "plasma-nm-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-nm-5.22.2.1.tar.xz";
+      sha256 = "1wsdgzjw5a5h73877xxvj0pk39j62291csj50gjkg39figcj2ixg";
+      name = "plasma-nm-5.22.2.1.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-pa-5.22.0.tar.xz";
-      sha256 = "0ha7kpny7iwdszai1azm00d6a880w54cdhy8l87n8vrw62i3nvvd";
-      name = "plasma-pa-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-pa-5.22.2.1.tar.xz";
+      sha256 = "0r6i493633ymkwh09n6gx7avwm5gqlq5qf4zhdavswfcg4h0izhz";
+      name = "plasma-pa-5.22.2.1.tar.xz";
     };
   };
   plasma-phone-components = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-phone-components-5.22.0.tar.xz";
-      sha256 = "1bz1pgvn72y704wcb993jblgzghrnjkx80pn7dsyhix6l5jw29li";
-      name = "plasma-phone-components-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-phone-components-5.22.2.1.tar.xz";
+      sha256 = "0qg3h07mzf7lkfrwbxrv4r91971sfbp9w16r8282vza2ynpf325q";
+      name = "plasma-phone-components-5.22.2.1.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-sdk-5.22.0.tar.xz";
-      sha256 = "0lkmnzm7zm2vs8a0z955p1sf50zzqqf6z1gkk609rqch00clqdlh";
-      name = "plasma-sdk-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-sdk-5.22.2.1.tar.xz";
+      sha256 = "0mvfbss9l26l0kim1x4w4zlvzk48hm2fbnwpbr7cqw0iq4jfxhkp";
+      name = "plasma-sdk-5.22.2.1.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-systemmonitor-5.22.0.tar.xz";
-      sha256 = "1jkmwg7h64nh9aggmn9lvfc7a89mbs6kjhvxmgjprxal0wpw583g";
-      name = "plasma-systemmonitor-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-systemmonitor-5.22.2.1.tar.xz";
+      sha256 = "0ndp94605j2mgzib8557ankn63vybh9ilnqh8zsv5k3mzili3vfd";
+      name = "plasma-systemmonitor-5.22.2.1.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-tests-5.22.0.tar.xz";
-      sha256 = "09mc7zlxypwx6igamjgd3jzn5zxscxqqk3yyrgiv25qji33dklf5";
-      name = "plasma-tests-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-tests-5.22.2.1.tar.xz";
+      sha256 = "13sjnf1msk5v71a6rnvfib9hplqcw35122kj8pyzl5ihwnl7ln26";
+      name = "plasma-tests-5.22.2.1.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-thunderbolt-5.22.0.tar.xz";
-      sha256 = "1y1dp591qpqk4m3agka4qyyjdk8vi3h9pwnkg2cpdlkbcsklg47s";
-      name = "plasma-thunderbolt-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-thunderbolt-5.22.2.1.tar.xz";
+      sha256 = "1cidp2mrsqawdb0vhj1v0d2r9biwdagccdyln5csgkbmdvcq6iir";
+      name = "plasma-thunderbolt-5.22.2.1.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-vault-5.22.0.tar.xz";
-      sha256 = "1awn5rhvlvg95bn2kyanyzxclq0ki07h55384y2qxf19bsyblfqz";
-      name = "plasma-vault-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-vault-5.22.2.1.tar.xz";
+      sha256 = "1f6z38kj3qq3wyv27lj7q6l5hd12h2mwi2i2z9bj6snjgabbxayq";
+      name = "plasma-vault-5.22.2.1.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-5.22.0.tar.xz";
-      sha256 = "0z5ppf5sq7hp6zslwqgaazdga25k9vl0xyilcxcgg1wd40q1mm0y";
-      name = "plasma-workspace-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-5.22.2.1.tar.xz";
+      sha256 = "0q23xsh67mym5zmrifvnk5aw677fngjsqidr92rq0d73rc32v01w";
+      name = "plasma-workspace-5.22.2.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plasma-workspace-wallpapers-5.22.0.tar.xz";
-      sha256 = "056g8924sqqp3zk99xlc00n5gd1fvdg7pqyg5sgzagi9vqw7s18x";
-      name = "plasma-workspace-wallpapers-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-wallpapers-5.22.2.1.tar.xz";
+      sha256 = "15h40xhb7s2kr07jggn9gnggsrwnq29gjm45ywz2z01cayg9frcm";
+      name = "plasma-workspace-wallpapers-5.22.2.1.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/plymouth-kcm-5.22.0.tar.xz";
-      sha256 = "03nxl6k2s3w4k50dvda09f7wm7ybar7qx0ayhdhfx9f96j2dg1mr";
-      name = "plymouth-kcm-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/plymouth-kcm-5.22.2.1.tar.xz";
+      sha256 = "04y21bp1fcr3sb5p0k7hsrimdy04j118g7p11sddad7dv16a4krd";
+      name = "plymouth-kcm-5.22.2.1.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.22.0";
+    version = "1-5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/polkit-kde-agent-1-5.22.0.tar.xz";
-      sha256 = "0h6jyc6yrbf7jc7vr2a4ly7wa63fyrak8lix2r9bmsz260sg5jl3";
-      name = "polkit-kde-agent-1-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/polkit-kde-agent-1-5.22.2.1.tar.xz";
+      sha256 = "0jpp0xkvh3zv5p4axrpr38laikn2c29afrkglly9xdan7hdw4nfb";
+      name = "polkit-kde-agent-1-5.22.2.1.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/powerdevil-5.22.0.tar.xz";
-      sha256 = "1h9vfs0adgharcmb66kr54myshzikp7ahbhdqv05rv6jrahc3and";
-      name = "powerdevil-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/powerdevil-5.22.2.1.tar.xz";
+      sha256 = "15mp2bwn485jazs95iwsd2bcji4ipfn1axm0n9x0l4pmsqzbavwm";
+      name = "powerdevil-5.22.2.1.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/qqc2-breeze-style-5.22.0.tar.xz";
-      sha256 = "0vq2n0nd3ppmg3z8f0s3xyrlcav5bfahjazjd301v19fakxj74p6";
-      name = "qqc2-breeze-style-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/qqc2-breeze-style-5.22.2.1.tar.xz";
+      sha256 = "10grjvm9gnw4a5c9p104fzzxgrz0n6hx34harnwxvk7a9921ry81";
+      name = "qqc2-breeze-style-5.22.2.1.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/sddm-kcm-5.22.0.tar.xz";
-      sha256 = "0kcd717byx4791z17sirp88vwzfx4lbar1i2696q6nciv49w3zn1";
-      name = "sddm-kcm-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/sddm-kcm-5.22.2.1.tar.xz";
+      sha256 = "10c96ryzzq5d9crgnawa4pji3w2cfylikr0kx9335xsl6pi16bfz";
+      name = "sddm-kcm-5.22.2.1.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/systemsettings-5.22.0.tar.xz";
-      sha256 = "1vyrp6pln3j9vwd4q0wd77d6qsc1rhrl4v3r7qywhzazrkp6k3k6";
-      name = "systemsettings-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/systemsettings-5.22.2.1.tar.xz";
+      sha256 = "1i1jrgbfrc0x16j3jkfmiwp07ap7sy4g83ijij8s3maxc6mbyxj4";
+      name = "systemsettings-5.22.2.1.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.22.0";
+    version = "5.22.2.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.0/xdg-desktop-portal-kde-5.22.0.tar.xz";
-      sha256 = "1j6s8jg7viqlmclz6c7wg428qrwiy0c19h38drrrrbalxxl0z4sv";
-      name = "xdg-desktop-portal-kde-5.22.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.2/xdg-desktop-portal-kde-5.22.2.1.tar.xz";
+      sha256 = "065jg40p3xj802bscvhrcv49f849mf1lqp24jip5cicf2jmai5c7";
+      name = "xdg-desktop-portal-kde-5.22.2.1.tar.xz";
     };
   };
 }

From 0cd4fab86489eb61cedab8a33040a7fd25c8801e Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Tue, 6 Jul 2021 19:05:02 +0300
Subject: [PATCH 093/105] plasma5: 5.22.2 -> 5.22.3

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 424 ++++++++++++++++----------------
 2 files changed, 213 insertions(+), 213 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 559700ee86ad..d03f3e86fdd2 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.22.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.22.3/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index aa369f8d9d3d..675cb51e09b7 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/bluedevil-5.22.2.1.tar.xz";
-      sha256 = "1ipv6afc40a4q6gifzi8hp723p0p81a41f7mxz5xwzqcxxrdr90l";
-      name = "bluedevil-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/bluedevil-5.22.3.tar.xz";
+      sha256 = "1qgq4c3c1jmhssq9yllx69df58a884w39ng9z2ddl3kvph6c1f4m";
+      name = "bluedevil-5.22.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/breeze-5.22.2.1.tar.xz";
-      sha256 = "02hi5jx366imbwcmql82da73jrsf64pmlfgh9c8bz3kqrlw5kqnl";
-      name = "breeze-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/breeze-5.22.3.tar.xz";
+      sha256 = "1r10y41l6l2xhmwvy2q03icp6b4163pav98bdrwysrx7pvlj131b";
+      name = "breeze-5.22.3.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/breeze-grub-5.22.2.1.tar.xz";
-      sha256 = "0vial16xp9s1s9vsaa4pyxnj5n94cym7ylcxnkhmqzl7z9mrykd3";
-      name = "breeze-grub-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/breeze-grub-5.22.3.tar.xz";
+      sha256 = "06i0k2s7arfwjzcr972c1zs2kpkxvl57ih9nz5idd0lshamc36gy";
+      name = "breeze-grub-5.22.3.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/breeze-gtk-5.22.2.1.tar.xz";
-      sha256 = "1vc8lxbkaax12d4dx4wnyjnd4pfs484p04w7fpx884k84r06ldl2";
-      name = "breeze-gtk-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/breeze-gtk-5.22.3.tar.xz";
+      sha256 = "1gvx1ip8jkc7pj6bciy3514bkmlazliz60sxdab8b6m00lb0rwng";
+      name = "breeze-gtk-5.22.3.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/breeze-plymouth-5.22.2.1.tar.xz";
-      sha256 = "1k0xpjr7gg13gxxmla6s7rnlyajps6y6wiwyiddfqj3rl98x3ib4";
-      name = "breeze-plymouth-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/breeze-plymouth-5.22.3.tar.xz";
+      sha256 = "03px2jk50plalpnzj6xsbkpqxmj5vkxl7r6y60g7dxf6d4hv15dr";
+      name = "breeze-plymouth-5.22.3.tar.xz";
     };
   };
   discover = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/discover-5.22.2.1.tar.xz";
-      sha256 = "15vwhg37656vhjvl58fxy0gl9yc6f8wlrryplvpxm1yb9pz3b81k";
-      name = "discover-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/discover-5.22.3.tar.xz";
+      sha256 = "1893wwq4m40z6k64n97vqgxkhwcgbhw4q5m5cs0dpczx1803sa8y";
+      name = "discover-5.22.3.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/drkonqi-5.22.2.1.tar.xz";
-      sha256 = "03fk2m6m0w33xgxzcppjrrpg0mrgg1xyjj2674ad0dnmjyp82c3d";
-      name = "drkonqi-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/drkonqi-5.22.3.tar.xz";
+      sha256 = "09jf0rdpb1k2fbbqg3p5ypk7jhp2nls19x1zc8rphnsr1hwxxsb3";
+      name = "drkonqi-5.22.3.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kactivitymanagerd-5.22.2.1.tar.xz";
-      sha256 = "1sd09xy8sxprmfnkh9n2xzzm4ny4qmsiw8sycn52fjwpnj69b2cr";
-      name = "kactivitymanagerd-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kactivitymanagerd-5.22.3.tar.xz";
+      sha256 = "1i2hs9204vi41d3jb6hr050g9v0jm5in07nqyxy1wxw2bmpncisx";
+      name = "kactivitymanagerd-5.22.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kde-cli-tools-5.22.2.1.tar.xz";
-      sha256 = "1hlhrj0a5hf9z86m6flj1qzsvl3wbdpb7zmvagrkpjj67xysczgk";
-      name = "kde-cli-tools-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kde-cli-tools-5.22.3.tar.xz";
+      sha256 = "1w5c65fd0p2xz185prkrr6ys0cy3wasfkbfv1q4qiniwxjipa3q4";
+      name = "kde-cli-tools-5.22.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kdecoration-5.22.2.1.tar.xz";
-      sha256 = "1avdz2rvrdfdb5hk82vmgh2grbnyz5av63a1lcinjklrpafn1nj6";
-      name = "kdecoration-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kdecoration-5.22.3.tar.xz";
+      sha256 = "1bgygqi37yc34nhlf5w32zgz0qvrga9kh7ickxc2gydslvjwaq5p";
+      name = "kdecoration-5.22.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kde-gtk-config-5.22.2.1.tar.xz";
-      sha256 = "0absshw3p105yr1m38sd79gmzdz54q711ydqbcqglyh7r6h1jhx8";
-      name = "kde-gtk-config-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kde-gtk-config-5.22.3.tar.xz";
+      sha256 = "1mq10qbp3jm4mdbkday1afwa0nj9zx8clvaw51qxprcphg4csjy8";
+      name = "kde-gtk-config-5.22.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kdeplasma-addons-5.22.2.1.tar.xz";
-      sha256 = "08q0l9p2bgyv3w5022g0g7nlkbhy3nm9nf8rl9mzjmzxrmdnm1yv";
-      name = "kdeplasma-addons-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kdeplasma-addons-5.22.3.tar.xz";
+      sha256 = "1hd3lv9sjlhab91lsxbg6rkgjcp50zy7n3sj51hdcbsdi8fjr9nh";
+      name = "kdeplasma-addons-5.22.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kgamma5-5.22.2.1.tar.xz";
-      sha256 = "1h7mrfv17wcgyl7qxm90n8ad1wahrkribrdfk24q4x1hls4qv6bi";
-      name = "kgamma5-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kgamma5-5.22.3.tar.xz";
+      sha256 = "1v7jak4bpj5vhzqzq07v9v6b24xqp52k00dx43w2dhsh0vaas9sc";
+      name = "kgamma5-5.22.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/khotkeys-5.22.2.1.tar.xz";
-      sha256 = "1wdhxljyw7ax461ih7qrscsf9i034wyc0fswybnrbmnr9pwckf5z";
-      name = "khotkeys-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/khotkeys-5.22.3.tar.xz";
+      sha256 = "0070nk02nwsbnikvf7qjw0wdxkpfv6nvyv1sw68whnm0xjgxnkl5";
+      name = "khotkeys-5.22.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kinfocenter-5.22.2.1.tar.xz";
-      sha256 = "0l0smj8jbz8nmjb6hh8r4zqamns7vqv3pxxxgk3wa037175k1iil";
-      name = "kinfocenter-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kinfocenter-5.22.3.tar.xz";
+      sha256 = "1qkbhic99ddd55z3wvnhx1ykiy2ydanw32gs7gww8i0adwh0jc3b";
+      name = "kinfocenter-5.22.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kmenuedit-5.22.2.1.tar.xz";
-      sha256 = "0q7zpmy50adsl6swmr3ynnds00gg5bc4c5w7ajph86vy87paa5jn";
-      name = "kmenuedit-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kmenuedit-5.22.3.tar.xz";
+      sha256 = "1ldvx0mvzx3ym7aqz9hk044nn33b97n5bh757v8kwi8fy6yk10xx";
+      name = "kmenuedit-5.22.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kscreen-5.22.2.1.tar.xz";
-      sha256 = "1nrabgml1wyk9kp5dnn6i4kq55fhm5k62a7n4xky3xj8009fb59k";
-      name = "kscreen-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kscreen-5.22.3.tar.xz";
+      sha256 = "09ai5l3rnhsq3fy1faqg8q3hrikmsjq7gvh1rsw542v9ii37bgjn";
+      name = "kscreen-5.22.3.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kscreenlocker-5.22.2.1.tar.xz";
-      sha256 = "0il32gs3688xvy27y816p3g0i773s5zgi0lwc43s7j5a64bcjg2f";
-      name = "kscreenlocker-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kscreenlocker-5.22.3.tar.xz";
+      sha256 = "119jbpvni7id6d1kidi8n4nsxscisyc8ifd5a4q7y73sspdr46fp";
+      name = "kscreenlocker-5.22.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/ksshaskpass-5.22.2.1.tar.xz";
-      sha256 = "1qymxy84mg956sjlcxl3ql4nk1xvn0pjci8vs83h4spiysj3ilrl";
-      name = "ksshaskpass-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/ksshaskpass-5.22.3.tar.xz";
+      sha256 = "1vgnz3j83yypymwqzi9r314zwgvaqp82akyfwzzfw60csb6vqdfr";
+      name = "ksshaskpass-5.22.3.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/ksystemstats-5.22.2.1.tar.xz";
-      sha256 = "15zjiiczxp7pv9q4jql5k8mbd8fpsvhjfg84z878l62562i9dwxw";
-      name = "ksystemstats-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/ksystemstats-5.22.3.tar.xz";
+      sha256 = "0p19lcn8rmpxnnwa6crn9id6pwxixmh68yx6j3cy7z2l3ngfrnka";
+      name = "ksystemstats-5.22.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kwallet-pam-5.22.2.1.tar.xz";
-      sha256 = "0dsgmifbd6jvydpmlhhf58gwajwbp5sw7ih7hinrxd96i70nj20n";
-      name = "kwallet-pam-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kwallet-pam-5.22.3.tar.xz";
+      sha256 = "0x2dw5rgqr0hysdbd4d7nqx4wkxh511xhwfikrgbc3m13vs7l8dg";
+      name = "kwallet-pam-5.22.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kwayland-integration-5.22.2.1.tar.xz";
-      sha256 = "1s4i87axlfxvgpwdfjx5cklqvwc2nbbak343gw3bjijv2s5awikk";
-      name = "kwayland-integration-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kwayland-integration-5.22.3.tar.xz";
+      sha256 = "096a8b4pjc1l57jq08x7x181biichrjp5i3s9kyp2kkd09lk0niz";
+      name = "kwayland-integration-5.22.3.tar.xz";
     };
   };
   kwayland-server = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kwayland-server-5.22.2.1.tar.xz";
-      sha256 = "1ri5fc8znn2wissyxx6jrkk7d4bryidp7xkn7m5pz2bjjm9bywcd";
-      name = "kwayland-server-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kwayland-server-5.22.3.tar.xz";
+      sha256 = "0c5xcnj29d5j9zqj4qnqgs5732aqi6xqpxqwid20v551lf24kc6n";
+      name = "kwayland-server-5.22.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kwin-5.22.2.1.tar.xz";
-      sha256 = "0rh1ys4mjjam1gprp54w5acj2hwrm7737mrqxm1kkj0lygn70x68";
-      name = "kwin-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kwin-5.22.3.tar.xz";
+      sha256 = "03kd07p1hm6s8vkfjr1rlbjj9bpc48k5ynfb364dkypbfin5p6dw";
+      name = "kwin-5.22.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/kwrited-5.22.2.1.tar.xz";
-      sha256 = "07lyi83x2slwgqhgn1llyq49wn4xlcm2wbglr0bsd3nj5n0qsx2j";
-      name = "kwrited-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/kwrited-5.22.3.tar.xz";
+      sha256 = "063hmj24i3hvaw6wzjqs56ln6p9jjfz08f9r04wgzgg01zzyznjn";
+      name = "kwrited-5.22.3.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/layer-shell-qt-5.22.2.1.tar.xz";
-      sha256 = "053f4kssp67f9mh87klkq73f3x7khc0vml6wphvbiv02rviac8cm";
-      name = "layer-shell-qt-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/layer-shell-qt-5.22.3.tar.xz";
+      sha256 = "0jnfhq86419f9y0vs6l7z3n2f63xy7mwz1s0992zx44ambvwfpnq";
+      name = "layer-shell-qt-5.22.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/libkscreen-5.22.2.1.tar.xz";
-      sha256 = "195s6slxnq91dyvhci22hchqdb4clmzq938hmviz2vfyzcdssarq";
-      name = "libkscreen-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/libkscreen-5.22.3.tar.xz";
+      sha256 = "1whhxzbl8sh63490c222y2dn6qcx9rp8wxsmx8mpx9i7p0x3rl01";
+      name = "libkscreen-5.22.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/libksysguard-5.22.2.1.tar.xz";
-      sha256 = "11s95p99jdg0shy3kzzazl1nhss18hvrdagd3pqzdx5cjimcs2gr";
-      name = "libksysguard-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/libksysguard-5.22.3.tar.xz";
+      sha256 = "0sjrm3g4wxscv0p9vkw0p6vr1hdysmngc1l57a26cg1z920zidjh";
+      name = "libksysguard-5.22.3.tar.xz";
     };
   };
   milou = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/milou-5.22.2.1.tar.xz";
-      sha256 = "13qgalqv0dkjwzgh7i909v9dkzpwgzilzh2p5a537sykdyb2sn2d";
-      name = "milou-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/milou-5.22.3.tar.xz";
+      sha256 = "0qcy7snn3r16x0vyz57xv60fnjl565pfq9rd265n3w6543ivc09r";
+      name = "milou-5.22.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/oxygen-5.22.2.1.tar.xz";
-      sha256 = "08sc04sxm8hjv2z7dji5k67p70j9cbw6khznx5s3ivkjwvr7rawx";
-      name = "oxygen-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/oxygen-5.22.3.tar.xz";
+      sha256 = "1fp425ifzk5fxapkwdc4q8xfyajs2skqg83sf1gqh9qsyniw47m5";
+      name = "oxygen-5.22.3.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-browser-integration-5.22.2.1.tar.xz";
-      sha256 = "0gkw0mcxmc5vghg63n5jppci1dkm2z27cq8knbvjn33rilswg2yj";
-      name = "plasma-browser-integration-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-browser-integration-5.22.3.tar.xz";
+      sha256 = "16mpzycxpag946l6fivr5gv5ns5wlmxq7q8mwmhmffa0byg87wxs";
+      name = "plasma-browser-integration-5.22.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-desktop-5.22.2.1.tar.xz";
-      sha256 = "0j2jkx2alcl4z3kj3hhfwzd0p8pls9xl5slvcwmhwsgdfzbcqmab";
-      name = "plasma-desktop-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-desktop-5.22.3.tar.xz";
+      sha256 = "046n6wxbdmjxhv1xvvdkb2vy76cpb7nkj7x5zpkmjy2ifa2q6nxx";
+      name = "plasma-desktop-5.22.3.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-disks-5.22.2.1.tar.xz";
-      sha256 = "0i5wadi6s4l5afprgpxb5wv9x5v1cafi2mqx14l4l7k3sa5vxdd0";
-      name = "plasma-disks-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-disks-5.22.3.tar.xz";
+      sha256 = "1a36mgd32743jmnib2gc9x5yg8ipv7zpjwjq087b39k7sr16c40l";
+      name = "plasma-disks-5.22.3.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-firewall-5.22.2.1.tar.xz";
-      sha256 = "1svr6q36wcjx0ccihh44akzwm5cvy7294hys28xv5yjdg6x2n8wy";
-      name = "plasma-firewall-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-firewall-5.22.3.tar.xz";
+      sha256 = "09300mbq6g193k3bk51g0a21idw5lfvibciiw6dqpn4dxynb8i0d";
+      name = "plasma-firewall-5.22.3.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-integration-5.22.2.1.tar.xz";
-      sha256 = "01hv0qkmn6w0v40maxjglql6w2k4kclm99j4k9bapl9knsg0281z";
-      name = "plasma-integration-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-integration-5.22.3.tar.xz";
+      sha256 = "02xsw10zn3p17zb6nqgbjlsmy6ayxyyr6krnmqdg5xz03p6m9whq";
+      name = "plasma-integration-5.22.3.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-nano-5.22.2.1.tar.xz";
-      sha256 = "05cizgh98x13h3z29cvkq4qvy4mq9q0g0rj9asspjki3qm1hibpf";
-      name = "plasma-nano-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-nano-5.22.3.tar.xz";
+      sha256 = "100ljwavpm02dvf0msp2al2hrjb2ki1zpm57bwkfaqj40knir6p6";
+      name = "plasma-nano-5.22.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-nm-5.22.2.1.tar.xz";
-      sha256 = "1wsdgzjw5a5h73877xxvj0pk39j62291csj50gjkg39figcj2ixg";
-      name = "plasma-nm-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-nm-5.22.3.tar.xz";
+      sha256 = "1imq4j5a62idqjp0bqwbz2rqc9ln1dwxxarxkq68jiw7bvyy0rix";
+      name = "plasma-nm-5.22.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-pa-5.22.2.1.tar.xz";
-      sha256 = "0r6i493633ymkwh09n6gx7avwm5gqlq5qf4zhdavswfcg4h0izhz";
-      name = "plasma-pa-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-pa-5.22.3.tar.xz";
+      sha256 = "184a89qfn58ylakqjh524p3n4knvch85klz534jzxdxzb8kjmn0a";
+      name = "plasma-pa-5.22.3.tar.xz";
     };
   };
   plasma-phone-components = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-phone-components-5.22.2.1.tar.xz";
-      sha256 = "0qg3h07mzf7lkfrwbxrv4r91971sfbp9w16r8282vza2ynpf325q";
-      name = "plasma-phone-components-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-phone-components-5.22.3.tar.xz";
+      sha256 = "1plp49acy83a1ls7i9aafckb62grwhsqv1i7l3hrzdd1ci7gsmxl";
+      name = "plasma-phone-components-5.22.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-sdk-5.22.2.1.tar.xz";
-      sha256 = "0mvfbss9l26l0kim1x4w4zlvzk48hm2fbnwpbr7cqw0iq4jfxhkp";
-      name = "plasma-sdk-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-sdk-5.22.3.tar.xz";
+      sha256 = "0hn7im5wb2jka2q1g5gyp9hr8n000raxpk1rfcr09i8yrc6xhsnj";
+      name = "plasma-sdk-5.22.3.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-systemmonitor-5.22.2.1.tar.xz";
-      sha256 = "0ndp94605j2mgzib8557ankn63vybh9ilnqh8zsv5k3mzili3vfd";
-      name = "plasma-systemmonitor-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-systemmonitor-5.22.3.tar.xz";
+      sha256 = "1lz4j5cv405jfbx4bl522wica0xylc33hgsf8v5915d3i074z669";
+      name = "plasma-systemmonitor-5.22.3.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-tests-5.22.2.1.tar.xz";
-      sha256 = "13sjnf1msk5v71a6rnvfib9hplqcw35122kj8pyzl5ihwnl7ln26";
-      name = "plasma-tests-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-tests-5.22.3.tar.xz";
+      sha256 = "0qvgmk4idxr4ajj33frrsa2xpdgr53am4cvzs70g6fk3wfjm0b9z";
+      name = "plasma-tests-5.22.3.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-thunderbolt-5.22.2.1.tar.xz";
-      sha256 = "1cidp2mrsqawdb0vhj1v0d2r9biwdagccdyln5csgkbmdvcq6iir";
-      name = "plasma-thunderbolt-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-thunderbolt-5.22.3.tar.xz";
+      sha256 = "1f5vnf4zacgzvg9rbga90mcgjzfhrqq1qbbf16syi0xkbg031prz";
+      name = "plasma-thunderbolt-5.22.3.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-vault-5.22.2.1.tar.xz";
-      sha256 = "1f6z38kj3qq3wyv27lj7q6l5hd12h2mwi2i2z9bj6snjgabbxayq";
-      name = "plasma-vault-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-vault-5.22.3.tar.xz";
+      sha256 = "13vdbmbsz6bfjdsbhwv29rm515h7bk11lqc6hk2178yh9p4xn6nk";
+      name = "plasma-vault-5.22.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-5.22.2.1.tar.xz";
-      sha256 = "0q23xsh67mym5zmrifvnk5aw677fngjsqidr92rq0d73rc32v01w";
-      name = "plasma-workspace-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-5.22.3.tar.xz";
+      sha256 = "1mm4lpx094v62h05qlg0rbgk10g8aisnnr82ynyal4m1awahlp6r";
+      name = "plasma-workspace-5.22.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plasma-workspace-wallpapers-5.22.2.1.tar.xz";
-      sha256 = "15h40xhb7s2kr07jggn9gnggsrwnq29gjm45ywz2z01cayg9frcm";
-      name = "plasma-workspace-wallpapers-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plasma-workspace-wallpapers-5.22.3.tar.xz";
+      sha256 = "0xay6zfrvz535n5cl3w40x63b5mvqmzmmha4csbwhingqrxyxqp3";
+      name = "plasma-workspace-wallpapers-5.22.3.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/plymouth-kcm-5.22.2.1.tar.xz";
-      sha256 = "04y21bp1fcr3sb5p0k7hsrimdy04j118g7p11sddad7dv16a4krd";
-      name = "plymouth-kcm-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/plymouth-kcm-5.22.3.tar.xz";
+      sha256 = "0xwn827xi0fwvwsrb69q6k8xgbgdjjhb50v4d9icy1n7dfjlbw19";
+      name = "plymouth-kcm-5.22.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.22.2.1";
+    version = "1-5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/polkit-kde-agent-1-5.22.2.1.tar.xz";
-      sha256 = "0jpp0xkvh3zv5p4axrpr38laikn2c29afrkglly9xdan7hdw4nfb";
-      name = "polkit-kde-agent-1-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/polkit-kde-agent-1-5.22.3.tar.xz";
+      sha256 = "16jdrqgibm9iv1j7vl9n8k7q4sqjqmvzcndq67wyva2lvy2xhjcw";
+      name = "polkit-kde-agent-1-5.22.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/powerdevil-5.22.2.1.tar.xz";
-      sha256 = "15mp2bwn485jazs95iwsd2bcji4ipfn1axm0n9x0l4pmsqzbavwm";
-      name = "powerdevil-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/powerdevil-5.22.3.tar.xz";
+      sha256 = "1i7zx8ykp73g8mav1k8jiizfz4f3lzjvsjf0ky74hklc610hgvb4";
+      name = "powerdevil-5.22.3.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/qqc2-breeze-style-5.22.2.1.tar.xz";
-      sha256 = "10grjvm9gnw4a5c9p104fzzxgrz0n6hx34harnwxvk7a9921ry81";
-      name = "qqc2-breeze-style-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/qqc2-breeze-style-5.22.3.tar.xz";
+      sha256 = "1pfpmqs4469sfk753915jjg78a61jjswzq2ckg1mrvpvjm6c3m3n";
+      name = "qqc2-breeze-style-5.22.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/sddm-kcm-5.22.2.1.tar.xz";
-      sha256 = "10c96ryzzq5d9crgnawa4pji3w2cfylikr0kx9335xsl6pi16bfz";
-      name = "sddm-kcm-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/sddm-kcm-5.22.3.tar.xz";
+      sha256 = "1cp421qk5plp0l3h0z3v6kkfm2qc3j1xk1q7xgfw7s6scrxkj1gp";
+      name = "sddm-kcm-5.22.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/systemsettings-5.22.2.1.tar.xz";
-      sha256 = "1i1jrgbfrc0x16j3jkfmiwp07ap7sy4g83ijij8s3maxc6mbyxj4";
-      name = "systemsettings-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/systemsettings-5.22.3.tar.xz";
+      sha256 = "0hg999vk4nw8hpyl0wmy1h0bcgd9jc7xd1y073bd28bjjpywn5vq";
+      name = "systemsettings-5.22.3.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.22.2.1";
+    version = "5.22.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.22.2/xdg-desktop-portal-kde-5.22.2.1.tar.xz";
-      sha256 = "065jg40p3xj802bscvhrcv49f849mf1lqp24jip5cicf2jmai5c7";
-      name = "xdg-desktop-portal-kde-5.22.2.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.22.3/xdg-desktop-portal-kde-5.22.3.tar.xz";
+      sha256 = "1ggcnwvpp32912jgi2ly1541456kwk18q7a7z7l913vhfyrmsa5q";
+      name = "xdg-desktop-portal-kde-5.22.3.tar.xz";
     };
   };
 }

From c4c5c49fa64b7f4a19d1f2141cdac88cd15063da Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Tue, 6 Jul 2021 19:10:14 +0300
Subject: [PATCH 094/105] kde-frameworks: remove outdated patch

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../libraries/kde-frameworks/kimageformats.nix    | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 00a9ef015f29..97b413e805c6 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchpatch,
+  mkDerivation, lib,
   extra-cmake-modules,
   ilmbase, karchive, openexr, libavif, qtbase
 }:
@@ -9,19 +9,6 @@ let inherit (lib) getDev; in
 mkDerivation {
   name = "kimageformats";
 
-  patches = [
-    (fetchpatch { # included in kimageformats >= 5.83
-      name = "avif-0.9.2.diff";
-      url = "https://invent.kde.org/frameworks/kimageformats/-/commit/bf3f94da766d66a0470ab744dbe1ced4697b572d.diff";
-      sha256 = "18d67l5kj9sv88jdpi061k9rl3adzkx9l51ng7saylrkfddwc3ig";
-    })
-    (fetchpatch { # included in kimageformats >= 5.82
-      name = "CVE-2021-36083.patch";
-      url = "https://invent.kde.org/frameworks/kimageformats/-/commit/297ed9a2fe339bfe36916b9fce628c3242e5be0f.diff";
-      sha256 = "16axaljgaar0j5796x1mjps93y92393x8zywh3nzw7rm9w2qxzml";
-    })
-  ];
-
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive openexr libavif qtbase ];
   outputs = [ "out" ]; # plugins only

From 08f219f22e6ab01cf9600383666b55666e2ff724 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 10 Jul 2021 16:27:53 +0300
Subject: [PATCH 095/105] kde-frameworks: 5.83 -> 5.84

Signed-off-by: Yaroslav Bolyukin <iam@lach.pw>
---
 .../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 06b491056531..93d7cbef74c3 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.83/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.84/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index a679fefa6daf..34792d254e72 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -4,667 +4,667 @@
 
 {
   attica = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/attica-5.83.0.tar.xz";
-      sha256 = "1vmb0ril1z5f5zfazm2py9mjj7g95m98km9h7xl1cp4zkmllgj26";
-      name = "attica-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/attica-5.84.0.tar.xz";
+      sha256 = "1q5imda1p26rw3lzz7p6wlg63d2kjl6yx93pxryy129xwyxszf5d";
+      name = "attica-5.84.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/baloo-5.83.0.tar.xz";
-      sha256 = "0ahhs07s2q64c1ybqyy2l539awjj36v4rhkr2jxlj4j3m89smbss";
-      name = "baloo-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/baloo-5.84.0.tar.xz";
+      sha256 = "15ldfq9qryw2xna6kr316fqldrfd2r09qj9ig8i2x391x18dzhg4";
+      name = "baloo-5.84.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/bluez-qt-5.83.0.tar.xz";
-      sha256 = "0fvdac35niy96sn2rbprn8g7can452q9q9n5cf4kma7wznndmf8v";
-      name = "bluez-qt-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/bluez-qt-5.84.0.tar.xz";
+      sha256 = "0pg6zj0b7j9v339g1q5a9dm1l0a7n1c388n26x6k2s1q785vk6lh";
+      name = "bluez-qt-5.84.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/breeze-icons-5.83.0.tar.xz";
-      sha256 = "1r3g03mam24g490r87qg5dpxzrf9vlg9bvqg38513nfg1i21k0dj";
-      name = "breeze-icons-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/breeze-icons-5.84.0.tar.xz";
+      sha256 = "1320c84pr39541lb4zk33brxx593dbvvnij5x8as4rp99mcjd6h4";
+      name = "breeze-icons-5.84.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/extra-cmake-modules-5.83.0.tar.xz";
-      sha256 = "07pqw3c86qzrlja0ykwjr9d82r9szaq0410gy7zhhckzj6rz7dvj";
-      name = "extra-cmake-modules-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/extra-cmake-modules-5.84.0.tar.xz";
+      sha256 = "0h8w5ahjpbb524qgabzbgd4x2j8qnfv1d1cq8vzq5hbpw7r5w25v";
+      name = "extra-cmake-modules-5.84.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/frameworkintegration-5.83.0.tar.xz";
-      sha256 = "1axkysrycxw0y3a152n8r4mbnv9vsafdqfdalndqrmpn5szp2ynj";
-      name = "frameworkintegration-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/frameworkintegration-5.84.0.tar.xz";
+      sha256 = "0jzrsw5fkbgk8xpdjfjprqm1vpa61x32zikyj370shcg3qsaiyir";
+      name = "frameworkintegration-5.84.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kactivities-5.83.0.tar.xz";
-      sha256 = "0yqp75v05dyv5p3zs9qn3cvqhqxq781m8pfip0syhc97x8pckins";
-      name = "kactivities-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kactivities-5.84.0.tar.xz";
+      sha256 = "0lihxr9jvmg2h7k36djdfvsz5slxzzgxpxmv9745ynvc92fr1c46";
+      name = "kactivities-5.84.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kactivities-stats-5.83.0.tar.xz";
-      sha256 = "1l9gnl3zwlk0z3g5wc6h50nlplxw3kmc4zd18rczm48330v1zgr2";
-      name = "kactivities-stats-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kactivities-stats-5.84.0.tar.xz";
+      sha256 = "1mb80jzccvha6rnd9q0xych1k4p0nfdyh7s9ryafv9fqqhzr5fh4";
+      name = "kactivities-stats-5.84.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kapidox-5.83.0.tar.xz";
-      sha256 = "0ixgnm2akays9wiv25snr87358wc0ygnfydhlq0cflqqbyzplqs6";
-      name = "kapidox-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kapidox-5.84.0.tar.xz";
+      sha256 = "0h8isigbgc02df3kb875p7yzy04i41lss2r5awlh5b1np89l5g51";
+      name = "kapidox-5.84.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/karchive-5.83.0.tar.xz";
-      sha256 = "0yg3larnhmfjng7cxbxbmyf3l40ypj5wpyjcq1czfy57a4wrbaaw";
-      name = "karchive-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/karchive-5.84.0.tar.xz";
+      sha256 = "1xjykx94xn0p1926my4f82dn9bsv2b2mv1l4pjpzzfwyn26df34s";
+      name = "karchive-5.84.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kauth-5.83.0.tar.xz";
-      sha256 = "1z46695aj7mh4sy6sd1gixwr1xgs3xhbqlxcl63i036n37s7sqfb";
-      name = "kauth-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kauth-5.84.0.tar.xz";
+      sha256 = "1jwynarchwbgdnfzpp3r8ggr8mz2gwgwiv9j2kxmh0m607sqzj04";
+      name = "kauth-5.84.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kbookmarks-5.83.0.tar.xz";
-      sha256 = "0cp733hpxrhmdjng949215p86kjz64fm30sv386j223iys32h3am";
-      name = "kbookmarks-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kbookmarks-5.84.0.tar.xz";
+      sha256 = "1k3mamhd55j3hvkw7h0gfizy5hg37d57h26xz9hbxrw1lb1p9gyc";
+      name = "kbookmarks-5.84.0.tar.xz";
     };
   };
   kcalendarcore = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcalendarcore-5.83.0.tar.xz";
-      sha256 = "07xgjb4l5nsswkjlw352yaqzdfxfj0qyasb6zqlx09sws88fkjzb";
-      name = "kcalendarcore-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcalendarcore-5.84.0.tar.xz";
+      sha256 = "06asygdsk4bnn29cc8khpzy68fiyrqwajl55fixmja7kvzsnq4cb";
+      name = "kcalendarcore-5.84.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcmutils-5.83.0.tar.xz";
-      sha256 = "0r86g01mx9mjmqflvdsw93d1dzzg4rixi5nkxxswqa5dlm4ybqaf";
-      name = "kcmutils-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcmutils-5.84.0.tar.xz";
+      sha256 = "1ackicsg2xnjl8gid9v4a72vvqhn7536s0w1g50hss142hp0b9zf";
+      name = "kcmutils-5.84.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcodecs-5.83.0.tar.xz";
-      sha256 = "0nc3a4z5wfvkfp5czjq5fz8zg2i0pvc5l7dk8g4ch0kasymjqd82";
-      name = "kcodecs-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcodecs-5.84.0.tar.xz";
+      sha256 = "0fjjz40kchw38p74zvgrcfsgclg54w6b8bl6ly72qmj5n0ip2gr3";
+      name = "kcodecs-5.84.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcompletion-5.83.0.tar.xz";
-      sha256 = "0jlysdbkmkny7m82hhyx4im2hm3dlj385w99cb7wzcx7wxzrmfwg";
-      name = "kcompletion-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcompletion-5.84.0.tar.xz";
+      sha256 = "1kbj1f3c3qpfxn4jyldhzlmgxfxn0af5rbs0irzwd9wqgk9i94vs";
+      name = "kcompletion-5.84.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kconfig-5.83.0.tar.xz";
-      sha256 = "1s7fhi7yhw5i4igfimbl0ls095nkl1rnxi2z33bjnam215ba113w";
-      name = "kconfig-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kconfig-5.84.0.tar.xz";
+      sha256 = "0wshg4hx4d6m1r17mc7l9ivhx6mw0h1qx8fd46hmydmbjp030jma";
+      name = "kconfig-5.84.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kconfigwidgets-5.83.0.tar.xz";
-      sha256 = "1hs0zpggfp08dnra1fdzh652ilgas6c69bck31mglwg0bdrn0cnp";
-      name = "kconfigwidgets-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kconfigwidgets-5.84.0.tar.xz";
+      sha256 = "17hyf495wlm5jqc0qxxymy1kcjybbihg8093kf59hvvpcci5xsin";
+      name = "kconfigwidgets-5.84.0.tar.xz";
     };
   };
   kcontacts = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcontacts-5.83.0.tar.xz";
-      sha256 = "0qy04j860944s7hx0x35wjwbj55l2gr8h0p5yvsw2df9rcwl5b94";
-      name = "kcontacts-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcontacts-5.84.0.tar.xz";
+      sha256 = "0gvskvfwfmrs884fkfl0gvmnic4hhymffs7jhq6yaixbsjl2mznl";
+      name = "kcontacts-5.84.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcoreaddons-5.83.0.tar.xz";
-      sha256 = "0mwakqbnf97d45xgys9jzalm9p5gp2xaqmjaxxq6r7qm7jv9jg3j";
-      name = "kcoreaddons-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcoreaddons-5.84.0.tar.xz";
+      sha256 = "1c0z2cn02jqanisq5rr6iry1hx9p5ffm59353mknyyg5xyk3qkbm";
+      name = "kcoreaddons-5.84.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kcrash-5.83.0.tar.xz";
-      sha256 = "1ix4rzg72l32rs78scv3jicymapwf59gwginp5dvwhymxdrh5vr9";
-      name = "kcrash-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kcrash-5.84.0.tar.xz";
+      sha256 = "0asr7llkdbr6wzq31vnmga7haxddz1b6xqp3smw7hvgzs0f8vrv5";
+      name = "kcrash-5.84.0.tar.xz";
     };
   };
   kdav = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kdav-5.83.0.tar.xz";
-      sha256 = "0fd07yiyzq1xzz911sh8nz39hfwai84mykf0zwjafrxsff4165q0";
-      name = "kdav-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kdav-5.84.0.tar.xz";
+      sha256 = "09wly717cp86b3gahj79nfplx71f78zyb5mhpw9xm0dkdf1qf56q";
+      name = "kdav-5.84.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kdbusaddons-5.83.0.tar.xz";
-      sha256 = "01a9jw8xm23f97a54hjqbpq77bb71pc2gsmd6fzcdqq4l71h83qa";
-      name = "kdbusaddons-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kdbusaddons-5.84.0.tar.xz";
+      sha256 = "0a4v2g86lss1wq359mssg142dp1qccn17yrdhbgy55qi6id6pvl5";
+      name = "kdbusaddons-5.84.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kdeclarative-5.83.0.tar.xz";
-      sha256 = "0h6amiq6hpsi0iyfca7q3m6fm0bf1grn236ypj4r2bs1mjxprals";
-      name = "kdeclarative-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kdeclarative-5.84.0.tar.xz";
+      sha256 = "0ygp3jwz0fjixiq7bkjchsxzvg6fn50qw7si9nil5hkkg6lwxir6";
+      name = "kdeclarative-5.84.0.tar.xz";
     };
   };
   kded = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kded-5.83.0.tar.xz";
-      sha256 = "0fwvl08mkci10y1z57chamiq22krhhs97j3gwjg0ihc7qmmrwcb9";
-      name = "kded-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kded-5.84.0.tar.xz";
+      sha256 = "0c6klrchbxy57f7hjvsk640bg6s8gp1ilrzvzg7f8m825yg1b5jc";
+      name = "kded-5.84.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kdelibs4support-5.83.0.tar.xz";
-      sha256 = "0cp4a37sb0mgshvnvhsxv5s925ksy95z86wv9ng65vkgwd87w6pa";
-      name = "kdelibs4support-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kdelibs4support-5.84.0.tar.xz";
+      sha256 = "1qkiqv0fq8q6i18mi7gm58qhnqra8xkslzjprap6zjq49g9lcgrp";
+      name = "kdelibs4support-5.84.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kdesignerplugin-5.83.0.tar.xz";
-      sha256 = "138c9834xiqa20c6w1ad15lznn6if278wsa2sjc681vwkncg2gr0";
-      name = "kdesignerplugin-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kdesignerplugin-5.84.0.tar.xz";
+      sha256 = "0k51pjkh4dfc8bkw0pbsa260fifvcm0wrbpckvd1xd32b0r1n2ax";
+      name = "kdesignerplugin-5.84.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kdesu-5.83.0.tar.xz";
-      sha256 = "1qqznk92054hivk68l3yx81jnivmz34s9pjafxcazwkpknzxkvwy";
-      name = "kdesu-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kdesu-5.84.0.tar.xz";
+      sha256 = "0b3ljqj86crccyqzlqg0fkjryi654pi5q84c11zywmws72bjjx9d";
+      name = "kdesu-5.84.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kdewebkit-5.83.0.tar.xz";
-      sha256 = "13i5l5q7xz362jvvdbb3zdg70qaz2n3dw95yzzk03yyv6phz4079";
-      name = "kdewebkit-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kdewebkit-5.84.0.tar.xz";
+      sha256 = "0rhjdqr5g4gphszz70nhvv9wgr0g048pnc36w4w2jpzyy75nwjq2";
+      name = "kdewebkit-5.84.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kdnssd-5.83.0.tar.xz";
-      sha256 = "1192a0gijzpdmbwwai1iyij24bnbrzxnvxy6dgjdhxvxv7j51xbg";
-      name = "kdnssd-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kdnssd-5.84.0.tar.xz";
+      sha256 = "1ayscd05m20i4nldidxdx83xsa66ybsyrf3f8sm3h99hgwb1yxm9";
+      name = "kdnssd-5.84.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kdoctools-5.83.0.tar.xz";
-      sha256 = "0nrrksl5ckmpsk4rl2zhq2b05c1ygm5a2nxa53rgyj03bh6ym96k";
-      name = "kdoctools-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kdoctools-5.84.0.tar.xz";
+      sha256 = "1x0dimayl1pj6r4cjwsvzvyc5j79308bcdi27bn0lq1769wm7rlp";
+      name = "kdoctools-5.84.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kemoticons-5.83.0.tar.xz";
-      sha256 = "1h74x9khac7ppj8dpzg1wipva7c2kafvym4vllbaphpbiakg0hww";
-      name = "kemoticons-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kemoticons-5.84.0.tar.xz";
+      sha256 = "0h8ilgwd5y8mbmvr89qkq81km216gs2lx7ln4rijamv2380gwcq7";
+      name = "kemoticons-5.84.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kfilemetadata-5.83.0.tar.xz";
-      sha256 = "13h9jiayh8d3g2jjwvq41jj3kjsr6f79znp6phiyidvyvq7gypfn";
-      name = "kfilemetadata-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kfilemetadata-5.84.0.tar.xz";
+      sha256 = "19a6lsnh7vxjgvy780bgispgxycj2838gyak6ivd9lxzn6d9jw6i";
+      name = "kfilemetadata-5.84.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kglobalaccel-5.83.0.tar.xz";
-      sha256 = "1zmg60hjzmvkacdndn5dfc2rgr68q2c9k4hqrx0rf5hnxsxyc1dl";
-      name = "kglobalaccel-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kglobalaccel-5.84.0.tar.xz";
+      sha256 = "0v3j4zx6p45lwd7jpbc9y43l5fh247dm6g21w5r56cq6asapx3k5";
+      name = "kglobalaccel-5.84.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kguiaddons-5.83.0.tar.xz";
-      sha256 = "1fga0ri62ib6prm7pfx32103zwl4jg87ikxq2b7m6kq87xcjxxij";
-      name = "kguiaddons-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kguiaddons-5.84.0.tar.xz";
+      sha256 = "0p98xzml58fv2cv8x382bmcrbk39q89mrxy52hkqy759g4ffj919";
+      name = "kguiaddons-5.84.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kholidays-5.83.0.tar.xz";
-      sha256 = "1i4qvbfn1rlg0x09fv4pviibjlrq8515056wr71mb6vqxyjirhr2";
-      name = "kholidays-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kholidays-5.84.0.tar.xz";
+      sha256 = "0fzcdlvai0p3l58wbs8ia7vmd9ll2akzzab12ask8kkaz7iwaqqs";
+      name = "kholidays-5.84.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/khtml-5.83.0.tar.xz";
-      sha256 = "04zjjgaq7m6wxbi5p1fijvx8sz7imr6x0bjc5cm4i30xgdwa108y";
-      name = "khtml-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/khtml-5.84.0.tar.xz";
+      sha256 = "13j2plfgx4zx99i3s70424v8b7qj2xf6gndp7hhmdka0vjhm5bv9";
+      name = "khtml-5.84.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/ki18n-5.83.0.tar.xz";
-      sha256 = "0ppg9gxcpgbizg7fchb006ii8fb9r5j164rlvxi38394cdky9gfi";
-      name = "ki18n-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/ki18n-5.84.0.tar.xz";
+      sha256 = "1530jxpbfky3mhr1dv3pr7lrvi96q4ai8fn85h5gnjp7s7h1wgv0";
+      name = "ki18n-5.84.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kiconthemes-5.83.0.tar.xz";
-      sha256 = "08dys6g9jyw46kba7jqk4bchyg33r84nd0mll2v6v5a9lhk16zws";
-      name = "kiconthemes-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kiconthemes-5.84.0.tar.xz";
+      sha256 = "0r90cdxs6x9bnqb6qb7p2szavqw2lfk9khhxhzgp2z9121smxpgn";
+      name = "kiconthemes-5.84.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kidletime-5.83.0.tar.xz";
-      sha256 = "13n9hqzkkk5pspv97f478a4541aqhgddh7g07d78jqsgj8krc3ik";
-      name = "kidletime-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kidletime-5.84.0.tar.xz";
+      sha256 = "0akkzj05399f72klr8qf5q0w9v8x1jw2961m3h4hcg1zfsmb6pv4";
+      name = "kidletime-5.84.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kimageformats-5.83.0.tar.xz";
-      sha256 = "05w9iprmij05sif3jygwsmxa4ih9bf13vsmsifvl4alzpzpnaffw";
-      name = "kimageformats-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kimageformats-5.84.0.tar.xz";
+      sha256 = "1xzddqc6wj188dhwcw1haa2a28r2d8c4aqhmgymwdwhs7k4ibpds";
+      name = "kimageformats-5.84.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kinit-5.83.0.tar.xz";
-      sha256 = "12lck3646llymcsbkhc6130qhq024lkc9rzm6kv6kc2hcggyhr61";
-      name = "kinit-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kinit-5.84.0.tar.xz";
+      sha256 = "0a5i2rvamw95y9bqscdg6fk1fjsib7rcis9fbk504qk4n7jdp9gw";
+      name = "kinit-5.84.0.tar.xz";
     };
   };
   kio = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kio-5.83.0.tar.xz";
-      sha256 = "1hai5w3k77wnaw576gnhv6db90vng8k4npq2ljbp3jycw0csb9gs";
-      name = "kio-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kio-5.84.0.tar.xz";
+      sha256 = "1lz07745w3549n7lc174p4rz5w12mm4q08y5xn2a95xg5xrjpgln";
+      name = "kio-5.84.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kirigami2-5.83.0.tar.xz";
-      sha256 = "0cpwnqg44j3qb8yqlypkrgjf7fj2nmm90bs0dvmc0jg395z6d3jv";
-      name = "kirigami2-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kirigami2-5.84.0.tar.xz";
+      sha256 = "05hpw2ba7g5kzg6z0slngrfz45kih8w1zmahbjhss9i7blj9x32r";
+      name = "kirigami2-5.84.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kitemmodels-5.83.0.tar.xz";
-      sha256 = "1kyjnqg53s8yn9jglwyx0jqqys5y5m3a49iw1v2ck67wi3vyl3b5";
-      name = "kitemmodels-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kitemmodels-5.84.0.tar.xz";
+      sha256 = "1v19vc155jh421z8djhrigc83ajz9qvb6qz9cpscdzrcimhaarns";
+      name = "kitemmodels-5.84.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kitemviews-5.83.0.tar.xz";
-      sha256 = "10p6gpp7mh9cpr1ahg2gh0zq8scd7n856bw899hykdxzajcm06xw";
-      name = "kitemviews-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kitemviews-5.84.0.tar.xz";
+      sha256 = "14rammhm5zp8h37a794z3pmgkpnb606izqy1zlk8lwvnw6aj0kwb";
+      name = "kitemviews-5.84.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kjobwidgets-5.83.0.tar.xz";
-      sha256 = "1rxmjpxps50wdyvihj5k0sn8flap51ljx3w0x9h5l97ffwd3gfgk";
-      name = "kjobwidgets-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kjobwidgets-5.84.0.tar.xz";
+      sha256 = "0gcdd07ma7wg6rqygfhmq2nc3cq78zcxbd7mx0fgirdns5fbp8p5";
+      name = "kjobwidgets-5.84.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kjs-5.83.0.tar.xz";
-      sha256 = "1fncc9kaqinm7j60hm0nprxl8wcrj31xqzyiasf5wjcx7sykgg58";
-      name = "kjs-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kjs-5.84.0.tar.xz";
+      sha256 = "0qi1xk6pq7nyzkh6jlp4l1v1b5gq9hryq2a81hgfl7q9xgrx00qy";
+      name = "kjs-5.84.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kjsembed-5.83.0.tar.xz";
-      sha256 = "0adcihgpgyps5816z4g3hbjaci2z1rkpyzbqz1133cvbcfc41brs";
-      name = "kjsembed-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kjsembed-5.84.0.tar.xz";
+      sha256 = "1av326byza162ds5vn54nmpd9ndr7yb0cpl8hxmwzfbym1favhvb";
+      name = "kjsembed-5.84.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kmediaplayer-5.83.0.tar.xz";
-      sha256 = "02qz56201xz0jns91hfsv6aggl201vja1v136qnp96v8dib8wl1m";
-      name = "kmediaplayer-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kmediaplayer-5.84.0.tar.xz";
+      sha256 = "1zzx7d9wcc1qh9zg83c2ihid0c2f5p23gpc475ql056ny71fdvv3";
+      name = "kmediaplayer-5.84.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/knewstuff-5.83.0.tar.xz";
-      sha256 = "11z65hvc5r3522zk2a3fdx2wpf78lbq2dbi4lnxcxbgcbss5qfqc";
-      name = "knewstuff-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/knewstuff-5.84.0.tar.xz";
+      sha256 = "1y1b7704xlf7kmw7c41b3ngsmi5304mvdgphcqsinav6bq48ka5f";
+      name = "knewstuff-5.84.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/knotifications-5.83.0.tar.xz";
-      sha256 = "01cdf99cz6v04icqwc5h69j7nzlmm46xkp370zkkhg3k0fzskhic";
-      name = "knotifications-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/knotifications-5.84.0.tar.xz";
+      sha256 = "02az98aqk8alq1cqrxym5idnlzvl6i4jvgnv34q6g4x7j5h4v75h";
+      name = "knotifications-5.84.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/knotifyconfig-5.83.0.tar.xz";
-      sha256 = "18z42q7bkzi6izfqkh8wygpz04l7cily35rl225jpnlx3zibhrpx";
-      name = "knotifyconfig-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/knotifyconfig-5.84.0.tar.xz";
+      sha256 = "1x7jp2c2a1bawl3nl46zfnp8d5al1z19za58g76wn40jy9ksnpy2";
+      name = "knotifyconfig-5.84.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kpackage-5.83.0.tar.xz";
-      sha256 = "07l0nyyxqx4dq82xq7a2m492p8hh2a8xv608gig9whk6pa1h15dc";
-      name = "kpackage-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kpackage-5.84.0.tar.xz";
+      sha256 = "166cc85y49xqk4r8k6003rlwphxxx2rmik24d7yhmq8p1qig4qb7";
+      name = "kpackage-5.84.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kparts-5.83.0.tar.xz";
-      sha256 = "1bhs69g4ywss2wvfvhb58rnw1hcbn0xs5ws0677xld87pazpn25y";
-      name = "kparts-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kparts-5.84.0.tar.xz";
+      sha256 = "1fbmywx1fvv9hnznpiy8cp27dfn2ysskymyppqi1hsw01gqs7vfy";
+      name = "kparts-5.84.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kpeople-5.83.0.tar.xz";
-      sha256 = "127079gmdg8gn3jizynnr3avd87zys71mkra47p8sg4ji3is2jrp";
-      name = "kpeople-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kpeople-5.84.0.tar.xz";
+      sha256 = "0llggx56xb3y10j0avm4vdmjfl4pwqbvpb5w7kk1gb43nxpz7h3p";
+      name = "kpeople-5.84.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kplotting-5.83.0.tar.xz";
-      sha256 = "0hcnf4cr9w98sswk1n8qn4fbwnk8b7xcq4w53979zcccls52fj8j";
-      name = "kplotting-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kplotting-5.84.0.tar.xz";
+      sha256 = "007cvy57ck2frnr5dvs80k3n7lv1q2xw1zadmw13wwdqqsl0kzag";
+      name = "kplotting-5.84.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kpty-5.83.0.tar.xz";
-      sha256 = "10da18l2w5wx62j79cyd20ph9ayp968c6d6n9g9f9y54afkivzm5";
-      name = "kpty-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kpty-5.84.0.tar.xz";
+      sha256 = "04q6qz62vwywzaxxmsq0g28k036ljrcyvn5hywdns58zi5d7nab2";
+      name = "kpty-5.84.0.tar.xz";
     };
   };
   kquickcharts = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kquickcharts-5.83.0.tar.xz";
-      sha256 = "0mm3kxdp69zi6y8abakgb637313hwadyna9h4qpfmb41lyqa2ak6";
-      name = "kquickcharts-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kquickcharts-5.84.0.tar.xz";
+      sha256 = "01q1ncvk8dc9jkm9x6q7wkcnj1z1377824gj7m83pzgy3g51vcdg";
+      name = "kquickcharts-5.84.0.tar.xz";
     };
   };
   kross = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kross-5.83.0.tar.xz";
-      sha256 = "1n0d730zvhdg94f8ibjqcscg67m22lm8lvlqfzfbibc355hdf4db";
-      name = "kross-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kross-5.84.0.tar.xz";
+      sha256 = "0fz4q2m16f4zy6pajcrmhm5a9fjrfjfqyns1lm6aimdsrvkwpc93";
+      name = "kross-5.84.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/krunner-5.83.0.tar.xz";
-      sha256 = "02nvnjlxma0z9dvn9vrqv1q85723i7in4jqxb1v8m9yxmi04di52";
-      name = "krunner-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/krunner-5.84.0.tar.xz";
+      sha256 = "15ai1x9v5hm5vj7qhh7c4ajiiaf56h3yy3qnb4kamkv146g09a1p";
+      name = "krunner-5.84.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kservice-5.83.0.tar.xz";
-      sha256 = "18i9awfkrbx750qfnr3vlpp9w2wrqxrdk9cf6nldmbl0iahr1myc";
-      name = "kservice-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kservice-5.84.0.tar.xz";
+      sha256 = "1lbx51wpsc7qdp480yl08wsp6lb1lww5ix5hpxxmv0x7galcgsf2";
+      name = "kservice-5.84.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/ktexteditor-5.83.0.tar.xz";
-      sha256 = "17h36aj0m38igr4bfabjzkd66cwj0mxf0s1j7nylmdmpf5g9jck2";
-      name = "ktexteditor-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/ktexteditor-5.84.0.tar.xz";
+      sha256 = "0znpls5ap33yjcjw1ayl6zja8qnqx5glk2bvig5aajriqbpw8irk";
+      name = "ktexteditor-5.84.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/ktextwidgets-5.83.0.tar.xz";
-      sha256 = "16bknjpn574b0xnc8fr8yxg6gc8mnl4f3rh808j4hbs5127xg00a";
-      name = "ktextwidgets-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/ktextwidgets-5.84.0.tar.xz";
+      sha256 = "069qk1frsfa9iqgchpvkq4sgh973fc2fy1hjymc2zv3mahz23qfl";
+      name = "ktextwidgets-5.84.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kunitconversion-5.83.0.tar.xz";
-      sha256 = "01bic73a5l3avqrq7dyfkn2y8xwkq4l6zscj91ddmjan881g10kf";
-      name = "kunitconversion-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kunitconversion-5.84.0.tar.xz";
+      sha256 = "0a8jc3vw4ydsfff1qis9323vcd7nhigwyjxqa57qzvswrk7wmlxf";
+      name = "kunitconversion-5.84.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kwallet-5.83.0.tar.xz";
-      sha256 = "1sczaykjh15pq7ra4vx4y0vhc71zzjdqr3ab12d1p3ni34smfbzw";
-      name = "kwallet-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kwallet-5.84.0.tar.xz";
+      sha256 = "1m08q820zl9wrc04i0inb7n0r35p0lzcv3hiwvzxmgdcm9zm2n3c";
+      name = "kwallet-5.84.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kwayland-5.83.0.tar.xz";
-      sha256 = "1fgs7m2nimqi5y6yd7jy12klb7vf18qhfzdzikm0ff7rcgrp3k4c";
-      name = "kwayland-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kwayland-5.84.0.tar.xz";
+      sha256 = "1lpmbqkfbjq3445lj42zqc90wk437kzyjlpzji0wh4p9nqa4a27s";
+      name = "kwayland-5.84.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kwidgetsaddons-5.83.0.tar.xz";
-      sha256 = "07a1yk35ss7vayi52hrm0mqkar0yd8w33v5jijga8r69rmmd68s5";
-      name = "kwidgetsaddons-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kwidgetsaddons-5.84.0.tar.xz";
+      sha256 = "1xffbmi3a3qp781aay964b30l9y170imxaa05r3xpj77saq673kp";
+      name = "kwidgetsaddons-5.84.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kwindowsystem-5.83.0.tar.xz";
-      sha256 = "0qfd9js8dy68h5drl62sm61m453vssgfgyzdq33drx1jp16k3bv9";
-      name = "kwindowsystem-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kwindowsystem-5.84.0.tar.xz";
+      sha256 = "19fa8j4paq245rwvnmnz2mnwgh8y6c26wbw25v8kgd7a33ryg0fg";
+      name = "kwindowsystem-5.84.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/kxmlgui-5.83.0.tar.xz";
-      sha256 = "1mn3ywmmbggbjf09gpbkrbchmppfixkyq2a4lra3g85dv5yhpr8v";
-      name = "kxmlgui-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/kxmlgui-5.84.0.tar.xz";
+      sha256 = "1ddfvjwww2270zx4f86w0xmd45pyir95llhc4x2ixicx94jvsg1c";
+      name = "kxmlgui-5.84.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/portingAids/kxmlrpcclient-5.83.0.tar.xz";
-      sha256 = "1pf4sl42f1jhwv42bimvs718bdw1vsbhrs50av4hvrsl7cj8qvwi";
-      name = "kxmlrpcclient-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/portingAids/kxmlrpcclient-5.84.0.tar.xz";
+      sha256 = "10jddyak99wd4x3vm9d6xzh45pl1lhhfw9isrdkgzcixip2s4p6i";
+      name = "kxmlrpcclient-5.84.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/modemmanager-qt-5.83.0.tar.xz";
-      sha256 = "0gbppx9pda881mizx4nddhsakpx2cg0rry1lyv51z3wgrxxy4rjy";
-      name = "modemmanager-qt-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/modemmanager-qt-5.84.0.tar.xz";
+      sha256 = "1k0dbgq3zbg1rhy775vbxwqssbdin4wm7rw4fkcdra4z9hf39xin";
+      name = "modemmanager-qt-5.84.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/networkmanager-qt-5.83.0.tar.xz";
-      sha256 = "0vb88fs33szlpg74zf0pa3v08dl5j33lcfvs515y9p1qhkkdg3v1";
-      name = "networkmanager-qt-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/networkmanager-qt-5.84.0.tar.xz";
+      sha256 = "1qd58p2hj1rnzjvd6sskmry7gq7gp9fvp115ihc8dkaq8xvwah77";
+      name = "networkmanager-qt-5.84.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/oxygen-icons5-5.83.0.tar.xz";
-      sha256 = "04768vbwmaajniqpy3vgp6rdkmanv78pvhn8w92hf40k089sv28p";
-      name = "oxygen-icons5-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/oxygen-icons5-5.84.0.tar.xz";
+      sha256 = "06h1c2lvvs41lcibgv5iz31g7j1x7fdyi7lnh21hkgd7747vk42l";
+      name = "oxygen-icons5-5.84.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/plasma-framework-5.83.0.tar.xz";
-      sha256 = "0p8lizkb09rpjin9rzxjah8y5gzn874jk8z74rba9xpcsxvmzpvs";
-      name = "plasma-framework-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/plasma-framework-5.84.0.tar.xz";
+      sha256 = "0chmmb04m1bq4d1w67bw3ppc2iycw7wzsdpams6c4y9f59iwrd8r";
+      name = "plasma-framework-5.84.0.tar.xz";
     };
   };
   prison = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/prison-5.83.0.tar.xz";
-      sha256 = "1j72c7asbzb3n34wgp3w628lyc65d4dx0vd9dfhmb807dgcfryba";
-      name = "prison-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/prison-5.84.0.tar.xz";
+      sha256 = "17bd40fqp88j5dwxixrhf1d4xwri574l4593rdhzg8qgi9jm2ypj";
+      name = "prison-5.84.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/purpose-5.83.0.tar.xz";
-      sha256 = "0s830i3vqkyraa1ck8ml2c95fp2c31198jm535czxfsfd8w1ml02";
-      name = "purpose-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/purpose-5.84.0.tar.xz";
+      sha256 = "01rh85fc4c4gl0lxw2rbcrh001akggnz7aahkc2spsgd64m7vfv7";
+      name = "purpose-5.84.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/qqc2-desktop-style-5.83.0.tar.xz";
-      sha256 = "18gkr34bkqi9z1njm35kz3gsnlll7f7n9f4fink1pvy93plvs361";
-      name = "qqc2-desktop-style-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/qqc2-desktop-style-5.84.0.tar.xz";
+      sha256 = "0vz68nh6iy92whjlkgf1jmmlhr5261rgsy1r7k3bfd91a41qh2qw";
+      name = "qqc2-desktop-style-5.84.0.tar.xz";
     };
   };
   solid = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/solid-5.83.0.tar.xz";
-      sha256 = "1ijqligf2xxaw833gk0mlywkzsa6n9b9x38ifk4g48i1259sddbk";
-      name = "solid-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/solid-5.84.0.tar.xz";
+      sha256 = "0lrims7zfr5xr5y25v63d08m6cm27z6mxbdg9j06xsrqf93vyz4s";
+      name = "solid-5.84.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/sonnet-5.83.0.tar.xz";
-      sha256 = "0bshjqgcb2kl3bfl0zy0f656x47carfg6a25ccdcp6jczby49n5a";
-      name = "sonnet-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/sonnet-5.84.0.tar.xz";
+      sha256 = "0xnbi1rbb2awl5bvyjxjvzq5a8n9xpmiqvlzcgprmqgmsygzlnnq";
+      name = "sonnet-5.84.0.tar.xz";
     };
   };
   syndication = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/syndication-5.83.0.tar.xz";
-      sha256 = "0pz2886zsyfs0y4qbrhr58qrxh75qa0b051h3b1vgi23vlcsipsz";
-      name = "syndication-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/syndication-5.84.0.tar.xz";
+      sha256 = "0m245vp5dkw88rz9kgym4ka729p688wspm8mv6zzsfffggvfkwrc";
+      name = "syndication-5.84.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/syntax-highlighting-5.83.0.tar.xz";
-      sha256 = "0plybipbmxx5f3w7kb1446wiazfzawwa69aplzrdpjhns7n88c2m";
-      name = "syntax-highlighting-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/syntax-highlighting-5.84.0.tar.xz";
+      sha256 = "1mb4di9k2rxf6f7n53z94q5awmwzfd516kv757ifd323w9xkmyxa";
+      name = "syntax-highlighting-5.84.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.83.0";
+    version = "5.84.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.83/threadweaver-5.83.0.tar.xz";
-      sha256 = "12h9nahhgws5f9ng11nc0cxp3phhlsi68r57vlgyq78glkgcw3jl";
-      name = "threadweaver-5.83.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.84/threadweaver-5.84.0.tar.xz";
+      sha256 = "0hmxkqwxjvk6m3h3l12bw01xgwqxzja5cismqrwcc3yxf8fyd572";
+      name = "threadweaver-5.84.0.tar.xz";
     };
   };
 }

From 7781962deb3ac15e44ade3ee5b87a9ba5464dab3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 28 Jul 2021 09:47:17 -0500
Subject: [PATCH 096/105] ksystemstats: Use getBin instead of hardcoding ouput
 name

---
 pkgs/desktops/plasma-5/ksystemstats.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/ksystemstats.nix b/pkgs/desktops/plasma-5/ksystemstats.nix
index e41f56c764ef..f117872ce5c4 100644
--- a/pkgs/desktops/plasma-5/ksystemstats.nix
+++ b/pkgs/desktops/plasma-5/ksystemstats.nix
@@ -5,7 +5,7 @@
 
 mkDerivation {
   name = "ksystemstats";
-  NIX_CFLAGS_COMPILE = [ "-I${libksysguard.bin}/share" ];
+  NIX_CFLAGS_COMPILE = [ "-I${lib.getBin libksysguard}/share" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ libksysguard libnl lm_sensors networkmanager-qt ];
 }

From cf7212d79d0628eaa3b9f8651814c6603b41cef9 Mon Sep 17 00:00:00 2001
From: Artturi <Artturin@artturin.com>
Date: Thu, 5 Aug 2021 11:25:02 +0300
Subject: [PATCH 097/105] ccextractor: enable ocr and hardsub support (#131849)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 .../video/ccextractor/default.nix             | 39 +++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/video/ccextractor/default.nix b/pkgs/applications/video/ccextractor/default.nix
index d18ca43cbf70..6e47f96253e2 100644
--- a/pkgs/applications/video/ccextractor/default.nix
+++ b/pkgs/applications/video/ccextractor/default.nix
@@ -1,7 +1,17 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, cmake
-, glew, glfw3, leptonica, libiconv, tesseract3, zlib }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, pkg-config
+, cmake
+, libiconv
+, zlib
+, enableOcr ? true
+, makeWrapper
+, tesseract4
+, leptonica
+, ffmpeg
+}:
 
-with lib;
 stdenv.mkDerivation rec {
   pname = "ccextractor";
   version = "0.91";
@@ -15,11 +25,20 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "source/src";
 
-  nativeBuildInputs = [ pkg-config cmake ];
+  nativeBuildInputs = [ pkg-config cmake makeWrapper ];
 
-  buildInputs = [ glew glfw3 leptonica tesseract3 zlib ] ++ lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = [ zlib ]
+    ++ lib.optional (!stdenv.isLinux) libiconv
+    ++ lib.optionals enableOcr [ leptonica tesseract4 ffmpeg ];
 
-  meta = {
+  cmakeFlags = lib.optionals enableOcr [ "-DWITH_OCR=on" "-DWITH_HARDSUBX=on" ];
+
+  postInstall = lib.optionalString enableOcr ''
+    wrapProgram "$out/bin/ccextractor" \
+      --set TESSDATA_PREFIX "${tesseract4}/share/"
+  '';
+
+  meta = with lib; {
     homepage = "https://www.ccextractor.org";
     description = "Tool that produces subtitles from closed caption data in videos";
     longDescription = ''
@@ -28,7 +47,13 @@ stdenv.mkDerivation rec {
       It works on Linux, Windows, and OSX.
     '';
     platforms = platforms.unix;
-    license = licenses.gpl2;
+    # undefined reference to `png_do_expand_palette_rgba8_neon'
+    # undefined reference to `png_riffle_palette_neon'
+    # undefined reference to `png_do_expand_palette_rgb8_neon'
+    # undefined reference to `png_init_filter_functions_neon'
+    # during Linking C executable ccextractor
+    broken = stdenv.isAarch64;
+    license = licenses.gpl2Only;
     maintainers = with maintainers; [ titanous ];
   };
 }

From 23b31e6ef1cd547c97861d331f9905df2966ebf7 Mon Sep 17 00:00:00 2001
From: Vo Anh Duy <vo@anhduy.io>
Date: Thu, 5 Aug 2021 16:21:32 +0800
Subject: [PATCH 098/105] lima: 0.5.0 -> 0.6.0

---
 pkgs/applications/virtualization/lima/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix
index 198e3b694ceb..bf4e14a6bab3 100644
--- a/pkgs/applications/virtualization/lima/default.nix
+++ b/pkgs/applications/virtualization/lima/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "lima";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
-    owner = "AkihiroSuda";
+    owner = "lima-vm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1952xGSfVFI2Fs5HLJKCyB6ZxKFf5uPKXIlctM/T+8o=";
+    sha256 = "sha256-UwsAeU7Me2UN9pUWvqGgQ7XSNcrClXYOA+9F6yO2aqA=";
   };
 
-  vendorSha256 = "sha256-rPL/jxMHMkKffoYLSI3FFtFRYGtARKmrODmL9w+rN0E=";
+  vendorSha256 = "sha256-vdqLdSXQ2ywZoG7ROQP9PLWUqhoOO7N5li+xjc2HtzM=";
 
   nativeBuildInputs = [ makeWrapper installShellFiles ];
 
@@ -44,7 +44,7 @@ buildGoModule rec {
   '';
 
   meta = with lib; {
-    homepage = "https://github.com/AkihiroSuda/lima";
+    homepage = "https://github.com/lima-vm/lima";
     description = "Linux virtual machines (on macOS, in most cases)";
     license = licenses.asl20;
     maintainers = with maintainers; [ anhduy ];

From 586172f0fe8f6ecc31998d3b7e7db7959bfa8a1b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 5 Aug 2021 11:20:42 +0200
Subject: [PATCH 099/105] terraform-providers.kubernetes: 2.1.0 -> 2.4.1

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7569f572b60d..e1e183f3d304 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -558,10 +558,10 @@
     "owner": "hashicorp",
     "provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
     "repo": "terraform-provider-kubernetes",
-    "rev": "v2.1.0",
-    "sha256": "02ygydgi3fa8z6qd04hgcilbbwns8f21agaqxly2pf9j23fzi37g",
+    "rev": "v2.4.1",
+    "sha256": "0mk0f12yy58gjkki7xpf9bjfw9h9zdgby2b4bddqp5csq11payhd",
     "vendorSha256": null,
-    "version": "2.1.0"
+    "version": "2.4.1"
   },
   "kubernetes-alpha": {
     "owner": "hashicorp",

From f11652f0a6ec62eb3b8f0e93db2211a14662c322 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 5 Aug 2021 11:20:58 +0200
Subject: [PATCH 100/105] signal-desktop: 5.12.0 -> 5.12.1

---
 .../networking/instant-messengers/signal-desktop/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index 67ce817f11a7..fe97581b68cf 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -28,7 +28,7 @@ let
       else "");
 in stdenv.mkDerivation rec {
   pname = "signal-desktop";
-  version = "5.12.0"; # Please backport all updates to the stable channel.
+  version = "5.12.1"; # Please backport all updates to the stable channel.
   # All releases have a limited lifetime and "expire" 90 days after the release.
   # When releases "expire" the application becomes unusable until an update is
   # applied. The expiration date for the current release can be extracted with:
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-    sha256 = "0cvh70ijx61rq7qjzrmn85lhkm8vkcbxvgjvkpls21v3yl5anrjb";
+    sha256 = "099p0bmaa60dfij5wq9pyfxnhy77cdnfqx4dj4377rzyfmfgnhzx";
   };
 
   nativeBuildInputs = [

From d752fb3b44f26a1c791d83a76f63a4100670a077 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 5 Aug 2021 11:48:48 +0200
Subject: [PATCH 101/105] terraform-providers.ovh: 0.8.0 -> 0.15.0

The provider had moved location, which prevented the auto-updated from
working.

https://github.com/hashicorp/terraform-provider-ovh ->
https://github.com/ovh/terraform-provider-ovh
---
 .../cluster/terraform-providers/providers.json         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ca2ce013b618..17aef961cc0b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -799,11 +799,13 @@
     "version": "1.5.3"
   },
   "ovh": {
-    "owner": "terraform-providers",
+    "owner": "ovh",
+    "provider-source-address": "registry.terraform.io/ovh/ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v0.8.0",
-    "sha256": "1ww4ng8w5hm50rbxd83xzbkq8qsn04dqwpdjhs587v9d0x2vwrf1",
-    "version": "0.8.0"
+    "rev": "v0.15.0",
+    "sha256": "1cmcfg9vq8cl98d5xambm5hr516b9pblm06y1py9v7msmfh3g09i",
+    "vendorSha256": null,
+    "version": "0.15.0"
   },
   "packet": {
     "owner": "packethost",

From 2ec3c8ec194d0942b582a97e548bec1729535ed2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 5 Aug 2021 11:21:10 +0200
Subject: [PATCH 102/105] terraform-providers.kubernetes-alpha: remove

This has graduated to beta, and the kubernetes_manifest resource has
moved into terraform-provider-kubernetes.

To use it, you must be enabled in the provider block:

```hcl
provider "kubernetes" {
  experiments {
    manifest_resource = true
  }
  config_path = "~/.kube/config"
}
```
---
 .../networking/cluster/terraform-providers/default.nix   | 1 +
 .../cluster/terraform-providers/providers.json           | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index d88602d75bae..d47b9fd4b890 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -57,6 +57,7 @@ let
     cloudfoundry = callPackage ./cloudfoundry {};
     gandi = callPackage ./gandi {};
     hcloud = callPackage ./hcloud {};
+    kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
     libvirt = callPackage ./libvirt {};
     linuxbox = callPackage ./linuxbox {};
     lxd = callPackage ./lxd {};
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index e1e183f3d304..8ecf51580f1b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -563,15 +563,6 @@
     "vendorSha256": null,
     "version": "2.4.1"
   },
-  "kubernetes-alpha": {
-    "owner": "hashicorp",
-    "provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
-    "repo": "terraform-provider-kubernetes-alpha",
-    "rev": "v0.5.0",
-    "sha256": "0yqm3wlya69w9g9kzgvm28mbbwp6wik51syjnbnj8dis5kspx8gd",
-    "vendorSha256": null,
-    "version": "0.5.0"
-  },
   "launchdarkly": {
     "owner": "terraform-providers",
     "repo": "terraform-provider-launchdarkly",

From d1dfdf7b3b860ea0beec5271c47c1276f0790c17 Mon Sep 17 00:00:00 2001
From: Ricardo Guevara <fuzztkd@gmail.com>
Date: Thu, 5 Aug 2021 03:00:54 -0700
Subject: [PATCH 103/105] terraform-providers.datadog: 2.7.0 -> 3.2.0 (#104310)

---
 .../cluster/terraform-providers/providers.json         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index ca2ce013b618..97aac84b1071 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -245,11 +245,13 @@
     "version": "0.8.0"
   },
   "datadog": {
-    "owner": "terraform-providers",
+    "owner": "DataDog",
+    "provider-source-address": "registry.terraform.io/DataDog/datadog",
     "repo": "terraform-provider-datadog",
-    "rev": "v2.7.0",
-    "sha256": "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd",
-    "version": "2.7.0"
+    "rev": "v3.2.0",
+    "sha256": "1qrk40w81qzcmm52gr3ysrh077417cxyh4xy7igwdjfzl85z22mx",
+    "vendorSha256": "0iphsz6y9gajwmw5rj4yq65azx02ki093agqbqw49rnzdhc6jahr",
+    "version": "3.2.0"
   },
   "digitalocean": {
     "owner": "digitalocean",

From ec6fca686da6bb11789d2f237a4d3e2c3c4089b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 5 Aug 2021 12:30:04 +0200
Subject: [PATCH 104/105] pixie: format

---
 pkgs/development/interpreters/pixie/dust.nix | 24 +++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix
index e6818cb03ed2..bbe9ae3dcc4b 100644
--- a/pkgs/development/interpreters/pixie/dust.nix
+++ b/pkgs/development/interpreters/pixie/dust.nix
@@ -1,35 +1,43 @@
 { lib, stdenv, pixie, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "dust-0-91";
+  pname = "dust";
+  version = "0-91";
+
   src = fetchFromGitHub {
     owner = "pixie-lang";
     repo = "dust";
     rev = "efe469661e749a71e86858fd006f61464810575a";
     sha256 = "09n57b6haxwask9m8vimv42ikczf7lgfc7m9izjrcqgs0padvfzc";
   };
+
   buildInputs = [ pixie ];
+
   patches = [ ./make-paths-configurable.patch ];
+
   configurePhase = ''
     pixiePath="${pixie}/bin/pixie-vm" \
     basePath="$out/share/dust" \
       substituteAll dust.in dust
     chmod +x dust
   '';
-# FIXME: AOT for dust
-#  buildPhase = ''
-#    find . -name "*.pxi" -exec pixie-vm -c {} \;
-#  '';
+
+  # FIXME: AOT for dust
+  #  buildPhase = ''
+  #    find . -name "*.pxi" -exec pixie-vm -c {} \;
+  #  '';
+
   installPhase = ''
     mkdir -p $out/bin $out/share/dust
     cp -a src/ run.pxi $out/share/dust
     mv dust $out/bin/dust
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies";
     homepage = src.meta.homepage;
-    license = lib.licenses.lgpl3;
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with maintainers; [ ];
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
   };
 }

From 45c4b6b9e4ca221fd3d16008ae9cf1133725f824 Mon Sep 17 00:00:00 2001
From: Benjamin Smith <polynomial@users.noreply.github.com>
Date: Thu, 5 Aug 2021 04:01:59 -0700
Subject: [PATCH 105/105] Apache Kafka: add 2.7.1 and 2.8.0 (#128043)

---
 nixos/tests/kafka.nix                 |  5 ++---
 pkgs/servers/apache-kafka/default.nix | 24 +++++++++---------------
 pkgs/top-level/aliases.nix            |  9 ---------
 pkgs/top-level/all-packages.nix       |  7 +++----
 4 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix
index 034601c815b9..95711808a2c3 100644
--- a/nixos/tests/kafka.nix
+++ b/nixos/tests/kafka.nix
@@ -75,7 +75,6 @@ let
   }) { inherit system; });
 
 in with pkgs; {
-  kafka_2_4  = makeKafkaTest "kafka_2_4"  apacheKafka_2_4;
-  kafka_2_5  = makeKafkaTest "kafka_2_5"  apacheKafka_2_5;
-  kafka_2_6  = makeKafkaTest "kafka_2_6"  apacheKafka_2_6;
+  kafka_2_7  = makeKafkaTest "kafka_2_7"  apacheKafka_2_7;
+  kafka_2_8  = makeKafkaTest "kafka_2_8"  apacheKafka_2_8;
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 935db27044f3..4fec4390e345 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -5,22 +5,16 @@ let
   jre8 = jdk8_headless;
   jre11 = jdk11_headless;
   versionMap = {
-    "2.4" = {
-      kafkaVersion = "2.4.1";
-      scalaVersion = "2.12";
-      sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1";
-      jre = jre8;
-    };
-    "2.5" = {
-      kafkaVersion = "2.5.1";
-      scalaVersion = "2.12";
-      sha256 = "1wn4iszrm2rvsfyyr515zx79k5m86davjkcwcwpxcgc4k3q0z7lv";
-      jre = jre8;
-    };
-    "2.6" = {
-      kafkaVersion = "2.6.1";
+    "2.7" = {
+      kafkaVersion = "2.7.1";
       scalaVersion = "2.13";
-      sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y";
+      sha256 = "1qv6blf99211bc80xnd4k42r9v9c5vilyqkplyhsa6hqymg32gfa";
+      jre = jre11;
+    };
+    "2.8" = {
+      kafkaVersion = "2.8.0";
+      scalaVersion = "2.13";
+      sha256 = "1iljfjlp29m4s6gkja9fxkzj8a8p0qc0sfy8x4g1318kbnp818rz";
       jre = jre11;
     };
   };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1bdadffbc601..06f0ff4d5582 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -53,15 +53,6 @@ mapAliases ({
   ammonite-repl = ammonite; # added 2017-05-02
   amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
   antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
-  apacheKafka_0_9 = throw "kafka 0.9 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_0_10 = throw "kafka 0.10 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_0_11 = throw "kafka 0.11 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_1_0 = throw "kafka 1.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_1_1 = throw "kafka 1.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_2_0 = throw "kafka 2.0 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_2_1 = throw "kafka 2.1 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_2_2 = throw "kafka 2.2 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
-  apacheKafka_2_3 = throw "kafka 2.3 is no longer supported. Please upgrade to a newer version."; # added 2020-12-21
   arduino_core = arduino-core;  # added 2015-02-04
   arora = throw "arora has been removed."; # added 2020-09-09
   asciidocFull = asciidoc-full;  # added 2014-06-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3cca0379df1..b75524099d3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13128,10 +13128,9 @@ in
   apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
   ant = apacheAnt;
 
-  apacheKafka = apacheKafka_2_6;
-  apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; };
-  apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; };
-  apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; };
+  apacheKafka = apacheKafka_2_8;
+  apacheKafka_2_7 = callPackage ../servers/apache-kafka { majorVersion = "2.7"; };
+  apacheKafka_2_8 = callPackage ../servers/apache-kafka { majorVersion = "2.8"; };
 
   kt = callPackage ../tools/misc/kt {};