From f676d1192e3516a6612564b833c97b15c6c4b307 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@web.de>
Date: Sun, 16 Jan 2022 19:13:18 +0100
Subject: [PATCH 01/38] whitebophir: pin to nodejs-14_x to unbreak the build

---
 pkgs/servers/web-apps/whitebophir/default.nix |  5 ++-
 pkgs/servers/web-apps/whitebophir/generate.sh |  6 +++
 .../whitebophir/node-packages-generated.nix   | 40 +++++++++----------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/web-apps/whitebophir/default.nix b/pkgs/servers/web-apps/whitebophir/default.nix
index 7373724a0180..630410de1133 100644
--- a/pkgs/servers/web-apps/whitebophir/default.nix
+++ b/pkgs/servers/web-apps/whitebophir/default.nix
@@ -1,11 +1,14 @@
 { stdenv
 , pkgs
 , lib
-, nodejs
+, nodejs-14_x
 , runtimeShell
 }:
 
 let
+  # nodejs-16_x fails with ENOTCACHED
+  nodejs = nodejs-14_x;
+
   nodePackages = import ./node-packages.nix {
     inherit pkgs nodejs;
     inherit (stdenv.hostPlatform) system;
diff --git a/pkgs/servers/web-apps/whitebophir/generate.sh b/pkgs/servers/web-apps/whitebophir/generate.sh
index 825def892fc5..814a83a033d0 100755
--- a/pkgs/servers/web-apps/whitebophir/generate.sh
+++ b/pkgs/servers/web-apps/whitebophir/generate.sh
@@ -1,7 +1,13 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i bash -p nodePackages.node2nix
+
+# Run this script not via `./generate.sh`, but via `$PWD/generate.sh`.
+# Else `nix-shell` will not find this script.
+
 set -euo pipefail
 
+cd -- "$(dirname -- "$BASH_SOURCE[0]")"
+
 node2nix \
      --input node-packages.json \
      --output node-packages-generated.nix \
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
index 5a511da72a48..dc00e6e5fd0b 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@@ -49,13 +49,13 @@ let
         sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==";
       };
     };
-    "@types/node-17.0.0" = {
+    "@types/node-17.0.8" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "17.0.0";
+      version = "17.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.0.tgz";
-        sha512 = "eMhwJXc931Ihh4tkU+Y7GiLzT/y/DBNpNtr4yU9O2w3SYBsr9NaOPhQlLKRmoWtI54uNwuo0IOUFQjVOTZYRvw==";
+        url = "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz";
+        sha512 = "YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==";
       };
     };
     "accept-language-parser-1.5.0" = {
@@ -193,13 +193,13 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "engine.io-6.1.0" = {
+    "engine.io-6.1.1" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "6.1.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.0.tgz";
-        sha512 = "ErhZOVu2xweCjEfYcTdkCnEYUiZgkAcBBAhW4jbIvNG8SLU3orAqoJCiytZjYF7eTpVmmCrLDjLIEaPlUAs1uw==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.1.tgz";
+        sha512 = "AyMc20q8JUUdvKd46+thc9o7yCZ6iC6MoBCChG5Z1XmFMpp+2+y/oKvwpZTUJB0KCjxScw1dV9c2h5pjiYBLuQ==";
       };
     };
     "engine.io-parser-5.0.2" = {
@@ -256,13 +256,13 @@ let
         sha1 = "18282b27d08a267cb3030cd2b8b4b0f212af752a";
       };
     };
-    "graceful-fs-4.2.8" = {
+    "graceful-fs-4.2.9" = {
       name = "graceful-fs";
       packageName = "graceful-fs";
-      version = "4.2.8";
+      version = "4.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz";
-        sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==";
+        url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz";
+        sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==";
       };
     };
     "handlebars-4.7.7" = {
@@ -535,13 +535,13 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "socket.io-4.4.0" = {
+    "socket.io-4.4.1" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "4.4.0";
+      version = "4.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.0.tgz";
-        sha512 = "bnpJxswR9ov0Bw6ilhCvO38/1WPtE3eA2dtxi2Iq4/sFebiDJQzgKNYA7AuVVdGW09nrESXd90NbZqtDd9dzRQ==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-4.4.1.tgz";
+        sha512 = "s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==";
       };
     };
     "socket.io-adapter-2.3.3" = {
@@ -715,7 +715,7 @@ in
       sources."@types/component-emitter-1.2.11"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-17.0.0"
+      sources."@types/node-17.0.8"
       sources."accept-language-parser-1.5.0"
       sources."accepts-1.3.7"
       sources."async-mutex-0.3.2"
@@ -734,7 +734,7 @@ in
       sources."destroy-1.0.4"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-6.1.0" // {
+      (sources."engine.io-6.1.1" // {
         dependencies = [
           sources."debug-4.3.3"
           sources."ms-2.1.2"
@@ -746,7 +746,7 @@ in
       sources."fresh-0.5.2"
       sources."from2-2.3.0"
       sources."from2-string-1.1.0"
-      sources."graceful-fs-4.2.8"
+      sources."graceful-fs-4.2.9"
       sources."handlebars-4.7.7"
       sources."http-errors-1.8.1"
       sources."inherits-2.0.4"
@@ -775,7 +775,7 @@ in
       sources."send-0.17.2"
       sources."serve-static-1.14.2"
       sources."setprototypeof-1.2.0"
-      (sources."socket.io-4.4.0" // {
+      (sources."socket.io-4.4.1" // {
         dependencies = [
           sources."debug-4.3.3"
           sources."ms-2.1.2"

From edd46c86115dd4ef94ba8b1984cb0b27e251de86 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Thu, 3 Feb 2022 16:30:03 +0100
Subject: [PATCH 02/38] whitebophir: 1.16.0 -> 1.17.0

---
 .../whitebophir/node-packages-generated.nix   | 258 ++++++++++++++----
 .../web-apps/whitebophir/node-packages.json   |   2 +-
 2 files changed, 205 insertions(+), 55 deletions(-)

diff --git a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
index dc00e6e5fd0b..a3feac5bffa7 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix
@@ -22,6 +22,15 @@ let
         sha512 = "v6Ucl//xSVhpyTtHMVCA9uv9W7CVwj8vBAQFKFDkfGC1DquBobOMhnzH9Odc+Tunf+i4WRnNgt90fQ7CSAbU3g==";
       };
     };
+    "@socket.io/base64-arraybuffer-1.0.2" = {
+      name = "_at_socket.io_slash_base64-arraybuffer";
+      packageName = "@socket.io/base64-arraybuffer";
+      version = "1.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz";
+        sha512 = "dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==";
+      };
+    };
     "@types/component-emitter-1.2.11" = {
       name = "_at_types_slash_component-emitter";
       packageName = "@types/component-emitter";
@@ -49,13 +58,13 @@ let
         sha512 = "vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==";
       };
     };
-    "@types/node-17.0.8" = {
+    "@types/node-17.0.14" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "17.0.8";
+      version = "17.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-17.0.8.tgz";
-        sha512 = "YofkM6fGv4gDJq78g4j0mMuGMkZVxZDgtU0JRdx6FgiJDG+0fY0GKVolOV8WqVmEhLCXkQRjwDdKyPxJp/uucg==";
+        url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz";
+        sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==";
       };
     };
     "accept-language-parser-1.5.0" = {
@@ -67,13 +76,13 @@ let
         sha1 = "8877c54040a8dcb59e0a07d9c1fde42298334791";
       };
     };
-    "accepts-1.3.7" = {
+    "accepts-1.3.8" = {
       name = "accepts";
       packageName = "accepts";
-      version = "1.3.7";
+      version = "1.3.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz";
-        sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==";
+        url = "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz";
+        sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
       };
     };
     "async-mutex-0.3.2" = {
@@ -85,15 +94,6 @@ let
         sha512 = "HuTK7E7MT7jZEh1P9GtRW9+aTWiDWWi9InbZ5hjxrnRa39KS4BW04+xLBhYNS2aXhHUIKZSw3gj4Pn1pj+qGAA==";
       };
     };
-    "base64-arraybuffer-1.0.1" = {
-      name = "base64-arraybuffer";
-      packageName = "base64-arraybuffer";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.1.tgz";
-        sha512 = "vFIUq7FdLtjZMhATwDul5RZWv2jpXQ09Pd6jcVEOvIsqCWTRFD/ONHNfyOS8dA/Ippi5dsIgpyKWKZaAKZltbA==";
-      };
-    };
     "base64id-2.0.0" = {
       name = "base64id";
       packageName = "base64id";
@@ -103,6 +103,15 @@ let
         sha512 = "lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==";
       };
     };
+    "buffer-equal-constant-time-1.0.1" = {
+      name = "buffer-equal-constant-time";
+      packageName = "buffer-equal-constant-time";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+        sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
+      };
+    };
     "component-emitter-1.3.0" = {
       name = "component-emitter";
       packageName = "component-emitter";
@@ -112,13 +121,13 @@ let
         sha512 = "Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==";
       };
     };
-    "cookie-0.4.1" = {
+    "cookie-0.4.2" = {
       name = "cookie";
       packageName = "cookie";
-      version = "0.4.1";
+      version = "0.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
-        sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
+        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz";
+        sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
       };
     };
     "core-util-is-1.0.3" = {
@@ -175,6 +184,15 @@ let
         sha1 = "978857442c44749e4206613e37946205826abd80";
       };
     };
+    "ecdsa-sig-formatter-1.0.11" = {
+      name = "ecdsa-sig-formatter";
+      packageName = "ecdsa-sig-formatter";
+      version = "1.0.11";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz";
+        sha512 = "nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==";
+      };
+    };
     "ee-first-1.1.1" = {
       name = "ee-first";
       packageName = "ee-first";
@@ -193,22 +211,22 @@ let
         sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59";
       };
     };
-    "engine.io-6.1.1" = {
+    "engine.io-6.1.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "6.1.1";
+      version = "6.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.1.tgz";
-        sha512 = "AyMc20q8JUUdvKd46+thc9o7yCZ6iC6MoBCChG5Z1XmFMpp+2+y/oKvwpZTUJB0KCjxScw1dV9c2h5pjiYBLuQ==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.1.2.tgz";
+        sha512 = "v/7eGHxPvO2AWsksyx2PUsQvBafuvqs0jJJQ0FdmJG1b9qIvgSbqDRGwNhfk2XHaTTbTXiC4quRE8Q9nRjsrQQ==";
       };
     };
-    "engine.io-parser-5.0.2" = {
+    "engine.io-parser-5.0.3" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.2.tgz";
-        sha512 = "wuiO7qO/OEkPJSFueuATIXtrxF7/6GTbAO9QLv7nnbjwZ5tYhLm9zxvLwxstRs0dcT0KUlWTjtIOs1T86jt12g==";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.3.tgz";
+        sha512 = "BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==";
       };
     };
     "escape-html-1.0.3" = {
@@ -301,6 +319,96 @@ let
         sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
       };
     };
+    "jsonwebtoken-8.5.1" = {
+      name = "jsonwebtoken";
+      packageName = "jsonwebtoken";
+      version = "8.5.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz";
+        sha512 = "XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==";
+      };
+    };
+    "jwa-1.4.1" = {
+      name = "jwa";
+      packageName = "jwa";
+      version = "1.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz";
+        sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==";
+      };
+    };
+    "jws-3.2.2" = {
+      name = "jws";
+      packageName = "jws";
+      version = "3.2.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz";
+        sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==";
+      };
+    };
+    "lodash.includes-4.3.0" = {
+      name = "lodash.includes";
+      packageName = "lodash.includes";
+      version = "4.3.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz";
+        sha1 = "60bb98a87cb923c68ca1e51325483314849f553f";
+      };
+    };
+    "lodash.isboolean-3.0.3" = {
+      name = "lodash.isboolean";
+      packageName = "lodash.isboolean";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz";
+        sha1 = "6c2e171db2a257cd96802fd43b01b20d5f5870f6";
+      };
+    };
+    "lodash.isinteger-4.0.4" = {
+      name = "lodash.isinteger";
+      packageName = "lodash.isinteger";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz";
+        sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343";
+      };
+    };
+    "lodash.isnumber-3.0.3" = {
+      name = "lodash.isnumber";
+      packageName = "lodash.isnumber";
+      version = "3.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz";
+        sha1 = "3ce76810c5928d03352301ac287317f11c0b1ffc";
+      };
+    };
+    "lodash.isplainobject-4.0.6" = {
+      name = "lodash.isplainobject";
+      packageName = "lodash.isplainobject";
+      version = "4.0.6";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz";
+        sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb";
+      };
+    };
+    "lodash.isstring-4.0.1" = {
+      name = "lodash.isstring";
+      packageName = "lodash.isstring";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz";
+        sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451";
+      };
+    };
+    "lodash.once-4.1.1" = {
+      name = "lodash.once";
+      packageName = "lodash.once";
+      version = "4.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz";
+        sha1 = "0dd3971213c7c56df880977d504c88fb471a97ac";
+      };
+    };
     "lru-cache-6.0.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -391,13 +499,13 @@ let
         sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
-    "negotiator-0.6.2" = {
+    "negotiator-0.6.3" = {
       name = "negotiator";
       packageName = "negotiator";
-      version = "0.6.2";
+      version = "0.6.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz";
-        sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==";
+        url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz";
+        sha512 = "+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==";
       };
     };
     "neo-async-2.6.2" = {
@@ -499,6 +607,24 @@ let
         sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==";
       };
     };
+    "safe-buffer-5.2.1" = {
+      name = "safe-buffer";
+      packageName = "safe-buffer";
+      version = "5.2.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz";
+        sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==";
+      };
+    };
+    "semver-5.7.1" = {
+      name = "semver";
+      packageName = "semver";
+      version = "5.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz";
+        sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==";
+      };
+    };
     "semver-7.3.5" = {
       name = "semver";
       packageName = "semver";
@@ -643,13 +769,13 @@ let
         sha512 = "77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==";
       };
     };
-    "uglify-js-3.14.5" = {
+    "uglify-js-3.15.0" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.14.5";
+      version = "3.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz";
-        sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz";
+        sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg==";
       };
     };
     "util-deprecate-1.0.2" = {
@@ -700,29 +826,34 @@ let
   };
 in
 {
-  "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.16.0" = nodeEnv.buildNodePackage {
+  "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.17.0" = nodeEnv.buildNodePackage {
     name = "whitebophir";
     packageName = "whitebophir";
-    version = "1.16.0";
+    version = "1.17.0";
     src = fetchgit {
       url = "https://github.com/lovasoa/whitebophir.git";
-      rev = "8a3997b26419b3d510ad92c18071c4ce007b0081";
-      sha256 = "8aab3d89c72589d60f956f83a8e33d9d52a5b4da3c13004f9ab75b6dcbdaadcc";
+      rev = "7fd1b7bbeaf9a178ba76ff60ebc4c9870bc599f3";
+      sha256 = "a343b29069e5da8ab129588a8d21ddefd03af5a69f04db6b35082ecfcef75d40";
     };
     dependencies = [
-      sources."@financial-times/polyfill-useragent-normaliser-1.10.1"
+      (sources."@financial-times/polyfill-useragent-normaliser-1.10.1" // {
+        dependencies = [
+          sources."semver-7.3.5"
+        ];
+      })
       sources."@financial-times/useragent_parser-1.6.0"
+      sources."@socket.io/base64-arraybuffer-1.0.2"
       sources."@types/component-emitter-1.2.11"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.12"
-      sources."@types/node-17.0.8"
+      sources."@types/node-17.0.14"
       sources."accept-language-parser-1.5.0"
-      sources."accepts-1.3.7"
+      sources."accepts-1.3.8"
       sources."async-mutex-0.3.2"
-      sources."base64-arraybuffer-1.0.1"
       sources."base64id-2.0.0"
+      sources."buffer-equal-constant-time-1.0.1"
       sources."component-emitter-1.3.0"
-      sources."cookie-0.4.1"
+      sources."cookie-0.4.2"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
       (sources."debug-2.6.9" // {
@@ -732,15 +863,16 @@ in
       })
       sources."depd-1.1.2"
       sources."destroy-1.0.4"
+      sources."ecdsa-sig-formatter-1.0.11"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-6.1.1" // {
+      (sources."engine.io-6.1.2" // {
         dependencies = [
           sources."debug-4.3.3"
           sources."ms-2.1.2"
         ];
       })
-      sources."engine.io-parser-5.0.2"
+      sources."engine.io-parser-5.0.3"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
       sources."fresh-0.5.2"
@@ -751,6 +883,16 @@ in
       sources."http-errors-1.8.1"
       sources."inherits-2.0.4"
       sources."isarray-1.0.0"
+      sources."jsonwebtoken-8.5.1"
+      sources."jwa-1.4.1"
+      sources."jws-3.2.2"
+      sources."lodash.includes-4.3.0"
+      sources."lodash.isboolean-3.0.3"
+      sources."lodash.isinteger-4.0.4"
+      sources."lodash.isnumber-3.0.3"
+      sources."lodash.isplainobject-4.0.6"
+      sources."lodash.isstring-4.0.1"
+      sources."lodash.once-4.1.1"
       sources."lru-cache-6.0.0"
       sources."merge2-1.4.1"
       sources."mime-1.6.0"
@@ -759,7 +901,7 @@ in
       sources."minimist-1.2.5"
       sources."mnemonist-0.38.5"
       sources."ms-2.1.3"
-      sources."negotiator-0.6.2"
+      sources."negotiator-0.6.3"
       sources."neo-async-2.6.2"
       sources."object-assign-4.1.1"
       sources."obliterator-2.0.1"
@@ -769,9 +911,13 @@ in
       sources."process-nextick-args-2.0.1"
       sources."promise-polyfill-1.1.6"
       sources."range-parser-1.2.1"
-      sources."readable-stream-2.3.7"
-      sources."safe-buffer-5.1.2"
-      sources."semver-7.3.5"
+      (sources."readable-stream-2.3.7" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."safe-buffer-5.2.1"
+      sources."semver-5.7.1"
       sources."send-0.17.2"
       sources."serve-static-1.14.2"
       sources."setprototypeof-1.2.0"
@@ -793,11 +939,15 @@ in
       sources."statuses-1.5.0"
       sources."stream-from-promise-1.0.0"
       sources."stream-to-string-1.2.0"
-      sources."string_decoder-1.1.1"
+      (sources."string_decoder-1.1.1" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
       sources."toidentifier-1.0.1"
       sources."toposort-2.0.2"
       sources."tslib-2.3.1"
-      sources."uglify-js-3.14.5"
+      sources."uglify-js-3.15.0"
       sources."util-deprecate-1.0.2"
       sources."vary-1.1.2"
       sources."wordwrap-1.0.0"
diff --git a/pkgs/servers/web-apps/whitebophir/node-packages.json b/pkgs/servers/web-apps/whitebophir/node-packages.json
index 0d0615804f5a..6b42db95e3e0 100644
--- a/pkgs/servers/web-apps/whitebophir/node-packages.json
+++ b/pkgs/servers/web-apps/whitebophir/node-packages.json
@@ -1,3 +1,3 @@
 [
-  { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.16.0" }
+  { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.17.0" }
 ]

From 6af3e61632c651db2dc1fe55ae48460006eda0ad Mon Sep 17 00:00:00 2001
From: Boris Sukholitko <boriss@gmail.com>
Date: Thu, 24 Mar 2022 10:56:35 +0200
Subject: [PATCH 03/38] nixos/qemu-vm: allow booting VM with the custom kernel

While doing kernel development with the nixos testing infrastructure, it
is useful to quickly compile the kernel on the side and boot it in the testing VM.

This patch allows overriding the kernel through the environment
variable. For example, the following:

$ NIXPKGS_QEMU_KERNEL_testvm=$LINUX_SRC/arch/x86/boot/bzImage $VM/bin/nixos-test-driver

runs testvm testing VM with the fresh kernel compiled in $LINUX_SRC.

Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
---
 nixos/modules/virtualisation/qemu-vm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 514389358947..653bdc8f3016 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -854,7 +854,7 @@ in
         "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet"
       ])
       (mkIf (!cfg.useBootLoader) [
-        "-kernel ${config.system.build.toplevel}/kernel"
+        "-kernel \${NIXPKGS_QEMU_KERNEL_${config.system.name}:-${config.system.build.toplevel}/kernel}"
         "-initrd ${config.system.build.toplevel}/initrd"
         ''-append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${consoles} $QEMU_KERNEL_PARAMS"''
       ])

From 63c705fda998ea99607d8aaa8553c1b4174d5f7d Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Sun, 27 Mar 2022 23:01:00 +0200
Subject: [PATCH 04/38] unicode-emoji: 12.1 -> 14.0

In Unicode 13.0 and later, emoji-data.txt and
emoji-variation-sequences.txt are part of UCD proper.
---
 pkgs/data/misc/unicode-emoji/default.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix
index b91afb08f60e..9fe9ff78f804 100644
--- a/pkgs/data/misc/unicode-emoji/default.nix
+++ b/pkgs/data/misc/unicode-emoji/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "12.1";
+  version = "14.0";
 
   fetchData = { file, sha256 }: fetchurl {
     url = "https://www.unicode.org/Public/emoji/${version}/${file}";
@@ -19,25 +19,17 @@ let
   };
 
   srcs = {
-    emoji-data = fetchData {
-      file = "emoji-data.txt";
-      sha256 = "17gfm5a28lsymx36prbjy2g0b27gf3rcgggy0yxdshbxwf6zpf9k";
-    };
     emoji-sequences = fetchData {
       file = "emoji-sequences.txt";
-      sha256 = "1fckw5hfyvz5jfp2jczzx8qcs79vf0zyq0z2942230j99arq70vc";
+      sha256 = "sha256-4helD/0oe+UmNIuVxPx/P0R9V10EY/RccewdeemeGxE=";
     };
     emoji-test = fetchData {
       file = "emoji-test.txt";
-      sha256 = "0w29lva7gp9g9lf7bz1i24qdalvf440bcq8npsbwr3cpp7na95kh";
-    };
-    emoji-variation-sequences = fetchData {
-      file = "emoji-variation-sequences.txt";
-      sha256 = "0akpib3cinr8xcs045hda5wnpfj6qfdjlkzmq5vgdc50gyhrd2z3";
+      sha256 = "sha256-DDOVhnFzfvowINzBZ7dGYMZnL4khyRWVzrLL95djsUg=";
     };
     emoji-zwj-sequences = fetchData {
       file = "emoji-zwj-sequences.txt";
-      sha256 = "0s2mvy1nr2v1x0rr1fxlsv8ly1vyf9978rb4hwry5vnr678ls522";
+      sha256 = "sha256-owlGLICFkyEsIHz/DUZucxjBmgVO40A69BCJPbIYDA0=";
     };
   };
 in

From c1706880ea2afc092b77c29794619237dadf4622 Mon Sep 17 00:00:00 2001
From: derjohn <himself@derjohn.de>
Date: Tue, 29 Mar 2022 16:10:26 +0200
Subject: [PATCH 05/38] ferdi: 5.8.0 -> 5.8.1

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

diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
index 0a44a37cf4bc..6e0e39043ee0 100644
--- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix
@@ -17,10 +17,10 @@ in
 mkFranzDerivation' rec {
   pname = "ferdi";
   name = "Ferdi";
-  version = "5.8.0";
+  version = "5.8.1";
   src = fetchurl {
     url = "https://github.com/getferdi/ferdi/releases/download/v${version}/ferdi_${version}_amd64.deb";
-    sha256 = "sha256-Dd/iH9dtr4WvM++bSURF8kI6BsF6uBiSFviC/ik2H+o=";
+    sha256 = "sha256-Bl7bM5iDQlfPSZxksqlg7GbuwWlm53QkOf/TQEg3/n0=";
   };
   extraBuildInputs = [ xorg.libxshmfence ];
   meta = with lib; {

From 1f78ade8858f21a517d22df31e045856eee03e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Tue, 29 Mar 2022 12:18:05 -0300
Subject: [PATCH 06/38] kde/plasma5: 5.24.3 -> 5.24.4

---
 pkgs/desktops/plasma-5/fetch.sh    |   2 +-
 pkgs/desktops/plasma-5/kscreen.nix |   4 +-
 pkgs/desktops/plasma-5/srcs.nix    | 432 ++++++++++++++---------------
 3 files changed, 219 insertions(+), 219 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index f517cc6371f2..c7b7599c3195 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.24.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.24.4/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 36eea905739e..49f77fc5ff8c 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -3,7 +3,7 @@
   extra-cmake-modules,
   kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
   kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors,
-  kwindowsystem, kdeclarative, plasma-framework
+  kwindowsystem, kdeclarative, plasma-framework, qtx11extras
 }:
 
 mkDerivation {
@@ -12,6 +12,6 @@ mkDerivation {
   buildInputs = [
     kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
     kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors
-    kwindowsystem kdeclarative plasma-framework
+    kwindowsystem kdeclarative plasma-framework qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index e98a769f60fe..fc9e97c7f686 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/bluedevil-5.24.3.tar.xz";
-      sha256 = "1hlyqhn14yq7960zfjwjygkpkvbmrlsanm1g1wrr7dwbmrp5dlcx";
-      name = "bluedevil-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/bluedevil-5.24.4.tar.xz";
+      sha256 = "1mph04r6l9bxml1brwifbnk6lkjxkzxx75b3g3myzijjv6f8wxw3";
+      name = "bluedevil-5.24.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-5.24.3.tar.xz";
-      sha256 = "0h19m6wmhjw8v6ys47kgzcb0h2nb9w2fcjzypnvmkvbjbkjr53sb";
-      name = "breeze-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-5.24.4.tar.xz";
+      sha256 = "01cqji6figwb95drcq9vrqlkv7xmpn2csbi2mvixbcdawqhywsg3";
+      name = "breeze-5.24.4.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-grub-5.24.3.tar.xz";
-      sha256 = "15cpmqp7klp4dhcil3i78iff4kjasfx273v36ml8y05hm8w0igjq";
-      name = "breeze-grub-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-grub-5.24.4.tar.xz";
+      sha256 = "1p154g2x1g00iam2gkv7pml1r0b91b21s8fgrfrqg5pj45ysp5bc";
+      name = "breeze-grub-5.24.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-gtk-5.24.3.tar.xz";
-      sha256 = "1922s17mh4ifaqbf4b7p6yj8pwd6z3qwpbf21j1fqhmdk4pvn499";
-      name = "breeze-gtk-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-gtk-5.24.4.tar.xz";
+      sha256 = "0s51azc2xmh7agbqlm9rn39c5qh6rfwyc2dq4sfv6vspm1883zmj";
+      name = "breeze-gtk-5.24.4.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/breeze-plymouth-5.24.3.tar.xz";
-      sha256 = "0nkf0ll4hcawmkd7nrh8gcf6hhbl0ajxiz2azf9njab9pv2lcz1j";
-      name = "breeze-plymouth-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/breeze-plymouth-5.24.4.tar.xz";
+      sha256 = "038pglghl40nyq6lzydijy3wnr5agvfzddjxrf6lc9m6qapqd37v";
+      name = "breeze-plymouth-5.24.4.tar.xz";
     };
   };
   discover = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/discover-5.24.3.tar.xz";
-      sha256 = "097m5njz86vi4innap1mvizas60r1qcrdzdgsid1hd6p5a92rwca";
-      name = "discover-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/discover-5.24.4.tar.xz";
+      sha256 = "0smhys51chvjh2ij4mk03cfnq09n8cq22iag1ld9j2125l5iwa99";
+      name = "discover-5.24.4.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/drkonqi-5.24.3.tar.xz";
-      sha256 = "1n6psvr3washk796zrc8ag011fwy677h2mdkw9ijx8dhrk80br0k";
-      name = "drkonqi-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/drkonqi-5.24.4.tar.xz";
+      sha256 = "1yn7yj8nwnxm1s0si2353wl17jv7c7l5dc7833ndl56phv2999x0";
+      name = "drkonqi-5.24.4.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kactivitymanagerd-5.24.3.tar.xz";
-      sha256 = "0qxf3j36dj1yklnl27znsi9qdjmn6nr779cnzms38x76dq9kxblw";
-      name = "kactivitymanagerd-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kactivitymanagerd-5.24.4.tar.xz";
+      sha256 = "0aamfgc4bdrysq7ps134pf5v4bgiwrsxffi0nb6d8zazswgkfa41";
+      name = "kactivitymanagerd-5.24.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kde-cli-tools-5.24.3.tar.xz";
-      sha256 = "00z8yxic5ibk05x8c25dsc4ijvk6yv0aw1iyfhnpnzmdwdydlr7y";
-      name = "kde-cli-tools-5.24.3.tar.xz";
-    };
-  };
-  kdecoration = {
-    version = "5.24.3";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kdecoration-5.24.3.tar.xz";
-      sha256 = "0dpnaf5myn1h368cnkq9g6xfm1sqmyam6bxyidbd5j3dyy1kvz5v";
-      name = "kdecoration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kde-cli-tools-5.24.4.tar.xz";
+      sha256 = "1w2rhz32xaqhmq5lyvfmjrbssqf9f35k5fk02f05fz79yk9wir7z";
+      name = "kde-cli-tools-5.24.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kde-gtk-config-5.24.3.tar.xz";
-      sha256 = "0p50kf34csdrgck1y09d3lnz0r9ly0ca4778achrc59yr4qcsjzv";
-      name = "kde-gtk-config-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kde-gtk-config-5.24.4.tar.xz";
+      sha256 = "02spbx2rniiyvzj4qb6lgzj0f83k4vq53fk4i1m45438z7aslymi";
+      name = "kde-gtk-config-5.24.4.tar.xz";
+    };
+  };
+  kdecoration = {
+    version = "5.24.4";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.24.4/kdecoration-5.24.4.tar.xz";
+      sha256 = "05ccyb314mxf0d4ivj71l9lh13s3fqr7f4d2rmg6qshsql39569c";
+      name = "kdecoration-5.24.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kdeplasma-addons-5.24.3.tar.xz";
-      sha256 = "0g7jcvd6abnlzz9ibnc7phzm58pn6dv3795w4hhy47738jkhizl6";
-      name = "kdeplasma-addons-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kdeplasma-addons-5.24.4.tar.xz";
+      sha256 = "03b8d3kdzwpyqrqkmpswryksrhav3mwcnbyzdc3g2kpk2qnx68fp";
+      name = "kdeplasma-addons-5.24.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kgamma5-5.24.3.tar.xz";
-      sha256 = "0rwqvz14a50s43p74n19v1zzd9y8f2lylfappxmhrdyxmbgkpnk6";
-      name = "kgamma5-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kgamma5-5.24.4.tar.xz";
+      sha256 = "0z1zrw5id455idjbaqracs1vcwgs93an7w27ggfqs6i8nabrivbk";
+      name = "kgamma5-5.24.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/khotkeys-5.24.3.tar.xz";
-      sha256 = "1jxg91rpz09sh13fz270pxfw40qdy6p50j5xw7cpnyqlk2l5zx0p";
-      name = "khotkeys-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/khotkeys-5.24.4.tar.xz";
+      sha256 = "033dgz8wbsw2nj133hnmygz1izmcpxdn80jbjbm66nhbbyq7bb2s";
+      name = "khotkeys-5.24.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kinfocenter-5.24.3.tar.xz";
-      sha256 = "08z2044bl0v4ydlx2chv849y6m4py0yd4lnw76sycd14lnvsrxfj";
-      name = "kinfocenter-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kinfocenter-5.24.4.tar.xz";
+      sha256 = "0f5q6ajyd794p1z9j3il8sajlqkdcnf06xq4612qxdp49nb88nyw";
+      name = "kinfocenter-5.24.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kmenuedit-5.24.3.tar.xz";
-      sha256 = "1yivrdix4jiycfbw9g6pzx8zkmdq4g8g51ndc7sy3r0qxzgx1icb";
-      name = "kmenuedit-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kmenuedit-5.24.4.tar.xz";
+      sha256 = "0ril8jxqkaavc4bkpksnyxn3bww7b81gnp9bnb17acrr2nd7wyhl";
+      name = "kmenuedit-5.24.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kscreen-5.24.3.tar.xz";
-      sha256 = "1wjbd33h8473v8i5qxdccxrsv04v6jyd7scrqdxqaln9n8ylp08f";
-      name = "kscreen-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kscreen-5.24.4.tar.xz";
+      sha256 = "0shvhymdfxw1gz49y1s79zik9kkg5qh0mqdj6dx0s6r3w6vysj1h";
+      name = "kscreen-5.24.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kscreenlocker-5.24.3.tar.xz";
-      sha256 = "1dh3z55hwakj11ffn2fm79vnlw7gcg1nkcxbxvcdcpq84ahpq583";
-      name = "kscreenlocker-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kscreenlocker-5.24.4.tar.xz";
+      sha256 = "1xzc80awsapsg65kk21ssp7y0jb374k1w2bb7gvzj8j40rrn48pv";
+      name = "kscreenlocker-5.24.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/ksshaskpass-5.24.3.tar.xz";
-      sha256 = "0ivq9nyyqm1rrm6ck26jlsh8qv9q98dz5qwvcnpgpmxb3mr1dgiv";
-      name = "ksshaskpass-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/ksshaskpass-5.24.4.tar.xz";
+      sha256 = "1pa41w793dbi3rv6mm1a4xp46n80qwdpdlwhi6z4x76hjvqx9i9l";
+      name = "ksshaskpass-5.24.4.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/ksystemstats-5.24.3.tar.xz";
-      sha256 = "03ikpd3m0qk8cb92g63i7q9c8bks7ggf1pmmig559cmg7gbknc2c";
-      name = "ksystemstats-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/ksystemstats-5.24.4.tar.xz";
+      sha256 = "1pa7xrw5ij32bm66pn72zkzz8y70fq71n4kigm9ixc1s2glkbiwd";
+      name = "ksystemstats-5.24.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwallet-pam-5.24.3.tar.xz";
-      sha256 = "0zxdrpjq8sg3qw2gfkvjs567b41labi940cq4qrix395v7251p9k";
-      name = "kwallet-pam-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwallet-pam-5.24.4.tar.xz";
+      sha256 = "0s6z7ds42a7kba25jd7pzylw7d2mc27xgymmdrpkg2afqanf3m4r";
+      name = "kwallet-pam-5.24.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwayland-integration-5.24.3.tar.xz";
-      sha256 = "1kq5vrrplbdxri8610h89apfz07a6xi1gnlvmr8gbsvas5zicvwz";
-      name = "kwayland-integration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwayland-integration-5.24.4.tar.xz";
+      sha256 = "1cnfb81yv6m37m2kyk523skqbk5in1kpbpxq60ivjri91sm4pryj";
+      name = "kwayland-integration-5.24.4.tar.xz";
     };
   };
   kwayland-server = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwayland-server-5.24.3.tar.xz";
-      sha256 = "0fq61qk3cp4xg9759ylqqw5ncx9s7kayjf0bilg5m725bfhj02sn";
-      name = "kwayland-server-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwayland-server-5.24.4.tar.xz";
+      sha256 = "1279nqhy1qyz84dkn23rvzak8bg71hbrp09jlhv9mkjdb3bhnyfi";
+      name = "kwayland-server-5.24.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwin-5.24.3.tar.xz";
-      sha256 = "0szlrcsj4h4fa5yf27nmza7c4dyc0xcwdrihs05pl5qk5bivfkfq";
-      name = "kwin-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwin-5.24.4.tar.xz";
+      sha256 = "1qwcd6iw6yvpchiwmvq5nwsr465jmrmscf286mjrc65im4hj6572";
+      name = "kwin-5.24.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/kwrited-5.24.3.tar.xz";
-      sha256 = "1sgd3iik647pz2zr5cpsbwm2ll8f11xyw2jv2sfxkbiiw53qaxid";
-      name = "kwrited-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/kwrited-5.24.4.tar.xz";
+      sha256 = "0j86ih4g762a94cyzilcbigh7iv04a80bqrlxm02fbqhffv01mv2";
+      name = "kwrited-5.24.4.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/layer-shell-qt-5.24.3.tar.xz";
-      sha256 = "0h3xlvmgyxyzxvazgbbn0a9l14hg5d38cl9hclnwmrnpwbn0bqax";
-      name = "layer-shell-qt-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/layer-shell-qt-5.24.4.tar.xz";
+      sha256 = "03qyf6pvk36ig6ilimq02q19frdlsmrkbng2iz3d59k15zdrz5x0";
+      name = "layer-shell-qt-5.24.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/libkscreen-5.24.3.tar.xz";
-      sha256 = "18777lwn5j0isc347dks25731byyfdyls79lj6hnxqb6807lz1x6";
-      name = "libkscreen-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/libkscreen-5.24.4.tar.xz";
+      sha256 = "1xv7vml5lxj1lnansisfbfym35h265ggwsyjplz76aibj5nyqv81";
+      name = "libkscreen-5.24.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/libksysguard-5.24.3.tar.xz";
-      sha256 = "18piiy24rd5fzvp4cnhgx0d4x4m6fnxx01zm1mx0sh676g7m31hl";
-      name = "libksysguard-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/libksysguard-5.24.4.tar.xz";
+      sha256 = "00i4l2kc02wymmiqh7wam8dp4h9hvn8nsxfv258waq7pnxzjmnkn";
+      name = "libksysguard-5.24.4.tar.xz";
     };
   };
   milou = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/milou-5.24.3.tar.xz";
-      sha256 = "06xx4afym92hfpvbiqrv7mx30bdm3dhdfn8vki5zxq2k0rv0pmri";
-      name = "milou-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/milou-5.24.4.tar.xz";
+      sha256 = "0z7kmygvjzj30llwg8gpibjja2gzc09nh9pxrpy78pa1jxnas29i";
+      name = "milou-5.24.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/oxygen-5.24.3.tar.xz";
-      sha256 = "02j0drc24mf2pfhdgzri5sdcscq1bbj4lhhmhp6bn1v74wybv381";
-      name = "oxygen-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/oxygen-5.24.4.tar.xz";
+      sha256 = "1d3sz2qc1cz9x6g04r0scvw9fmrazfn5v3iav4cn7wdkz8x06kc0";
+      name = "oxygen-5.24.4.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-browser-integration-5.24.3.tar.xz";
-      sha256 = "1msib3c8arybqbv1vfj1ijx74a34a02hn8gvjy4sf95zcl07mc20";
-      name = "plasma-browser-integration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-browser-integration-5.24.4.tar.xz";
+      sha256 = "1havd775d4x2y36nkba2k6vdf839dspk10mxccnk2wkhdxmzfyk7";
+      name = "plasma-browser-integration-5.24.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-desktop-5.24.3.tar.xz";
-      sha256 = "1lwizprs6nk6nibydwkwmpi9c7c50lvg2k188pb6ddz2sb7pwgjq";
-      name = "plasma-desktop-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-desktop-5.24.4.tar.xz";
+      sha256 = "09fhqz2sp4caabr1li1shjd8l052vp4d10ci7pwsqj8f61331qmh";
+      name = "plasma-desktop-5.24.4.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-disks-5.24.3.tar.xz";
-      sha256 = "0nklcimxyvci3xa6nc5jxbcxds4a14vkkwihgc6xfpc7xcca0wcy";
-      name = "plasma-disks-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-disks-5.24.4.tar.xz";
+      sha256 = "1mi5fp3305kjw41zhbccxyg666gcmmrvckipjhnnnfwd3gl372ng";
+      name = "plasma-disks-5.24.4.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-firewall-5.24.3.tar.xz";
-      sha256 = "0r7gh3asnc5lbfsp1jb33lmgcxfpjmlrqlyz41g0wv9aj9x6pwxz";
-      name = "plasma-firewall-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-firewall-5.24.4.tar.xz";
+      sha256 = "0f9g5m2ddbp2axfxqc4d92fzg6r4z1l56i6nsry6nlz6cqky3fm2";
+      name = "plasma-firewall-5.24.4.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-integration-5.24.3.tar.xz";
-      sha256 = "031w205icblf50ps7bw7wp5q4azbqpcp4bnig2wh5d1lc8xqzvvs";
-      name = "plasma-integration-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-integration-5.24.4.tar.xz";
+      sha256 = "1d2d7cmhdhmdzs91vpc2p3fg413daqhqilp8d2qbpsks5hyrkm3k";
+      name = "plasma-integration-5.24.4.tar.xz";
     };
   };
   plasma-mobile = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-mobile-5.24.3.tar.xz";
-      sha256 = "1bwmy7xvd8wmh0snqqjh9jjgawib8ks2g30w48sqxwhplhf3da58";
-      name = "plasma-mobile-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-mobile-5.24.4.tar.xz";
+      sha256 = "1hgcnb4flw224j57fxkhaiwapymq6ccjwqj8s6jgqzc3ax0py0vr";
+      name = "plasma-mobile-5.24.4.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-nano-5.24.3.tar.xz";
-      sha256 = "13jxhfi3c3dhg7zdyfqnsii661h1am0w9dsv82dalqvwr1mw28l5";
-      name = "plasma-nano-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-nano-5.24.4.tar.xz";
+      sha256 = "1fdq4r5zlkf3qb0a47zv3apgnqs4gqqfj8pdlcmzkyn9xykzs9vw";
+      name = "plasma-nano-5.24.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-nm-5.24.3.tar.xz";
-      sha256 = "1z9vzj2mbvqklnjxf2izpx9s6cq097im0kz41fy4c5cjxna4xxic";
-      name = "plasma-nm-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-nm-5.24.4.tar.xz";
+      sha256 = "0bzc48vdrnd6n9qcm8ms7wrjm2yl7h9dik32arwdxx56vb7jhv08";
+      name = "plasma-nm-5.24.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-pa-5.24.3.tar.xz";
-      sha256 = "0n87rb04izd0ix50iy2dgj6yzzr626vhpfk76lnqr57jz6fbx3z1";
-      name = "plasma-pa-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-pa-5.24.4.tar.xz";
+      sha256 = "09fkaq2zzicgr214zi2wf7cirffm7mwh55bivvafblp1wlavkrgz";
+      name = "plasma-pa-5.24.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-sdk-5.24.3.tar.xz";
-      sha256 = "0g6nypqsbmsp9msixd7p25lk58zismdamkp41f5lx3cbb49x1fpr";
-      name = "plasma-sdk-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-sdk-5.24.4.tar.xz";
+      sha256 = "1zkggp9a1yz5mwwvndizwlan6wlb2fy8n940ljnhldccl91mgwzc";
+      name = "plasma-sdk-5.24.4.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-systemmonitor-5.24.3.tar.xz";
-      sha256 = "17a3q1az4d3xpk2ifqsj6sz7r4apxy58kk2r2l14p6s6aszhqk4h";
-      name = "plasma-systemmonitor-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-systemmonitor-5.24.4.tar.xz";
+      sha256 = "0jcsmmg0asf2npl3f1nbzazz3i8m9b34q55088k8jjakwwxqbwhz";
+      name = "plasma-systemmonitor-5.24.4.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-tests-5.24.3.tar.xz";
-      sha256 = "1x5hr465kj3dg6c335lji2lxvp7cbn86181l78qk4l75sj1ss721";
-      name = "plasma-tests-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-tests-5.24.4.tar.xz";
+      sha256 = "1ms298h9wghj9gpi7laf1dsd7s3yiycy44k4s5v4id8vfarnbs27";
+      name = "plasma-tests-5.24.4.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-thunderbolt-5.24.3.tar.xz";
-      sha256 = "1px5vfk37ak6hj6q3ipljj2dpazdbgdsga6nbkwcfn31708c7gjj";
-      name = "plasma-thunderbolt-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-thunderbolt-5.24.4.tar.xz";
+      sha256 = "1cqabdsg8v8b00ppbabrg2gih16lf79lr5i8mqvjnc73npacvzhy";
+      name = "plasma-thunderbolt-5.24.4.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-vault-5.24.3.tar.xz";
-      sha256 = "0f5yhz7qz4bqj7mc7hv7mvh2ji82pp02c901ws5cwwsh23yrhjcd";
-      name = "plasma-vault-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-vault-5.24.4.tar.xz";
+      sha256 = "0rj9z2c52mya2fjm4bimqz5z3lj2qg764zri6bqwrgwgsjwc4s81";
+      name = "plasma-vault-5.24.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-5.24.3.tar.xz";
-      sha256 = "1d1a8k75q0rdbbwkx8p1i38hc6xv9kggvfm6973lh3q0pc75qk0h";
-      name = "plasma-workspace-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-5.24.4.tar.xz";
+      sha256 = "0w7cnawnpcg5zk9bycjcnc8yfz21whrhd9h2z7hizgfnj2q403jv";
+      name = "plasma-workspace-5.24.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plasma-workspace-wallpapers-5.24.3.tar.xz";
-      sha256 = "0j1qqjc27grh3k02dgfb657ps11gym28lc9hzcw3qdxkf3djw9fs";
-      name = "plasma-workspace-wallpapers-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plasma-workspace-wallpapers-5.24.4.tar.xz";
+      sha256 = "0hpg7nn5wsn56my48jk225x1qb70sgf3hf8q5swwqc1xc6xzcg14";
+      name = "plasma-workspace-wallpapers-5.24.4.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/plymouth-kcm-5.24.3.tar.xz";
-      sha256 = "196nx8h54bnnrly12zvnwl22ksr9nk2mi6g39k4xmp28agw94jv5";
-      name = "plymouth-kcm-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/plymouth-kcm-5.24.4.tar.xz";
+      sha256 = "0s5h25vyk5yzipwj91rb62xzgi6aafpwikh7ibpmmh2wn71x3amr";
+      name = "plymouth-kcm-5.24.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.24.3";
+    version = "1-5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/polkit-kde-agent-1-5.24.3.tar.xz";
-      sha256 = "1mbr8xpjvd8w9b5nd6k8fxcnjykzzygwqk19il4wirqyh4n3k3bq";
-      name = "polkit-kde-agent-1-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/polkit-kde-agent-1-5.24.4.tar.xz";
+      sha256 = "1bc5ss6v4d7kwk1chhvpis5srs8lfypims46wgxjncyhjg2lcllm";
+      name = "polkit-kde-agent-1-5.24.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/powerdevil-5.24.3.tar.xz";
-      sha256 = "047h4lz8d1kdyakh5x7fr3kpk35r38z39vm7wb974rd9hjz7alj9";
-      name = "powerdevil-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/powerdevil-5.24.4.tar.xz";
+      sha256 = "0sjlx5fhfdld1i352adi2bhyd29ja9lbmzhfxgnvmpfl6q7c0w7g";
+      name = "powerdevil-5.24.4.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/qqc2-breeze-style-5.24.3.tar.xz";
-      sha256 = "1y21ldxwlb12kfqzxpyhdw9lkcaf5sfamwhg68r512hy785sg490";
-      name = "qqc2-breeze-style-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/qqc2-breeze-style-5.24.4.tar.xz";
+      sha256 = "1d0cgsxvnm0zza7n5hz47n28yrr35hp0vniggifncm0ag8sn0kmd";
+      name = "qqc2-breeze-style-5.24.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/sddm-kcm-5.24.3.tar.xz";
-      sha256 = "15n6drklwk3lmiaklw1af98qcixml4w83hngy23lwwv2lbnirl6h";
-      name = "sddm-kcm-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/sddm-kcm-5.24.4.tar.xz";
+      sha256 = "0pfqp5das7pxpmh111i2dlfqm6xzzd99bcb32bbmd9v6w2wlgwxy";
+      name = "sddm-kcm-5.24.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/systemsettings-5.24.3.tar.xz";
-      sha256 = "11fmjdh6v0a4gacqshhrk374i07px989p3x70w8438gr6y0n2032";
-      name = "systemsettings-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/systemsettings-5.24.4.tar.xz";
+      sha256 = "0cqm7s89jvzqz1fw32284ppnm3dc69yvc8bqqgw5jdbbjnc1z4k9";
+      name = "systemsettings-5.24.4.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.24.3";
+    version = "5.24.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.24.3/xdg-desktop-portal-kde-5.24.3.tar.xz";
-      sha256 = "06qdr7j2m9s9l60mk8vspb2173va10zdv6sinhmkhxxp78h857z6";
-      name = "xdg-desktop-portal-kde-5.24.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.24.4/xdg-desktop-portal-kde-5.24.4.tar.xz";
+      sha256 = "07nwb6ff8rnlk2play9gar52d8d44b8y412hnx9a9d4b50b4js0i";
+      name = "xdg-desktop-portal-kde-5.24.4.tar.xz";
     };
   };
 }

From 14960141d2accd8f6f07468fe7cb9ed97424bdf4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 1 Apr 2022 00:47:04 +0200
Subject: [PATCH 07/38] babeld: 1.10 -> 1.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

30 March 2022: babeld-1.11

  * Implemented MAC authentication (RFC 8967).  Thanks to Clara Dô,
    Weronika Kołodziejak and Antonin Décimo.
  * Changed the interface of the add_filter function in order to simplify
    integration in OpenWRT.  Thanks to Nick Hainke.

https://github.com/jech/babeld/blob/f82a10e97a02849cd82087863055c9af08ca3454/CHANGES
---
 pkgs/tools/networking/babeld/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 47894c1a5329..cde173ba305a 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "babeld";
-  version = "1.10";
+  version = "1.11";
 
   src = fetchurl {
     url = "https://www.irif.fr/~jch/software/files/${pname}-${version}.tar.gz";
-    sha256 = "1sld5bbig2pkcr4zrdpvfzifc6a3lc8i8kdzk5ryjh166844mxd5";
+    sha256 = "sha256-mTFa6vLqIH8XfBaFX/o0/DVK8bWYjAcODy/KOg1ND6U=";
   };
 
   preBuild = ''

From 2f7dda4450092f9f3019d131784c4c098f30d6a8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 1 Apr 2022 08:45:47 +0300
Subject: [PATCH 08/38] ocrfeeder: 0.8.3 -> 0.8.5

---
 pkgs/applications/graphics/ocrfeeder/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix
index da5f1c5dcc49..7319d4aa84e3 100644
--- a/pkgs/applications/graphics/ocrfeeder/default.nix
+++ b/pkgs/applications/graphics/ocrfeeder/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ocrfeeder";
-  version = "0.8.3";
+  version = "0.8.5";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "12f5gnq92ffnd5zaj04df7jrnsdz1zn4zcgpbf5p9qnd21i2y529";
+    sha256 = "sha256-sD0qWUndguJzTw0uy0FIqupFf4OX6dTFvcd+Mz+8Su0=";
   };
 
   nativeBuildInputs = [
@@ -49,18 +49,13 @@ stdenv.mkDerivation rec {
     ]))
   ];
 
-  # https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/22
-  postConfigure = ''
-    substituteInPlace src/ocrfeeder/util/constants.py \
-      --replace /usr/share/xml/iso-codes ${isocodes}/share/xml/iso-codes
-  '';
-
   enginesPath = lib.makeBinPath ([
     tesseract4
   ] ++ extraOcrEngines);
 
   preFixup = ''
     gappsWrapperArgs+=(--prefix PATH : "${enginesPath}")
+    gappsWrapperArgs+=(--set ISO_CODES_DIR "${isocodes}/share/xml/iso-codes")
   '';
 
   meta = with lib; {

From f81b05ab46afd7b0b8907f4b990345760ee24bd7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 3 Apr 2022 10:03:43 +0200
Subject: [PATCH 09/38] prometheus-backbox-exporter: correctly expose version
 info

---
 .../monitoring/prometheus/blackbox-exporter.nix   | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 2349bac177c9..430da1ea4d08 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -3,9 +3,10 @@
 buildGoModule rec {
   pname = "blackbox_exporter";
   version = "0.20.0";
+  rev = "v${version}";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
+    inherit rev;
     owner = "prometheus";
     repo = "blackbox_exporter";
     sha256 = "sha256-Y3HdFIChkQVooxy2I2Gbqw3WLHsI4Zm+osHTzFluRZA=";
@@ -18,11 +19,21 @@ buildGoModule rec {
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) blackbox; };
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/prometheus/common/version.Version=${version}"
+    "-X github.com/prometheus/common/version.Revision=${rev}"
+    "-X github.com/prometheus/common/version.Branch=unknown"
+    "-X github.com/prometheus/common/version.BuildUser=nix@nixpkgs"
+    "-X github.com/prometheus/common/version.BuildDate=unknown"
+  ];
+
   meta = with lib; {
     description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP";
     homepage = "https://github.com/prometheus/blackbox_exporter";
     license = licenses.asl20;
-    maintainers = with maintainers; [ globin fpletz willibutz Frostman ];
+    maintainers = with maintainers; [ globin fpletz willibutz Frostman ma27 ];
     platforms = platforms.unix;
   };
 }

From 6f8e808b8a9b7d3d8ebf361b36b94a28a8751878 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 3 Apr 2022 18:07:52 +0100
Subject: [PATCH 10/38] claws-mail: 4.0.0 -> 4.1.0

https://claws-mail.org/NEWS
---
 .../mailreaders/claws-mail/default.nix         | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 93dfc4d8a1db..af1099cbcf3e 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, fetchpatch, wrapGAppsHook, autoreconfHook, bison, flex
+{ stdenv, lib, fetchgit, wrapGAppsHook, autoreconfHook, bison, flex
 , curl, gtk3, pkg-config, python3, shared-mime-info
 , glib-networking, gsettings-desktop-schemas
 
@@ -96,28 +96,18 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "claws-mail";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchgit {
     rev = version;
     url = "git://git.claws-mail.org/claws.git";
-    sha256 = "0mwnjiqg2sj61va0y9yi3v52iyr5kzmbnvsqxav3a48m2f8p27qn";
-    };
+    sha256 = "1pgl7z87qs3ksh1pazq9cml3h0vb7kr9b97gkkrzgsgfg1vbx390";
+  };
 
   outputs = [ "out" "dev" ];
 
   patches = [
     ./mime.patch
-
-    # Fixes a bug with the automatic authentication method, resulting in errors
-    # with certain mail providers.
-    # <https://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=4497>
-    # This MUST be removed for the next release.
-    (fetchpatch {
-      name = "fix-automatic-auth.patch";
-      url = "https://git.claws-mail.org/?p=claws.git;a=patch;h=9c2585c58b49815a0eab8d683f0a94f75cbbe64e";
-      sha256 = "0v8v5q2p4h93lp7yq3gnlvarsrcssv96aks1wqy3187vsr4kdw7a";
-    })
   ];
 
   preConfigure = ''

From 84f98081dc5ec0992757cb5099b4c537a08a938b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 3 Apr 2022 22:30:50 +0300
Subject: [PATCH 11/38] ocrfeeder: Mark as broken due to upstream issue

---
 pkgs/applications/graphics/ocrfeeder/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix
index 7319d4aa84e3..2cd3299c6175 100644
--- a/pkgs/applications/graphics/ocrfeeder/default.nix
+++ b/pkgs/applications/graphics/ocrfeeder/default.nix
@@ -64,5 +64,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ doronbehar ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
+    # Compiles, but doesn't launch, see: https://gitlab.gnome.org/GNOME/ocrfeeder/-/issues/83
+    broken = true;
   };
 }

From 36a2f67a648df7aeedc1f04dc4401b79d493a32d Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Tue, 29 Mar 2022 01:45:33 +0200
Subject: [PATCH 12/38] cldr-annotations: init at 40.0

---
 pkgs/data/misc/cldr-annotations/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/data/misc/cldr-annotations/default.nix

diff --git a/pkgs/data/misc/cldr-annotations/default.nix b/pkgs/data/misc/cldr-annotations/default.nix
new file mode 100644
index 000000000000..14c8d36f28bf
--- /dev/null
+++ b/pkgs/data/misc/cldr-annotations/default.nix
@@ -0,0 +1,24 @@
+{ lib, fetchzip }:
+
+let
+  version = "40.0";
+in fetchzip rec {
+  name = "cldr-annotations-${version}";
+
+  url = "https://unicode.org/Public/cldr/40/cldr-common-${version}.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/unicode/cldr
+    unzip -d $out/share/unicode/cldr $downloadedFile 'common/annotations/*' 'common/annotationsDerived/*'
+  '';
+
+  sha256 = "sha256-L4NSMNFYKJWV3qKQhio9eMABtDlLieT9VeMZfzeAkbM=";
+
+  meta = with lib; {
+    description = "Names and keywords for Unicode characters from the Common Locale Data Repository";
+    homepage = "https://cldr.unicode.org";
+    license = licenses.unicode-dfs-2016;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ DeeUnderscore ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d13066e27f35..655b03656ae4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23690,6 +23690,8 @@ with pkgs;
 
   chonburi-font = callPackage ../data/fonts/chonburi { };
 
+  cldr-annotations = callPackage ../data/misc/cldr-annotations { };
+
   cldr-emoji-annotation = callPackage ../data/misc/cldr-emoji-annotation { };
 
   clearlooks-phenix = callPackage ../data/themes/clearlooks-phenix { };

From 6ae3cfc430bb416ca59cbff435aeddc2d63289f9 Mon Sep 17 00:00:00 2001
From: D Anzorge <d.anzorge@gmail.com>
Date: Tue, 29 Mar 2022 01:46:39 +0200
Subject: [PATCH 13/38] ibus: switch from cldr-emoji-annotation to
 cldr-annotations

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

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 0f4dde0a4169..4ca1e62bfb8a 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -21,7 +21,7 @@
 , gtk-doc
 , runCommand
 , isocodes
-, cldr-emoji-annotation
+, cldr-annotations
 , unicode-character-database
 , unicode-emoji
 , python3
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
     "--enable-gtk4"
     "--enable-install-tests"
     "--with-unicode-emoji-dir=${unicode-emoji}/share/unicode/emoji"
-    "--with-emoji-annotation-dir=${cldr-emoji-annotation}/share/unicode/cldr/common/annotations"
+    "--with-emoji-annotation-dir=${cldr-annotations}/share/unicode/cldr/common/annotations"
     "--with-ucd-dir=${unicode-character-database}/share/unicode"
   ];
 

From be8f812fcaf2d4360cd906879d66e5f2e1063e62 Mon Sep 17 00:00:00 2001
From: Ingo Blechschmidt <iblech@speicherleck.de>
Date: Mon, 4 Apr 2022 10:01:35 +0200
Subject: [PATCH 14/38] ethercalc: migrate from nodejs-12_x to nodejs-14_x

---
 pkgs/servers/web-apps/ethercalc/generate.sh   |  1 +
 .../ethercalc/node-packages-generated.nix     | 81 +++++++------------
 .../web-apps/ethercalc/node-packages.nix      |  2 +-
 3 files changed, 33 insertions(+), 51 deletions(-)

diff --git a/pkgs/servers/web-apps/ethercalc/generate.sh b/pkgs/servers/web-apps/ethercalc/generate.sh
index 814a83a033d0..d87c9b93966b 100755
--- a/pkgs/servers/web-apps/ethercalc/generate.sh
+++ b/pkgs/servers/web-apps/ethercalc/generate.sh
@@ -9,6 +9,7 @@ set -euo pipefail
 cd -- "$(dirname -- "$BASH_SOURCE[0]")"
 
 node2nix \
+     --nodejs-14 \
      --input node-packages.json \
      --output node-packages-generated.nix \
      --composition node-packages.nix \
diff --git a/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix b/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
index 97435a5225f8..21cd090df86c 100644
--- a/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
+++ b/pkgs/servers/web-apps/ethercalc/node-packages-generated.nix
@@ -31,13 +31,13 @@ let
         sha1 = "6a3e6bf0a63900ba15652808cb15c6813d1a5f25";
       };
     };
-    "adler-32-1.3.0" = {
+    "adler-32-1.3.1" = {
       name = "adler-32";
       packageName = "adler-32";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.0.tgz";
-        sha512 = "f5nltvjl+PRUh6YNfUstRaXwJxtfnKEWhAWWlmKvh+Y3J2+98a0KKVYDEhz6NdKGqswLhjNGznxfSsZGOvOd9g==";
+        url = "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz";
+        sha512 = "ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==";
       };
     };
     "after-0.8.1" = {
@@ -184,13 +184,13 @@ let
         sha1 = "82306becadf44543e826b3907eae93f0237c4e5c";
       };
     };
-    "brace-expansion-1.1.11" = {
+    "brace-expansion-2.0.1" = {
       name = "brace-expansion";
       packageName = "brace-expansion";
-      version = "1.1.11";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";
-        sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==";
+        url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz";
+        sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==";
       };
     };
     "buffer-crc32-0.2.3" = {
@@ -391,15 +391,6 @@ let
         sha1 = "69700cf1ee8963454356ac192a6e5e91e232bffb";
       };
     };
-    "concat-map-0.0.1" = {
-      name = "concat-map";
-      packageName = "concat-map";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
-        sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
-      };
-    };
     "concat-stream-2.0.0" = {
       name = "concat-stream";
       packageName = "concat-stream";
@@ -481,13 +472,13 @@ let
         sha1 = "09507984ee9bcce3bd1b8861f0de8ab10ae8187d";
       };
     };
-    "crc-32-1.2.0" = {
+    "crc-32-1.2.1" = {
       name = "crc-32";
       packageName = "crc-32";
-      version = "1.2.0";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.0.tgz";
-        sha512 = "1uBwHxF+Y/4yF5G48fwnKq6QsIXheor3ZLPT80yGBV1oEUwpPojlEhQbWKVw1VwcTQyMGHK1/XMmTjmlsmTTGA==";
+        url = "https://registry.npmjs.org/crc-32/-/crc-32-1.2.1.tgz";
+        sha512 = "Dn/xm/1vFFgs3nfrpEVScHoIslO9NZRITWGz/1E/St6u4xw99vfZzVkW0OSnzx2h9egej9xwMCEut6sqwokM/w==";
       };
     };
     "csrf-2.0.7" = {
@@ -595,7 +586,7 @@ let
       version = "1.0.1";
       src = fetchurl {
         name = "emitter-1.0.1.tar.gz";
-        url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1";
+        url = "https://codeload.github.com/component/emitter/tar.gz/refs/tags/1.0.1";
         sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d";
       };
     };
@@ -731,7 +722,7 @@ let
       version = "2.0.1";
       src = fetchurl {
         name = "global-2.0.1.tar.gz";
-        url = "https://codeload.github.com/component/global/tar.gz/v2.0.1";
+        url = "https://codeload.github.com/component/global/tar.gz/refs/tags/v2.0.1";
         sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785";
       };
     };
@@ -924,13 +915,13 @@ let
         sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
       };
     };
-    "minimatch-3.0.4" = {
+    "minimatch-5.0.1" = {
       name = "minimatch";
       packageName = "minimatch";
-      version = "3.0.4";
+      version = "5.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz";
-        sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz";
+        sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==";
       };
     };
     "minimist-0.0.10" = {
@@ -1185,22 +1176,13 @@ let
         sha512 = "zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==";
       };
     };
-    "printj-1.2.3" = {
+    "printj-1.3.1" = {
       name = "printj";
       packageName = "printj";
-      version = "1.2.3";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/printj/-/printj-1.2.3.tgz";
-        sha512 = "sanczS6xOJOg7IKDvi4sGOUOe7c1tsEzjwlLFH/zgwx/uyImVM9/rgBkc8AfiQa/Vg54nRd8mkm9yI7WV/O+WA==";
-      };
-    };
-    "printj-1.3.0" = {
-      name = "printj";
-      packageName = "printj";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/printj/-/printj-1.3.0.tgz";
-        sha512 = "017o8YIaz8gLhaNxRB9eBv2mWXI2CtzhPJALnQTP+OPpuUfP0RMWqr/mHCzqVeu1AQxfzSfAtAq66vKB8y7Lzg==";
+        url = "https://registry.npmjs.org/printj/-/printj-1.3.1.tgz";
+        sha512 = "GA3TdL8szPK4AQ2YnOe/b+Y1jUFwmmGMMK/qbY7VcE3Z7FU8JstbKiKRzO6CIiAKPhTO8m01NoQ0V5f3jc4OGg==";
       };
     };
     "proxy-addr-1.0.1" = {
@@ -1806,19 +1788,15 @@ in
           sources."iconv-lite-0.4.4"
         ];
       })
-      sources."brace-expansion-1.1.11"
+      sources."brace-expansion-2.0.1"
       sources."buffer-crc32-0.2.3"
       sources."buffer-from-1.1.2"
       sources."bytes-1.0.0"
       sources."callsite-1.0.0"
       (sources."cfb-1.2.1" // {
         dependencies = [
-          (sources."adler-32-1.3.0" // {
-            dependencies = [
-              sources."printj-1.2.3"
-            ];
-          })
-          sources."printj-1.3.0"
+          sources."adler-32-1.3.1"
+          sources."printj-1.3.1"
         ];
       })
       (sources."codepage-1.14.0" // {
@@ -1844,7 +1822,6 @@ in
           sources."vary-1.0.1"
         ];
       })
-      sources."concat-map-0.0.1"
       sources."concat-stream-2.0.0"
       sources."connect-2.25.9"
       sources."connect-timeout-1.2.2"
@@ -1853,7 +1830,11 @@ in
       sources."cookie-signature-1.0.4"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
-      sources."crc-32-1.2.0"
+      (sources."crc-32-1.2.1" // {
+        dependencies = [
+          sources."printj-1.3.1"
+        ];
+      })
       sources."csrf-2.0.7"
       sources."cssom-0.2.5"
       sources."csurf-1.4.1"
@@ -1937,7 +1918,7 @@ in
       sources."methods-1.1.0"
       sources."mime-1.2.11"
       sources."mime-types-1.0.2"
-      sources."minimatch-3.0.4"
+      sources."minimatch-5.0.1"
       sources."minimist-0.0.10"
       (sources."mkdirp-0.5.0" // {
         dependencies = [
diff --git a/pkgs/servers/web-apps/ethercalc/node-packages.nix b/pkgs/servers/web-apps/ethercalc/node-packages.nix
index 0961603968ea..862d22340099 100644
--- a/pkgs/servers/web-apps/ethercalc/node-packages.nix
+++ b/pkgs/servers/web-apps/ethercalc/node-packages.nix
@@ -2,7 +2,7 @@
 
 {pkgs ? import <nixpkgs> {
     inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
+  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}:
 
 let
   nodeEnv = import ../../../development/node-packages/node-env.nix {

From 4b9efea2554e035ec03f73fb922eab16db8c7fb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 4 Apr 2022 10:04:45 +0100
Subject: [PATCH 15/38] nixos/stage-1-systemd: Implement job scripts

---
 nixos/lib/systemd-unit-options.nix           | 181 ++++++++++---------
 nixos/modules/system/boot/systemd/initrd.nix |   3 +-
 2 files changed, 97 insertions(+), 87 deletions(-)

diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index c9d424d39119..35831f4b7f44 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -250,7 +250,7 @@ in rec {
   };
   stage1CommonUnitOptions = commonUnitOptions;
 
-  serviceOptions = { options = {
+  serviceOptions = { name, config, ... }: { options = {
 
     environment = mkOption {
       default = {};
@@ -284,71 +284,107 @@ in rec {
       '';
     };
 
-  }; };
+    script = mkOption {
+      type = types.lines;
+      default = "";
+      description = "Shell commands executed as the service's main process.";
+    };
 
-  stage2ServiceOptions = { name, config, ... }: {
+    scriptArgs = mkOption {
+      type = types.str;
+      default = "";
+      description = "Arguments passed to the main process script.";
+    };
+
+    preStart = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed before the service's main process
+        is started.
+      '';
+    };
+
+    postStart = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed after the service's main process
+        is started.
+      '';
+    };
+
+    reload = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed when the service's main process
+        is reloaded.
+      '';
+    };
+
+    preStop = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed to stop the service.
+      '';
+    };
+
+    postStop = mkOption {
+      type = types.lines;
+      default = "";
+      description = ''
+        Shell commands executed after the service's main process
+        has exited.
+      '';
+    };
+
+    jobScripts = mkOption {
+      type = with types; coercedTo path singleton (listOf path);
+      internal = true;
+      description = "A list of all job script derivations of this unit.";
+      default = [];
+    };
+
+  };
+
+  config = mkMerge [
+    (mkIf (config.preStart != "") rec {
+      jobScripts = makeJobScript "${name}-pre-start" config.preStart;
+      serviceConfig.ExecStartPre = [ jobScripts ];
+    })
+    (mkIf (config.script != "") rec {
+      jobScripts = makeJobScript "${name}-start" config.script;
+      serviceConfig.ExecStart = jobScripts + " " + config.scriptArgs;
+    })
+    (mkIf (config.postStart != "") rec {
+      jobScripts = (makeJobScript "${name}-post-start" config.postStart);
+      serviceConfig.ExecStartPost = [ jobScripts ];
+    })
+    (mkIf (config.reload != "") rec {
+      jobScripts = makeJobScript "${name}-reload" config.reload;
+      serviceConfig.ExecReload = jobScripts;
+    })
+    (mkIf (config.preStop != "") rec {
+      jobScripts = makeJobScript "${name}-pre-stop" config.preStop;
+      serviceConfig.ExecStop = jobScripts;
+    })
+    (mkIf (config.postStop != "") rec {
+      jobScripts = makeJobScript "${name}-post-stop" config.postStop;
+      serviceConfig.ExecStopPost = jobScripts;
+    })
+  ];
+
+  };
+
+  stage2ServiceOptions = {
     imports = [
       stage2CommonUnitOptions
       serviceOptions
     ];
 
     options = {
-      script = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands executed as the service's main process.";
-      };
-
-      scriptArgs = mkOption {
-        type = types.str;
-        default = "";
-        description = "Arguments passed to the main process script.";
-      };
-
-      preStart = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Shell commands executed before the service's main process
-          is started.
-        '';
-      };
-
-      postStart = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Shell commands executed after the service's main process
-          is started.
-        '';
-      };
-
-      reload = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Shell commands executed when the service's main process
-          is reloaded.
-        '';
-      };
-
-      preStop = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Shell commands executed to stop the service.
-        '';
-      };
-
-      postStop = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Shell commands executed after the service's main process
-          has exited.
-        '';
-      };
-
       restartIfChanged = mkOption {
         type = types.bool;
         default = true;
@@ -404,33 +440,6 @@ in rec {
         apply = v: if isList v then v else [ v ];
       };
     };
-
-    config = mkMerge
-      [ (mkIf (config.preStart != "")
-          { serviceConfig.ExecStartPre =
-              [ (makeJobScript "${name}-pre-start" config.preStart) ];
-          })
-        (mkIf (config.script != "")
-          { serviceConfig.ExecStart =
-              makeJobScript "${name}-start" config.script + " " + config.scriptArgs;
-          })
-        (mkIf (config.postStart != "")
-          { serviceConfig.ExecStartPost =
-              [ (makeJobScript "${name}-post-start" config.postStart) ];
-          })
-        (mkIf (config.reload != "")
-          { serviceConfig.ExecReload =
-              makeJobScript "${name}-reload" config.reload;
-          })
-        (mkIf (config.preStop != "")
-          { serviceConfig.ExecStop =
-              makeJobScript "${name}-pre-stop" config.preStop;
-          })
-        (mkIf (config.postStop != "")
-          { serviceConfig.ExecStopPost =
-              makeJobScript "${name}-post-stop" config.postStop;
-          })
-      ];
   };
 
   stage1ServiceOptions = {
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index 30bdc9a3422c..36a14d7a8256 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -96,6 +96,7 @@ let
 
   enabledUpstreamUnits = filter (n: ! elem n cfg.suppressedUnits) upstreamUnits;
   enabledUnits = filterAttrs (n: v: ! elem n cfg.suppressedUnits) cfg.units;
+  jobScripts = concatLists (mapAttrsToList (_: unit: unit.jobScripts or []) (filterAttrs (_: v: v.enable) cfg.services));
 
   stage1Units = generateUnits {
     type = "initrd";
@@ -378,7 +379,7 @@ in {
 
         # so NSS can look up usernames
         "${pkgs.glibc}/lib/libnss_files.so"
-      ];
+      ] ++ jobScripts;
 
       targets.initrd.aliases = ["default.target"];
       units =

From ef6d9dfd710cf082b90aa78804f0743aa9b1a8a8 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 4 Apr 2022 13:11:00 +0200
Subject: [PATCH 16/38] pkgs.formats.javaProperties: Add implementation note to
 type

---
 .../formats/java-properties/default.nix       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/pkgs-lib/formats/java-properties/default.nix b/pkgs/pkgs-lib/formats/java-properties/default.nix
index b63b96d32769..6ac56bff4bf6 100644
--- a/pkgs/pkgs-lib/formats/java-properties/default.nix
+++ b/pkgs/pkgs-lib/formats/java-properties/default.nix
@@ -1,6 +1,30 @@
 { lib, pkgs }:
 {
   javaProperties = { comment ? "Generated with Nix" }: {
+
+    # Design note:
+    # A nested representation of inevitably leads to bad UX:
+    # 1. keys like "a.b" must be disallowed, or
+    #    the addition of options in a freeformType module
+    #    become breaking changes
+    # 2. adding a value for "a" after "a"."b" was already
+    #    defined leads to a somewhat hard to understand
+    #    Nix error, because that's not something you can
+    #    do with attrset syntax. Workaround: "a"."", but
+    #    that's too little too late. Another workaround:
+    #    mkMerge [ { a = ...; } { a.b = ...; } ].
+    #
+    # Choosing a non-nested representation does mean that
+    # we sacrifice the ability to override at the (conceptual)
+    # hierarchical levels, _if_ an application exhibits those.
+    #
+    # Some apps just use periods instead of spaces in an odd
+    # mix of attempted categorization and natural language,
+    # with no meaningful hierarchy.
+    #
+    # We _can_ choose to support hierarchical config files
+    # via nested attrsets, but the module author should
+    # make sure that problem (2) does not occur.
     type = lib.types.attrsOf lib.types.str;
 
     generate = name: value:

From dcca8f5be287bf7efd4867d0e0ed7643434a8236 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 4 Apr 2022 13:11:47 +0200
Subject: [PATCH 17/38] tests.pkgs-lib.formats: Detect when impossible input is
 fed

---
 pkgs/pkgs-lib/tests/formats.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index 1efe9d8686b1..99b88d36ec3c 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -9,7 +9,11 @@ let
     let
       formatSet = format args;
       config = formatSet.type.merge [] (imap1 (n: def: {
-        value = def;
+        # We check the input values, so that
+        #  - we don't write nonsensical tests that will impede progress
+        #  - the test author has a slightly more realistic view of the
+        #    final format during development.
+        value = lib.throwIfNot (formatSet.type.check def) (builtins.trace def "definition does not pass the type's check function") def;
         file = "def${toString n}";
       }) [ def ]);
     in formatSet.generate "test-format-file" config;

From cb69b89d9033c5edfcac1781b4b630841a9cb746 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Mon, 4 Apr 2022 08:47:59 -0400
Subject: [PATCH 18/38] pulumi: fix hashes

---
 pkgs/tools/admin/pulumi/data.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix
index c14cee290144..1db58accc4b2 100644
--- a/pkgs/tools/admin/pulumi/data.nix
+++ b/pkgs/tools/admin/pulumi/data.nix
@@ -6,7 +6,7 @@
     x86_64-linux = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-linux-x64.tar.gz";
-        sha256 = "1ngwbv5dhi7xw2dvwlxm8l62h44b5inn3ybhcndsqklwgylsgf88";
+        sha256 = "0983axi1hxika5a1jl84hfndx8qgfl9pchfakkqcb9w9hwzz5zdq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-amd64.tar.gz";
@@ -164,7 +164,7 @@
     x86_64-darwin = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-darwin-x64.tar.gz";
-        sha256 = "0nwpar4vz7af3ylpyg8lf2mmp86qggxihg2nh2acwc0fhdad4jr5";
+        sha256 = "0nixfzgl94kqzzvwr572rzqcayldcyj03ilbqhns7x3wl31fn583";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-darwin-amd64.tar.gz";
@@ -322,7 +322,7 @@
     aarch64-linux = [
       {
         url = "https://get.pulumi.com/releases/sdk/pulumi-v3.28.0-linux-arm64.tar.gz";
-        sha256 = "0nbzl4mhms9v6dr0db5pgnv187a5mipwhnp86a21a5q964dz998v";
+        sha256 = "1zrz7vgl36wj4h3h298x4vh2dl0a909niw22dxfvzvsvxcd88y9v";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v4.5.0-linux-arm64.tar.gz";

From beb02229fb92b5dfad59e27ced9f635846d1a5c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 4 Apr 2022 11:48:13 +0100
Subject: [PATCH 19/38] nixos/systemd-unit-options: Fix indentation

---
 nixos/lib/systemd-unit-options.nix | 767 +++++++++++++++--------------
 1 file changed, 392 insertions(+), 375 deletions(-)

diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix
index 35831f4b7f44..02e91fdf1e62 100644
--- a/nixos/lib/systemd-unit-options.nix
+++ b/nixos/lib/systemd-unit-options.nix
@@ -94,131 +94,133 @@ in rec {
 
   };
 
-  commonUnitOptions = { options = (sharedOptions // {
+  commonUnitOptions = {
+    options = sharedOptions // {
+
+      description = mkOption {
+        default = "";
+        type = types.singleLineStr;
+        description = "Description of this unit used in systemd messages and progress indicators.";
+      };
+
+      documentation = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        description = "A list of URIs referencing documentation for this unit or its configuration.";
+      };
+
+      requires = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          Start the specified units when this unit is started, and stop
+          this unit when the specified units are stopped or fail.
+        '';
+      };
+
+      wants = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          Start the specified units when this unit is started.
+        '';
+      };
+
+      after = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          If the specified units are started at the same time as
+          this unit, delay this unit until they have started.
+        '';
+      };
+
+      before = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          If the specified units are started at the same time as
+          this unit, delay them until this unit has started.
+        '';
+      };
+
+      bindsTo = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          Like ‘requires’, but in addition, if the specified units
+          unexpectedly disappear, this unit will be stopped as well.
+        '';
+      };
+
+      partOf = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          If the specified units are stopped or restarted, then this
+          unit is stopped or restarted as well.
+        '';
+      };
+
+      conflicts = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          If the specified units are started, then this unit is stopped
+          and vice versa.
+        '';
+      };
+
+      requisite = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          Similar to requires. However if the units listed are not started,
+          they will not be started and the transaction will fail.
+        '';
+      };
+
+      unitConfig = mkOption {
+        default = {};
+        example = { RequiresMountsFor = "/data"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Unit]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.unit</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
+
+      onFailure = mkOption {
+        default = [];
+        type = types.listOf unitNameType;
+        description = ''
+          A list of one or more units that are activated when
+          this unit enters the "failed" state.
+        '';
+      };
+
+      startLimitBurst = mkOption {
+         type = types.int;
+         description = ''
+           Configure unit start rate limiting. Units which are started
+           more than startLimitBurst times within an interval time
+           interval are not permitted to start any more.
+         '';
+      };
+
+      startLimitIntervalSec = mkOption {
+         type = types.int;
+         description = ''
+           Configure unit start rate limiting. Units which are started
+           more than startLimitBurst times within an interval time
+           interval are not permitted to start any more.
+         '';
+      };
 
-    description = mkOption {
-      default = "";
-      type = types.singleLineStr;
-      description = "Description of this unit used in systemd messages and progress indicators.";
     };
-
-    documentation = mkOption {
-      default = [];
-      type = types.listOf types.str;
-      description = "A list of URIs referencing documentation for this unit or its configuration.";
-    };
-
-    requires = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        Start the specified units when this unit is started, and stop
-        this unit when the specified units are stopped or fail.
-      '';
-    };
-
-    wants = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        Start the specified units when this unit is started.
-      '';
-    };
-
-    after = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        If the specified units are started at the same time as
-        this unit, delay this unit until they have started.
-      '';
-    };
-
-    before = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        If the specified units are started at the same time as
-        this unit, delay them until this unit has started.
-      '';
-    };
-
-    bindsTo = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        Like ‘requires’, but in addition, if the specified units
-        unexpectedly disappear, this unit will be stopped as well.
-      '';
-    };
-
-    partOf = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        If the specified units are stopped or restarted, then this
-        unit is stopped or restarted as well.
-      '';
-    };
-
-    conflicts = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        If the specified units are started, then this unit is stopped
-        and vice versa.
-      '';
-    };
-
-    requisite = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        Similar to requires. However if the units listed are not started,
-        they will not be started and the transaction will fail.
-      '';
-    };
-
-    unitConfig = mkOption {
-      default = {};
-      example = { RequiresMountsFor = "/data"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Unit]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.unit</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    onFailure = mkOption {
-      default = [];
-      type = types.listOf unitNameType;
-      description = ''
-        A list of one or more units that are activated when
-        this unit enters the "failed" state.
-      '';
-    };
-
-    startLimitBurst = mkOption {
-       type = types.int;
-       description = ''
-         Configure unit start rate limiting. Units which are started
-         more than startLimitBurst times within an interval time
-         interval are not permitted to start any more.
-       '';
-    };
-
-    startLimitIntervalSec = mkOption {
-       type = types.int;
-       description = ''
-         Configure unit start rate limiting. Units which are started
-         more than startLimitBurst times within an interval time
-         interval are not permitted to start any more.
-       '';
-    };
-
-  }); };
+  };
 
   stage2CommonUnitOptions = {
     imports = [
@@ -250,131 +252,132 @@ in rec {
   };
   stage1CommonUnitOptions = commonUnitOptions;
 
-  serviceOptions = { name, config, ... }: { options = {
+  serviceOptions = { name, config, ... }: {
+    options = {
+
+      environment = mkOption {
+        default = {};
+        type = with types; attrsOf (nullOr (oneOf [ str path package ]));
+        example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
+        description = "Environment variables passed to the service's processes.";
+      };
+
+      path = mkOption {
+        default = [];
+        type = with types; listOf (oneOf [ package str ]);
+        description = ''
+          Packages added to the service's <envar>PATH</envar>
+          environment variable.  Both the <filename>bin</filename>
+          and <filename>sbin</filename> subdirectories of each
+          package are added.
+        '';
+      };
+
+      serviceConfig = mkOption {
+        default = {};
+        example =
+          { RestartSec = 5;
+          };
+        type = types.addCheck (types.attrsOf unitOption) checkService;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Service]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.service</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
+
+      script = mkOption {
+        type = types.lines;
+        default = "";
+        description = "Shell commands executed as the service's main process.";
+      };
+
+      scriptArgs = mkOption {
+        type = types.str;
+        default = "";
+        description = "Arguments passed to the main process script.";
+      };
+
+      preStart = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Shell commands executed before the service's main process
+          is started.
+        '';
+      };
+
+      postStart = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Shell commands executed after the service's main process
+          is started.
+        '';
+      };
+
+      reload = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Shell commands executed when the service's main process
+          is reloaded.
+        '';
+      };
+
+      preStop = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Shell commands executed to stop the service.
+        '';
+      };
+
+      postStop = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Shell commands executed after the service's main process
+          has exited.
+        '';
+      };
+
+      jobScripts = mkOption {
+        type = with types; coercedTo path singleton (listOf path);
+        internal = true;
+        description = "A list of all job script derivations of this unit.";
+        default = [];
+      };
 
-    environment = mkOption {
-      default = {};
-      type = with types; attrsOf (nullOr (oneOf [ str path package ]));
-      example = { PATH = "/foo/bar/bin"; LANG = "nl_NL.UTF-8"; };
-      description = "Environment variables passed to the service's processes.";
     };
 
-    path = mkOption {
-      default = [];
-      type = with types; listOf (oneOf [ package str ]);
-      description = ''
-        Packages added to the service's <envar>PATH</envar>
-        environment variable.  Both the <filename>bin</filename>
-        and <filename>sbin</filename> subdirectories of each
-        package are added.
-      '';
-    };
-
-    serviceConfig = mkOption {
-      default = {};
-      example =
-        { RestartSec = 5;
-        };
-      type = types.addCheck (types.attrsOf unitOption) checkService;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Service]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.service</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-    script = mkOption {
-      type = types.lines;
-      default = "";
-      description = "Shell commands executed as the service's main process.";
-    };
-
-    scriptArgs = mkOption {
-      type = types.str;
-      default = "";
-      description = "Arguments passed to the main process script.";
-    };
-
-    preStart = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed before the service's main process
-        is started.
-      '';
-    };
-
-    postStart = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed after the service's main process
-        is started.
-      '';
-    };
-
-    reload = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed when the service's main process
-        is reloaded.
-      '';
-    };
-
-    preStop = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed to stop the service.
-      '';
-    };
-
-    postStop = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands executed after the service's main process
-        has exited.
-      '';
-    };
-
-    jobScripts = mkOption {
-      type = with types; coercedTo path singleton (listOf path);
-      internal = true;
-      description = "A list of all job script derivations of this unit.";
-      default = [];
-    };
-
-  };
-
-  config = mkMerge [
-    (mkIf (config.preStart != "") rec {
-      jobScripts = makeJobScript "${name}-pre-start" config.preStart;
-      serviceConfig.ExecStartPre = [ jobScripts ];
-    })
-    (mkIf (config.script != "") rec {
-      jobScripts = makeJobScript "${name}-start" config.script;
-      serviceConfig.ExecStart = jobScripts + " " + config.scriptArgs;
-    })
-    (mkIf (config.postStart != "") rec {
-      jobScripts = (makeJobScript "${name}-post-start" config.postStart);
-      serviceConfig.ExecStartPost = [ jobScripts ];
-    })
-    (mkIf (config.reload != "") rec {
-      jobScripts = makeJobScript "${name}-reload" config.reload;
-      serviceConfig.ExecReload = jobScripts;
-    })
-    (mkIf (config.preStop != "") rec {
-      jobScripts = makeJobScript "${name}-pre-stop" config.preStop;
-      serviceConfig.ExecStop = jobScripts;
-    })
-    (mkIf (config.postStop != "") rec {
-      jobScripts = makeJobScript "${name}-post-stop" config.postStop;
-      serviceConfig.ExecStopPost = jobScripts;
-    })
-  ];
+    config = mkMerge [
+      (mkIf (config.preStart != "") rec {
+        jobScripts = makeJobScript "${name}-pre-start" config.preStart;
+        serviceConfig.ExecStartPre = [ jobScripts ];
+      })
+      (mkIf (config.script != "") rec {
+        jobScripts = makeJobScript "${name}-start" config.script;
+        serviceConfig.ExecStart = jobScripts + " " + config.scriptArgs;
+      })
+      (mkIf (config.postStart != "") rec {
+        jobScripts = (makeJobScript "${name}-post-start" config.postStart);
+        serviceConfig.ExecStartPost = [ jobScripts ];
+      })
+      (mkIf (config.reload != "") rec {
+        jobScripts = makeJobScript "${name}-reload" config.reload;
+        serviceConfig.ExecReload = jobScripts;
+      })
+      (mkIf (config.preStop != "") rec {
+        jobScripts = makeJobScript "${name}-pre-stop" config.preStop;
+        serviceConfig.ExecStop = jobScripts;
+      })
+      (mkIf (config.postStop != "") rec {
+        jobScripts = makeJobScript "${name}-post-stop" config.postStop;
+        serviceConfig.ExecStopPost = jobScripts;
+      })
+    ];
 
   };
 
@@ -450,41 +453,43 @@ in rec {
   };
 
 
-  socketOptions = { options = {
+  socketOptions = {
+    options = {
 
-    listenStreams = mkOption {
-      default = [];
-      type = types.listOf types.str;
-      example = [ "0.0.0.0:993" "/run/my-socket" ];
-      description = ''
-        For each item in this list, a <literal>ListenStream</literal>
-        option in the <literal>[Socket]</literal> section will be created.
-      '';
+      listenStreams = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        example = [ "0.0.0.0:993" "/run/my-socket" ];
+        description = ''
+          For each item in this list, a <literal>ListenStream</literal>
+          option in the <literal>[Socket]</literal> section will be created.
+        '';
+      };
+
+      listenDatagrams = mkOption {
+        default = [];
+        type = types.listOf types.str;
+        example = [ "0.0.0.0:993" "/run/my-socket" ];
+        description = ''
+          For each item in this list, a <literal>ListenDatagram</literal>
+          option in the <literal>[Socket]</literal> section will be created.
+        '';
+      };
+
+      socketConfig = mkOption {
+        default = {};
+        example = { ListenStream = "/run/my-socket"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Socket]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.socket</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
     };
 
-    listenDatagrams = mkOption {
-      default = [];
-      type = types.listOf types.str;
-      example = [ "0.0.0.0:993" "/run/my-socket" ];
-      description = ''
-        For each item in this list, a <literal>ListenDatagram</literal>
-        option in the <literal>[Socket]</literal> section will be created.
-      '';
-    };
-
-    socketConfig = mkOption {
-      default = {};
-      example = { ListenStream = "/run/my-socket"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Socket]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.socket</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
-    };
-
-  }; };
+  };
 
   stage2SocketOptions = {
     imports = [
@@ -501,23 +506,25 @@ in rec {
   };
 
 
-  timerOptions = { options = {
+  timerOptions = {
+    options = {
+
+      timerConfig = mkOption {
+        default = {};
+        example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Timer]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.timer</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> and
+          <citerefentry><refentrytitle>systemd.time</refentrytitle>
+          <manvolnum>7</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    timerConfig = mkOption {
-      default = {};
-      example = { OnCalendar = "Sun 14:00:00"; Unit = "foo.service"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Timer]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.timer</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> and
-        <citerefentry><refentrytitle>systemd.time</refentrytitle>
-        <manvolnum>7</manvolnum></citerefentry> for details.
-      '';
     };
-
-  }; };
+  };
 
   stage2TimerOptions = {
     imports = [
@@ -534,21 +541,23 @@ in rec {
   };
 
 
-  pathOptions = { options = {
+  pathOptions = {
+    options = {
+
+      pathConfig = mkOption {
+        default = {};
+        example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Path]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.path</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    pathConfig = mkOption {
-      default = {};
-      example = { PathChanged = "/some/path"; Unit = "changedpath.service"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Path]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.path</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
     };
-
-  }; };
+  };
 
   stage2PathOptions = {
     imports = [
@@ -565,49 +574,52 @@ in rec {
   };
 
 
-  mountOptions = { options = {
+  mountOptions = {
+    options = {
 
-    what = mkOption {
-      example = "/dev/sda1";
-      type = types.str;
-      description = "Absolute path of device node, file or other resource. (Mandatory)";
-    };
+      what = mkOption {
+        example = "/dev/sda1";
+        type = types.str;
+        description = "Absolute path of device node, file or other resource. (Mandatory)";
+      };
 
-    where = mkOption {
-      example = "/mnt";
-      type = types.str;
-      description = ''
-        Absolute path of a directory of the mount point.
-        Will be created if it doesn't exist. (Mandatory)
-      '';
-    };
+      where = mkOption {
+        example = "/mnt";
+        type = types.str;
+        description = ''
+          Absolute path of a directory of the mount point.
+          Will be created if it doesn't exist. (Mandatory)
+        '';
+      };
 
-    type = mkOption {
-      default = "";
-      example = "ext4";
-      type = types.str;
-      description = "File system type.";
-    };
+      type = mkOption {
+        default = "";
+        example = "ext4";
+        type = types.str;
+        description = "File system type.";
+      };
 
-    options = mkOption {
-      default = "";
-      example = "noatime";
-      type = types.commas;
-      description = "Options used to mount the file system.";
-    };
+      options = mkOption {
+        default = "";
+        example = "noatime";
+        type = types.commas;
+        description = "Options used to mount the file system.";
+      };
+
+      mountConfig = mkOption {
+        default = {};
+        example = { DirectoryMode = "0775"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Mount]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.mount</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    mountConfig = mkOption {
-      default = {};
-      example = { DirectoryMode = "0775"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Mount]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.mount</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
     };
-  }; };
+  };
 
   stage2MountOptions = {
     imports = [
@@ -623,29 +635,32 @@ in rec {
     ];
   };
 
-  automountOptions = { options = {
+  automountOptions = {
+    options = {
 
-    where = mkOption {
-      example = "/mnt";
-      type = types.str;
-      description = ''
-        Absolute path of a directory of the mount point.
-        Will be created if it doesn't exist. (Mandatory)
-      '';
-    };
+      where = mkOption {
+        example = "/mnt";
+        type = types.str;
+        description = ''
+          Absolute path of a directory of the mount point.
+          Will be created if it doesn't exist. (Mandatory)
+        '';
+      };
+
+      automountConfig = mkOption {
+        default = {};
+        example = { DirectoryMode = "0775"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Automount]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.automount</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    automountConfig = mkOption {
-      default = {};
-      example = { DirectoryMode = "0775"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Automount]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.automount</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
     };
-  }; };
+  };
 
   stage2AutomountOptions = {
     imports = [
@@ -661,21 +676,23 @@ in rec {
     ];
   };
 
-  sliceOptions = { options = {
+  sliceOptions = {
+    options = {
+
+      sliceConfig = mkOption {
+        default = {};
+        example = { MemoryMax = "2G"; };
+        type = types.attrsOf unitOption;
+        description = ''
+          Each attribute in this set specifies an option in the
+          <literal>[Slice]</literal> section of the unit.  See
+          <citerefentry><refentrytitle>systemd.slice</refentrytitle>
+          <manvolnum>5</manvolnum></citerefentry> for details.
+        '';
+      };
 
-    sliceConfig = mkOption {
-      default = {};
-      example = { MemoryMax = "2G"; };
-      type = types.attrsOf unitOption;
-      description = ''
-        Each attribute in this set specifies an option in the
-        <literal>[Slice]</literal> section of the unit.  See
-        <citerefentry><refentrytitle>systemd.slice</refentrytitle>
-        <manvolnum>5</manvolnum></citerefentry> for details.
-      '';
     };
-
-  }; };
+  };
 
   stage2SliceOptions = {
     imports = [

From 2105726e8737229754f797961cce4dc6177e3c32 Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Mon, 4 Apr 2022 00:29:30 +0100
Subject: [PATCH 20/38] xfsdump: init at 3.1.10

---
 pkgs/tools/filesystems/xfsdump/default.nix | 59 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/tools/filesystems/xfsdump/default.nix

diff --git a/pkgs/tools/filesystems/xfsdump/default.nix b/pkgs/tools/filesystems/xfsdump/default.nix
new file mode 100644
index 000000000000..af9c2e92f05a
--- /dev/null
+++ b/pkgs/tools/filesystems/xfsdump/default.nix
@@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchurl
+, attr
+, gettext
+, autoconf
+, automake
+, ncurses
+, libtool
+, libuuid
+, libxfs
+}:
+
+stdenv.mkDerivation rec {
+  pname = "xfsdump";
+  version = "3.1.10";
+
+  src = fetchurl {
+    url = "mirror://kernel/linux/utils/fs/xfs/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "sha256-mqt6U6oFzUbtyXJp6/FFaqsrYKuMH/+q+KpJLwtfZRc=";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    gettext
+    libtool
+  ];
+  buildInputs = [
+    attr
+    libuuid
+    libxfs
+    ncurses
+  ];
+
+  patchPhase = ''
+    substituteInPlace Makefile \
+      --replace "cp include/install-sh ." "cp -f include/install-sh ."
+  '';
+
+  # Conifigure scripts don't check PATH, see xfstests derviation
+  preConfigure = ''
+    export MAKE=$(type -P make)
+    export MSGFMT=$(type -P msgfmt)
+    export MSGMERGE=$(type -P msgmerge)
+    export XGETTEXT=$(type -P xgettext)
+
+    make configure
+    patchShebangs ./install-sh
+  '';
+
+  meta = with lib; {
+    description = "XFS filesystem incremental dump utility";
+    homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfsdump-dev.git/tree/doc/CHANGES";
+    license = licenses.gpl2Only;
+    maintainers = [ maintainers.lunik1 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65c5b9e133f0..9d91b1d7f3df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11491,6 +11491,8 @@ with pkgs;
   xflux = callPackage ../tools/misc/xflux { };
   xflux-gui = python3Packages.callPackage ../tools/misc/xflux/gui.nix { };
 
+  xfsdump = callPackage ../tools/filesystems/xfsdump { };
+
   xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
   libxfs = xfsprogs.dev;
 

From 0fae27376d8a80e76d1ab45380583866f68b32ee Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sat, 11 Dec 2021 11:15:42 +0000
Subject: [PATCH 21/38] cipherscan: drop

---
 pkgs/development/libraries/openssl/chacha.nix | 82 -------------------
 pkgs/tools/security/cipherscan/default.nix    | 43 ----------
 pkgs/top-level/aliases.nix                    |  3 +-
 pkgs/top-level/all-packages.nix               |  8 --
 4 files changed, 2 insertions(+), 134 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/chacha.nix
 delete mode 100644 pkgs/tools/security/cipherscan/default.nix

diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
deleted file mode 100644
index bae3e53f441f..000000000000
--- a/pkgs/development/libraries/openssl/chacha.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, perl, zlib
-, withCryptodev ? false, cryptodev
-}:
-
-with lib;
-stdenv.mkDerivation {
-  pname = "openssl-chacha";
-  version = "2016-08-22";
-
-  src = fetchFromGitHub {
-    owner = "PeterMosmans";
-    repo = "openssl";
-    rev = "293717318e903b95f4d7e83a98a087282f37efc3";
-    sha256 = "134j3anjnj2q99xsd8d47bwvjp73qkdsimdd9riyjxa3hd8ysr00";
-  };
-
-  outputs = [ "bin" "dev" "out" "man" ];
-  setOutputFlags = false;
-
-  nativeBuildInputs = [ perl zlib ];
-  buildInputs = lib.optional withCryptodev cryptodev;
-
-  configureScript = "./config";
-
-  configureFlags = [
-    "zlib"
-    "shared"
-    "experimental-jpake"
-    "enable-md2"
-    "enable-rc5"
-    "enable-rfc3779"
-    "enable-gost"
-    "--libdir=lib"
-    "--openssldir=etc/ssl"
-  ] ++ lib.optionals withCryptodev [
-    "-DHAVE_CRYPTODEV"
-    "-DUSE_CRYPTODEV_DIGESTS"
-  ];
-
-  makeFlags = [
-    "MANDIR=$(man)/share/man"
-  ];
-
-  # Parallel building is broken in OpenSSL.
-  enableParallelBuilding = false;
-
-  postInstall = ''
-    # If we're building dynamic libraries, then don't install static
-    # libraries.
-    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
-        rm "$out/lib/"*.a
-    fi
-
-    mkdir -p $bin
-    mv $out/bin $bin/
-
-    mkdir $dev
-    mv $out/include $dev/
-
-    # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc
-
-    rmdir $out/etc/ssl/{certs,private}
-  '';
-
-  postFixup = ''
-    # Check to make sure we don't depend on perl
-    if grep -r '${perl}' $out; then
-      echo "Found an erroneous dependency on perl ^^^" >&2
-      exit 1
-    fi
-  '';
-
-  meta = {
-    homepage = "https://www.openssl.org/";
-    description = "A cryptographic library that implements the SSL and TLS protocols";
-    platforms = [ "x86_64-linux" ];
-    maintainers = [ lib.maintainers.cstrahan ];
-    license = licenses.openssl;
-    priority = 10; # resolves collision with ‘man-pages’
-  };
-}
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
deleted file mode 100644
index 23022f92b6af..000000000000
--- a/pkgs/tools/security/cipherscan/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, openssl, makeWrapper, python3, coreutils }:
-
-stdenv.mkDerivation rec {
-  pname = "cipherscan";
-  version = "2016-08-16";
-
-  src = fetchFromGitHub {
-    owner = "mozilla";
-    repo = "cipherscan";
-    rev = "74dd82e8ad994a140daf79489d3bd1c5ad928d38";
-    sha256 = "16azhlmairnvdz7xmwgvfpn2pzw1p8z7c9b27m07fngqjkpx0mhh";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ python3 ];
-
-  strictDeps = true;
-
-  buildPhase = ''
-    substituteInPlace cipherscan --replace '$0' 'cipherscan'
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-
-    cp cipherscan $out/bin
-    cp openssl.cnf $out/bin
-    cp analyze.py $out/bin/cipherscan-analyze
-
-    wrapProgram $out/bin/cipherscan \
-      --set NOAUTODETECT 1 \
-      --set TIMEOUTBIN "${coreutils}/bin/timeout" \
-      --set OPENSSLBIN "${openssl}/bin/openssl"
-  '';
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Very simple way to find out which SSL ciphersuites are supported by a target";
-    license = licenses.mpl20;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ cstrahan fpletz ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc86887cba15..c398b3efdfbd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -139,6 +139,7 @@ mapAliases ({
   caddy1 = throw "caddy 1.x has been removed from nixpkgs, as it's unmaintained: https://github.com/caddyserver/caddy/blob/master/.github/SECURITY.md#supported-versions"; # Added 2020-10-02
   calibre-py2 = throw "calibre-py2 has been removed from nixpkgs, as calibre has upgraded to python 3. Please use calibre as replacement"; # Added 2021-01-13
   calibre-py3 = throw "calibre-py3 has been removed from nixpkgs, as calibre's default python version is now 3. Please use calibre as replacement"; # Added 2021-01-13
+  callPackage_i686 = pkgsi686Linux.callPackage;
   cantarell_fonts = throw "'cantarell_fonts' has been renamed to/replaced by 'cantarell-fonts'"; # Converted to throw 2022-02-22
   cargo-tree = throw "cargo-tree has been removed, use the builtin `cargo tree` command instead"; # Added 2020-08-20
   casperjs = throw "casperjs has been removed, it was abandoned by upstream and broken";
@@ -150,8 +151,8 @@ mapAliases ({
   chronos = throw "chronos has been removed from nixpkgs, as it was unmaintained"; # Added 2020-08-15
   chunkwm = throw "chunkwm has been removed: abandoned by upstream"; # Added 2022-01-07
   cifs_utils = throw "'cifs_utils' has been renamed to/replaced by 'cifs-utils'"; # Converted to throw 2022-02-22
+  cipherscan = throw "cipherscan was removed from nixpkgs, as it was unmaintained"; # added 2021-12-11
   ckb = throw "'ckb' has been renamed to/replaced by 'ckb-next'"; # Converted to throw 2022-02-22
-  callPackage_i686 = pkgsi686Linux.callPackage;
   creddump = throw "creddump has been removed from nixpkgs as the upstream has abandoned the project"; # Added 2022-01-01
 
   # these are for convenience, not for backward compat and shouldn't expire
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65c5b9e133f0..7208913d4c64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4244,12 +4244,6 @@ with pkgs;
 
   cilium-cli = callPackage ../applications/networking/cluster/cilium { };
 
-  cipherscan = callPackage ../tools/security/cipherscan {
-    openssl = if stdenv.hostPlatform.system == "x86_64-linux"
-      then openssl-chacha
-      else openssl;
-  };
-
   cjdns = callPackage ../tools/networking/cjdns { };
   cjdns-tools = callPackage ../tools/admin/cjdns-tools { };
 
@@ -19630,8 +19624,6 @@ with pkgs;
     openssl_1_1
     openssl_3_0;
 
-  openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix { };
-
   opensubdiv = callPackage ../development/libraries/opensubdiv { };
 
   opensupaplex = callPackage ../games/opensupaplex { };

From 0412e8a3967e0068707e8d3b71a1bcc2fa94e688 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 15:12:14 +0000
Subject: [PATCH 22/38] ucommon: switch to gnutls version, because modern
 openssl is not supported

Closes #82688
---
 pkgs/top-level/all-packages.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7208913d4c64..59da3def4c66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20587,18 +20587,10 @@ with pkgs;
 
   utmps = skawarePackages.utmps;
 
-  ucommon = ucommon_openssl;
-
-  ucommon_openssl = callPackage ../development/libraries/ucommon {
-    gnutls = null;
-    openssl = openssl_1_0_2;
-  };
-
-  ucommon_gnutls = lowPrio (ucommon.override {
+  ucommon = callPackage ../development/libraries/ucommon {
     openssl = null;
     zlib = null;
-    gnutls = gnutls;
-  });
+  };
 
   v8 = callPackage ../development/libraries/v8 { };
 

From 9c34fd2d73aa7a9c4492ff3ae32de0dd24ef1254 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 15:15:33 +0000
Subject: [PATCH 23/38] gtmess: drop

---
 .../instant-messengers/gtmess/default.nix     | 20 -------------------
 pkgs/top-level/aliases.nix                    |  5 +++--
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/gtmess/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix
deleted file mode 100644
index 3474e5729316..000000000000
--- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{lib, stdenv, fetchurl, ncurses, openssl, tcl, tk}:
-
-stdenv.mkDerivation rec {
-  pname = "gtmess";
-  version = "0.97";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gtmess/gtmess-${version}.tar.gz";
-    sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0";
-  };
-
-  buildInputs = [ ncurses openssl tcl tk];
-
-  meta = {
-    description = "Console MSN Messenger client for Linux and other unix systems";
-    homepage = "http://gtmess.sourceforge.net/";
-    license = lib.licenses.gpl2Plus;
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c398b3efdfbd..f8099e2f9ce4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -452,11 +452,12 @@ mapAliases ({
   gsettings_desktop_schemas = throw "'gsettings_desktop_schemas' has been renamed to/replaced by 'gsettings-desktop-schemas'"; # Converted to throw 2022-02-22
   gtk_doc = throw "'gtk_doc' has been renamed to/replaced by 'gtk-doc'"; # Converted to throw 2022-02-22
   gtklick = throw "gtklick has been removed from nixpkgs as the project is stuck on python2"; # Added 2022-01-01
-  guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22
+  gtmess = throw "gtmess has been removed, because it was a MSN client."; # add 2021-12-15
   guile-gnome = throw "guile-gnome has been removed"; # Added 2022-01-16
+  guileCairo = throw "'guileCairo' has been renamed to/replaced by 'guile-cairo'"; # Converted to throw 2022-02-22
   guileGnome = throw "guile-gnome has been removed"; # Added 2022-01-16
-  guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22
   guileLint = throw "'guileLint' has been renamed to/replaced by 'guile-lint'"; # Converted to throw 2022-02-22
+  guile_lib = throw "'guile_lib' has been renamed to/replaced by 'guile-lib'"; # Converted to throw 2022-02-22
   guile_ncurses = throw "'guile_ncurses' has been renamed to/replaced by 'guile-ncurses'"; # Converted to throw 2022-02-22
   gupnp_av = throw "'gupnp_av' has been renamed to/replaced by 'gupnp-av'"; # Converted to throw 2022-02-22
   gupnp_dlna = throw "'gupnp_dlna' has been renamed to/replaced by 'gupnp-dlna'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59da3def4c66..90fb74cf2b79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6434,10 +6434,6 @@ with pkgs;
 
   gtk-vnc = callPackage ../tools/admin/gtk-vnc {};
 
-  gtmess = callPackage ../applications/networking/instant-messengers/gtmess {
-    openssl = openssl_1_0_2;
-  };
-
   gup = callPackage ../development/tools/build-managers/gup {};
 
   gupnp = callPackage ../development/libraries/gupnp { };

From 6e9e5dfd556484766a0265c959ae70ac34d22079 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 17:44:25 +0000
Subject: [PATCH 24/38] intecture-*: drop

---
 pkgs/tools/admin/intecture/agent.nix | 29 -------------------------
 pkgs/tools/admin/intecture/auth.nix  | 29 -------------------------
 pkgs/tools/admin/intecture/cli.nix   | 32 ----------------------------
 pkgs/top-level/aliases.nix           |  3 +++
 pkgs/top-level/all-packages.nix      |  8 -------
 5 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 pkgs/tools/admin/intecture/agent.nix
 delete mode 100644 pkgs/tools/admin/intecture/auth.nix
 delete mode 100644 pkgs/tools/admin/intecture/cli.nix

diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix
deleted file mode 100644
index 33145e0e548f..000000000000
--- a/pkgs/tools/admin/intecture/agent.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "intecture-agent";
-  version = "0.3.1";
-
-  src = fetchFromGitHub {
-    owner = "intecture";
-    repo = "agent";
-    rev = version;
-    sha256 = "0j27qdgyxybaixggh7k57mpm6rifimn4z2vydk463msc8b3kgywj";
-  };
-
-  cargoSha256 = "0j7yv00ipaa60hpakfj60xrblcyzjwi0lp2hpzz41vq3p9bkigvm";
-
-  buildInputs = [ openssl zeromq czmq zlib ];
-
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  meta = with lib; {
-    description = "Authentication client/server for Intecture components";
-    homepage = "https://intecture.io";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
-  };
-}
diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix
deleted file mode 100644
index 5fe81b78c9a6..000000000000
--- a/pkgs/tools/admin/intecture/auth.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "intecture-auth";
-  version = "0.1.2";
-
-  src = fetchFromGitHub {
-    owner = "intecture";
-    repo = "auth";
-    rev = version;
-    sha256 = "0c7ar3pc7n59lzfy74lwz51p09s2bglc870rfr4c0vmc91jl0pj2";
-  };
-
-  cargoSha256 = "15f7lb0xxaxvhvj8g3kjmqy5jzy4pyzwk3zfdvykphpg18qgg6qj";
-
-  buildInputs = [ openssl zeromq czmq zlib ];
-
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  meta = with lib; {
-    description = "Authentication client/server for Intecture components";
-    homepage = "https://intecture.io";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
-  };
-}
diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix
deleted file mode 100644
index 9b543b40498e..000000000000
--- a/pkgs/tools/admin/intecture/cli.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, fetchFromGitHub, rustPlatform
-, openssl, zeromq, czmq, pkg-config, cmake, zlib }:
-
-with rustPlatform;
-
-buildRustPackage rec {
-  pname = "intecture-cli";
-  version = "0.3.4";
-
-  src = fetchFromGitHub {
-    owner = "intecture";
-    repo = "cli";
-    rev = version;
-    sha256 = "16a5fkpyqkf8w20k3ircc1d0qmif7nygkzxj6mzk9609dlb0dmxq";
-  };
-
-  cargoSha256 = "09phc0gxz1amrk1bbl5ajg0jmgxcqm4xzbvq3nj58qps991kvgf1";
-
-  buildInputs = [ openssl zeromq czmq zlib ];
-
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  # Needed for tests
-  USER = "$(whoami)";
-
-  meta = with lib; {
-    description = "A developer friendly, language agnostic configuration management tool for server systems";
-    homepage = "https://intecture.io";
-    license = licenses.mpl20;
-    maintainers = [ maintainers.rushmorem ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f8099e2f9ce4..ab0b43f8ee96 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -498,6 +498,9 @@ mapAliases ({
   infiniband-diags = rdma-core; # Added 2019-08-09
   ino = throw "ino has been removed from nixpkgs, the project is stuck on python2 and upstream has archived the project"; # Added 2022-01-12
   inotifyTools = inotify-tools;
+  intecture-agent = throw "intecture-agent has been removed, because it was no longer maintained upstream"; # added 2021-12-15
+  intecture-auth = throw "intecture-auth has been removed, because it was no longer maintained upstream"; # added 2021-12-15
+  intecture-cli = throw "intecture-cli has been removed, because it was no longer maintained upstream"; # added 2021-12-15
   inter-ui = inter; # Added 2021-03-27
   iops = throw "iops was removed: upstream is gone"; # Added 2022-02-06
   iproute = iproute2; # moved from top-level 2021-03-14
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90fb74cf2b79..7602e851baa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6793,14 +6793,6 @@ with pkgs;
 
   inql = callPackage ../tools/security/inql { };
 
-  intecture-agent = callPackage ../tools/admin/intecture/agent.nix { };
-
-  intecture-auth = callPackage ../tools/admin/intecture/auth.nix { };
-
-  intecture-cli = callPackage ../tools/admin/intecture/cli.nix {
-    openssl = openssl_1_0_2;
-  };
-
   intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { };
 
   intermodal = callPackage ../tools/misc/intermodal { };

From 5aafec8647976b65dc0a9716778b8d9ca9a30f58 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 18:04:59 +0000
Subject: [PATCH 25/38] proxytunnel: drop

---
 pkgs/tools/misc/proxytunnel/default.nix | 22 ----------------------
 pkgs/top-level/aliases.nix              |  1 +
 pkgs/top-level/all-packages.nix         |  4 ----
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/misc/proxytunnel/default.nix

diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix
deleted file mode 100644
index 1319a6bfabe9..000000000000
--- a/pkgs/tools/misc/proxytunnel/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, openssl }:
-
-stdenv.mkDerivation rec {
-  pname = "proxytunnel";
-  version = "1.9.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/proxytunnel/proxytunnel-${version}.tgz";
-    sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f";
-  };
-
-  buildInputs = [ openssl ];
-
-  installPhase = ''make DESTDIR="$out" PREFIX="" install'';
-
-  meta = {
-    description = "Program that connects stdin and stdout to a server somewhere on the network, through a standard HTTPS proxy";
-    homepage = "http://proxytunnel.sourceforge.net/download.php";
-    license = lib.licenses.gpl2;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ab0b43f8ee96..d7d9a4486b89 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -967,6 +967,7 @@ mapAliases ({
   proglodyte-wasm = throw "proglodyte-wasm has been removed from nixpkgs, because it is unmaintained since 5 years with zero github stars"; # Added 2021-06-30
   proj_5 = throw "Proj-5 has been removed from nixpkgs, use proj instead"; # Added 2021-04-12
   prometheus-cups-exporter = throw "outdated and broken by design; removed by developer"; # Added 2021-03-16
+  proxytunnel = throw "proxytunnel has been removed from nixpkgs, because it has not been update upstream since it was added to nixpkgs in 2008 and has therefore bitrotted."; # added 2021-12-15
   pulseaudioLight = throw "'pulseaudioLight' has been renamed to/replaced by 'pulseaudio'"; # Converted to throw 2022-02-22
   pulseeffects = throw "Use pulseeffects-legacy if you use PulseAudio and easyeffects if you use PipeWire"; # Added 2021-02-13
   pulseeffects-pw = easyeffects; # Added 2021-07-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7602e851baa1..4d8b7641f904 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9194,10 +9194,6 @@ with pkgs;
 
   proxysql = callPackage ../servers/sql/proxysql { };
 
-  proxytunnel = callPackage ../tools/misc/proxytunnel {
-    openssl = openssl_1_0_2;
-  };
-
   prs = callPackage ../tools/security/prs { };
 
   psw = callPackage ../tools/misc/psw { };

From ea7bb55441a4699a8cfaaf0eabd88c501ed2405a Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 18:11:35 +0000
Subject: [PATCH 26/38] botan: drop

---
 pkgs/development/libraries/botan/default.nix | 17 -----------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  5 -----
 3 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/botan/default.nix

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
deleted file mode 100644
index d6ee9ff152f4..000000000000
--- a/pkgs/development/libraries/botan/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // {
-  baseVersion = "1.10";
-  revision = "17";
-  sha256 = "04rnha712dd3sdb2q7k2yw45sf405jyigk7yrjfr6bwd9fvgyiv8";
-  sourceExtension = "tgz";
-  extraConfigureFlags = "--with-gnump";
-  postPatch = ''
-    sed -e 's@lang_flags "@&--std=c++11 @' -i src/build-data/cc/{gcc,clang}.txt
-  '';
-  knownVulnerabilities = [
-    "CVE-2021-40529"
-    # https://botan.randombit.net/security.html#id1
-    "2020-03-24: Side channel during CBC padding"
-  ];
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d7d9a4486b89..f4ecbaf6ee85 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -107,6 +107,7 @@ mapAliases ({
   blastem = throw "blastem has been removed from nixpkgs as it would still require python2"; # Added 2022-01-01
   bluezFull = bluez; # Added 2019-12-03
   bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # Added 2020-12-10
+  botan = throw "botan has been removed because it did not support a supported openssl version"; # added 2021-12-15
   bpftool = bpftools; # Added 2021-05-03
   brackets = throw "brackets has been removed, it was unmaintained and had open vulnerabilities"; # Added 2021-01-24
   bridge_utils = throw "'bridge_utils' has been renamed to/replaced by 'bridge-utils'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d8b7641f904..5b024b37dd83 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16337,11 +16337,6 @@ with pkgs;
 
   bosh-cli = callPackage ../applications/networking/cluster/bosh-cli { };
 
-  botan = callPackage ../development/libraries/botan {
-    openssl = openssl_1_0_2;
-    inherit (darwin.apple_sdk.frameworks) CoreServices Security;
-  };
-
   botan2 = callPackage ../development/libraries/botan/2.0.nix {
     inherit (darwin.apple_sdk.frameworks) CoreServices Security;
   };

From b52d39ee09d9f82f063a615e3370feae461df6a6 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 18:45:42 +0000
Subject: [PATCH 27/38] eagle7: drop

---
 .../science/electronics/eagle/eagle7.nix      | 97 -------------------
 pkgs/top-level/aliases.nix                    |  2 +-
 pkgs/top-level/all-packages.nix               |  7 --
 3 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 pkgs/applications/science/electronics/eagle/eagle7.nix

diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix
deleted file mode 100644
index f48d08d40799..000000000000
--- a/pkgs/applications/science/electronics/eagle/eagle7.nix
+++ /dev/null
@@ -1,97 +0,0 @@
-{ lib, stdenv, fetchurl, makeDesktopItem, patchelf, zlib, freetype, fontconfig
-, openssl, libXrender, libXrandr, libXcursor, libX11, libXext, libXi
-, libxcb, cups, xkeyboardconfig, runtimeShell
-}:
-
-let
-
-  libPath = lib.makeLibraryPath
-    [ zlib freetype fontconfig openssl libXrender libXrandr libXcursor libX11
-      libXext libXi libxcb cups
-    ];
-
-in
-
-stdenv.mkDerivation rec {
-  pname = "eagle";
-  version = "7.7.0";
-
-  src =
-    if stdenv.hostPlatform.system == "i686-linux" then
-      fetchurl {
-        url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-${version}.run";
-        sha256 = "16fa66p77xigc7zvzfm7737mllrcs6nrgk2p7wvkjw3p9lvbz7z1";
-      }
-    else if stdenv.hostPlatform.system == "x86_64-linux" then
-      fetchurl {
-        url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-${version}.run";
-        sha256 = "18dcn6wqph1sqh0ah98qzfi05wip8a8ifbkaq79iskbrsi8iqnrg";
-      }
-    else
-      throw "Unsupported system: ${stdenv.hostPlatform.system}";
-
-  desktopItem = makeDesktopItem {
-    name = "eagle";
-    exec = "eagle";
-    icon = "eagle";
-    comment = "Schematic capture and PCB layout";
-    desktopName = "Eagle";
-    genericName = "Schematic editor";
-    categories = [ "Development" ];
-  };
-
-  buildInputs =
-    [ patchelf zlib freetype fontconfig openssl libXrender libXrandr libXcursor
-      libX11 libXext libXi
-    ];
-
-  dontUnpack = true;
-
-  # NOTES:
-  # Eagle for Linux comes as a self-extracting shell script with embedded
-  # tarball. The tarball data (.tar.bz2) starts after a __DATA__ marker.
-  #
-  # Eagle apparently doesn't like binary patching. This is what happens:
-  #   $ ./result/eagle-6.4.0/bin/eagle
-  #   argv[0] (/home/bfo/nixpkgs/result/eagle-6.4.0/bin/eagle) is not the currently executed program version!
-  installPhase = ''
-    # Extract eagle tarball
-    mkdir "$out"
-    sed '1,/^__DATA__$/d' "$src" | tar -xjf - -C "$out"
-
-    # Install manpage
-    mkdir -p "$out"/share/man/man1
-    ln -s "$out"/eagle-${version}/doc/eagle.1 "$out"/share/man/man1/eagle.1
-
-    # Build LD_PRELOAD library that redirects license file access to the home
-    # directory of the user
-    mkdir -p "$out"/lib
-    gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle7_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl
-
-    # Make wrapper script
-    dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)"
-    mkdir -p "$out"/bin
-    cat > "$out"/bin/eagle << EOF
-    #!${runtimeShell}
-    export LD_LIBRARY_PATH="${stdenv.cc.cc.lib}/lib:${libPath}"
-    export LD_PRELOAD="$out/lib/eagle_fixer.so"
-    export QT_XKB_CONFIG_ROOT="${xkeyboardconfig}/share/X11/xkb"
-    exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@"
-    EOF
-    chmod a+x "$out"/bin/eagle
-
-    # Make desktop item
-    mkdir -p "$out"/share/applications
-    cp "$desktopItem"/share/applications/* "$out"/share/applications/
-    mkdir -p "$out"/share/icons
-    ln -s "$out/eagle-${version}/bin/eagleicon50.png" "$out"/share/icons/eagle.png
-  '';
-
-  meta = with lib; {
-    description = "Schematic editor and PCB layout tool from CadSoft";
-    homepage = "https://www.autodesk.com/products/eagle/overview";
-    license = licenses.unfree;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f4ecbaf6ee85..78067c42334b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -278,7 +278,7 @@ mapAliases ({
 
   ### E ###
 
-
+  eagle7 = throw "eagle7 has been removed because it did not support a supported openssl version"; # added 2021-12-15
   ec2_ami_tools = ec2-ami-tools; # Added 2021-10-08
   ec2_api_tools = ec2-api-tools; # Added 2021-10-08
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b024b37dd83..042fa0dff1a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32846,13 +32846,6 @@ with pkgs;
 
   appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { };
 
-  # Since version 8 Eagle requires an Autodesk account and a subscription
-  # in contrast to single payment for the charged editions.
-  # This is the last version with the old model.
-  eagle7 = callPackage ../applications/science/electronics/eagle/eagle7.nix {
-    openssl = openssl_1_0_2;
-  };
-
   eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
 
   caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };

From 9dca986a47d8dd7fd02b3244fcf0f8892d931676 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 19:01:46 +0000
Subject: [PATCH 28/38] Revert "ovftool: init at 4.4.1"

This reverts commit 0418760037f2aef5e67beccbb1fe58b0fe4d7370.
---
 pkgs/tools/virtualization/ovftool/default.nix | 230 ------------------
 pkgs/top-level/all-packages.nix               |   2 -
 2 files changed, 232 deletions(-)
 delete mode 100644 pkgs/tools/virtualization/ovftool/default.nix

diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix
deleted file mode 100644
index cc4af17b47d0..000000000000
--- a/pkgs/tools/virtualization/ovftool/default.nix
+++ /dev/null
@@ -1,230 +0,0 @@
-{ lib, stdenv, system ? builtins.currentSystem, ovftoolBundles ? {}
-, requireFile, buildFHSUserEnv, patchelf, autoPatchelfHook, makeWrapper, nix, unzip
-, glibc, c-ares, openssl_1_0_2, curl, expat, icu60, xercesc, zlib
-}:
-
-let
-  version = "4.4.1-16812187";
-
-  # FHS environment required to unpack ovftool on x86.
-  ovftoolX86Unpacker = buildFHSUserEnv rec {
-    name = "ovftool-unpacker";
-    targetPkgs = pkgs: [ pkgs.bash ];
-    multiPkgs = targetPkgs;
-    runScript = "bash";
-  };
-
-  # unpackPhase for i686 and x86_64 ovftool self-extracting bundles.
-  ovftoolX86UnpackPhase = ''
-    runHook preUnpack
-
-    # This is a self-extracting shell script and needs a FHS environment to run.
-    # In reality, it could be doing anything, which is bad for reproducibility.
-    # Our postUnpack uses nix-hash to verify the hash to prevent problems.
-    #
-    # Note that the Arch PKGBUILD at
-    # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=vmware-ovftool
-    # appears to use xvfb-run - this hasn't been proven necessary so far.
-    #
-    cp ${ovftoolSource} ./ovftool.bundle
-    chmod +x ./ovftool.bundle
-    ${ovftoolX86Unpacker}/bin/ovftool-unpacker ./ovftool.bundle -x ovftool
-    rm ovftool.bundle
-
-    local extracted=ovftool/vmware-ovftool/
-    if [ -d "$extracted" ]; then
-      # Move the directory we care about to ovftool/
-      mv "$extracted" .
-      rm -r ovftool
-      mv "$(basename -- "$extracted")" ovftool
-      echo "ovftool extracted successfully" >&2
-    else
-      echo "Could not find $extracted - are you sure this is ovftool?" >&2
-      rm -r ovftool
-      exit 1
-    fi
-
-    runHook postUnpack
-  '';
-
-  # unpackPhase for aarch64 .zip.
-  ovftoolAarch64UnpackPhase = ''
-    runHook preUnpack
-
-    unzip ${ovftoolSource}
-
-    local extracted=ovftool/
-    if [ -d "$extracted" ]; then
-      echo "ovftool extracted successfully" >&2
-    else
-      echo "Could not find $extracted - are you sure this is ovftool?" >&2
-      exit 1
-    fi
-
-    runHook postUnpack
-  '';
-
-  # When the version is bumped, postUnpackHash will change
-  # for all these supported systems. Update it from the printed error on build.
-  #
-  # This is just a sanity check, since ovftool is a self-extracting bundle
-  # that could be doing absolutely anything on 2/3 of the supported platforms.
-  ovftoolSystems = {
-    "i686-linux" = {
-      filename = "VMware-ovftool-${version}-lin.i386.bundle";
-      sha256 = "0gx78g3s77mmpir7jbiskna10i6262ihal1ywivlb6xxxxbhqzwj";
-      unpackPhase = ovftoolX86UnpackPhase;
-      postUnpackHash = "1k8rp8ywhs0cl9aad37v1p0493bdvkxrsvwg5pgv2bhvjs4hqk7n";
-    };
-    "x86_64-linux" = {
-      filename = "VMware-ovftool-${version}-lin.x86_64.bundle";
-      sha256 = "1kp2bp4d9i8y7q25yqff2bn62mh292lws7b66lyn8ka9b35kvnzc";
-      unpackPhase = ovftoolX86UnpackPhase;
-      postUnpackHash = "0zvyakwi4iishqxxisihgh91bmdsfvj5vchm2c192hia03a143py";
-    };
-    "aarch64-linux" = {
-      filename = "VMware-ovftool-${version}-lin.aarch64.zip";
-      sha256 = "0all8bwv5p5adnzqvrly6nzmxmfpywvlbfr0finr4n100yv0v1xy";
-      unpackPhase = ovftoolAarch64UnpackPhase;
-      postUnpackHash = "16vyyzrmryi8b7mrd6nxnhywvvj2pw0ban4qfiqfahw763fn6971";
-    };
-  };
-
-  ovftoolSystem = if builtins.hasAttr system ovftoolSystems then
-                    ovftoolSystems.${system}
-                  else throw "System '${system}' is unsupported by ovftool";
-
-  ovftoolSource = if builtins.hasAttr system ovftoolBundles then
-                    ovftoolBundles.${system}
-                  else
-                    requireFile {
-                      name = ovftoolSystem.filename;
-                      url = "https://my.vmware.com/group/vmware/downloads/get-download?downloadGroup=OVFTOOL441";
-                      sha256 = ovftoolSystem.sha256;
-                    };
-in
-stdenv.mkDerivation rec {
-  pname = "ovftool";
-  inherit version;
-
-  src = ovftoolSource;
-
-  buildInputs = [
-    glibc
-
-    # This is insecure, but we don't really have a way around it
-    # since ovftool depends on it. In theory we could ship their OpenSSL
-    # build... but that makes the reliance on an insecure library less obvious.
-    openssl_1_0_2
-
-    c-ares
-    (curl.override { openssl = openssl_1_0_2; })
-    expat
-    icu60
-    xercesc
-    zlib
-  ];
-
-  nativeBuildInputs = [ nix patchelf autoPatchelfHook makeWrapper unzip ];
-
-  sourceRoot = ".";
-
-  unpackPhase = ovftoolSystem.unpackPhase;
-
-  postUnpackHash = ovftoolSystem.postUnpackHash;
-
-  # Expects a directory named 'ovftool'. Validates the postUnpackHash in
-  # ovftoolSystem.
-  postUnpack = ''
-    if [ -d ovftool ]; then
-      # Ensure we're in the staging directory
-      cd ovftool
-    fi
-
-    # Verify the hash with nix-hash before proceeding to ensure reproducibility.
-    local ovftool_hash
-    ovftool_hash="$(nix-hash --type sha256 --base32 .)"
-    if [ "$ovftool_hash" != "$postUnpackHash" ]; then
-      echo "Expected hash: $postUnpackHash" >&2
-      echo "Actual hash:   $ovftool_hash" >&2
-      echo "Could not verify post-unpack hash!" >&2
-      exit 1
-    fi
-  '';
-
-  # Expects a directory named 'ovftool' containing the ovftool install.
-  # Based on https://aur.archlinux.org/packages/vmware-ovftool/
-  # with the addition of a libexec directory and a Nix-style binary wrapper.
-  installPhase = ''
-    runHook preInstall
-
-    if [ -d ovftool ]; then
-      # Ensure we're in the staging directory
-      cd ovftool
-    fi
-
-    # libraries
-    install -m 755 -d "$out/lib/$pname"
-
-    # These all appear to be VMWare proprietary except for libgoogleurl.
-    # The rest of the libraries that the installer extracts are omitted here,
-    # and provided in buildInputs.
-    #
-    # FIXME: can we replace libgoogleurl? Possibly from Chromium?
-    #
-    install -m 644 -t "$out/lib/$pname" \
-      libgoogleurl.so.59 \
-      libssoclient.so \
-      libvim-types.so libvmacore.so libvmomi.so
-
-    # ovftool specifically wants 1.0.2 but our libcrypto is named 1.0.0
-    ln -s "${openssl_1_0_2.out}/lib/libcrypto.so" \
-      "$out/lib/$pname/libcrypto.so.1.0.2"
-    ln -s "${openssl_1_0_2.out}/lib/libssl.so" \
-      "$out/lib/$pname/libssl.so.1.0.2"
-
-    # libexec
-    install -m 755 -d "$out/libexec/$pname"
-    install -m 755 -t "$out/libexec/$pname" ovftool.bin
-    install -m 644 -t "$out/libexec/$pname" icudt44l.dat
-
-    # libexec resources
-    for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do
-      install -m 755 -d "$out/libexec/$pname/$subdir"
-      install -m 644 -t "$out/libexec/$pname/$subdir" "$subdir"/*.*
-    done
-
-    # EULA/OSS files
-    install -m 755 -d "$out/share/licenses/$pname"
-    install -m 644 -t "$out/share/licenses/$pname" \
-      "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt"
-
-    # documentation files
-    install -m 755 -d "$out/share/doc/$pname"
-    install -m 644 -t "$out/share/doc/$pname" "README.txt"
-
-    # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by
-    # VMWare's wrapper script. We use C.UTF-8 instead.
-    install -m 755 -d "$out/bin"
-    makeWrapper "$out/libexec/$pname/ovftool.bin" "$out/bin/ovftool" \
-      --set-default LC_CTYPE C.UTF-8 \
-      --prefix LD_LIBRARY_PATH : "$out/lib"
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    addAutoPatchelfSearchPath "$out/lib"
-  '';
-
-  dontBuild = true;
-  dontPatch = true;
-  dontConfigure = true;
-
-  meta = with lib; {
-    description = "VMWare tools for working with OVF, OVA, and VMX images";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ numinit ];
-    platforms = builtins.attrNames ovftoolSystems;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 042fa0dff1a1..042bfc4a6d76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8779,8 +8779,6 @@ with pkgs;
 
   otpw = callPackage ../os-specific/linux/otpw { };
 
-  ovftool = callPackage ../tools/virtualization/ovftool { };
-
   overcommit = callPackage ../development/tools/overcommit { };
 
   overmind = callPackage ../applications/misc/overmind { };

From dac6f134316f1859f4f75a593309ecd00fc779ec Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 19:06:11 +0000
Subject: [PATCH 29/38] pbis-open: drop

---
 pkgs/tools/security/pbis/default.nix | 70 ----------------------------
 pkgs/top-level/aliases.nix           |  5 +-
 pkgs/top-level/all-packages.nix      |  2 -
 3 files changed, 3 insertions(+), 74 deletions(-)
 delete mode 100644 pkgs/tools/security/pbis/default.nix

diff --git a/pkgs/tools/security/pbis/default.nix b/pkgs/tools/security/pbis/default.nix
deleted file mode 100644
index acd1fc5607bc..000000000000
--- a/pkgs/tools/security/pbis/default.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, perl, flex, bison, curl,
-  pam, popt, libiconv, libuuid, openssl_1_0_2, cyrus_sasl, sqlite, tdb, libxml2 }:
-
-stdenv.mkDerivation rec {
-  pname = "pbis-open";
-  version = "9.1.0";
-
-  src = fetchFromGitHub {
-    owner = "BeyondTrust";
-    repo = pname;
-    rev = version;
-    sha256 = "081jm34sf488nwz5wzs55d6rxx3sv566x6p4h1yqcjaw36174m8v";
-  };
-
-  nativeBuildInputs = [
-    autoconf automake libtool perl flex bison
-  ];
-
-  # curl must be placed after openssl_1_0_2, because it pulls openssl 1.1 dependency.
-  buildInputs = [
-    pam popt libiconv libuuid openssl_1_0_2 cyrus_sasl
-    curl sqlite popt tdb libxml2
-  ];
-
-  postPatch = ''
-    patchShebangs .
-    sed -i -e 's/legacy//g' lwupgrade/MakeKitBuild # disable /opt/ symlinks
-    sed -i -e 's/tdb.h//g' samba-interop/MakeKitBuild #include <tdb.h> fails but it won't affect the build
-  '';
-  preConfigure = ''
-    mkdir release
-    cd release
-    if [ $CC = gcc ]; then
-            NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=format-overflow -Wno-error=address-of-packed-member"
-    fi
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${lib.getDev libxml2}/include/libxml2 -Wno-error=array-bounds -Wno-error=pointer-sign -Wno-error=deprecated-declarations -Wno-error=unused-variable"
-  '';
-  configureScript = "../configure";
-  configureFlags = [
-    "CFLAGS=-O"
-    "--docdir=${placeholder "prefix"}/share/doc"
-    "--mandir=${placeholder "prefix"}/share/doc/man"
-    "--datadir=${placeholder "prefix"}/share"
-    "--lw-initdir=${placeholder "prefix"}/etc/init.d"
-    "--selinux=no" # NixOS does not support SELinux
-    "--build-isas=x86_64" # [lwbase] endianness (host/x86_32): [lwbase] ERROR: could not determine endianness
-    "--fail-on-warn=no"
-    # "--debug=yes"
-  ]; # ^ See https://github.com/BeyondTrust/pbis-open/issues/124
-  configureFlagsArray = [ "--lw-bundled-libs=linenoise-mob tomlc99 opensoap krb5 cyrus-sasl curl openldap ${ if libuuid == null then "libuuid" else "" }" ];
-  # ^ it depends on old krb5 version 1.9 (issue #228)
-  # linenoise-mod, tomlc99, opensoap is not in nixpkgs.
-  # krb5 must be old one, and cyrus-sasl and openldap have dependency to newer libkrb5 that cause runtime error
-  enableParallelBuilding = true;
-  makeFlags = "SHELL=";
-  hardeningDisable = [ "format" ]; # -Werror=format-security
-  installPhase = ''
-    mkdir $sys
-    mv stage/{lib,var} $sys
-    mv stage$out $out
-  '';
-  outputs = [ "out" "sys" ];
-
-  meta = with lib; {
-    description = "BeyondTrust AD Bridge Open simplifies the process of joining non-Microsoft hosts to Active Directory domains";
-    homepage = "https://github.com/BeyondTrust/pbis-open";
-    license = with licenses; [ gpl2 lgpl21 ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 78067c42334b..191344cbd989 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -848,10 +848,11 @@ mapAliases ({
   parquet-cpp = throw "'parquet-cpp' has been renamed to/replaced by 'arrow-cpp'"; # Converted to throw 2022-02-22
   patchmatrix = throw "'patchmatrix' has been renamed to/replaced by 'open-music-kontrollers.patchmatrix'"; # Added 2022-03-09
   pass-otp = throw "'pass-otp' has been renamed to/replaced by 'pass.withExtensions'"; # Converted to throw 2022-02-22
-  pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15
-  pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22
+  pbis-open = throw "pbis-open has been removed, because it is no longer maintained upstream"; # added 2021-12-15
   pdf-redact-tools = throw "pdf-redact-tools has been removed from nixpkgs because the upstream has abandoned the project"; # Added 2022-01-01
   pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03
+  pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15
+  pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22
   perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22
   perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22
   pgadmin = pgadmin4;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 042bfc4a6d76..0cf4ba89639b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27940,8 +27940,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
-  pbis-open = callPackage ../tools/security/pbis { };
-
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
   pcmanfm-qt = lxqt.pcmanfm-qt;

From 32e1d67cc691756bce2e407baab58ced7c9874b8 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 19:09:00 +0000
Subject: [PATCH 30/38] epsxe: drop

---
 pkgs/applications/emulators/epsxe/default.nix | 52 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 pkgs/applications/emulators/epsxe/default.nix

diff --git a/pkgs/applications/emulators/epsxe/default.nix b/pkgs/applications/emulators/epsxe/default.nix
deleted file mode 100644
index f39c2ae74ac4..000000000000
--- a/pkgs/applications/emulators/epsxe/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ lib, stdenv, fetchurl, alsa-lib, curl, gdk-pixbuf, glib, gtk3, libGLU, libGL,
-  libX11, openssl_1_0_2, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook, autoPatchelfHook }:
-
-with lib;
-
-stdenv.mkDerivation rec {
-  pname = "epsxe";
-  version = "2.0.5";
-
-  src = let
-    version2 = replaceStrings ["."] [""] version;
-    platform = "linux" + (optionalString stdenv.is64bit "_x64");
-  in fetchurl {
-    url = "https://www.epsxe.com/files/ePSXe${version2}${platform}.zip";
-    sha256 = if stdenv.is64bit
-             then "16fa9qc2xhaz1f6294m0b56s5l86cbmclwm9w3mqnch0yjsrvab0"
-             else "1677lclam557kp8jwvchdrk27zfj50fqx2q9i3bcx26d9k61q3kl";
-  };
-
-  nativeBuildInputs = [ unzip wrapGAppsHook autoPatchelfHook ];
-  sourceRoot = ".";
-
-  buildInputs = [
-    alsa-lib
-    curl
-    gdk-pixbuf
-    glib
-    gtk3
-    libX11
-    libGLU libGL
-    openssl_1_0_2
-    ncurses5
-    SDL
-    SDL_ttf
-    stdenv.cc.cc.lib
-    zlib
-  ];
-
-  dontStrip = true;
-
-  installPhase = ''
-    install -D ${if stdenv.is64bit then "epsxe_x64" else "ePSXe"} $out/bin/epsxe
-  '';
-
-  meta = {
-    homepage = "http://epsxe.com/";
-    description = "Enhanced PSX (PlayStation 1) emulator";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ yana ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 191344cbd989..54a278d58d41 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -309,6 +309,7 @@ mapAliases ({
   encryptr = throw "encryptr was removed because it reached end of life"; # Added 2022-02-06
   envelope = throw "envelope has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-05
   epoxy = libepoxy; # Added 2021-11-11
+  epsxe = throw "epsxe has been removed from nixpkgs, as it was unmaintained."; # added 2021-12-15
   esniper = throw "esniper has been removed because upstream no longer maintains it (and it no longer works)"; # Added 2021-04-12
   etcdctl = throw "'etcdctl' has been renamed to/replaced by 'etcd'"; # Converted to throw 2022-02-22
   eteroj.lv2 = throw "'eteroj.lv2' has been renamed to/replaced by 'open-music-kontrollers.eteroj'"; # Added 2022-03-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0cf4ba89639b..370b6a9a7f92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5316,8 +5316,6 @@ with pkgs;
 
   epstool = callPackage ../tools/graphics/epstool { };
 
-  epsxe = callPackage ../applications/emulators/epsxe { };
-
   escrotum = callPackage ../tools/graphics/escrotum { };
 
   etcher = callPackage ../tools/misc/etcher {

From ac93d53e9fc3bac5ffb29c005c1bc899838c8c7e Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 17 Dec 2021 22:51:02 +0000
Subject: [PATCH 31/38] gpshell, globalplatform, gppcscconnectionplugin: drop

---
 .../libraries/globalplatform/default.nix      | 21 ---------------
 .../globalplatform/gppcscconnectionplugin.nix | 21 ---------------
 .../tools/misc/gpshell/default.nix            | 27 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  6 -----
 5 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 pkgs/development/libraries/globalplatform/default.nix
 delete mode 100644 pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
 delete mode 100644 pkgs/development/tools/misc/gpshell/default.nix

diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix
deleted file mode 100644
index a8dfa430f599..000000000000
--- a/pkgs/development/libraries/globalplatform/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, zlib, openssl_1_0_2, pcsclite }:
-
-stdenv.mkDerivation rec {
-  pname = "globalplatform";
-  version  = "6.0.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
-    sha256 = "191s9005xbc7i90bzjk4rlw15licd6m0rls9fxli8jyymz2021zy";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ zlib openssl_1_0_2 pcsclite ];
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
-    description = "Library for interacting with smart card devices";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
deleted file mode 100644
index a3ea4305bea7..000000000000
--- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, globalplatform, openssl_1_0_2, pcsclite }:
-
-stdenv.mkDerivation rec {
-  pname = "gppcscconnectionplugin";
-  version  = "1.1.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/${pname}-${version}.tar.gz";
-    sha256 = "0d3vcrh9z55rbal0dchmj661pqqrav9c400bx1c46grcl1q022ad";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ globalplatform openssl_1_0_2 pcsclite ];
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
-    description = "GlobalPlatform pcsc connection plugin";
-    license = [ licenses.lgpl3 licenses.gpl3 ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix
deleted file mode 100644
index f5298d685eba..000000000000
--- a/pkgs/development/tools/misc/gpshell/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, globalplatform, pcsclite, gppcscconnectionplugin
-, makeWrapper
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gpshell";
-  version = "1.4.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/globalplatform/gpshell-${version}.tar.gz";
-    sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi";
-  };
-
-  nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ globalplatform pcsclite ];
-
-  postFixup = ''
-    wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib"
-  '';
-
-  meta = with lib; {
-    homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/";
-    description = "Smartcard management application";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 54a278d58d41..d12c09c93e90 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -439,6 +439,7 @@ mapAliases ({
   google-music-scripts = throw "google-music-scripts has been removed because Google Play Music was discontinued"; # Added 2021-03-07
   go-pup = throw "'go-pup' has been renamed to/replaced by 'pup'"; # Converted to throw 2022-02-22
   gpgstats = throw "gpgstats has been removed: upstream is gone"; # Added 2022-02-06
+  gpshell = throw "gpshell has been removed, because it was unmaintained in nixpkgs"; # added 2021-12-17
 
   graalvm11 = graalvm11-ce;
   graalvm8-ce = throw "graalvm8-ce has been removed by upstream"; # Added 2021-10-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 370b6a9a7f92..d72dcc8d7566 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17106,10 +17106,6 @@ with pkgs;
 
   glm = callPackage ../development/libraries/glm { };
 
-  globalplatform = callPackage ../development/libraries/globalplatform { };
-  gppcscconnectionplugin =
-    callPackage ../development/libraries/globalplatform/gppcscconnectionplugin.nix { };
-
   glog = callPackage ../development/libraries/glog { };
 
   gloox = callPackage ../development/libraries/gloox { };
@@ -17228,8 +17224,6 @@ with pkgs;
 
   pgweb = callPackage ../development/tools/database/pgweb { };
 
-  gpshell = callPackage ../development/tools/misc/gpshell { };
-
   grantlee = callPackage ../development/libraries/grantlee { };
 
   gsasl = callPackage ../development/libraries/gsasl { };

From 36a7bc52fbdba272a0e4078d39314185a2cefcf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 4 Apr 2022 05:46:21 +0000
Subject: [PATCH 32/38] apostrophe: 2.6.1 -> 2.6.2

---
 pkgs/applications/editors/apostrophe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix
index 1f9f64822f1b..ce8d32f465e2 100644
--- a/pkgs/applications/editors/apostrophe/default.nix
+++ b/pkgs/applications/editors/apostrophe/default.nix
@@ -13,14 +13,14 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "apostrophe";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitLab {
     owner  = "World";
     repo   = pname;
     domain = "gitlab.gnome.org";
     rev    = "v${version}";
-    sha256 = "awaXXSUiEIzOAj9Zw8K961HuIKsLFi3QKETUTTIaTjk=";
+    sha256 = "sha256-At3kaVJE07j/QWXerYnvxleE2Cbn0FjlBXH69tkuFys=";
   };
 
   nativeBuildInputs = [ meson ninja pkg-config desktop-file-utils

From 6fa52289b4f7723960909c7532981c3a3fe90464 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Mon, 4 Apr 2022 15:27:16 +0100
Subject: [PATCH 33/38] wapiti: 3.0.9 -> 3.1.1

---
 pkgs/tools/security/wapiti/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix
index e27851f618d6..6bd5382ce888 100644
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@@ -5,14 +5,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "wapiti";
-  version = "3.0.9";
+  version = "3.1.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "wapiti-scanner";
     repo = pname;
     rev = version;
-    sha256 = "sha256-olqPM8EQ8LxQQM7kqcjbT9RMdBeYdhfn6Qp6BUu8K5Q=";
+    sha256 = "1xyvyan5gz7fz8wa2fbgvma59pr79arqra2gvx861szn2njkf272";
   };
 
   nativeBuildInputs = with python3.pkgs; [
@@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     browser-cookie3
     cryptography
     dnspython
+    httpcore
     httpx
     httpx-ntlm
     httpx-socks
@@ -54,7 +55,7 @@ python3.pkgs.buildPythonApplication rec {
     # Ignore pinned versions
     substituteInPlace setup.py \
       --replace "httpx-socks[asyncio] == 0.6.0" "httpx-socks[asyncio]"
-    sed -i -e "s/==[0-9.]*//" setup.py
+    sed -i -e "s/==[0-9.]*//;s/>=[0-9.]*//" setup.py
     substituteInPlace setup.cfg \
       --replace " --cov --cov-report=xml" ""
   '';
@@ -107,6 +108,7 @@ python3.pkgs.buildPythonApplication rec {
     "test_true_positive_request_count"
     "test_unregistered_cname"
     "test_url_detection"
+    "test_verify_dns"
     "test_warning"
     "test_whole"
     "test_xss_inside_tag_input"
@@ -118,9 +120,14 @@ python3.pkgs.buildPythonApplication rec {
     # Requires a PHP installation
     "test_timesql"
     "test_cookies"
+    "test_redirect"
     # TypeError: Expected bytes or bytes-like object got: <class 'str'>
     "test_persister_upload"
   ];
+  disabledTestPaths = [
+    # requires sslyze
+    "tests/attack/test_mod_ssl.py"
+  ];
 
   pythonImportsCheck = [
     "wapitiCore"

From 35e93564adf2f4a816815466b9ff1e79e1a34e06 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Fri, 11 Feb 2022 01:41:56 +0100
Subject: [PATCH 34/38] sslyze: drop

---
 .../python-modules/nassl/default.nix          | 170 ------------------
 .../python-modules/sslyze/default.nix         | 113 ------------
 pkgs/tools/security/wapiti/default.nix        |   1 -
 pkgs/top-level/all-packages.nix               |   2 -
 pkgs/top-level/python-packages.nix            |   4 -
 5 files changed, 290 deletions(-)
 delete mode 100644 pkgs/development/python-modules/nassl/default.nix
 delete mode 100644 pkgs/development/python-modules/sslyze/default.nix

diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix
deleted file mode 100644
index 3e159dfe7cee..000000000000
--- a/pkgs/development/python-modules/nassl/default.nix
+++ /dev/null
@@ -1,170 +0,0 @@
-{ lib
-, fetchFromGitHub
-, fetchurl
-, buildPythonPackage
-, pkgsStatic
-, openssl_1_1
-, openssl_1_0_2
-, invoke
-, tls-parser
-, cacert
-, pytestCheckHook
-, pythonAtLeast
-, pythonOlder
-}:
-
-let
-  zlibStatic = (pkgsStatic.zlib.override {
-    splitStaticOutput = false;
-  }).overrideAttrs (oldAttrs: {
-    NIX_CFLAGS_COMPILE = "${oldAttrs.NIX_CFLAGS_COMPILE} -fPIC";
-  });
-  nasslOpensslArgs = {
-    static = true;
-    enableSSL2 = true;
-  };
-  nasslOpensslFlagsCommon = [
-    "zlib"
-    "no-zlib-dynamic"
-    "no-shared"
-    "--with-zlib-lib=${zlibStatic.out}/lib"
-    "--with-zlib-include=${zlibStatic.out.dev}/include"
-    "enable-rc5"
-    "enable-md2"
-    "enable-gost"
-    "enable-cast"
-    "enable-idea"
-    "enable-ripemd"
-    "enable-mdc2"
-    "-fPIC"
-  ];
-  opensslStatic = (openssl_1_1.override nasslOpensslArgs).overrideAttrs (
-    oldAttrs: rec {
-      name = "openssl-${version}";
-      version = "1.1.1h";
-      src = fetchurl {
-        url = "https://www.openssl.org/source/${name}.tar.gz";
-        sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w";
-      };
-      configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon ++ [
-        "enable-weak-ssl-ciphers"
-        "enable-tls1_3"
-        "no-async"
-      ];
-      patches = builtins.filter
-        (
-          p: (builtins.baseNameOf (toString p)) != "macos-yosemite-compat.patch"
-        )
-        oldAttrs.patches;
-      buildInputs = oldAttrs.buildInputs ++ [ zlibStatic cacert ];
-      meta = oldAttrs.meta // {
-        knownVulnerabilities = [
-          "CVE-2020-1971"
-          "CVE-2021-23840"
-          "CVE-2021-23841"
-          "CVE-2021-3449"
-          "CVE-2021-3450"
-          "CVE-2021-3711"
-          "CVE-2021-3712"
-        ];
-      };
-    }
-  );
-  opensslLegacyStatic = (openssl_1_0_2.override nasslOpensslArgs).overrideAttrs (
-    oldAttrs: rec {
-      name = "openssl-${version}";
-      version = "1.0.2e";
-      src = fetchurl {
-        url = "https://www.openssl.org/source/${name}.tar.gz";
-        sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
-      };
-      configureFlags = oldAttrs.configureFlags ++ nasslOpensslFlagsCommon;
-      patches = builtins.filter
-        (
-          p: (builtins.baseNameOf (toString p)) == "darwin64-arm64.patch"
-        )
-        oldAttrs.patches;
-      buildInputs = oldAttrs.buildInputs ++ [ zlibStatic ];
-      # openssl_1_0_2 needs `withDocs = false`
-      outputs = lib.remove "doc" oldAttrs.outputs;
-    }
-  );
-in
-buildPythonPackage rec {
-  pname = "nassl";
-  version = "4.0.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "nabla-c0d3";
-    repo = pname;
-    rev = version;
-    hash = "sha256-lLyHXLmBVvT+LgsKBU8DcUXd0qaLSrwvXxFnIB9CHcU=";
-  };
-
-  postPatch =
-    let
-      legacyOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslLegacyStatic.version;
-      modernOpenSSLVersion = lib.replaceStrings [ "." ] [ "_" ] opensslStatic.version;
-      zlibVersion = zlibStatic.version;
-    in
-    ''
-      mkdir -p deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
-      cp ${opensslLegacyStatic.out}/lib/libssl.a \
-        ${opensslLegacyStatic.out}/lib/libcrypto.a \
-        deps/openssl-OpenSSL_${legacyOpenSSLVersion}/
-      ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_${legacyOpenSSLVersion}/include
-      ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_${legacyOpenSSLVersion}/apps
-
-      mkdir -p deps/openssl-OpenSSL_${modernOpenSSLVersion}/
-      cp ${opensslStatic.out}/lib/libssl.a \
-        ${opensslStatic.out}/lib/libcrypto.a \
-        deps/openssl-OpenSSL_${modernOpenSSLVersion}/
-      ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_${modernOpenSSLVersion}/include
-      ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_${modernOpenSSLVersion}/apps
-
-      mkdir -p deps/zlib-${zlibVersion}/
-      cp ${zlibStatic.out}/lib/libz.a deps/zlib-${zlibVersion}/
-    '';
-
-  nativeBuildInputs = [
-    invoke
-  ];
-
-  propagatedBuildInputs = [
-    tls-parser
-  ];
-
-  checkInputs = [
-    pytestCheckHook
-  ];
-
-  buildPhase = ''
-    invoke build.nassl
-    invoke package.wheel
-  '';
-
-  doCheck = true;
-
-  pythonImportsCheck = [
-    "nassl"
-  ];
-
-  disabledTests = [
-    "Online"
-  ] ++ lib.optionals (pythonAtLeast "3.10") [
-    "test_write_bad"
-    "test_client_authentication_no_certificate_supplied"
-    "test_client_authentication_succeeds"
-  ];
-
-  meta = with lib; {
-    description = "Low-level OpenSSL wrapper for Python";
-    homepage = "https://github.com/nabla-c0d3/nassl";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ veehaitch ];
-    platforms = with platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/development/python-modules/sslyze/default.nix b/pkgs/development/python-modules/sslyze/default.nix
deleted file mode 100644
index bc3e2c238c9f..000000000000
--- a/pkgs/development/python-modules/sslyze/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ lib
-, fetchFromGitHub
-, buildPythonPackage
-, pytestCheckHook
-, pythonOlder
-  # deps
-, cryptography
-, nassl
-, pydantic
-, tls-parser
-  # check deps
-, faker
-, openssl_1_0_2
-, openssl_1_1
-}:
-
-buildPythonPackage rec {
-  pname = "sslyze";
-  version = "5.0.3";
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "nabla-c0d3";
-    repo = pname;
-    rev = version;
-    hash = "sha256-d465WJIDsgNAPe8KW5v2KDSgzMH7OPLSiFfFH9n+jiA=";
-  };
-
-  patchPhase = ''
-    substituteInPlace setup.py \
-      --replace "cryptography>=2.6,<36.0.0" "cryptography>=2.6"
-  '';
-
-  checkInputs = [
-    pytestCheckHook
-    faker
-  ];
-
-  # Most of the tests are online; hence, applicable tests are listed
-  # explicitly here
-  pytestFlagsArray = [
-    "tests/cli_tests/test_console_output.py"
-    "tests/cli_tests/test_server_string_parser.py"
-    "tests/json_tests/test_json_output.py"
-    "tests/plugins_tests/certificate_info/test_certificate_algorithms.py"
-    "tests/plugins_tests/certificate_info/test_certificate_utils.py"
-    "tests/plugins_tests/certificate_info/test_symantec.py"
-    "tests/plugins_tests/certificate_info/test_trust_store_repository.py"
-    "tests/plugins_tests/openssl_cipher_suites/test_cipher_suites.py"
-    "tests/plugins_tests/test_early_data_plugin.py"
-    "tests/plugins_tests/test_http_headers_plugin.py"
-    "tests/plugins_tests/test_robot_plugin.py"
-    "tests/plugins_tests/test_scan_commands.py"
-    "tests/plugins_tests/test_session_renegotiation_plugin.py"
-    "tests/scanner_tests/test_jobs_worker_thread.py"
-    "tests/scanner_tests/test_mass_scanner.py"
-    "tests/scanner_tests/test_models.py"
-    "tests/scanner_tests/test_scanner.py"
-    "tests/server_connectivity_tests/test_client_authentication.py"
-  ];
-
-  disabledTests = [
-    # TestEllipticCurvesPluginWithOnlineServer
-    "test_supported_curves"
-    # TestRobotPluginPlugin
-    "test_robot_attack_good"
-    # TestHttpHeadersPlugin
-    "test_all_headers_disabled"
-    "test_expect_ct_enabled"
-    "test_hsts_enabled"
-    # TestSessionRenegotiationPlugin
-    "test_renegotiation_good"
-    # TestCertificateAlgorithms
-    "test_ecdsa_certificate"
-    "test_invalid_certificate_bad_name"
-    # TestEarlyDataPlugin
-    "test_early_data_enabled"
-    # TestTrustStoresRepository
-    "test_update_default"
-    # TestClientAuthentication
-    "test_optional_client_authentication"
-  ];
-
-  # Some tests require OpenSSL
-  preCheck = ''
-    pushd $TMPDIR/$sourceRoot/tests/openssl_server/
-
-    rm openssl-1-1-1-linux64
-    ln -s ${openssl_1_1.bin}/bin/openssl openssl-1-1-1-linux64
-
-    rm openssl-1-0-0e-linux64
-    ln -s ${openssl_1_0_2.bin}/bin/openssl openssl-1-0-0e-linux64
-
-    popd
-  '';
-
-  pythonImportsCheck = [ "sslyze" ];
-
-  propagatedBuildInputs = [
-    cryptography
-    nassl
-    pydantic
-    tls-parser
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/nabla-c0d3/sslyze";
-    description = "Fast and powerful SSL/TLS scanning library";
-    platforms = platforms.linux ++ platforms.darwin;
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ veehaitch ];
-  };
-}
diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix
index 6bd5382ce888..4fb28559483d 100644
--- a/pkgs/tools/security/wapiti/default.nix
+++ b/pkgs/tools/security/wapiti/default.nix
@@ -37,7 +37,6 @@ python3.pkgs.buildPythonApplication rec {
     markupsafe
     pysocks
     six
-    sslyze
     sqlalchemy
     tld
     yaswfp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d72dcc8d7566..daea7f2a186c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29228,8 +29228,6 @@ with pkgs;
     python = python3;
   };
 
-  sslyze = with python3Packages; toPythonApplication sslyze;
-
   ssr = callPackage ../applications/audio/soundscape-renderer {
     autoreconfHook = buildPackages.autoreconfHook269;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36fe14cb0b57..a1a394fc8846 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5438,8 +5438,6 @@ in {
 
   napari-svg = callPackage ../development/python-modules/napari-svg { };
 
-  nassl = callPackage ../development/python-modules/nassl { };
-
   nats-py = callPackage ../development/python-modules/nats-py { };
 
   nats-python = callPackage ../development/python-modules/nats-python { };
@@ -9660,8 +9658,6 @@ in {
 
   sslib = callPackage ../development/python-modules/sslib { };
 
-  sslyze = callPackage ../development/python-modules/sslyze { };
-
   stack-data = callPackage ../development/python-modules/stack-data { };
 
   stanza = callPackage ../development/python-modules/stanza { };

From 49c51cdd516d51e3ebbb7930e5edb4174c25a0fa Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Wed, 15 Dec 2021 17:48:19 +0000
Subject: [PATCH 35/38] openssl_1_0_2: drop

---
 .../libraries/openssl/1.0.2/darwin64-arm64.patch | 12 ------------
 .../openssl/1.0.2/nix-ssl-cert-file.patch        | 16 ----------------
 .../openssl/1.0.2/use-etc-ssl-certs-darwin.patch | 13 -------------
 .../openssl/1.0.2/use-etc-ssl-certs.patch        | 13 -------------
 pkgs/development/libraries/openssl/default.nix   | 14 --------------
 .../network_cmds/default.nix                     |  4 ++--
 pkgs/top-level/all-packages.nix                  |  1 -
 7 files changed, 2 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch
 delete mode 100644 pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
 delete mode 100644 pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
 delete mode 100644 pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch

diff --git a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch b/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch
deleted file mode 100644
index 5ecfb4175569..000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/darwin64-arm64.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/Configure b/Configure
-index 494e0b3..0b448aa 100755
---- a/Configure
-+++ b/Configure
-@@ -652,6 +652,8 @@ my %table=(
- "darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- "debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"darwin64-arm64-cc","cc:-arch arm64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-+"debug-darwin64-arm64-cc","cc:-arch arm64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-arch arm64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
- # iPhoneOS/iOS
- "iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
diff --git a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
deleted file mode 100644
index 5765409fdd57..000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/nix-ssl-cert-file.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
-index e6d0e6e1a6..b89456fd87 100644
---- a/crypto/x509/by_file.c
-+++ b/crypto/x509/by_file.c
-@@ -97,7 +97,10 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp,
-     switch (cmd) {
-     case X509_L_FILE_LOAD:
-         if (argl == X509_FILETYPE_DEFAULT) {
--            file = ossl_safe_getenv(X509_get_default_cert_file_env());
-+            file = ossl_safe_getenv("NIX_SSL_CERT_FILE");
-+
-+            if (!file)
-+                file = ossl_safe_getenv(X509_get_default_cert_file_env());
- 
-             if (file)
-                 ok = (X509_load_cert_crl_file(ctx, file,
diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
deleted file mode 100644
index 3d9ee7e6a822..000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs-darwin.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
---- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100
-+++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100
-@@ -81,8 +81,8 @@
- 
- # ifndef OPENSSL_SYS_VMS
- #  define X509_CERT_AREA          OPENSSLDIR
- #  define X509_CERT_DIR           OPENSSLDIR "/certs"
--#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-+#  define X509_CERT_FILE          "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"
- #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
- # else
- #  define X509_CERT_AREA          "SSLROOT:[000000]"
diff --git a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
deleted file mode 100644
index 813c6bdf44ab..000000000000
--- a/pkgs/development/libraries/openssl/1.0.2/use-etc-ssl-certs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
---- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100
-+++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100
-@@ -81,8 +81,8 @@
- 
- # ifndef OPENSSL_SYS_VMS
- #  define X509_CERT_AREA          OPENSSLDIR
- #  define X509_CERT_DIR           OPENSSLDIR "/certs"
--#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
-+#  define X509_CERT_FILE          "/etc/ssl/certs/ca-certificates.crt"
- #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
- # else
- #  define X509_CERT_AREA          "SSLROOT:[000000]"
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 33ddbf7018c5..648357b00cfb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -170,20 +170,6 @@ let
 
 in {
 
-  openssl_1_0_2 = common {
-    version = "1.0.2u";
-    sha256 = "ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16";
-    patches = [
-      ./1.0.2/nix-ssl-cert-file.patch
-
-      (if stdenv.hostPlatform.isDarwin
-       then ./1.0.2/use-etc-ssl-certs-darwin.patch
-       else ./1.0.2/use-etc-ssl-certs.patch)
-    ] ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [
-      ./1.0.2/darwin64-arm64.patch
-    ];
-    extraMeta.knownVulnerabilities = [ "Support for OpenSSL 1.0.2 ended with 2019." ];
-  };
 
   openssl_1_1 = common rec {
     version = "1.1.1n";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
index dd3cf0309526..2772ca0460d6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix
@@ -1,9 +1,9 @@
 { lib, appleDerivation, xcbuildHook
-, openssl_1_0_2, Librpcsvc, xnu, libpcap, developer_cmds }:
+, openssl, Librpcsvc, xnu, libpcap, developer_cmds }:
 
 appleDerivation {
   nativeBuildInputs = [ xcbuildHook ];
-  buildInputs = [ openssl_1_0_2 xnu Librpcsvc libpcap developer_cmds ];
+  buildInputs = [ openssl xnu Librpcsvc libpcap developer_cmds ];
 
   NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index daea7f2a186c..6ae4b3a39598 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19589,7 +19589,6 @@ with pkgs;
   openssl = openssl_1_1;
 
   inherit (callPackages ../development/libraries/openssl { })
-    openssl_1_0_2
     openssl_1_1
     openssl_3_0;
 

From 149f31a857f98945389d9b6e3fcd07603085b3ec Mon Sep 17 00:00:00 2001
From: Iwan <iwanb@users.noreply.github.com>
Date: Mon, 4 Apr 2022 16:39:37 +0200
Subject: [PATCH 36/38] jacktrip: init at 1.5.3 (#166137)

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 maintainers/maintainer-list.nix              |  6 ++
 pkgs/applications/audio/jacktrip/default.nix | 61 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 3 files changed, 69 insertions(+)
 create mode 100644 pkgs/applications/audio/jacktrip/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7cae29a1eefe..2fe9ebac21f4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5417,6 +5417,12 @@
     githubId = 41924494;
     name = "Ivar";
   };
+  iwanb = {
+    email = "tracnar@gmail.com";
+    github = "iwanb";
+    githubId = 4035835;
+    name = "Iwan";
+  };
   ixmatus = {
     email = "parnell@digitalmentat.com";
     github = "ixmatus";
diff --git a/pkgs/applications/audio/jacktrip/default.nix b/pkgs/applications/audio/jacktrip/default.nix
new file mode 100644
index 000000000000..7dd60a6c4d1b
--- /dev/null
+++ b/pkgs/applications/audio/jacktrip/default.nix
@@ -0,0 +1,61 @@
+{ lib, mkDerivation, fetchFromGitHub
+, pkg-config
+, help2man
+, qmake
+, alsa-lib
+, libjack2
+, dbus
+, qtbase
+, qttools
+, qtx11extras
+, meson
+, python3
+, rtaudio
+, ninja
+}:
+
+mkDerivation rec {
+  version = "1.5.3";
+  pname = "jacktrip";
+
+  src = fetchFromGitHub {
+    owner = "jacktrip";
+    repo = "jacktrip";
+    rev = "v${version}";
+    sha256 = "sha256-sfAYMTnBjT4LkgksyzDGGy97NLX5ljjhNDFioQnTzLs=";
+  };
+
+  preConfigure = ''
+    rm build
+  '';
+
+  buildInputs = [
+    rtaudio
+    qtbase
+    qtx11extras
+    libjack2
+    dbus
+  ];
+
+  nativeBuildInputs = [
+    python3
+    python3.pkgs.pyaml
+    python3.pkgs.jinja2
+    ninja
+    help2man
+    meson
+    qmake
+    qttools
+    pkg-config
+  ];
+
+  qmakeFlags = [ "jacktrip.pro" ];
+
+  meta = with lib; {
+    description = "Multi-machine audio network performance over the Internet";
+    homepage = "https://jacktrip.github.io/jacktrip/";
+    license = with licenses; [ gpl3 lgpl3 mit ];
+    maintainers = [ maintainers.iwanb ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65c5b9e133f0..d8b060c68beb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33553,6 +33553,8 @@ with pkgs;
 
   libjack2 = jack2.override { prefix = "lib"; };
 
+  jacktrip = libsForQt5.callPackage ../applications/audio/jacktrip { };
+
   j2cli = with python3Packages; toPythonApplication j2cli;
 
   jquake = callPackage ../applications/misc/jquake { };

From a1390787c3c165d93482ccd26587e855778a63b3 Mon Sep 17 00:00:00 2001
From: William Casarin <jb55@jb55.com>
Date: Mon, 4 Apr 2022 08:08:22 -0700
Subject: [PATCH 37/38] remove jb55 as maintainer from some packages

I no longer use these and don't have much incentive to maintain them :(
---
 pkgs/applications/networking/feedreaders/rss2email/default.nix  | 2 +-
 .../networking/instant-messengers/bitlbee-discord/default.nix   | 2 +-
 pkgs/applications/science/math/caffe/default.nix                | 2 +-
 pkgs/development/libraries/notcurses/default.nix                | 2 +-
 pkgs/development/libraries/rapidcheck/default.nix               | 2 +-
 pkgs/tools/misc/antimicrox/default.nix                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix
index 9f0ebc7d930f..ae98133f1899 100644
--- a/pkgs/applications/networking/feedreaders/rss2email/default.nix
+++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix
@@ -42,7 +42,7 @@ buildPythonApplication rec {
     description = "A tool that converts RSS/Atom newsfeeds to email";
     homepage = "https://pypi.python.org/pypi/rss2email";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ jb55 Profpatsch ekleog ];
+    maintainers = with maintainers; [ Profpatsch ekleog ];
   };
   passthru.tests = {
     smoke-test = nixosTests.rss2email;
diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
index 543a5f52c979..4450eefa6eb0 100644
--- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://github.com/sm00th/bitlbee-discord";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ lassulus jb55 ];
+    maintainers = with maintainers; [ lassulus ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index 462a05d300ce..74b89ed98c55 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -137,7 +137,7 @@ stdenv.mkDerivation rec {
       Center (BVLC) and by community contributors.
     '';
     homepage = "http://caffe.berkeleyvision.org/";
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ ];
     license = licenses.bsd2;
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/pkgs/development/libraries/notcurses/default.nix b/pkgs/development/libraries/notcurses/default.nix
index d23401c0fb49..ad10cfadf6eb 100644
--- a/pkgs/development/libraries/notcurses/default.nix
+++ b/pkgs/development/libraries/notcurses/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       replacement for NCURSES on existing systems.
     '';
     license = licenses.asl20;
-    maintainers = with maintainers; [ jb55 AndersonTorres ];
+    maintainers = with maintainers; [ AndersonTorres ];
     inherit (ncurses.meta) platforms;
   };
 }
diff --git a/pkgs/development/libraries/rapidcheck/default.nix b/pkgs/development/libraries/rapidcheck/default.nix
index 4df98c3026e5..a8a87dfd1172 100644
--- a/pkgs/development/libraries/rapidcheck/default.nix
+++ b/pkgs/development/libraries/rapidcheck/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "A C++ framework for property based testing inspired by QuickCheck";
     inherit (src.meta) homepage;
-    maintainers = with maintainers; [ jb55 ];
+    maintainers = with maintainers; [ ];
     license = licenses.bsd2;
     platforms = platforms.all;
   };
diff --git a/pkgs/tools/misc/antimicrox/default.nix b/pkgs/tools/misc/antimicrox/default.nix
index 6e87d82921a2..c7e629c280ee 100644
--- a/pkgs/tools/misc/antimicrox/default.nix
+++ b/pkgs/tools/misc/antimicrox/default.nix
@@ -36,7 +36,7 @@ mkDerivation rec {
   meta = with lib; {
     description = "GUI for mapping keyboard and mouse controls to a gamepad";
     inherit (src.meta) homepage;
-    maintainers = with maintainers; [ jb55 sbruder ];
+    maintainers = with maintainers; [ sbruder ];
     license = licenses.gpl3Plus;
     platforms = with platforms; linux;
   };

From 23ae4dfc223d75ed1265f43775f9ba1e76feb517 Mon Sep 17 00:00:00 2001
From: Ilya Elenskiy <elenskiy.ilya@gmail.com>
Date: Mon, 4 Apr 2022 17:10:31 +0200
Subject: [PATCH 38/38] python3.pkgs.numba: added optional CUDA support

---
 .../python-modules/numba/cuda_path.patch      | 79 +++++++++++++++++++
 .../python-modules/numba/default.nix          | 36 ++++++---
 pkgs/top-level/python-packages.nix            |  9 ++-
 3 files changed, 113 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/development/python-modules/numba/cuda_path.patch

diff --git a/pkgs/development/python-modules/numba/cuda_path.patch b/pkgs/development/python-modules/numba/cuda_path.patch
new file mode 100644
index 000000000000..275eeb1ccab6
--- /dev/null
+++ b/pkgs/development/python-modules/numba/cuda_path.patch
@@ -0,0 +1,79 @@
+diff --git a/numba/cuda/cuda_paths.py b/numba/cuda/cuda_paths.py
+index b9988bc..a642680 100644
+--- a/numba/cuda/cuda_paths.py
++++ b/numba/cuda/cuda_paths.py
+@@ -24,10 +24,7 @@ def _find_valid_path(options):
+ 
+ def _get_libdevice_path_decision():
+     options = [
+-        ('Conda environment', get_conda_ctk()),
+-        ('CUDA_HOME', get_cuda_home('nvvm', 'libdevice')),
+-        ('System', get_system_ctk('nvvm', 'libdevice')),
+-        ('Debian package', get_debian_pkg_libdevice()),
++        ('Nix store', get_nix_ctk('nvvm', 'libdevice')),
+     ]
+     by, libdir = _find_valid_path(options)
+     return by, libdir
+@@ -35,18 +32,16 @@ def _get_libdevice_path_decision():
+ 
+ def _nvvm_lib_dir():
+     if IS_WIN32:
+-        return 'nvvm', 'bin'
++        return 'bin',
+     elif IS_OSX:
+-        return 'nvvm', 'lib'
++        return 'lib',
+     else:
+-        return 'nvvm', 'lib64'
++        return 'lib64',
+ 
+ 
+ def _get_nvvm_path_decision():
+     options = [
+-        ('Conda environment', get_conda_ctk()),
+-        ('CUDA_HOME', get_cuda_home(*_nvvm_lib_dir())),
+-        ('System', get_system_ctk(*_nvvm_lib_dir())),
++        ('Nix store', get_nix_ctk(*_nvvm_lib_dir())),        
+     ]
+     by, path = _find_valid_path(options)
+     return by, path
+@@ -74,14 +69,12 @@ def _cudalib_path():
+     elif IS_OSX:
+         return 'lib'
+     else:
+-        return 'lib64'
++        return 'lib'
+ 
+ 
+ def _get_cudalib_dir_path_decision():
+     options = [
+-        ('Conda environment', get_conda_ctk()),
+-        ('CUDA_HOME', get_cuda_home(_cudalib_path())),
+-        ('System', get_system_ctk(_cudalib_path())),
++        ('Nix store', get_nix_lib_ctk(_cudalib_path())),
+     ]
+     by, libdir = _find_valid_path(options)
+     return by, libdir
+@@ -92,6 +85,22 @@ def _get_cudalib_dir():
+     return _env_path_tuple(by, libdir)
+ 
+ 
++def get_nix_ctk(*subdirs):
++    """Return path to nix store cudatoolkit; or, None if it doesn't exist.
++    """
++    base = '@cuda_toolkit_path@'
++    if os.path.exists(base):
++        return os.path.join(base, *subdirs)
++
++
++def get_nix_lib_ctk(*subdirs):
++    """Return path to nix store cudatoolkit-lib; or, None if it doesn't exist.
++    """
++    base = '@cuda_toolkit_lib_path@'
++    if os.path.exists(base):
++        return os.path.join(base, *subdirs)
++
++
+ def get_system_ctk(*subdirs):
+     """Return path to system-wide cudatoolkit; or, None if it doesn't exist.
+     """
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 8bead014e34a..c1415a07b68e 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -9,8 +9,15 @@
 , llvmlite
 , setuptools
 , libcxx
-}:
+, substituteAll
 
+# CUDA-only dependencies:
+, addOpenGLRunpath ? null
+, cudatoolkit ? null
+
+# CUDA flags:
+, cudaSupport ? false
+}:
 buildPythonPackage rec {
   version = "0.55.0";
   pname = "numba";
@@ -21,17 +28,26 @@ buildPythonPackage rec {
     sha256 = "sha256-siHr2ZdmKh3Ld+TwkUDgIvv+dXetB4H8LgIUE126bL0=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "1.21" "1.22"
-
-    substituteInPlace numba/__init__.py \
-      --replace "(1, 20)" "(1, 21)"
-  '';
-
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
 
-  propagatedBuildInputs = [ numpy llvmlite setuptools ];
+  propagatedBuildInputs = [ numpy llvmlite setuptools ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ];
+
+  nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath ];
+
+  patches = lib.optionals cudaSupport [
+    (substituteAll {
+      src = ./cuda_path.patch;
+      cuda_toolkit_path = cudatoolkit;
+      cuda_toolkit_lib_path = cudatoolkit.lib;
+    })
+  ];
+
+  postFixup = lib.optionalString cudaSupport ''
+    find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
+      addOpenGLRunpath "$lib"
+      patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:$(patchelf --print-rpath "$lib")" "$lib"
+    done
+  '';
 
   # Copy test script into $out and run the test suite.
   checkPhase = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a1a394fc8846..01fd6c39c4c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5674,7 +5674,14 @@ in {
 
   num2words = callPackage ../development/python-modules/num2words { };
 
-  numba = callPackage ../development/python-modules/numba { };
+  numba = callPackage ../development/python-modules/numba {
+    cudaSupport = pkgs.config.cudaSupport or false;
+    cudatoolkit = tensorflow_compat_cudatoolkit;
+  };
+
+  numbaWithCuda = self.numba.override {
+    cudaSupport = true;
+  };
 
   numba-scipy = callPackage ../development/python-modules/numba-scipy { };