From 6f89774b673b05339aa93b017f89da8a802f7b2a Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 12 Jun 2023 16:15:30 -0700
Subject: [PATCH 01/35] zulip: Respect NIXOS_OZONE_WL to enable Wayland mode

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../networking/instant-messengers/zulip/default.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix
index f00caad30267..87c65b428d7f 100644
--- a/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -20,6 +20,8 @@ let
 in appimageTools.wrapType2 {
   inherit pname version src;
 
+  runScript = "appimage-exec.sh -w ${appimageContents} -- \${NIXOS_OZONE_WL:+\${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}";
+
   extraInstallCommands = ''
     mv "$out/bin/${pname}-${version}" "$out/bin/${pname}"
     install -m 444 -D ${appimageContents}/zulip.desktop $out/share/applications/zulip.desktop

From d5f2be64d01ce301eb37c8a470d8b83a40bb7ffb Mon Sep 17 00:00:00 2001
From: Alexander Shpilkin <ashpilkin@gmail.com>
Date: Wed, 13 Sep 2023 02:12:26 +0300
Subject: [PATCH 02/35] der-ascii: init at 0.1.0

---
 pkgs/tools/security/der-ascii/default.nix | 27 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/security/der-ascii/default.nix

diff --git a/pkgs/tools/security/der-ascii/default.nix b/pkgs/tools/security/der-ascii/default.nix
new file mode 100644
index 000000000000..2bfcc9c37095
--- /dev/null
+++ b/pkgs/tools/security/der-ascii/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "der-ascii";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "1my93m1rx08kn2yms6k8w43byr8k61r1nra4b082j8b393wwxkqc";
+  };
+  vendorSha256 = null;
+
+  ldflags = [ "-s" "-w" ];
+
+  meta = with lib; {
+    description = ''
+      A small human-editable language to emit DER or BER encodings of ASN.1
+      structures and malformed variants of them
+    '';
+    homepage = "https://github.com/google/der-ascii";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ alexshpilkin cpu hawkw ];
+    mainProgram = "ascii2der"; # has stable output, unlike its inverse
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df11cbca064b..adc1319710c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7333,6 +7333,8 @@ with pkgs;
 
   deluge-2_x = deluge;
 
+  der-ascii = callPackage ../tools/security/der-ascii { };
+
   desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { };
 
   dfc  = callPackage ../tools/system/dfc { };

From 4d4d3bdfacc9ba40224aae72abd9554ad04d92e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 12 Sep 2023 17:45:51 -0700
Subject: [PATCH 03/35] redoc-cli: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 432 ------------------
 pkgs/development/tools/redoc-cli/default.nix  |  34 ++
 pkgs/top-level/all-packages.nix               |   2 +-
 5 files changed, 36 insertions(+), 434 deletions(-)
 create mode 100644 pkgs/development/tools/redoc-cli/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index d4fcd87951ff..4adaaddbbfaf 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -101,6 +101,7 @@ mapAliases {
   inherit (pkgs) quicktype; # added 2023-09-09
   inherit (pkgs) react-static; # added 2023-08-21
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
+  inherit (pkgs) redoc-cli; # added 2023-09-12
   reveal-md = pkgs.reveal-md; # added 2023-07-31
   inherit (pkgs) rtlcss; # added 2023-08-29
   s3http = throw "s3http was removed because it was abandoned upstream"; # added 2023-08-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 56f65d701153..0809c072cc2d 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -217,7 +217,6 @@
 , "pyright"
 , "react-native-cli"
 , "react-tools"
-, "redoc-cli"
 , "remod-cli"
 , "reveal.js"
 , "rimraf"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 6fc85413c173..8c1bb902a66a 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -102696,438 +102696,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  redoc-cli = nodeEnv.buildNodePackage {
-    name = "redoc-cli";
-    packageName = "redoc-cli";
-    version = "0.13.21";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.13.21.tgz";
-      sha512 = "pjuPf0HkKqo9qtoHxMK4x5dhC/lJ08O0hO0rJISbSRCf19bPBjQ5lb2mHRu9j6vypTMltyaLtFIfVNveuyF5fQ==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.2.1"
-      (sources."@babel/code-frame-7.22.10" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@babel/compat-data-7.22.9"
-      sources."@babel/core-7.22.10"
-      sources."@babel/generator-7.22.10"
-      sources."@babel/helper-annotate-as-pure-7.22.5"
-      sources."@babel/helper-compilation-targets-7.22.10"
-      sources."@babel/helper-environment-visitor-7.22.5"
-      sources."@babel/helper-function-name-7.22.5"
-      sources."@babel/helper-hoist-variables-7.22.5"
-      sources."@babel/helper-module-imports-7.22.5"
-      sources."@babel/helper-module-transforms-7.22.9"
-      sources."@babel/helper-plugin-utils-7.22.5"
-      sources."@babel/helper-simple-access-7.22.5"
-      sources."@babel/helper-split-export-declaration-7.22.6"
-      sources."@babel/helper-string-parser-7.22.5"
-      sources."@babel/helper-validator-identifier-7.22.5"
-      sources."@babel/helper-validator-option-7.22.5"
-      sources."@babel/helpers-7.22.10"
-      (sources."@babel/highlight-7.22.10" // {
-        dependencies = [
-          sources."ansi-styles-3.2.1"
-          sources."chalk-2.4.2"
-          sources."color-convert-1.9.3"
-          sources."color-name-1.1.3"
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."@babel/parser-7.22.10"
-      sources."@babel/plugin-syntax-jsx-7.22.5"
-      sources."@babel/runtime-7.22.10"
-      sources."@babel/template-7.22.5"
-      sources."@babel/traverse-7.22.10"
-      sources."@babel/types-7.22.10"
-      sources."@emotion/is-prop-valid-1.2.1"
-      sources."@emotion/memoize-0.8.1"
-      sources."@emotion/stylis-0.8.5"
-      sources."@emotion/unitless-0.7.5"
-      sources."@exodus/schemasafe-1.2.4"
-      sources."@jridgewell/gen-mapping-0.3.3"
-      sources."@jridgewell/resolve-uri-3.1.1"
-      sources."@jridgewell/set-array-1.1.2"
-      sources."@jridgewell/source-map-0.3.5"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
-      sources."@jridgewell/trace-mapping-0.3.19"
-      sources."@redocly/ajv-8.11.0"
-      sources."@redocly/openapi-core-1.0.2"
-      sources."@types/eslint-8.44.2"
-      sources."@types/eslint-scope-3.7.4"
-      sources."@types/estree-1.0.1"
-      sources."@types/json-schema-7.0.12"
-      sources."@types/node-14.18.55"
-      sources."@webassemblyjs/ast-1.11.6"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
-      sources."@webassemblyjs/helper-api-error-1.11.6"
-      sources."@webassemblyjs/helper-buffer-1.11.6"
-      sources."@webassemblyjs/helper-numbers-1.11.6"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.6"
-      sources."@webassemblyjs/helper-wasm-section-1.11.6"
-      sources."@webassemblyjs/ieee754-1.11.6"
-      sources."@webassemblyjs/leb128-1.11.6"
-      sources."@webassemblyjs/utf8-1.11.6"
-      sources."@webassemblyjs/wasm-edit-1.11.6"
-      sources."@webassemblyjs/wasm-gen-1.11.6"
-      sources."@webassemblyjs/wasm-opt-1.11.6"
-      sources."@webassemblyjs/wasm-parser-1.11.6"
-      sources."@webassemblyjs/wast-printer-1.11.6"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."acorn-8.10.0"
-      sources."acorn-import-assertions-1.9.0"
-      (sources."ajv-6.12.6" // {
-        dependencies = [
-          sources."json-schema-traverse-0.4.1"
-        ];
-      })
-      sources."ajv-keywords-3.5.2"
-      sources."ansi-align-3.0.1"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."anymatch-3.1.3"
-      sources."argparse-2.0.1"
-      (sources."asn1.js-5.4.1" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      (sources."assert-1.5.0" // {
-        dependencies = [
-          sources."util-0.10.3"
-        ];
-      })
-      sources."babel-plugin-styled-components-2.1.4"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."binary-extensions-2.2.0"
-      sources."bn.js-5.2.1"
-      sources."boxen-5.1.2"
-      sources."brace-expansion-2.0.1"
-      sources."braces-3.0.2"
-      sources."brorand-1.1.0"
-      sources."browserify-aes-1.2.0"
-      sources."browserify-cipher-1.0.1"
-      sources."browserify-des-1.0.2"
-      sources."browserify-rsa-4.1.0"
-      (sources."browserify-sign-4.2.1" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-          sources."readable-stream-3.6.2"
-        ];
-      })
-      sources."browserify-zlib-0.2.0"
-      sources."browserslist-4.21.10"
-      sources."buffer-4.9.2"
-      sources."buffer-from-1.1.2"
-      sources."buffer-xor-1.0.3"
-      sources."builtin-status-codes-3.0.0"
-      sources."call-bind-1.0.2"
-      sources."call-me-maybe-1.0.2"
-      sources."camelcase-6.3.0"
-      sources."camelize-1.0.1"
-      sources."caniuse-lite-1.0.30001522"
-      sources."chalk-4.1.2"
-      sources."chokidar-3.5.3"
-      sources."chrome-trace-event-1.0.3"
-      sources."cipher-base-1.0.4"
-      sources."classnames-2.3.2"
-      sources."cli-boxes-2.2.1"
-      sources."cliui-8.0.1"
-      sources."clsx-1.2.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."colorette-1.4.0"
-      sources."commander-2.20.3"
-      sources."console-browserify-1.2.0"
-      sources."constants-browserify-1.0.0"
-      sources."convert-source-map-1.9.0"
-      sources."core-js-3.32.1"
-      sources."core-util-is-1.0.3"
-      (sources."create-ecdh-4.0.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
-      sources."crypto-browserify-3.12.0"
-      sources."css-color-keywords-1.0.0"
-      sources."css-to-react-native-3.2.0"
-      sources."debug-4.3.4"
-      sources."decko-1.2.0"
-      sources."des.js-1.1.0"
-      (sources."diffie-hellman-5.0.3" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."domain-browser-1.2.0"
-      sources."dompurify-2.4.7"
-      sources."electron-to-chromium-1.4.499"
-      (sources."elliptic-6.5.4" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-          sources."inherits-2.0.4"
-        ];
-      })
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."enhanced-resolve-5.15.0"
-      sources."es-module-lexer-1.3.0"
-      sources."es6-promise-3.3.1"
-      sources."escalade-3.1.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."eslint-scope-5.1.1"
-      (sources."esrecurse-4.3.0" // {
-        dependencies = [
-          sources."estraverse-5.3.0"
-        ];
-      })
-      sources."estraverse-4.3.0"
-      sources."eventemitter3-4.0.7"
-      sources."events-3.3.0"
-      sources."evp_bytestokey-1.0.3"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-safe-stringify-2.1.1"
-      sources."fill-range-7.0.1"
-      sources."foreach-2.0.6"
-      sources."fsevents-2.3.3"
-      sources."function-bind-1.1.1"
-      sources."gensync-1.0.0-beta.2"
-      sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.2.1"
-      sources."glob-parent-5.1.2"
-      sources."glob-to-regexp-0.4.1"
-      sources."globals-11.12.0"
-      sources."graceful-fs-4.2.11"
-      sources."handlebars-4.7.8"
-      sources."has-1.0.3"
-      sources."has-flag-4.0.0"
-      sources."has-proto-1.0.1"
-      sources."has-symbols-1.0.3"
-      (sources."hash-base-3.1.0" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-          sources."readable-stream-3.6.2"
-        ];
-      })
-      (sources."hash.js-1.1.7" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-        ];
-      })
-      sources."hmac-drbg-1.0.1"
-      sources."hoist-non-react-statics-3.3.2"
-      sources."http2-client-1.3.5"
-      sources."https-browserify-1.0.0"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      sources."inherits-2.0.1"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."isarray-1.0.0"
-      (sources."jest-worker-27.5.1" // {
-        dependencies = [
-          sources."supports-color-8.1.1"
-        ];
-      })
-      sources."js-levenshtein-1.1.6"
-      sources."js-tokens-4.0.0"
-      sources."js-yaml-4.1.0"
-      sources."jsesc-2.5.2"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-pointer-0.6.2"
-      sources."json-schema-traverse-1.0.0"
-      sources."json5-2.2.3"
-      sources."loader-runner-4.3.0"
-      sources."lodash-4.17.21"
-      sources."lodash.isequal-4.5.0"
-      sources."loose-envify-1.4.0"
-      sources."lru-cache-5.1.1"
-      sources."lunr-2.3.9"
-      sources."mark.js-8.11.1"
-      sources."marked-4.3.0"
-      sources."md5.js-1.3.5"
-      sources."merge-stream-2.0.0"
-      (sources."miller-rabin-4.0.1" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimalistic-crypto-utils-1.0.1"
-      sources."minimatch-5.1.6"
-      sources."minimist-1.2.8"
-      sources."mkdirp-1.0.4"
-      sources."mobx-6.10.0"
-      sources."mobx-react-7.6.0"
-      sources."mobx-react-lite-3.4.3"
-      sources."ms-2.1.2"
-      sources."neo-async-2.6.2"
-      sources."node-fetch-2.6.13"
-      sources."node-fetch-h2-2.3.0"
-      sources."node-libs-browser-2.2.1"
-      sources."node-readfiles-0.2.0"
-      sources."node-releases-2.0.13"
-      sources."normalize-path-3.0.0"
-      sources."oas-kit-common-1.0.8"
-      sources."oas-linter-3.2.2"
-      sources."oas-resolver-2.5.6"
-      sources."oas-schema-walker-1.1.5"
-      sources."oas-validator-5.0.8"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.12.3"
-      sources."openapi-sampler-1.3.1"
-      sources."os-browserify-0.3.0"
-      sources."pako-1.0.11"
-      sources."parse-asn1-5.1.6"
-      sources."path-browserify-0.0.1"
-      sources."pbkdf2-3.1.2"
-      sources."perfect-scrollbar-1.5.5"
-      sources."picocolors-1.0.0"
-      sources."picomatch-2.3.1"
-      sources."pluralize-8.0.0"
-      sources."polished-4.2.2"
-      sources."postcss-value-parser-4.2.0"
-      sources."prismjs-1.29.0"
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."prop-types-15.8.1"
-      (sources."public-encrypt-4.0.3" // {
-        dependencies = [
-          sources."bn.js-4.12.0"
-        ];
-      })
-      sources."punycode-1.4.1"
-      sources."qs-6.11.2"
-      sources."querystring-es3-0.2.1"
-      sources."randombytes-2.1.0"
-      sources."randomfill-1.0.4"
-      sources."react-17.0.2"
-      sources."react-dom-17.0.2"
-      sources."react-is-16.13.1"
-      sources."react-tabs-3.2.3"
-      (sources."readable-stream-2.3.8" // {
-        dependencies = [
-          sources."inherits-2.0.4"
-          sources."safe-buffer-5.1.2"
-          sources."string_decoder-1.1.1"
-        ];
-      })
-      sources."readdirp-3.6.0"
-      (sources."redoc-2.0.0" // {
-        dependencies = [
-          sources."path-browserify-1.0.1"
-        ];
-      })
-      sources."reftools-1.1.9"
-      sources."regenerator-runtime-0.14.0"
-      sources."require-directory-2.1.1"
-      sources."require-from-string-2.0.2"
-      sources."ripemd160-2.0.2"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."scheduler-0.20.2"
-      sources."schema-utils-3.3.0"
-      sources."semver-6.3.1"
-      sources."serialize-javascript-6.0.1"
-      sources."setimmediate-1.0.5"
-      sources."sha.js-2.4.11"
-      sources."shallowequal-1.1.0"
-      sources."should-13.2.3"
-      sources."should-equal-2.0.0"
-      sources."should-format-3.0.3"
-      sources."should-type-1.4.0"
-      sources."should-type-adaptors-1.1.0"
-      sources."should-util-1.0.1"
-      sources."side-channel-1.0.4"
-      sources."slugify-1.4.7"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."stickyfill-1.1.1"
-      sources."stream-browserify-2.0.2"
-      sources."stream-http-2.8.3"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."style-loader-3.3.3"
-      (sources."styled-components-5.3.11" // {
-        dependencies = [
-          sources."has-flag-3.0.0"
-          sources."supports-color-5.5.0"
-        ];
-      })
-      sources."supports-color-7.2.0"
-      sources."swagger2openapi-7.0.8"
-      sources."tapable-2.2.1"
-      sources."terser-5.19.2"
-      sources."terser-webpack-plugin-5.3.9"
-      sources."timers-browserify-2.0.12"
-      sources."to-arraybuffer-1.0.1"
-      sources."to-fast-properties-2.0.0"
-      sources."to-regex-range-5.0.1"
-      sources."tr46-0.0.3"
-      sources."tty-browserify-0.0.0"
-      sources."type-fest-0.20.2"
-      sources."uglify-js-3.17.4"
-      sources."update-browserslist-db-1.0.11"
-      (sources."uri-js-4.4.1" // {
-        dependencies = [
-          sources."punycode-2.3.0"
-        ];
-      })
-      sources."url-0.11.1"
-      sources."url-template-2.0.8"
-      (sources."util-0.11.1" // {
-        dependencies = [
-          sources."inherits-2.0.3"
-        ];
-      })
-      sources."util-deprecate-1.0.2"
-      sources."vm-browserify-1.1.2"
-      sources."watchpack-2.4.0"
-      sources."webidl-conversions-3.0.1"
-      sources."webpack-5.88.2"
-      sources."webpack-sources-3.2.3"
-      sources."whatwg-url-5.0.0"
-      sources."widest-line-3.1.0"
-      sources."wordwrap-1.0.0"
-      sources."wrap-ansi-7.0.0"
-      sources."xtend-4.0.2"
-      sources."y18n-5.0.8"
-      sources."yallist-3.1.1"
-      sources."yaml-1.10.2"
-      sources."yaml-ast-parser-0.0.43"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "ReDoc's Command Line Interface";
-      homepage = "https://github.com/Redocly/redoc#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   remod-cli = nodeEnv.buildNodePackage {
     name = "remod-cli";
     packageName = "remod-cli";
diff --git a/pkgs/development/tools/redoc-cli/default.nix b/pkgs/development/tools/redoc-cli/default.nix
new file mode 100644
index 000000000000..ed475e08fa44
--- /dev/null
+++ b/pkgs/development/tools/redoc-cli/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "redoc-cli";
+  version = "0.13.21";
+
+  src = fetchFromGitHub {
+    owner = "Redocly";
+    repo = "redoc";
+    rev = "d3ac16f4774ae5b5f698b4e8f4c1d3f5a009d361";
+    hash = "sha256-LmNb+m1Ng/53SPUqrr/AmxNMiWsrMGCKow0DW/9t3Do=";
+  };
+
+  sourceRoot = "${src.name}/cli";
+
+  npmDepsHash = "sha256-XL4D7+hb0zOxAr/aRo2UOg4UOip3oewbffsnkFddmWw=";
+
+  postPatch = ''
+    ln -s npm-shrinkwrap.json package-lock.json
+  '';
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "OpenAPI/Swagger-generated API Reference Documentation";
+    homepage = "https://github.com/Redocly/redoc/tree/redoc-cli/cli";
+    license = lib.licenses.mit;
+    mainProgram = "redoc-cli";
+    maintainers = with lib.maintainers; [ veehaitch ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e97e9ca1cf5b..3e3d8c02cdc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12661,7 +12661,7 @@ with pkgs;
 
   recoll = libsForQt5.callPackage ../applications/search/recoll { };
 
-  redoc-cli = nodePackages.redoc-cli;
+  redoc-cli = callPackage ../development/tools/redoc-cli { };
 
   reflex = callPackage ../development/tools/reflex { };
 

From 568ee7bc40b9f4ac984ecafd40a3e0fb8db367f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 14 Sep 2023 08:16:43 -0700
Subject: [PATCH 04/35] prettier-d-slim: use buildNpmPackage

---
 pkgs/by-name/pr/prettier-d-slim/package.nix   | 28 ++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 33 -------------------
 4 files changed, 29 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/by-name/pr/prettier-d-slim/package.nix

diff --git a/pkgs/by-name/pr/prettier-d-slim/package.nix b/pkgs/by-name/pr/prettier-d-slim/package.nix
new file mode 100644
index 000000000000..3b92503d7423
--- /dev/null
+++ b/pkgs/by-name/pr/prettier-d-slim/package.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "prettier-d-slim";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "mikew";
+    repo = "prettier_d_slim";
+    rev = "v${version}";
+    hash = "sha256-M+qlFKtIro3geVsVaYu6dIfOrJIlUQY98LSBikKNV/I=";
+  };
+
+  npmDepsHash = "sha256-zkyB3PYpfeEw5U70KewxIWd4eImIbTgy+e88264sotc=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "Makes prettier fast";
+    homepage = "https://github.com/mikew/prettier_d_slim";
+    license = lib.licenses.mit;
+    mainProgram = "prettier_d_slim";
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index fbc2118442ae..b9dc543df5dc 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -98,6 +98,7 @@ mapAliases {
   inherit (pkgs) npm-check-updates; # added 2023-08-22
   ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
   parcel-bundler = parcel; # added 2023-09-04
+  prettier_d_slim = pkgs.prettier-d-slim; # added 2023-09-14
   inherit (pkgs) quicktype; # added 2023-09-09
   inherit (pkgs) react-static; # added 2023-08-21
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1495f5c67d4c..6435c66d40bd 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -202,7 +202,6 @@
 , "postcss-cli"
 , "prebuild-install"
 , "prettier"
-, "prettier_d_slim"
 , "prettier-plugin-toml"
 , "prisma"
 , "@prisma/language-server"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 13ddaa66f59c..354c473d635d 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -101421,39 +101421,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  prettier_d_slim = nodeEnv.buildNodePackage {
-    name = "prettier_d_slim";
-    packageName = "prettier_d_slim";
-    version = "1.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/prettier_d_slim/-/prettier_d_slim-1.2.0.tgz";
-      sha512 = "Wq/Qida9MweJX7dKjlNeJ9Ppfeu4YPWY2947x1xev2RXjimvv2QOBRQJhGAir/QZ+WJnrU82e9O67Uqu8JgbZw==";
-    };
-    dependencies = [
-      sources."camelize-1.0.1"
-      sources."core_d-3.2.0"
-      sources."function-bind-1.1.1"
-      sources."has-1.0.3"
-      sources."has-flag-4.0.0"
-      sources."is-core-module-2.13.0"
-      sources."minimist-1.2.8"
-      sources."nanolru-1.0.0"
-      sources."path-parse-1.0.7"
-      sources."prettier-2.8.8"
-      sources."resolve-1.22.4"
-      sources."supports-color-8.1.1"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Makes prettier fast";
-      homepage = "https://github.com/mikew/prettier_d_slim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   prettier-plugin-toml = nodeEnv.buildNodePackage {
     name = "prettier-plugin-toml";
     packageName = "prettier-plugin-toml";

From 4c52285967565c42c5bac3b1346841da627fcd67 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 14 Sep 2023 00:25:25 -0700
Subject: [PATCH 05/35] =?UTF-8?q?zulip:=205.10.0=20=E2=86=92=205.10.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../networking/instant-messengers/zulip/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix
index 87c65b428d7f..12ae864b8042 100644
--- a/pkgs/applications/networking/instant-messengers/zulip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix
@@ -5,11 +5,11 @@
 
 let
   pname = "zulip";
-  version = "5.10.0";
+  version = "5.10.2";
 
   src = fetchurl {
     url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage";
-    hash = "sha256-rfFEhoykCStFCyBasQV6Cpb5ey+wvQLMXloIR0A1z7g=";
+    hash = "sha256-lz9PiikIEgGWW1N5KeNJmtIRB+0zFjWsR92PY1r0+NU=";
     name="${pname}-${version}.AppImage";
   };
 

From 0530d95a653ca2ef0be12bf7fe22cc4fd5081a46 Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Thu, 14 Sep 2023 15:46:52 -0400
Subject: [PATCH 06/35] brave: 1.57.62 -> 1.58.124

https://community.brave.com/t/release-channel-1-58-124/505801
---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 5fa70bd098d6..fe3df61ae10b 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -91,11 +91,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "brave";
-  version = "1.57.62";
+  version = "1.58.124";
 
   src = fetchurl {
     url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-    sha256 = "sha256-98zhLxlV/pe5fownqQ3k165YfcoLLxz2vBM/4FEq8ug=";
+    sha256 = "sha256-Q/bdauGZR68ueeKxOKI8X7OAc7UmNgixxEJncDsYhH0=";
   };
 
   dontConfigure = true;

From 7450048ad248622931865a4fee1f8c196b1a146d Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Thu, 14 Sep 2023 22:52:50 +0200
Subject: [PATCH 07/35] streamlink: 6.1.0 -> 6.2.0

https://github.com/streamlink/streamlink/releases/tag/6.2.0
---
 pkgs/applications/video/streamlink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix
index 896476c0580d..3fe81cb14c6d 100644
--- a/pkgs/applications/video/streamlink/default.nix
+++ b/pkgs/applications/video/streamlink/default.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "streamlink";
-  version = "6.1.0";
+  version = "6.2.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FwsgJ9TYBzCHxYlBwxrsOEy/mQH8tAH4JOkZrjh8Q4U=";
+    hash = "sha256-rq4beEhEb5CZjGIyTnEHyPQfjAgmbbxBm4HhzBs1VZo=";
   };
 
   nativeCheckInputs = with python3Packages; [

From 51056e2098c2c9f820f16ff92cf379def9c61572 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Sep 2023 23:28:28 +0000
Subject: [PATCH 08/35] python310Packages.yq: 3.2.2 -> 3.2.3

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

diff --git a/pkgs/development/python-modules/yq/default.nix b/pkgs/development/python-modules/yq/default.nix
index 5b652910ea14..c730725581ac 100644
--- a/pkgs/development/python-modules/yq/default.nix
+++ b/pkgs/development/python-modules/yq/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "yq";
-  version = "3.2.2";
+  version = "3.2.3";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jbt6DJN92/w90XXmR49AlgwUDT6LHxoDFd52OE1mZQo=";
+    hash = "sha256-Kcj+HTa09kFj9NATFMauIXU5hw9hAhbe5gJd+16vr7E=";
   };
 
   patches = [

From 41b53bac9656705f628698e271c6dd73181c73ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 08:09:14 +0200
Subject: [PATCH 09/35] trufflehog: 3.54.4 -> 3.55.0

Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.54.4...3.55.0

Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.55.0
---
 pkgs/tools/security/trufflehog/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 453cb0d14ac2..9d96e45ecda8 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.54.4";
+  version = "3.55.0";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-VWFGM4kRPrcdRwrzKrlbHl+eCpvnpYB2MD1ziPYJwjA=";
+    hash = "sha256-wHBMsGzMwHWPPeTtM5vwrf66Lyo9qn+BAMK+QHw3nOo=";
   };
 
-  vendorHash = "sha256-zYvKhhwN5TtJQxkkcY5U9LtTdMb97ucfksxpTMKH/Zc=";
+  vendorHash = "sha256-NBwPyA+NuW9RA/dXj+FpTa6RU0WOZRrey7gosDOatG8=";
 
   ldflags = [
     "-s"

From d53d237cbfe161c600e732669808f597a6b9bc3b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 08:14:52 +0200
Subject: [PATCH 10/35] trufflehog: 3.55.0 -> 3.56.0

Diff: https://github.com/trufflesecurity/trufflehog/compare/refs/tags/v3.55.0...3.56.0

Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.56.0
---
 pkgs/tools/security/trufflehog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix
index 9d96e45ecda8..bb4fb395de63 100644
--- a/pkgs/tools/security/trufflehog/default.nix
+++ b/pkgs/tools/security/trufflehog/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.55.0";
+  version = "3.56.0";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wHBMsGzMwHWPPeTtM5vwrf66Lyo9qn+BAMK+QHw3nOo=";
+    hash = "sha256-JNv3O8NSmQnk8lpGahlrZYVfpxeJCh7uxRahSfpXQ2Q=";
   };
 
   vendorHash = "sha256-NBwPyA+NuW9RA/dXj+FpTa6RU0WOZRrey7gosDOatG8=";

From 46475b96c76fc5fce01781d3bdb65a13f5c47e98 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 15 Sep 2023 10:31:15 +0200
Subject: [PATCH 11/35] recoll: 1.33.4 -> 1.35.0

---
 pkgs/applications/search/recoll/default.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 3058d83bf58c..fdc8b6317a9d 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -3,6 +3,7 @@
 , lib
 , mkDerivation
 , antiword
+, aspell
 , bison
 , catdoc
 , catdvi
@@ -27,6 +28,7 @@
 , poppler_utils
 , python3Packages
 , qtbase
+, qttools
 , unrtf
 , untex
 , unzip
@@ -68,11 +70,11 @@ in
 
 mkDerivation rec {
   pname = "recoll";
-  version = "1.33.4";
+  version = "1.35.0";
 
   src = fetchurl {
     url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-ffD49sGYWYEWAFPRtpyDU/CYFvkrEDL21Ddq3QsXCvc=";
+    hash = "sha256-5msEeHCdrpPS0VMCVohYNllaFJJdXRn8laY6BNBt+UE=";
   };
 
   configureFlags = [
@@ -102,18 +104,19 @@ mkDerivation rec {
     ./fix-datadir.patch
   ];
 
-  nativeBuildInputs = lib.optionals withGui [
-    qtbase
-  ] ++ [
+  nativeBuildInputs = [
+    makeWrapper
     pkg-config
+    which
+  ] ++ lib.optionals withGui [
+    qtbase
+    qttools
   ] ++ lib.optionals withPython [
     python3Packages.setuptools
-  ] ++ [
-    makeWrapper
-    which
   ];
 
   buildInputs = [
+    aspell
     bison
     chmlib
   ] ++ lib.optionals withPython [

From f83d7f90c3629690afe359430e30a2ef675b3407 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 12:32:13 +0200
Subject: [PATCH 12/35] python311Packages.archinfo: 9.2.66 -> 9.2.68

Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.66...v9.2.68
---
 pkgs/development/python-modules/archinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index 73e371ed0aab..9b489ef8e733 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.66";
+  version = "9.2.68";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-l9AakU68ACb02NGKWbkmUp14/lC21PJeGuzexYPTaNg=";
+    hash = "sha256-rbhzqp8PaotOt5d4E8hqWTwDRsG+hm7sVjBDkkblaIU=";
   };
 
   nativeBuildInputs = [

From 8e6c89d04cb29f9fce41180c43eaa2e0649c636f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 12:32:15 +0200
Subject: [PATCH 13/35] python311Packages.ailment: 9.2.66 -> 9.2.68

Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.66...v9.2.68
---
 pkgs/development/python-modules/ailment/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 2cde5dda3ae9..1eeb2c2e7b2a 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.66";
+  version = "9.2.68";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-5F6mSdYkeDS/n4Quu6UrBK3alfieop6Go3muGlmr/84=";
+    hash = "sha256-dQ4N1ixqcX+pHm6BIykISiHyao5kxJP+pFFqFV8+Ah0=";
   };
 
   nativeBuildInputs = [

From 44a93c773e090e6157d230a0430ba9d07b72a998 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 12:32:19 +0200
Subject: [PATCH 14/35] python311Packages.pyvex: 9.2.66 -> 9.2.68

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 292bd039f8d0..cde97a307466 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.66";
+  version = "9.2.68";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-NmOa/DH/EapcYCrpdcdn4CR9DiKuVnrDvKbnTiO3Ldc=";
+    hash = "sha256-Wsme663FssNGG/XhjkFi3tFeyli1yiofBQQiXi9P6nI=";
   };
 
   nativeBuildInputs = [

From 4c55c7bfeb07ebc9de8f5bc121428c2d29d2d3d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 12:32:22 +0200
Subject: [PATCH 15/35] python311Packages.claripy: 9.2.66 -> 9.2.68

Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.66...v9.2.68
---
 pkgs/development/python-modules/claripy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index d71fc9266d2d..cf74525d84e8 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.66";
+  version = "9.2.68";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-CDFZ6CN3pqNpwigYVHyKxwpa9iPfl4m/XDAo1YSRir8=";
+    hash = "sha256-ZMXlCfeSt2Dcvuc0CdB27rfSIEIgvMS81s7nAbmw5QM=";
   };
 
   nativeBuildInputs = [

From e1fdf924c42bd990e5e3b9b172276e9b565eb8ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 12:32:25 +0200
Subject: [PATCH 16/35] python311Packages.cle: 9.2.66 -> 9.2.68

Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.66...v9.2.68
---
 pkgs/development/python-modules/cle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index a8aa9cbfbc60..a808be461f8a 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -16,7 +16,7 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.66";
+  version = "9.2.68";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-/LDVpw1Ej2YuzwA2qUoZv/ajQZPL9dDvvawj9r5bGbo=";
+    hash = "sha256-qJrVAofIhoYS9dA/ipLh6Xuyt2b+trDRE/yq8tV9arI=";
   };
 
   nativeBuildInputs = [

From b0e6fe6d519269b32b666bfe49cc2279c97585f0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 12:32:29 +0200
Subject: [PATCH 17/35] python311Packages.angr: 9.2.66 -> 9.2.68

Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.66...v9.2.68
---
 pkgs/development/python-modules/angr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix
index 815d283a58ee..26a988a7632a 100644
--- a/pkgs/development/python-modules/angr/default.nix
+++ b/pkgs/development/python-modules/angr/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "angr";
-  version = "9.2.66";
+  version = "9.2.68";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-l/O+7M9f2HtIcXNd49+zr2Z0Cx/3mbXgZvqOyPlvJbk=";
+    hash = "sha256-+RDsYDROIbcuXl5q45T6lFzDpObWduOK9paDBALbImg=";
   };
 
   propagatedBuildInputs = [

From e1c5111a10bc6a1c6f37a742d97db4d7914e1c15 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Fri, 15 Sep 2023 13:34:15 +0200
Subject: [PATCH 18/35] eris-go: 20230729 -> 20230914

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

diff --git a/pkgs/servers/eris-go/default.nix b/pkgs/servers/eris-go/default.nix
index fa2517b9ba2a..dc6d72bba342 100644
--- a/pkgs/servers/eris-go/default.nix
+++ b/pkgs/servers/eris-go/default.nix
@@ -2,18 +2,20 @@
 
 buildGoModule rec {
   pname = "eris-go";
-  version = "20230729";
+  version = "20230914";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "eris";
     repo = "eris-go";
     rev = version;
-    hash = "sha256-yFWmfWmlGL4fC36XsjO/ao/v8FVI20EpXSblZ0EcosI=";
+    hash = "sha256-7aEsCQ+bZ//6Z+XXAEHgsAd61L+QgRl77+UtHr/BM1g=";
   };
 
   vendorHash = "sha256-Z6rirsiiBzH0herQAkxZp1Xr++489qNoiD4fqoLt9/A=";
 
+  skipNetworkTests = true;
+
   passthru.tests = { inherit (nixosTests) eris-server; };
 
   meta = src.meta // {

From 627947be69bf88db58a46f25049ce7ed1e5e53cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 14:30:43 +0200
Subject: [PATCH 19/35] python311Packages.syncedlyrics: 0.5.0 -> 0.6.0

Diff: https://github.com/rtcq/syncedlyrics/compare/refs/tags/v0.5.0...v0.6.0

Changelog: https://github.com/rtcq/syncedlyrics/releases/tag/v0.6.0
---
 pkgs/development/python-modules/syncedlyrics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix
index 48330988df83..267db53c14f7 100644
--- a/pkgs/development/python-modules/syncedlyrics/default.nix
+++ b/pkgs/development/python-modules/syncedlyrics/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "syncedlyrics";
-  version = "0.5.0";
+  version = "0.6.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rtcq";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-79dy1f5Pd/JGIpH/71E6IBg+AtR4zgHL4b/GRH1AFp0=";
+    hash = "sha256-SVB6hlVBk+0nNfJjp5zdv4A6FmVt1/NV4ov6qS1DlLI=";
   };
 
   nativeBuildInputs = [

From 528c9278aaf2f49062bed45d136c7e2d63289758 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 15:10:37 +0200
Subject: [PATCH 20/35] python311Packages.slack-sdk: 3.21.3 -> 3.22.0

Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.21.3...v3.22.0

Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.22.0
---
 pkgs/development/python-modules/slack-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 433f9ad62a85..14211eadd65d 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "slack-sdk";
-  version = "3.21.3";
+  version = "3.22.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "slackapi";
     repo = "python-slack-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-begpT/DaDqOi8HZE10FCuIIv18KSU/i5G/Z5DXKUT7Y=";
+    hash = "sha256-PRJgOAC1IJjQb1c4FAbpV8bxOPL9PTbAxNXo2MABRzc=";
   };
 
   propagatedBuildInputs = [

From 83040ac63e33d893e6c572a14908044d10cc4dc9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 18:59:00 +0200
Subject: [PATCH 21/35] python311Packages.google-cloud-container: 2.30.0 ->
 2.31.0

Changelog: https://github.com/googleapis/python-container/blob/v2.31.0/CHANGELOG.md
---
 .../python-modules/google-cloud-container/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-container/default.nix b/pkgs/development/python-modules/google-cloud-container/default.nix
index e9890447e46a..a79c74b3de08 100644
--- a/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/pkgs/development/python-modules/google-cloud-container/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-container";
-  version = "2.30.0";
+  version = "2.31.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iR6+A3ekRxl3zA1K7DMaw4dyMwjM/yxh/7tOH//mwXY=";
+    hash = "sha256-PGrG29a5tq41hn8zzJWdAy4Dju1O5ZPYhZ+CcsBraAY=";
   };
 
   propagatedBuildInputs = [

From 7e1e92876e52202e090229fbecb3265c72e0fcf8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 19:02:25 +0200
Subject: [PATCH 22/35] python311Packages.google-cloud-firestore: 2.11.1 ->
 2.12.0

Changelog: https://github.com/googleapis/python-firestore/blob/v2.12.0/CHANGELOG.md
---
 .../python-modules/google-cloud-firestore/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-firestore/default.nix b/pkgs/development/python-modules/google-cloud-firestore/default.nix
index 19b8c25f377c..0869a6e7f221 100644
--- a/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-firestore/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-firestore";
-  version = "2.11.1";
+  version = "2.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-f336hlZ8jWbGbI26i8XvhWd8hTK0IGBVozlBP4BxUl0=";
+    hash = "sha256-Pu3JsiONj9tsJkXaRV3nuo3wqaHSU4FZMqw6mMXuyc0=";
   };
 
   propagatedBuildInputs = [

From c010807547add8805f930810e647d2ee97db8ac0 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 15 Sep 2023 13:04:40 -0400
Subject: [PATCH 23/35] browsr: 1.15.0 -> 1.16.0

Diff: https://github.com/juftin/browsr/compare/v1.15.0...v1.16.0

Changelog: https://github.com/juftin/browsr/releases/tag/v1.16.0
---
 pkgs/applications/file-managers/browsr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/file-managers/browsr/default.nix b/pkgs/applications/file-managers/browsr/default.nix
index 409f1d1c5dfa..b26d20c65098 100644
--- a/pkgs/applications/file-managers/browsr/default.nix
+++ b/pkgs/applications/file-managers/browsr/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "browsr";
-  version = "1.15.0";
+  version = "1.16.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "juftin";
     repo = "browsr";
     rev = "v${version}";
-    hash = "sha256-v3DNk0wNG/TISP609YsVfgOFcr+ZOtdOXrm4j81dtLE=";
+    hash = "sha256-Tb/7ek5aKFxv8g4jAmj9nQ909LiHqrAXJoeC9o6fwFM=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 6771fc78e381c636bbd9e88ac78c8b93da63aaff Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 15 Sep 2023 13:49:16 -0400
Subject: [PATCH 24/35] cargo-hack: 0.6.7 -> 0.6.8

Diff: https://diff.rs/cargo-hack/0.6.7/0.6.8

Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.6.8/CHANGELOG.md
---
 pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix
index 6c34f3a59054..fbb3aeb7cc9d 100644
--- a/pkgs/development/tools/rust/cargo-hack/default.nix
+++ b/pkgs/development/tools/rust/cargo-hack/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-hack";
-  version = "0.6.7";
+  version = "0.6.8";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-uS0QDRSitwCGlo36OvtpjJ6ejKetjYEAuNEZpGiplQs=";
+    hash = "sha256-ZFFrluvnm5kCOyIe4c+gT2N4W7aeg1Cv1666by92BJo=";
   };
 
-  cargoSha256 = "sha256-Tro0Yp91P9CB/Md6MqbZGkw03QKUe8gh80357mWKMMY=";
+  cargoHash = "sha256-Nbs2pE9WqwsTJLV3nUAWVVz6gwcmhyk9hv/uaOoAkIQ=";
 
   # some necessary files are absent in the crate version
   doCheck = false;

From f92f6b6a84205f817ae3df709295eb2a216bb108 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Fri, 15 Sep 2023 20:00:43 +0200
Subject: [PATCH 25/35] parallel: fix cross-compilation

---
 pkgs/tools/misc/parallel/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index c36393dab29d..704f30d9dbe2 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils }:
+{ fetchurl, lib, stdenv, perl, makeWrapper, procps, coreutils, buildPackages }:
 
 stdenv.mkDerivation rec {
   pname = "parallel";
@@ -14,6 +14,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ perl procps ];
 
+  postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    substituteInPlace Makefile.in \
+      --replace '$(DESTDIR)$(bindir)/parallel --shell-completion' '${lib.getExe buildPackages.parallel} --shell-completion'
+  '';
+
   preInstall = ''
     patchShebangs ./src/parallel
   '';
@@ -48,5 +53,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ pSub vrthra tomberek ];
+    mainProgram = "parallel";
   };
 }

From 60012bc500fd6102ab1264c99eca0de4d12f8194 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 20:15:15 +0200
Subject: [PATCH 26/35] python311Packages.oracledb: 1.4.0 -> 1.4.1

Changelog: https://github.com/oracle/python-oracledb/blob/v1.4.1/doc/src/release_notes.rst
---
 .../development/python-modules/oracledb/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix
index b7aae7330bba..de0c449905a2 100644
--- a/pkgs/development/python-modules/oracledb/default.nix
+++ b/pkgs/development/python-modules/oracledb/default.nix
@@ -1,32 +1,33 @@
 { lib
 , buildPythonPackage
+, cryptography
+, cython_3
 , fetchPypi
 , pythonOlder
-, cryptography
-, cython
 }:
 
 buildPythonPackage rec {
   pname = "oracledb";
-  version = "1.4.0";
+  version = "1.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lrpQj3g4ksfKZI8misvLikqcgDfH3UpQnwXyyJ1iMb4=";
+    hash = "sha256-v2IlgQNsfTdWZDOANv4X7/0SStEjyDZeIvJ0LQvSN68=";
   };
 
   nativeBuildInputs = [
-    cython
+    cython_3
   ];
 
   propagatedBuildInputs = [
     cryptography
   ];
 
-  doCheck = false;  # Checks need an Oracle database
+  # Checks need an Oracle database
+  doCheck = false;
 
   pythonImportsCheck = [
     "oracledb"

From 94905873aecc8e3a33ad4d64a3833a1d83a1341a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 20:38:46 +0200
Subject: [PATCH 27/35] python311Packages.pyinstrument: 4.5.2 -> 4.5.3

Diff: https://github.com/joerick/pyinstrument/compare/refs/tags/v4.5.2...v4.5.3

Changelog: https://github.com/joerick/pyinstrument/releases/tag/v4.5.3
---
 pkgs/development/python-modules/pyinstrument/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyinstrument/default.nix b/pkgs/development/python-modules/pyinstrument/default.nix
index 4cc60efbc637..9848af44925d 100644
--- a/pkgs/development/python-modules/pyinstrument/default.nix
+++ b/pkgs/development/python-modules/pyinstrument/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pyinstrument";
-  version = "4.5.2";
+  version = "4.5.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "joerick";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-VL/JzgMxn5zABfmol+5oofR1RjyxTdzvUi6JnwsSFao=";
+    hash = "sha256-rGjHVbIl0kXgscKNZ/U1AU3Ij9Y+iOpIXnmO4jeb3jI=";
   };
 
   nativeBuildInputs = [

From 05c19a34df10ca2941968389553ddfe14f1759e7 Mon Sep 17 00:00:00 2001
From: Adam Stephens <adam@valkor.net>
Date: Fri, 15 Sep 2023 14:41:44 -0400
Subject: [PATCH 28/35] envoy: fix another hash invalidator in fetcher

---
 pkgs/servers/http/envoy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix
index e5d56fbdd0df..7c758331688a 100644
--- a/pkgs/servers/http/envoy/default.nix
+++ b/pkgs/servers/http/envoy/default.nix
@@ -80,8 +80,8 @@ buildBazelPackage rec {
 
   fetchAttrs = {
     sha256 = {
-      x86_64-linux = "sha256-+8MnbcFUyAE2122VA5olWAW8ZgjGweumRI62bxi9KOI=";
-      aarch64-linux = "sha256-4PH8rgsHxEwtx8RQGjLbAxHpLfWVqRLOvSX9sqQoy4Y=";
+      x86_64-linux = "sha256-MvY4cLdLOeb7+Zt7Oz7Kzz1+dsUceemP/V02egvHg+M=";
+      aarch64-linux = "sha256-U5mnAq8RHDygxiYeNc0HDeOgoaGyrd0MPjHKdyUkM0A=";
     }.${stdenv.system} or (throw "unsupported system ${stdenv.system}");
     dontUseCmakeConfigure = true;
     dontUseGnConfigure = true;
@@ -97,7 +97,7 @@ buildBazelPackage rec {
         -e 's,${stdenv.shellPackage},__NIXSHELL__,' \
         $bazelOut/external/com_github_luajit_luajit/build.py \
         $bazelOut/external/local_config_sh/BUILD \
-        $bazelOut/external/base_pip3/BUILD.bazel
+        $bazelOut/external/*_pip3/BUILD.bazel
 
       rm -r $bazelOut/external/go_sdk
       rm -r $bazelOut/external/local_jdk
@@ -133,7 +133,7 @@ buildBazelPackage rec {
         -e 's,__NIXSHELL__,${stdenv.shellPackage},' \
         $bazelOut/external/com_github_luajit_luajit/build.py \
         $bazelOut/external/local_config_sh/BUILD \
-        $bazelOut/external/base_pip3/BUILD.bazel
+        $bazelOut/external/*_pip3/BUILD.bazel
     '';
     installPhase = ''
       install -Dm0755 bazel-bin/source/exe/envoy-static $out/bin/envoy

From 1a840c31505d628c96ac1d9310ca982fb86fbb66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Sep 2023 18:59:07 +0000
Subject: [PATCH 29/35] werf: 1.2.253 -> 1.2.255

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

diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix
index 632fcaee21d1..0c02ba844024 100644
--- a/pkgs/applications/networking/cluster/werf/default.nix
+++ b/pkgs/applications/networking/cluster/werf/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "werf";
-  version = "1.2.253";
+  version = "1.2.255";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     rev = "v${version}";
-    hash = "sha256-cHMMLV2NdYueL3qV0wpB4n0+2XZTvg4mfKTSgGZHqqY=";
+    hash = "sha256-XrW/owPeh+lpkGDy0iNigu68Zx0dZIyBhrUkOXaHsaM=";
   };
 
-  vendorHash = "sha256-vuEqimNRWQGwybzOkGVoevpyVpU8XyXqhAIa7I66ajs=";
+  vendorHash = "sha256-rLUZnjrKZd1Br4upb+cGY3AMKtKVNxO/VxntmRLGu8A=";
 
   proxyVendor = true;
 

From e7db057d1762e0a0f0dcfb34a04b544aa602fd3d Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Fri, 15 Sep 2023 20:05:00 +0100
Subject: [PATCH 30/35] remnote: 1.12.22 -> 1.12.36

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

diff --git a/pkgs/applications/misc/remnote/default.nix b/pkgs/applications/misc/remnote/default.nix
index 1a2ccae164d2..b1039e17a757 100644
--- a/pkgs/applications/misc/remnote/default.nix
+++ b/pkgs/applications/misc/remnote/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: let
 in
 {
   pname = "remnote";
-  version = "1.12.22";
+  version = "1.12.36";
 
   src = fetchurl {
     url = "https://download.remnote.io/remnote-desktop/RemNote-${version}.AppImage";
-    hash = "sha256-lsTs9Xf0gDRvHQkteNu2JK2eZvF7XK0ryZZgMwTRWvk=";
+    hash = "sha256-uVncAEKCuUvJCeKMqflWq3R6BVHfbt1Bo+PwNk/pOu4=";
   };
   appexec = appimageTools.wrapType2 {
     inherit pname version src;

From 473c3a70c5bcc2f15fab762b66d7de05f9fe5dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 15 Sep 2023 21:02:42 +0200
Subject: [PATCH 31/35] python310Packages.natsort: disable timing sensitive
 test

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

diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index fc5d5ab4d590..b39460f71aa6 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -34,6 +34,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # timing sensitive test
+    # hypothesis.errors.DeadlineExceeded: Test took 524.23ms, which exceeds the deadline of 200.00ms
+    "test_string_component_transform_factory"
+  ];
+
   pythonImportsCheck = [
     "natsort"
   ];

From 6714a55df03c4f210c26b85432b6aaebb4b32800 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 15 Sep 2023 22:17:23 +0200
Subject: [PATCH 32/35] python311Packages.pythonfinder: 1.3.2 -> 2.0.5

Diff: https://github.com/sarugaku/pythonfinder/compare/refs/tags/1.3.2...2.0.5

Changelog: https://github.com/sarugaku/pythonfinder/blob/v2.0.5/CHANGELOG.rst
---
 .../python-modules/pythonfinder/default.nix   | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pythonfinder/default.nix b/pkgs/development/python-modules/pythonfinder/default.nix
index 79fb7ce78cbb..25e0484041a7 100644
--- a/pkgs/development/python-modules/pythonfinder/default.nix
+++ b/pkgs/development/python-modules/pythonfinder/default.nix
@@ -1,65 +1,71 @@
 { lib
 , buildPythonPackage
-, pythonOlder
-, fetchFromGitHub
-, pytestCheckHook
-, attrs
 , cached-property
 , click
+, fetchFromGitHub
 , packaging
-, pytest-cov
+, pydantic
 , pytest-timeout
+, pytestCheckHook
+, pythonOlder
 , setuptools
 }:
 
 buildPythonPackage rec {
   pname = "pythonfinder";
-  version = "1.3.2";
+  version = "2.0.5";
   format = "pyproject";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchFromGitHub {
     owner = "sarugaku";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-sfoAS3QpD78we8HcXpxjSyEIN1xLRVLExaM3oXe6tLU=";
+    hash = "sha256-L/+6w5lLqHO5c9CThoUPOHXRPVxBlOWFDAmfoYxRw5g=";
   };
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace " --cov" ""
+  '';
+
   nativeBuildInputs = [
     setuptools
   ];
 
   propagatedBuildInputs = [
-    attrs
     cached-property
-    click
     packaging
+    pydantic
   ];
 
+  passthru.optional-dependencies = {
+    cli = [
+      click
+    ];
+  };
+
   nativeCheckInputs = [
-    pytestCheckHook
-    pytest-cov
     pytest-timeout
-  ];
+    pytestCheckHook
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   pythonImportsCheck = [
     "pythonfinder"
   ];
 
-  pytestFlagsArray = [
-    "--no-cov"
-  ];
-
   # these tests invoke git in a subprocess and
   # for some reason git can't be found even if included in nativeCheckInputs
-  disabledTests = [
-    "test_shims_are_kept"
-    "test_shims_are_removed"
-  ];
+  # disabledTests = [
+  #   "test_shims_are_kept"
+  #   "test_shims_are_removed"
+  # ];
 
   meta = with lib; {
+    description = "Cross platform search tool for finding Python";
     homepage = "https://github.com/sarugaku/pythonfinder";
     changelog = "https://github.com/sarugaku/pythonfinder/blob/v${version}/CHANGELOG.rst";
-    description = "Cross Platform Search Tool for Finding Pythons";
     license = licenses.mit;
     maintainers = with maintainers; [ cpcloud ];
   };

From d68b3b0c914aea10eee7cf2e59ef44e39bc221c9 Mon Sep 17 00:00:00 2001
From: Colton Donnelly <colton@donn.io>
Date: Fri, 15 Sep 2023 16:33:02 -0400
Subject: [PATCH 33/35] bun: 1.0.1 -> 1.0.2

---
 pkgs/development/web/bun/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/web/bun/default.nix b/pkgs/development/web/bun/default.nix
index d3bf32a1ac24..ead4c54a7137 100644
--- a/pkgs/development/web/bun/default.nix
+++ b/pkgs/development/web/bun/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.2";
   pname = "bun";
 
   src = passthru.sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
@@ -35,19 +35,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-AzjCqfvR4Uad6+ocLo+KfqHKFjxOlZt4//Nw80FRijM=";
+        hash = "sha256-QvoEakfR5wmP10d6MDpfS8THke975bVyZc5pLVliUbQ=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        hash = "sha256-EEcKoaaC0KnaAfUqd5QNYpTeArY3ia38l5dkZCooZuw=";
+        hash = "sha256-izVtW28QE7Tty6DfQDKmw1oqD5GOolTzCeIUmtgI1Uw=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64.zip";
-        hash = "sha256-g4k0NdpWU1K+66Mi/idYAMx8pFLOBbUDk4rVczrxRjg=";
+        hash = "sha256-e/VXNCq2CwNsM7ruk8IGSwU/swkVhcvvQRv/yiIQtCU=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        hash = "sha256-RmgnWTG6kTebYwIa/VAwvvJmbL+ARNC+HkbF4mJPF7o=";
+        hash = "sha256-kHv8PU48Le4lG3pf304hXggAtx/I5uBeu4aHmLsbdgw=";
       };
     };
     updateScript = writeShellScript "update-bun" ''

From f7c51d5b5d321c4beb6e7f7ba1e68e93819b3d02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 16 Sep 2023 00:05:44 +0200
Subject: [PATCH 34/35] python311Packages.aiopegelonline: init at 0.0.6

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

diff --git a/pkgs/development/python-modules/aiopegelonline/default.nix b/pkgs/development/python-modules/aiopegelonline/default.nix
new file mode 100644
index 000000000000..3e78733ce443
--- /dev/null
+++ b/pkgs/development/python-modules/aiopegelonline/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, aiohttp
+, aioresponses
+, buildPythonPackage
+, fetchFromGitHub
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "aiopegelonline";
+  version = "0.0.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "mib1185";
+    repo = "aiopegelonline";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-UbH5S+BfXMAurEvPx0sOzNoV/yypbMCPN3Y3cSherfQ=";
+  };
+
+  propagatedBuildInputs = [
+    aiohttp
+  ];
+
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "aiopegelonline"
+  ];
+
+  meta = with lib; {
+    description = "Library to retrieve data from PEGELONLINE";
+    homepage = "https://github.com/mib1185/aiopegelonline";
+    changelog = "https://github.com/mib1185/aiopegelonline/releases/tag/v${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e5bd99704fa..98e0b60d3d4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -294,6 +294,8 @@ self: super: with self; {
 
   aiooss2 = callPackage ../development/python-modules/aiooss2 { };
 
+  aiopegelonline = callPackage ../development/python-modules/aiopegelonline { };
+
   aiopg = callPackage ../development/python-modules/aiopg { };
 
   aioprocessing = callPackage ../development/python-modules/aioprocessing { };

From 336c67eb66c52ef8b61e7f46308e94fc948c3db6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 21 Aug 2023 23:38:10 +0200
Subject: [PATCH 35/35] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 13637663d6ce..981fe9348c3a 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3069,7 +3069,8 @@
     "peco_opower" = ps: with ps; [
     ];
     "pegel_online" = ps: with ps; [
-    ]; # missing inputs: aiopegelonline
+      aiopegelonline
+    ];
     "pencom" = ps: with ps; [
       pencompy
     ];
@@ -5294,6 +5295,7 @@
     "panel_custom"
     "panel_iframe"
     "peco"
+    "pegel_online"
     "persistent_notification"
     "person"
     "philips_js"