From 893ae858d584f7e820e76acab83feac06d1b917a Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 31 Jul 2023 14:43:04 +1200
Subject: gogdl: 0.7.2 -> 0.7.3

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

diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix
index 346d5f81459ae..97bce673a80fd 100644
--- a/pkgs/games/gogdl/default.nix
+++ b/pkgs/games/gogdl/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonApplication rec {
   pname = "gogdl";
-  version = "0.7.2";
+  version = "0.7.3";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "heroic-gogdl";
-    rev = "d7f29dfef5818e8b323d04761e18a9abb750f93e";
-    hash = "sha256-9dAenawt9h/sz5paVYoqk+nmzPrInlqyh1EgshI25CE=";
+    rev = "d2fa34bfba7beb2ecc0e3fc70a657f2c612c8a10";
+    hash = "sha256-YCqtfY49lDg6sLrF/INOZVD9cMCwvejhySzUWrxHKAw=";
   };
 
   disabled = pythonOlder "3.8";
-- 
cgit 1.4.1


From 5a29bee734c4df3789970a988d7d163b220c83b0 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 31 Jul 2023 14:45:35 +1200
Subject: legendary-gl: 0.20.32 -> 0.20.33

---
 pkgs/games/legendary-gl/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix
index a863b1d1cee7a..569148f2cf505 100644
--- a/pkgs/games/legendary-gl/default.nix
+++ b/pkgs/games/legendary-gl/default.nix
@@ -4,20 +4,24 @@
 , buildPythonApplication
 , pythonOlder
 , requests
+, filelock
 }:
 
 buildPythonApplication rec {
   pname = "legendary-gl"; # Name in pypi
-  version = "0.20.32";
+  version = "0.20.33";
 
   src = fetchFromGitHub {
     owner = "derrod";
     repo = "legendary";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-MsvhVS3lqhgBJ+S/cjXFP70I3rM5WBYT7TyVlRWhNWw=";
+    sha256 = "sha256-fEQUChkxrKV2IkFGORUolZE2qTzA10Xxogjl5Va4TcE=";
   };
 
-  propagatedBuildInputs = [ requests ];
+  propagatedBuildInputs = [
+    requests
+    filelock
+  ];
 
   disabled = pythonOlder "3.8";
 
-- 
cgit 1.4.1


From 4d5658d7bd41b4d4fa5dbc2b2992dba58dc37cdf Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 1 Aug 2023 11:07:46 +1200
Subject: nile: init at 1.0.0

---
 pkgs/games/nile/default.nix     | 84 +++++++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 2 files changed, 86 insertions(+)
 create mode 100644 pkgs/games/nile/default.nix

diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix
new file mode 100644
index 0000000000000..beb444ae11ec9
--- /dev/null
+++ b/pkgs/games/nile/default.nix
@@ -0,0 +1,84 @@
+{ lib
+, writeScript
+, buildPythonApplication
+, fetchFromGitHub
+, pythonOlder
+, setuptools
+, requests
+, protobuf
+, pycryptodome
+, zstandard
+, json5
+, platformdirs
+, cacert
+}:
+
+buildPythonApplication rec {
+  pname = "nile";
+  version = "1.0.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "imLinguin";
+    repo = "nile";
+    rev = "f5f3b96f6483c59cfc646afbda6e97cb0bd94778";
+    hash = "sha256-HibY3U9/MibEDwHY+YiErW/pz6qwtps8wwjhznTISgA=";
+  };
+
+  disabled = pythonOlder "3.8";
+
+  propagatedBuildInputs = [
+    setuptools
+    requests
+    protobuf
+    pycryptodome
+    zstandard
+    json5
+    platformdirs
+  ];
+
+  pyprojectAppendix = ''
+    [tool.setuptools.packages.find]
+    include = ["nile*"]
+  '';
+
+  postPatch = ''
+    echo "$pyprojectAppendix" >> pyproject.toml
+  '';
+
+  pythonImportsCheck = [ "nile" ];
+
+  meta = with lib; {
+    description = "Unofficial Amazon Games client";
+    homepage = "https://github.com/imLinguin/nile";
+    license = with licenses; [ gpl3 ];
+    maintainers = with maintainers; [ aidalgol ];
+  };
+
+  # Upstream does not create git tags when bumping the version, so we have to
+  # extract it from the source code on the main branch.
+  passthru.updateScript = writeScript "gogdl-update-script" ''
+    #!/usr/bin/env nix-shell
+    #!nix-shell -i bash -p curl gnused jq common-updater-scripts
+    set -eou pipefail;
+
+    owner=imLinguin
+    repo=nile
+    path='nile/__init__.py'
+
+    version=$(
+      curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      https://raw.githubusercontent.com/$owner/$repo/main/$path |
+      sed -n 's/^\s*version\s*=\s*"\([0-9]\.[0-9]\.[0-9]\)"\s*$/\1/p')
+
+    commit=$(curl --cacert "${cacert}/etc/ssl/certs/ca-bundle.crt" \
+      https://api.github.com/repos/$owner/$repo/commits?path=$path |
+      jq -r '.[0].sha')
+
+    update-source-version \
+      ${pname} \
+      "$version" \
+      --file=./pkgs/games/nile/default.nix \
+      --rev=$commit
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 877a88a0ff10a..45d23ae6da23b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37600,6 +37600,8 @@ with pkgs;
 
   nexuiz = callPackage ../games/nexuiz { };
 
+  nile = python3Packages.callPackage ../games/nile { };
+
   ninvaders = callPackage ../games/ninvaders { };
 
   njam = callPackage ../games/njam { };
-- 
cgit 1.4.1


From 0e012f05c757c66d8d8f03bb165028afd1b2cc12 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Mon, 31 Jul 2023 15:05:58 +1200
Subject: heroic: 2.8.0 -> 2.9.1

Now also depends upon nile.
---
 pkgs/games/heroic/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index 1baf9cbf81630..94ca8329ffddb 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -10,23 +10,24 @@
 , electron
 , gogdl
 , legendary-gl
+, nile
 }:
 
 let appName = "heroic";
 in stdenv.mkDerivation rec {
   pname = "heroic-unwrapped";
-  version = "2.8.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "Heroic-Games-Launcher";
     repo = "HeroicGamesLauncher";
     rev = "v${version}";
-    hash = "sha256-AZwJRBkWuzBPT+ADVHabiK2KRXe6clZFa0IO99BO2Wk=";
+    hash = "sha256-1FtAcp6cG2qRfWrAgCOQ87DzMvszqqhObfSzepezBGc=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-xiLK0D9+oL2UMD7b/9htOQJEpYCNayKW+KJ/vNVCgsw=";
+    hash = "sha256-KEzTjtoBcHNJxC/7W/Bft75JZuZUSHieOOAwhbr5d3s=";
   };
 
   nativeBuildInputs = [
@@ -74,7 +75,11 @@ in stdenv.mkDerivation rec {
     chmod -R u+w "$out/share/${appName}/public/bin" "$out/share/${appName}/build/bin"
     rm -rf "$out/share/${appName}/public/bin" "$out/share/${appName}/build/bin"
     mkdir -p "$out/share/${appName}/build/bin/${binPlatform}"
-    ln -s "${gogdl}/bin/gogdl" "${legendary-gl}/bin/legendary" "$out/share/${appName}/build/bin/${binPlatform}"
+    ln -s \
+      "${gogdl}/bin/gogdl" \
+      "${legendary-gl}/bin/legendary" \
+      "${nile}"/bin/nile \
+      "$out/share/${appName}/build/bin/${binPlatform}"
 
     makeWrapper "${electron}/bin/electron" "$out/bin/heroic" \
       --inherit-argv0 \
@@ -92,7 +97,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "A Native GOG and Epic Games Launcher for Linux, Windows and Mac";
+    description = "A Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac";
     homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
     changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases";
     license = licenses.gpl3Only;
-- 
cgit 1.4.1


From 80701428e9e7819c5dc3cb2be40afc670386e769 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Tue, 1 Aug 2023 16:31:19 +1200
Subject: heroic: patch out DRM support

DRM support added in 2.9.0 prevent Heroic from running at all under
mainline Electron, instead requiring running against a non-free fork
with DRM support compiled in.
---
 pkgs/games/heroic/default.nix              |  6 ++++++
 pkgs/games/heroic/remove-drm-support.patch | 24 ++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/games/heroic/remove-drm-support.patch

diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index 94ca8329ffddb..6ebd911ccdc3c 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -38,6 +38,12 @@ in stdenv.mkDerivation rec {
     makeWrapper
   ];
 
+  patches = [
+    # Reverts part of upstream PR 2761 so that we don't have to use a non-free Electron fork.
+    # https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/2761
+    ./remove-drm-support.patch
+  ];
+
   configurePhase = ''
     runHook preConfigure
 
diff --git a/pkgs/games/heroic/remove-drm-support.patch b/pkgs/games/heroic/remove-drm-support.patch
new file mode 100644
index 0000000000000..f3cd80f003f3c
--- /dev/null
+++ b/pkgs/games/heroic/remove-drm-support.patch
@@ -0,0 +1,24 @@
+diff --git a/src/backend/main.ts b/src/backend/main.ts
+index 2cd1a28f..a60e04d0 100644
+--- a/src/backend/main.ts
++++ b/src/backend/main.ts
+@@ -19,8 +19,7 @@ import {
+   powerSaveBlocker,
+   protocol,
+   screen,
+-  clipboard,
+-  components
++  clipboard
+ } from 'electron'
+ import 'backend/updater'
+ import { autoUpdater } from 'electron-updater'
+@@ -286,8 +285,7 @@ if (!gotTheLock) {
+     initImagesCache()
+ 
+     if (!process.env.CI) {
+-      await components.whenReady()
+-      logInfo(['DRM module staus', components.status()])
++      logInfo('DRM modules disabled for nixpkgs')
+     }
+ 
+     // try to fix notification app name on windows
-- 
cgit 1.4.1


From 4523c65f95093a267ffe545a4be67a0d8773e0d5 Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Thu, 3 Aug 2023 23:45:55 +1200
Subject: gogdl: apply upstream PR patch for timeouts issue

---
 pkgs/games/gogdl/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix
index 97bce673a80fd..a6b41e7bd645e 100644
--- a/pkgs/games/gogdl/default.nix
+++ b/pkgs/games/gogdl/default.nix
@@ -1,4 +1,5 @@
 { lib
+, fetchpatch
 , writeScript
 , buildPythonApplication
 , fetchFromGitHub
@@ -27,6 +28,13 @@ buildPythonApplication rec {
     requests
   ];
 
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/Heroic-Games-Launcher/heroic-gogdl/pull/37.patch";
+      hash = "sha256-oZLetPoWzsEDrL0Bh89HB4hTn70FTh8aXj9mKGr4Dqw=";
+    })
+  ];
+
   pythonImportsCheck = [ "gogdl" ];
 
   meta = with lib; {
-- 
cgit 1.4.1


From ee15765c6519e59b9197661d8ba91c935a12a32e Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Thu, 3 Aug 2023 21:30:53 -0300
Subject: rtkit: reduce logging

Pull in a patch from a cleaner upstream PR to reduce logging.

Slightly update the URLs used to download the existing patches
to make it easier to find the relevant PRs.

Re: NixOS/nixpkgs#180102, heftig/rtkit#22
---
 pkgs/os-specific/linux/rtkit/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix
index fb41863c431d2..69d32079d5c76 100644
--- a/pkgs/os-specific/linux/rtkit/default.nix
+++ b/pkgs/os-specific/linux/rtkit/default.nix
@@ -16,14 +16,22 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://github.com/heftig/rtkit/commit/7d62095b94f8df3891c984a1535026d2658bb177.patch";
+      name = "meson-actual-use-systemd_systemunitdir.patch";
+      url = "https://github.com/heftig/rtkit/pull/19/commits/7d62095b94f8df3891c984a1535026d2658bb177.patch";
       sha256 = "17acv549zqcgh7sgprfagbf6drqsr0zdwvf1dsqda7wlqc2h9zn7";
     })
 
     (fetchpatch {
-      url = "https://github.com/heftig/rtkit/commit/98f70edd8f534c371cb4308b9720739c5178918d.patch";
+      name = "meson-fix-librt-find_library-check.patch";
+      url = "https://github.com/heftig/rtkit/pull/18/commits/98f70edd8f534c371cb4308b9720739c5178918d.patch";
       sha256 = "18mnjjsdjfr184nkzi01xyphpdngi31ry4bmkv9ysjxf9wilv4nl";
     })
+
+    (fetchpatch {
+      name = "rtkit-daemon-dont-log-debug-messages-by-default.patch";
+      url = "https://github.com/heftig/rtkit/pull/33/commits/ad649ee491ed1a41537774ad11564a208e598a09.patch";
+      sha256 = "sha256-p+MdJVMv58rFd1uc1UFKtq83RquDSFZ3M6YfaBU12UU=";
+    })
   ];
 
   nativeBuildInputs = [ meson ninja pkg-config unixtools.xxd ];
-- 
cgit 1.4.1


From 9594f53b996966eb87e2040561a589ff5419debc Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Mon, 14 Aug 2023 23:12:28 +0300
Subject: sage.with-env: remove unnecessary makeWrapper

Builds without it, all it seems to be doing is adding `/nix/store/6xfmwacsa9a7mzjjarknf9zg28q67ghq-sage-with-env-10.0/var/lib/sage/installed/make_shell_wrapper-hook`
---
 pkgs/applications/science/math/sage/sage-with-env.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix
index 7632b851773c2..378f7e29dd999 100644
--- a/pkgs/applications/science/math/sage/sage-with-env.nix
+++ b/pkgs/applications/science/math/sage/sage-with-env.nix
@@ -1,6 +1,5 @@
 { stdenv
 , lib
-, makeWrapper
 , sage-env
 , blas
 , lapack
@@ -72,7 +71,7 @@ let
       []
     );
 
-  allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs ++ [ makeWrapper ]);
+  allInputs = lib.remove null (nativeBuildInputs ++ buildInputs ++ pythonEnv.extraLibs);
   transitiveDeps = lib.unique (builtins.concatLists (map transitiveClosure allInputs ));
   # fix differences between spkg and sage names
   # (could patch sage instead, but this is more lightweight and also works for packages depending on sage)
-- 
cgit 1.4.1


From 88b60b61b9b35d481d29157e93f07ee963b9c43c Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 15 Aug 2023 01:01:54 +0300
Subject: treewide: fix cross makeWrapper eval

fix `error: makeWrapper/makeShellWrapper must be in nativeBuildInputs`

The `faust.faust2ApplBase` in used in `faust2sc` + more, requires
changes because it puts all the callPackage arguments in the
`mkDerivation` call and thus causes a eval fail

`nix-eval-jobs --flake ".#legacyPackages.x86_64-linux.pkgsCross.aarch64-multiplatform" --workers 2 2>/dev/null --impure | jq 'select(.error?) | select(.error | match ("makeWrapper/makeShellWrapper"))'
---
 pkgs/applications/audio/faust/faust2alqt.nix | 4 ++--
 pkgs/applications/audio/faust/faust2jaqt.nix | 4 ++--
 pkgs/top-level/all-packages.nix              | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/faust/faust2alqt.nix b/pkgs/applications/audio/faust/faust2alqt.nix
index 1d86cc3f6c3f2..b12b41763ba59 100644
--- a/pkgs/applications/audio/faust/faust2alqt.nix
+++ b/pkgs/applications/audio/faust/faust2alqt.nix
@@ -2,12 +2,12 @@
 , alsa-lib
 , qtbase
 , writeText
-, makeWrapper
+, buildPackages
 }:
 let
   # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
   wrapBinary = writeText "wrapBinary" ''
-    source ${makeWrapper}/nix-support/setup-hook
+    source ${buildPackages.makeWrapper}/nix-support/setup-hook
     for p in $FILES; do
       workpath=$PWD
       cd -- "$(dirname "$p")"
diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix
index 90498c9e3e3a7..90b6ca218dd42 100644
--- a/pkgs/applications/audio/faust/faust2jaqt.nix
+++ b/pkgs/applications/audio/faust/faust2jaqt.nix
@@ -4,13 +4,13 @@
 , libsndfile
 , alsa-lib
 , writeText
-, makeWrapper
+, buildPackages
 , which
 }:
 let
   # Wrap the binary coming out of the the compilation script, so it knows QT_PLUGIN_PATH
   wrapBinary = writeText "wrapBinary" ''
-    source ${makeWrapper}/nix-support/setup-hook
+    source ${buildPackages.makeWrapper}/nix-support/setup-hook
     for p in $FILES; do
       workpath=$PWD
       cd -- "$(dirname "$p")"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ce71f677689f..8e97f620ebf18 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13713,7 +13713,9 @@ with pkgs;
 
   tmux-xpanes = callPackage ../tools/misc/tmux-xpanes { };
 
-  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
+  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins {
+    pkgs = pkgs.__splicedPackages;
+  });
 
   tmsu = callPackage ../tools/filesystems/tmsu { };
 
@@ -16167,6 +16169,7 @@ with pkgs;
 
   idrisPackages = dontRecurseIntoAttrs (callPackage ../development/idris-modules {
     idris-no-deps = haskellPackages.idris;
+    pkgs = pkgs.__splicedPackages;
   });
 
   idris = idrisPackages.with-packages [ idrisPackages.base ] ;
-- 
cgit 1.4.1


From aae9f2ca22efe20369bfbd74561bbdaa61e5d381 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 15 Aug 2023 01:32:58 +0300
Subject: sbt-with-scala-native: use `overrideAttrs` to fix `nativeBuildInputs`
 splicing

preserve old nativeBuildInputs which includes autoPatchelfHook which was
not there when this override was added

drop the `sha256` and `version` overrides which have never worked
properly because they haven't been overriding src.

`sha256` and `version` were added in 49c7bed76385ab46d5e0f76b2f26f17a2c7d3658
---
 pkgs/development/tools/build-managers/sbt/scala-native.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/build-managers/sbt/scala-native.nix b/pkgs/development/tools/build-managers/sbt/scala-native.nix
index 70038ed2d3a43..caa9feebb5196 100644
--- a/pkgs/development/tools/build-managers/sbt/scala-native.nix
+++ b/pkgs/development/tools/build-managers/sbt/scala-native.nix
@@ -1,13 +1,9 @@
 { lib, sbt, makeWrapper, boehmgc, libunwind, re2, llvmPackages, zlib }:
 
-sbt.overrideDerivation(old: {
-  nativeBuildInputs = [ makeWrapper ];
+sbt.overrideAttrs(previousAttrs: {
+  nativeBuildInputs = (previousAttrs.nativeBuildInputs or [ ]) ++ [ makeWrapper ];
 
-  version = "0.13.16";
-
-  sha256 = "033nvklclvbirhpsiy28d3ccmbm26zcs9vb7j8jndsc1ln09awi2";
-
-  postFixup = ''
+  postFixup = (previousAttrs.postFixup or "") + ''
     wrapProgram $out/bin/sbt \
       --set CLANG_PATH      "${llvmPackages.clang}/bin/clang" \
       --set CLANGPP_PATH    "${llvmPackages.clang}/bin/clang" \
-- 
cgit 1.4.1


From a2342f740a6e592e8a6f8c9a7250a25526d6e76a Mon Sep 17 00:00:00 2001
From: Rafael Fernández López <ereslibre@ereslibre.es>
Date: Wed, 16 Aug 2023 19:25:22 +0200
Subject: fastly: 10.2.4 -> 10.3.0

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

diff --git a/pkgs/misc/fastly/default.nix b/pkgs/misc/fastly/default.nix
index 261c06dd2e24a..19089c59af77b 100644
--- a/pkgs/misc/fastly/default.nix
+++ b/pkgs/misc/fastly/default.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "fastly";
-  version = "10.2.4";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "cli";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4N2Eo6InqdK5CFhHp8X3+1xKA99Wtnj2Q0/GDglWoBc=";
+    hash = "sha256-UkhcSRVABgZs9/G5r6ZMLfFPZMeXE8atR5+HNG5y3tk=";
     # The git commit is part of the `fastly version` original output;
     # leave that output the same in nixpkgs. Use the `.git` directory
     # to retrieve the commit SHA, and remove the directory afterwards,
-- 
cgit 1.4.1


From 7a726590f29840dda0f64deffab936c9795527bb Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Wed, 16 Aug 2023 20:41:39 +0200
Subject: overcommit: 0.59.1 -> 0.60.0

See https://github.com/sds/overcommit/releases/tag/v0.60.0
---
 pkgs/development/tools/overcommit/Gemfile.lock | 6 +++---
 pkgs/development/tools/overcommit/gemset.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock
index 4c96598be697e..1c75368b7d814 100644
--- a/pkgs/development/tools/overcommit/Gemfile.lock
+++ b/pkgs/development/tools/overcommit/Gemfile.lock
@@ -3,11 +3,11 @@ GEM
   specs:
     childprocess (4.1.0)
     iniparse (1.5.0)
-    overcommit (0.59.1)
+    overcommit (0.60.0)
       childprocess (>= 0.6.3, < 5)
       iniparse (~> 1.4)
       rexml (~> 3.2)
-    rexml (3.2.5)
+    rexml (3.2.6)
 
 PLATFORMS
   ruby
@@ -16,4 +16,4 @@ DEPENDENCIES
   overcommit
 
 BUNDLED WITH
-   2.3.22
+   2.4.17
diff --git a/pkgs/development/tools/overcommit/gemset.nix b/pkgs/development/tools/overcommit/gemset.nix
index d0d6f36225377..96e84f288e4f5 100644
--- a/pkgs/development/tools/overcommit/gemset.nix
+++ b/pkgs/development/tools/overcommit/gemset.nix
@@ -25,19 +25,19 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0dbz2y98r351r218m9d871ris1zfb6bcwr1gdhb39g2r9pail79n";
+      sha256 = "0slqmsycbqx746liwq0qw0c81xrp4051iff8s574a4fmj941gkia";
       type = "gem";
     };
-    version = "0.59.1";
+    version = "0.60.0";
   };
   rexml = {
     groups = ["default"];
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
+      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
       type = "gem";
     };
-    version = "3.2.5";
+    version = "3.2.6";
   };
 }
-- 
cgit 1.4.1


From a3147333c3f9f095a362b549134f560a723c23c4 Mon Sep 17 00:00:00 2001
From: Ivan Kovnatsky <75213+ivankovnatsky@users.noreply.github.com>
Date: Fri, 18 Aug 2023 10:57:59 +0300
Subject: aws-sso-cli: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix
index 6ff97aa78d8c9..c381d05bb4ffa 100644
--- a/pkgs/tools/admin/aws-sso-cli/default.nix
+++ b/pkgs/tools/admin/aws-sso-cli/default.nix
@@ -6,15 +6,15 @@
 }:
 buildGoModule rec {
   pname = "aws-sso-cli";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "synfinatic";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Vem0RMKkCwgqs06Ly3Awz4EcCWLd0H4xjWGRbnAlqbE=";
+    hash = "sha256-RshR1GA3BvvPwwkVxrM98FfgW3kNaMM0Vqr7iEuoFek=";
   };
-  vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI=";
+  vendorHash = "sha256-skFENAr5XjdKoAyVwXYJVZH+IviqfyZmMIdgHq+7IPs=";
 
   nativeBuildInputs = [ makeWrapper ];
 
-- 
cgit 1.4.1


From 51f2cfd303c416da4d917c2ae832100d9530fd6e Mon Sep 17 00:00:00 2001
From: Jez Cope <j.cope@erambler.co.uk>
Date: Thu, 17 Aug 2023 19:03:41 +0100
Subject: gitless: 0.8.8 -> 0.9.17

fixes #249543
---
 pkgs/applications/version-management/gitless/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix
index 31ab40d79478f..0f6a59ac641e4 100644
--- a/pkgs/applications/version-management/gitless/default.nix
+++ b/pkgs/applications/version-management/gitless/default.nix
@@ -5,22 +5,21 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gitless";
-  version = "0.8.8";
+  version = "0.9.17";
   format = "setuptools";
 
   src = fetchFromGitHub {
-    owner = "gitless-vcs";
+    owner = "goldstar611";
     repo = pname;
-    rev = "v${version}";
-    hash = "sha256-xo5EWtP2aN8YzP8ro3bnxZwUGUp0PHD0g8hk+Y+gExE=";
+    rev = version;
+    hash = "sha256-XDB1i2b1reMCM6i1uK3IzTnsoLXO7jldYtNlYUo1AoQ=";
   };
 
   nativeBuildInputs = [ python3.pkgs.pythonRelaxDepsHook ];
 
   propagatedBuildInputs = with python3.pkgs; [
-    sh
     pygit2
-    clint
+    argcomplete
   ];
 
   pythonRelaxDeps = [ "pygit2" ];
-- 
cgit 1.4.1


From f8fa19a5da5f1f761c4ac924bfde796af990f9da Mon Sep 17 00:00:00 2001
From: Aidan Gauland <aidalgol@fastmail.net>
Date: Sat, 19 Aug 2023 08:06:17 +1200
Subject: heroic: apply patch to fix Steam shortcuts

---
 pkgs/games/heroic/default.nix                   |  2 ++
 pkgs/games/heroic/fix-non-steam-shortcuts.patch | 13 +++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/games/heroic/fix-non-steam-shortcuts.patch

diff --git a/pkgs/games/heroic/default.nix b/pkgs/games/heroic/default.nix
index 6ebd911ccdc3c..05455ae7c7d6f 100644
--- a/pkgs/games/heroic/default.nix
+++ b/pkgs/games/heroic/default.nix
@@ -42,6 +42,8 @@ in stdenv.mkDerivation rec {
     # Reverts part of upstream PR 2761 so that we don't have to use a non-free Electron fork.
     # https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/pull/2761
     ./remove-drm-support.patch
+    # Make Heroic create Steam shortcuts (to non-steam games) with the correct path to heroic.
+    ./fix-non-steam-shortcuts.patch
   ];
 
   configurePhase = ''
diff --git a/pkgs/games/heroic/fix-non-steam-shortcuts.patch b/pkgs/games/heroic/fix-non-steam-shortcuts.patch
new file mode 100644
index 0000000000000..7b46473245f7b
--- /dev/null
+++ b/pkgs/games/heroic/fix-non-steam-shortcuts.patch
@@ -0,0 +1,13 @@
+diff --git a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
+index ebef6aa4..c8bd853d 100644
+--- a/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
++++ b/src/backend/shortcuts/nonesteamgame/nonesteamgame.ts
+@@ -252,7 +252,7 @@ async function addNonSteamGame(props: {
+     // add new Entry
+     const newEntry = {} as ShortcutEntry
+     newEntry.AppName = props.gameInfo.title
+-    newEntry.Exe = `"${app.getPath('exe')}"`
++    newEntry.Exe = `"heroic"`
+     newEntry.StartDir = `"${process.cwd()}"`
+ 
+     if (isFlatpak) {
-- 
cgit 1.4.1


From a1a844841d728cafad6b9fe76f1e4ccc2f86893a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 00:25:51 +0000
Subject: rtx: 1.35.8 -> 2023.8.2

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

diff --git a/pkgs/tools/misc/rtx/default.nix b/pkgs/tools/misc/rtx/default.nix
index 3aa751e28d5e3..1da4909159180 100644
--- a/pkgs/tools/misc/rtx/default.nix
+++ b/pkgs/tools/misc/rtx/default.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rtx";
-  version = "1.35.8";
+  version = "2023.8.2";
 
   src = fetchFromGitHub {
     owner = "jdxcode";
     repo = "rtx";
     rev = "v${version}";
-    hash = "sha256-oofbnZAB1a/Het5fqwDVx8Fl2aZcOhtb2/sKIF3KDFA=";
+    hash = "sha256-I5S9HR+syvj5H7xJKhtM7Ja+8wlKL6A01SDb9TjeoS8=";
   };
 
-  cargoHash = "sha256-hcDHFA20jQgUnrdvqKSNCE17yVsH7B/WUKAVZN4Ck2o=";
+  cargoHash = "sha256-zbJ+U3PZIGp+BYQbc50+Kgh1KFF7svela3DsyogO/r8=";
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
   buildInputs = [ openssl  ] ++ lib.optionals stdenv.isDarwin [ Security ];
-- 
cgit 1.4.1


From 08da063a5edc304f8554efb2d2adb7a99e19037b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 01:20:28 +0000
Subject: slweb: 0.6.1 -> 0.6.7

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

diff --git a/pkgs/applications/misc/slweb/default.nix b/pkgs/applications/misc/slweb/default.nix
index ace4db26bdc24..1fcee352bdc46 100644
--- a/pkgs/applications/misc/slweb/default.nix
+++ b/pkgs/applications/misc/slweb/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "slweb";
-  version = "0.6.1";
+  version = "0.6.7";
 
   src = fetchFromSourcehut {
     owner = "~strahinja";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-TZxnJEBodRdZzL96Ichs+oiXVltF2HXVUKDETBQcIaI=";
+    sha256 = "sha256-Y7w3yVqA8MNJJ3OcGaeziydZyzF0bap41Il6eE/Hu40=";
   };
 
   nativeBuildInputs = [ redo-apenwarr ];
-- 
cgit 1.4.1


From ad17e14f713253f6682116a4fee11f0631163a49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 02:12:36 +0000
Subject: python310Packages.pipdeptree: 2.12.0 -> 2.13.0

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

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index 43d99563a47cb..d248672b170a3 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pipdeptree";
-  version = "2.12.0";
+  version = "2.13.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tox-dev";
     repo = "pipdeptree";
     rev = "refs/tags/${version}";
-    hash = "sha256-4qRMET04JLVuDRfQtv/uQquf76iU00rnsWNaUXj1Gfw=";
+    hash = "sha256-mblj6SQK/az2al81wMiWXHuyn1+30jfAxrWGv9Nw/gw=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
-- 
cgit 1.4.1


From e51fcee94a02e9a40cf5f13b1dac00c0e1e38f6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 02:46:04 +0000
Subject: python310Packages.trimesh: 3.23.1 -> 3.23.3

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

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index 6d7e549deabb1..1482d0a6589f1 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "3.23.1";
+  version = "3.23.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2MQJJaTzpDeuk9BPLbzwWtbLC3jzd7ht2oGrVMCXRoc=";
+    hash = "sha256-61nMytrqc7w7IbO7TX7H4O4DYoVL9MTBasN3UDx492w=";
   };
 
   nativeBuildInputs = [ setuptools ];
-- 
cgit 1.4.1


From 7d87be6c71f0680f82fe51fa18b40b7a7eed0d21 Mon Sep 17 00:00:00 2001
From: éclairevoyant <848000+eclairevoyant@users.noreply.github.com>
Date: Sat, 19 Aug 2023 03:27:42 -0400
Subject: cutechess: init at 1.3.1

---
 pkgs/games/cutechess/default.nix | 45 ++++++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/games/cutechess/default.nix

diff --git a/pkgs/games/cutechess/default.nix b/pkgs/games/cutechess/default.nix
new file mode 100644
index 0000000000000..5e374afa1bca5
--- /dev/null
+++ b/pkgs/games/cutechess/default.nix
@@ -0,0 +1,45 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, pkg-config
+, wrapQtAppsHook
+, qtbase
+, lib
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "cutechess";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "cutechess";
+    repo = "cutechess";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-P44Twbw2MGz+oTzPwMFCe73zPxAex6uYjSTtaUypfHw=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    wrapQtAppsHook
+  ];
+  buildInputs = [
+    qtbase
+  ];
+
+  postInstall = ''
+    install -Dm555 cutechess{,-cli} -t $out/bin/
+    install -Dm444 libcutechess.a -t $out/lib/
+    install -Dm444 $src/docs/cutechess-cli.6 -t $out/share/man/man6/
+    install -Dm444 $src/docs/cutechess-engines.json.5 -t $out/share/man/man5/
+  '';
+
+  meta = with lib; {
+    description = "GUI, CLI, and library for playing chess";
+    homepage = "https://cutechess.com/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ eclairevoyant ];
+    platforms = with platforms; (linux ++ windows);
+    mainProgram = "cutechess";
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bba95ef0ea613..f13a0e81efba0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -37453,6 +37453,8 @@ with pkgs;
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 
+  cutechess = qt5.callPackage ../games/cutechess { };
+
   cutemaze = qt6Packages.callPackage ../games/cutemaze { };
 
   cuyo = callPackage ../games/cuyo { };
-- 
cgit 1.4.1


From ae1039c04793c28f473084e14608cd1fc3a3dce8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 11 Aug 2023 08:19:24 +0200
Subject: python310Packages.notebook: 7.0.1 -> 7.0.2

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index 957752040e43b..95f387653d972 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "notebook";
-  version = "7.0.1";
+  version = "7.0.2";
   disabled = pythonOlder "3.8";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LhatTmPqiffvviEu58FpP8+lq1X/73UEdTD3SvS9kmw=";
+    hash = "sha256-1w1qB0GMgpvV9UM3zpk7cQUmHZAm+dP+aOm4qhog2po=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From cdb0e2e82bfa5b58b9177437184f53f7491a17b9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Jul 2023 08:49:16 +0200
Subject: python310Packages.jupyter-contrib-core: run tests

---
 pkgs/development/python-modules/jupyter-contrib-core/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/python-modules/jupyter-contrib-core/default.nix b/pkgs/development/python-modules/jupyter-contrib-core/default.nix
index 0f9c573e30070..a81c354974307 100644
--- a/pkgs/development/python-modules/jupyter-contrib-core/default.nix
+++ b/pkgs/development/python-modules/jupyter-contrib-core/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , jupyter-core
 , notebook
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -21,6 +22,13 @@ buildPythonPackage rec {
     notebook
   ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  disabledTestPaths = [
+    # This test fails upstream too
+    "tests/test_application.py"
+  ];
+
   pythonImportsCheck = [ "jupyter_contrib_core" ];
 
   meta = with lib; {
-- 
cgit 1.4.1


From b9dab7ce25ad12e82c81e9f33f89dbbe7134a9e1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Jul 2023 08:49:34 +0200
Subject: python310Packages.jupyter-nbextensions-configurator: run tests

---
 .../jupyter-nbextensions-configurator/default.nix        | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
index c675542be1080..61c235877f4a1 100644
--- a/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
+++ b/pkgs/development/python-modules/jupyter-nbextensions-configurator/default.nix
@@ -8,6 +8,9 @@
 , notebook
 , pyyaml
 , tornado
+, nose
+, pytestCheckHook
+, selenium
 }:
 
 buildPythonPackage rec {
@@ -39,6 +42,19 @@ buildPythonPackage rec {
     tornado
   ];
 
+  nativeCheckInputs = [
+    nose
+    pytestCheckHook
+    selenium
+  ];
+
+  # Those tests fails upstream
+  disabledTestPaths = [
+    "tests/test_application.py"
+    "tests/test_jupyterhub.py"
+    "tests/test_nbextensions_configurator.py"
+  ];
+
   pythonImportsCheck = [ "jupyter_nbextensions_configurator" ];
 
   meta = with lib; {
-- 
cgit 1.4.1


From bb244d60b922f78a13939995caaf6d1e8ef47dd5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Jul 2023 08:52:54 +0200
Subject: python310Packages.jupyter-highlight-selected-word: explicitly disable
 tests

---
 .../python-modules/jupyter-highlight-selected-word/default.nix         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix b/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix
index a069ecf948f51..64cbe33ae8bad 100644
--- a/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix
+++ b/pkgs/development/python-modules/jupyter-highlight-selected-word/default.nix
@@ -14,6 +14,9 @@ buildPythonPackage rec {
     hash = "sha256-KgM//SIfES46uZySwNR4ZOcolnJORltvThsmEvxXoIs=";
   };
 
+  # This package does not have tests
+  doChecks = false;
+
   pythonImportsCheck = [ "jupyter_highlight_selected_word" ];
 
   meta = with lib; {
-- 
cgit 1.4.1


From 635923cf53ffc8932511c90e15250b49026fc48d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Jul 2023 15:25:05 +0200
Subject: python310Packages.nbconvert: 7.2.5 -> 7.7.3

---
 .../python-modules/nbconvert/default.nix           | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix
index 54632a5025736..e7fb3dfba4721 100644
--- a/pkgs/development/python-modules/nbconvert/default.nix
+++ b/pkgs/development/python-modules/nbconvert/default.nix
@@ -1,28 +1,28 @@
-{ beautifulsoup4
-, bleach
+{ lib
+, fetchurl
 , buildPythonPackage
-, defusedxml
+, pythonOlder
 , fetchPypi
-, fetchpatch
-, fetchurl
 , hatchling
-, importlib-metadata
-, ipywidgets
+, beautifulsoup4
+, bleach
+, defusedxml
 , jinja2
 , jupyter-core
 , jupyterlab-pygments
-, lib
 , markupsafe
 , mistune
 , nbclient
 , packaging
 , pandocfilters
 , pygments
-, pyppeteer
-, pytestCheckHook
-, pythonOlder
 , tinycss2
 , traitlets
+, importlib-metadata
+, flaky
+, ipywidgets
+, pyppeteer
+, pytestCheckHook
 }:
 
 let
@@ -33,15 +33,15 @@ let
   };
 in buildPythonPackage rec {
   pname = "nbconvert";
-  version = "7.2.5";
+  version = "7.7.3";
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-j9xE/X2UJNt/3G4eg0oC9rhiD/tlN2c4i+L56xb4QYQ=";
+    hash = "sha256-SlmWv1880WqgQxiXuhqkxkhCwgefQ0s9xrjEslLvM1U=";
   };
 
   # Add $out/share/jupyter to the list of paths that are used to search for
@@ -85,6 +85,7 @@ in buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
+    flaky
     ipywidgets
     pyppeteer
     pytestCheckHook
-- 
cgit 1.4.1


From 3f69b1cbfaf1d6e8a43ea0c133ef988feac544a3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 20 Jul 2023 15:26:28 +0200
Subject: python310Packages.jupyter-contrib-nbextensions: run tests

---
 .../jupyter-contrib-nbextensions/default.nix          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix
index bf9bc2bd7cd0e..73ba031e39925 100644
--- a/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix
+++ b/pkgs/development/python-modules/jupyter-contrib-nbextensions/default.nix
@@ -6,6 +6,9 @@
 , jupyter-highlight-selected-word
 , jupyter-nbextensions-configurator
 , lxml
+, nose
+, pytestCheckHook
+, notebook
 }:
 
 buildPythonPackage rec {
@@ -27,6 +30,20 @@ buildPythonPackage rec {
     lxml
   ];
 
+  nativeCheckInputs = [
+    nose
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # Thoses tests fail upstream because of nbconvert being too recent
+    # https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1606
+    "tests/test_exporters.py"
+
+    # Requires to run jupyter which is not feasible here
+    "tests/test_application.py"
+  ];
+
   pythonImportsCheck = [ "jupyter_contrib_nbextensions" ];
 
   meta = with lib; {
@@ -34,5 +51,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/ipython-contrib/jupyter_contrib_nbextensions";
     license = licenses.bsd3;
     maintainers = with maintainers; [ GaetanLepage ];
+    # https://github.com/ipython-contrib/jupyter_contrib_nbextensions/issues/1647
+    broken = versionAtLeast notebook.version "7";
   };
 }
-- 
cgit 1.4.1


From 180f7932cd3ca2483a39a6519812d70c0a12692f Mon Sep 17 00:00:00 2001
From: rnhmjoj <rnhmjoj@inventati.org>
Date: Sat, 19 Aug 2023 13:01:41 +0200
Subject: qutebrowser: 2.5.4 -> 3.0.0

---
 .../networking/browsers/qutebrowser/default.nix    | 72 +++++++---------------
 pkgs/top-level/aliases.nix                         |  1 +
 pkgs/top-level/all-packages.nix                    |  3 +-
 3 files changed, 23 insertions(+), 53 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 47721f1834126..1bd35ef0a1d69 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchzip, fetchFromGitHub, python3
+{ stdenv, lib, fetchurl, fetchzip, python3
 , wrapQtAppsHook, glib-networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2
 , libxslt, gst_all_1 ? null
@@ -8,16 +8,14 @@
 , pipewireSupport    ? stdenv.isLinux
 , pipewire
 , qtwayland
-, mkDerivationWith ? null
-, qtbase ? null
-, qtwebengine ? null
-, wrapGAppsHook ? null
+, qtbase
+, qtwebengine
+, wrapGAppsHook
 , enableWideVine ? false
 , widevine-cdm
-}: let
-  isQt6 = mkDerivationWith == null;
+}:
 
-  python3Packages = python3.pkgs;
+let
   pdfjs = let
     version = "2.14.305";
   in
@@ -27,40 +25,21 @@
     stripRoot = false;
   };
 
-  backendPackage =
-   if backend == "webengine" then if isQt6 then python3Packages.pyqt6-webengine else python3Packages.pyqtwebengine else
-   if backend == "webkit"    then python3Packages.pyqt5_with_qtwebkit else
-   throw ''
-     Unknown qutebrowser backend "${backend}".
-     Valid choices are qtwebengine (recommended) or qtwebkit.
-   '';
-
-  buildPythonApplication = if isQt6 then python3Packages.buildPythonApplication else mkDerivationWith python3Packages.buildPythonApplication;
-
   pname = "qutebrowser";
-  version = if isQt6 then "unstable-2023-04-18" else "2.5.4";
+  version = "3.0.0";
 in
 
 assert withMediaPlayback -> gst_all_1 != null;
-assert isQt6 -> backend != "webkit";
+assert lib.assertMsg (backend != "webkit") ''
+  Support for the QtWebKit backend has been removed.
+  Please remove the `backend = "webkit"` option from your qutebrowser override.
+'';
 
-buildPythonApplication {
+python3.pkgs.buildPythonApplication {
   inherit pname version;
-
-  src = if isQt6 then
-    # comes from the master branch of upstream
-    # https://github.com/qutebrowser/qutebrowser/issues/7202
-    # https://github.com/qutebrowser/qutebrowser/discussions/7628
-    fetchFromGitHub {
-      owner = "qutebrowser";
-      repo = "qutebrowser";
-      rev = "d4cafc0019a4a5574caa11966fc40ede89076d26";
-      hash = "sha256-Ma79EPvnwmQkeXEG9aSnD/Vt1DGhK2JX9dib7uARH8M=";
-    }
-  # the release tarballs are different from the git checkout!
-   else fetchurl {
+  src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-pGCyICUn5CpnDCbSJdn6ZBfQkswfFvOpXnvJXdicGrE=";
+    hash = "sha256-Oer0p/DwUfOejUCgSCSkMvLLAjNyJx51qgN7bcQQ2Pw=";
   };
 
   # Needs tox
@@ -77,20 +56,18 @@ buildPythonApplication {
   nativeBuildInputs = [
     wrapQtAppsHook wrapGAppsHook asciidoc
     docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
-  ]
-    ++ lib.optional isQt6 python3Packages.pygments;
+    python3.pkgs.pygments
+  ];
 
-  propagatedBuildInputs = with python3Packages; ([
-    pyyaml backendPackage jinja2 pygments
+  propagatedBuildInputs = with python3.pkgs; ([
+    pyyaml pyqtwebengine jinja2 pygments
     # scripts and userscripts libs
     tldextract beautifulsoup4
     readability-lxml pykeepass stem
     pynacl
     # extensive ad blocking
     adblock
-  ]
-    ++ lib.optional (pythonOlder "3.9") importlib-resources
-    ++ lib.optional stdenv.isLinux qtwayland
+  ] ++ lib.optional stdenv.isLinux qtwayland
   );
 
   patches = [
@@ -100,10 +77,6 @@ buildPythonApplication {
   dontWrapGApps = true;
   dontWrapQtApps = true;
 
-  preConfigure = lib.optionalString isQt6 ''
-    python scripts/asciidoc2html.py
-  '';
-
   postPatch = ''
     substituteInPlace qutebrowser/misc/quitter.py --subst-var-by qutebrowser "$out/bin/qutebrowser"
 
@@ -141,10 +114,7 @@ buildPythonApplication {
     makeWrapperArgs+=(
       "''${gappsWrapperArgs[@]}"
       "''${qtWrapperArgs[@]}"
-      --add-flags '--backend ${backend}'
-      --set QUTE_QTWEBENGINE_VERSION_OVERRIDE "${lib.getVersion qtwebengine}"
-      ${lib.optionalString isQt6 ''--set QUTE_QT_WRAPPER "PyQt6"''}
-      ${lib.optionalString (pipewireSupport && backend == "webengine") ''--prefix LD_LIBRARY_PATH : ${libPath}''}
+      ${lib.optionalString pipewireSupport ''--prefix LD_LIBRARY_PATH : ${libPath}''}
       ${lib.optionalString enableWideVine ''--add-flags "--qt-flag widevine-path=${widevine-cdm}/share/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"''}
     )
   '';
@@ -153,7 +123,7 @@ buildPythonApplication {
     homepage    = "https://github.com/qutebrowser/qutebrowser";
     description = "Keyboard-focused browser with a minimal GUI";
     license     = licenses.gpl3Plus;
-    platforms   = if enableWideVine then [ "x86_64-linux" ] else backendPackage.meta.platforms;
+    platforms   = if enableWideVine then [ "x86_64-linux" ] else qtwebengine.meta.platforms;
     maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda nrdxp ];
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1c2ff72b4bec0..ac896222f16ef 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1473,6 +1473,7 @@ mapAliases ({
   quake3game = throw "'quake3game' has been renamed to/replaced by 'ioquake3'"; # Converted to throw 2022-02-22
   quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # Added 2020-04-09
   quilter = throw "quilter has been removed from nixpkgs, as it was unmaintained"; # Added 2021-08-03
+  qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19
   qvim = throw "qvim has been removed"; # Added 2020-08-31
   qweechat = throw "qweechat has been removed because it was broken"; # Added 2021-03-08
   qwt6 = throw "'qwt6' has been renamed to/replaced by 'libsForQt5.qwt'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e2b7de49d5022..f63707f0d20c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34573,8 +34573,7 @@ with pkgs;
     withXineBackend = true;
   };
 
-  qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };
-  qutebrowser-qt6 = callPackage ../applications/networking/browsers/qutebrowser {
+  qutebrowser = callPackage ../applications/networking/browsers/qutebrowser {
     inherit (qt6Packages) qtbase qtwebengine wrapQtAppsHook qtwayland;
   };
 
-- 
cgit 1.4.1


From ef82011918e35ff88340f7e2e075414f37231530 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 19 Aug 2023 13:44:09 +0200
Subject: linux-rt_6_1: 6.1.33-rt11 -> 6.1.46-rt13

---
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index 6d77e5f87fe2c..cfb84c25f275d 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "6.1.33-rt11"; # updated by ./update-rt.sh
+  version = "6.1.46-rt13"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-    sha256 = "1kfj7mi3n2lfaw4spz5cbvcl1md038figabyg80fha3kxal6nzdq";
+    sha256 = "15m228bllks2p8gpsmvplx08yxzp7bij9fnmnafqszylrk7ppxpm";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0swzp6brk01r7pb73yada18vf6fhdqq4c78abq3abj6y8ay0awhh";
+      sha256 = "00pj02mvamxvlkwrca1j3baaa18rg6dra7al1xsvgw3ypckwyafz";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 
-- 
cgit 1.4.1


From ccf0c5bd42d8aeb5bd12577f748857759904e8f8 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 19 Aug 2023 13:45:22 +0200
Subject: linux: make main update script slightly more robust

On #249636 I had to manually run the updaters for hardened & libre kernels.
The cause was that `update-rt.sh` suddenly broke. Because I didn't want to
inhibit other kernel updates because of a rather niche variant, I decided to
move forward temporarily and take care of it later.

One issue was that the script failed silently, i.e. I only saw that the
script terminated early from my prompt. This is fixed now by making each
niche kernel updater print its exit code code if it failed. Also, errors
are allowed, i.e. a broken `update-rt.sh` doesn't block
`hardened/update.py` etc..

The issue itself is rather simple. When I updated the kernels in #249636,
the sha256sums.asc for rt kernels[1] looked like this:

    199bbb0cdb97ead22732473b95c8b2e8da62dfd71bde2339163119fb537a2b7c  patch-6.1.38-rt13-rc1.patch.gz
    a1af54f6987e96de06cad0a3226c5b5a992b60df084a904b6b94ea247fb46027  patch-6.1.38-rt13-rc1.patch.xz
    7bb68561787e46e3c433d9b514373ce368d587ac459b91df41934e70280d008f  patches-6.1.38-rt13-rc1.tar.gz
    ee65336dd6ae0be398796e7b75291918811a23e10121dc09bd84b244b12402fa  patches-6.1.38-rt13-rc1.tar.xz

However, the script itself skips any RC versions of the realtime
patches, so no releases were usable and the script failed. It's probably
possible to use the overview over all releases instead[2], however
that'd complicate the script notably. Anyways, since RT kernels don't
bump to each patch-level release, I don't think it hurts too much if
such an update is slightly more delayed. However if we want to fix this, I'd prefer
this to be fixed by folks who care more about rt kernels than I do.

[1] https://kernel.org/pub/linux/kernel/projects/rt/6.1/sha256sums.asc
[2] https://mirrors.edge.kernel.org/pub/linux/kernel/projects/rt/6.1/older/sha256sums.asc
---
 pkgs/os-specific/linux/kernel/update.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh
index 560edced36ead..4171b7492b7b5 100755
--- a/pkgs/os-specific/linux/kernel/update.sh
+++ b/pkgs/os-specific/linux/kernel/update.sh
@@ -58,11 +58,15 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do
   echo "Updated $OLDVER -> $V"
 done
 
-# Update linux-rt
-COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh
+# Allowing errors again: one broken update script shouldn't inhibit the
+# update of other kernel variants.
+set +e
 
-# Update linux-libre
-COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh
+echo Update linux-rt
+COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh || echo "update-rt failed with exit code $?"
 
-# Update linux-hardened
-COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py
+echo Update linux-libre
+COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh || echo "update-libre failed with exit code $?"
+
+echo Update linux-hardened
+COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/hardened/update.py || echo "update-hardened failed with exit code $?"
-- 
cgit 1.4.1


From 772915fd04e5dfdf799172da0161603c9cc3a98b Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 19 Aug 2023 21:31:24 +0800
Subject: todiff: use sri hash

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

diff --git a/pkgs/applications/misc/todiff/default.nix b/pkgs/applications/misc/todiff/default.nix
index 14f03cdc8cef1..b3df5f48e8591 100644
--- a/pkgs/applications/misc/todiff/default.nix
+++ b/pkgs/applications/misc/todiff/default.nix
@@ -8,10 +8,10 @@ rustPlatform.buildRustPackage rec {
     owner = "Ekleog";
     repo = "todiff";
     rev = version;
-    sha256 = "1y0v8nkaqb8kn61xwarpbyrq019gxx1f5f5p1hzw73nqxadc1rcm";
+    hash = "sha256-leXAmurYjsM/DLe44kLvLwWAs183K96DsRMtrKZFG/g=";
   };
 
-  cargoSha256 = "0vrn1vc3rwabv6l2r1qb7mkcxbp75q79bfl3rxhyi51ra3ij507r";
+  cargoHash = "sha256-+YAi41A5lOhhz4O6lQ4u567OZj0Lhyyo2UvxPNgONm8=";
 
   checkFeatures = [ "integration_tests" ];
 
-- 
cgit 1.4.1


From a8eb4695438c78e4a611268daecca07b4b9d6c95 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <ludovicopiero@pm.me>
Date: Sun, 20 Aug 2023 00:00:48 +1000
Subject: waypaper: 1.2 -> 1.5

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

diff --git a/pkgs/applications/misc/waypaper/default.nix b/pkgs/applications/misc/waypaper/default.nix
index 83715ae525412..86c23400f1ba7 100644
--- a/pkgs/applications/misc/waypaper/default.nix
+++ b/pkgs/applications/misc/waypaper/default.nix
@@ -8,13 +8,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "waypaper";
-  version = "1.2";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "anufrievroman";
     repo = "waypaper";
     rev = "refs/tags/${version}";
-    hash = "sha256-wD3DtxP4aUwIn+EoM3s1Y9VNEcUGhtyugNBEFHI9eqw=";
+    hash = "sha256-lK4TygR9cwEHcnrC0E5vE7Jor6afEiM9TmEgGXj+hNA=";
   };
 
   nativeBuildInputs = [
-- 
cgit 1.4.1


From 34b92315b502eb822ad9c0646b05ac98d54756ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 14:24:33 +0000
Subject: numix-icon-theme-square: 23.07.21 -> 23.08.16

---
 pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix
index ecfea598a55ec..e8d6b81e1ff11 100644
--- a/pkgs/data/icons/numix-icon-theme-square/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-square/default.nix
@@ -2,13 +2,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "23.07.21";
+  version = "23.08.16";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = pname;
     rev = version;
-    sha256 = "sha256-rHT4lD+RcwRmE63Dd7/oXVAltRTfpisptzyD1EQG4Aw=";
+    sha256 = "sha256-zlh3Jh3ZrNo58ijGPwdaiHnTFoT6L3ZC0VTRY0Se3qs=";
   };
 
   nativeBuildInputs = [ gtk3 ];
-- 
cgit 1.4.1


From 95af888fe317d2d7ef3e8c157b68148eed8f5cdd Mon Sep 17 00:00:00 2001
From: Ross Light <ross@zombiezen.com>
Date: Sat, 19 Aug 2023 09:04:09 -0700
Subject: zeromq: update license to LGPL

zeromq 4.3.4 is [released under the LGPLv3](https://github.com/zeromq/libzmq/blob/v4.3.4/README.md#license).
---
 pkgs/development/libraries/zeromq/4.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 53b1f2f7431a7..9fa429f9a4cac 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     branch = "4";
     homepage = "http://www.zeromq.org";
     description = "The Intelligent Transport Layer";
-    license = licenses.gpl3;
+    license = licenses.lgpl3Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [ fpletz ];
   };
-- 
cgit 1.4.1


From 5eb1879e4e3dae137f762fbb8237e7afa84315f2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 19 Aug 2023 13:53:52 +0100
Subject: openssh: backport zlib-1.3 support

---
 pkgs/tools/networking/openssh/common.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index f3028573c05c0..d29f45e8af2f5 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -13,6 +13,8 @@
 # package without splicing See: https://github.com/NixOS/nixpkgs/pull/107606
 , pkgs
 , fetchurl
+, fetchpatch
+, autoreconfHook
 , zlib
 , openssl
 , libedit
@@ -42,6 +44,14 @@ stdenv.mkDerivation {
 
     # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
     ./dont_create_privsep_path.patch
+
+    # Pull upstream zlib-1.3 support.
+    # The patch changes configure.ac, uses autoreconfHook.
+    (fetchpatch {
+      name = "zlib-1.3.patch";
+      url = "https://github.com/openssh/openssh-portable/commit/cb4ed12ffc332d1f72d054ed92655b5f1c38f621.patch";
+      hash = "sha256-3Gx0/I2n9/XaWCIefVYtvk5f+VgH6MlhMBse+PMyf34=";
+    })
   ] ++ extraPatches;
 
   postPatch =
@@ -52,7 +62,7 @@ stdenv.mkDerivation {
     '';
 
   strictDeps = true;
-  nativeBuildInputs = [ pkg-config ]
+  nativeBuildInputs = [ autoreconfHook pkg-config ]
     # This is not the same as the libkrb5 from the inputs! pkgs.libkrb5 is
     # needed here to access krb5-config in order to cross compile. See:
     # https://github.com/NixOS/nixpkgs/pull/107606
-- 
cgit 1.4.1


From 72b3452d940a676b6f851b4ce08cb455f4672d3b Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Sat, 19 Aug 2023 15:37:47 +0200
Subject: gotosocial: 0.10.0 -> 0.11.0

---
 pkgs/servers/gotosocial/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/gotosocial/default.nix b/pkgs/servers/gotosocial/default.nix
index f264f8ac788e8..b75ef3cff13bf 100644
--- a/pkgs/servers/gotosocial/default.nix
+++ b/pkgs/servers/gotosocial/default.nix
@@ -9,13 +9,11 @@ let
   owner = "superseriousbusiness";
   repo = "gotosocial";
 
-  version = "0.10.0";
-  source-hash = "sha256-SE+u89xAV6jJulU8XETlzTrqtwBYeMdNGyjk648b7h8=";
-  web-assets-hash = "sha256-tYqnGqII8gf+aVd/J5lvhurhCrH8ihWYn7noBJbEgqA=";
+  version = "0.11.0";
 
   web-assets = fetchurl {
     url = "https://github.com/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
-    hash = web-assets-hash;
+    hash = "sha256-NK5m+ERZQtl5Stq2+bWw0LS2SbmlhEJDZjTTxYciemE=";
   };
 in
 buildGoModule rec {
@@ -25,7 +23,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     inherit owner repo;
     rev = "refs/tags/v${version}";
-    hash = source-hash;
+    hash = "sha256-qbq5pDvG2L1s6BG+sh7eagcFNH/DWyANMQaAl2WcQzE=";
   };
 
   vendorHash = null;
-- 
cgit 1.4.1


From 7a7bf33edf9d9c865fe88e55ad4639e4c9654c96 Mon Sep 17 00:00:00 2001
From: Jussi Kuokkanen <jussi.kuokkanen@protonmail.com>
Date: Sat, 19 Aug 2023 22:33:32 +0300
Subject: deface: init at 1.4.0

---
 pkgs/applications/video/deface/default.nix | 56 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/video/deface/default.nix

diff --git a/pkgs/applications/video/deface/default.nix b/pkgs/applications/video/deface/default.nix
new file mode 100644
index 0000000000000..43c009c9dbb81
--- /dev/null
+++ b/pkgs/applications/video/deface/default.nix
@@ -0,0 +1,56 @@
+{ lib
+, stdenv
+, python3
+, fetchFromGitHub
+, makeWrapper
+, pkgs
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "deface";
+  version = "1.4.0";
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "ORB-HD";
+    repo = "deface";
+    rev = "v${version}";
+    hash = "sha256-tLNTgdnKKmyYHVajz0dHIb7cvC1by5LQ5CFIbMvPEYk=";
+  };
+
+  nativeBuildInputs = with python3.pkgs; [
+    setuptools-scm
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    imageio
+    imageio-ffmpeg
+    numpy
+    onnx
+    onnxruntime # Nixpkgs onnxruntime is missing CUDA support
+    opencv4
+    scikit-image
+    tqdm
+  ];
+
+  # Native onnxruntime lib used by Python module onnxruntime can't find its other libs without this
+  makeWrapperArgs = [
+    ''--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ pkgs.onnxruntime ]}"''
+  ];
+
+  patchPhase = ''
+    substituteInPlace pyproject.toml requirements.txt --replace "opencv-python" "opencv"
+  '';
+
+  # Let setuptools know deface version
+  SETUPTOOLS_SCM_PRETEND_VERSION = "v${version}";
+
+  pythonImportsCheck = [ "deface" "onnx" "onnxruntime" ];
+
+  meta = with lib; {
+    description = "Video anonymization by face detection";
+    homepage = "https://github.com/ORB-HD/deface";
+    license = licenses.mit;
+    maintainers = with maintainers; [ lurkki ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2b09ecd239345..c4a1140053faa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -41866,6 +41866,8 @@ with pkgs;
 
   ov = callPackage ../tools/text/ov { };
 
+  deface = callPackage ../applications/video/deface { };
+
   tubekit = callPackage ../applications/networking/cluster/tubekit/wrapper.nix { };
 
   tubekit-unwrapped = callPackage ../applications/networking/cluster/tubekit { };
-- 
cgit 1.4.1


From b6001ab3ab7259afa21015283b56f005448daa94 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Aug 2023 21:37:07 +0200
Subject: xcrawl3r: init at 0.1.0

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

diff --git a/pkgs/tools/security/xcrawl3r/default.nix b/pkgs/tools/security/xcrawl3r/default.nix
new file mode 100644
index 0000000000000..c7b63c238be10
--- /dev/null
+++ b/pkgs/tools/security/xcrawl3r/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+}:
+
+buildGoModule rec {
+  pname = "xcrawl3r";
+  version = "0.1.0";
+
+  src = fetchFromGitHub {
+    owner = "hueristiq";
+    repo = "xcrawl3r";
+    rev = "refs/tags/${version}";
+    hash = "sha256-K7UuWsteI8mEAGOF/g/EbT/Ch6sbmKhiiYB3npdDmFk=";
+  };
+
+  vendorHash = "sha256-/yBSrZdlVMZgcKcONBSq7C5IFC30TJL0z6FZRXm+HUs=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = with lib; {
+    description = "A CLI utility to recursively crawl webpages";
+    homepage = "https://github.com/hueristiq/xcrawl3r";
+    changelog = "https://github.com/hueristiq/xcrawl3r/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f3a2e7ac13898..7f743aab59e45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14585,6 +14585,8 @@ with pkgs;
 
   xspim = callPackage ../development/tools/misc/xspim { };
 
+  xcrawl3r = callPackage ../tools/security/xcrawl3r { };
+
   xcruiser = callPackage ../applications/misc/xcruiser { };
 
   xwallpaper = callPackage ../tools/X11/xwallpaper { };
-- 
cgit 1.4.1


From fd3a7d686927f8b00c666259252bf4b3997a4a48 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Aug 2023 21:59:30 +0200
Subject: python311Packages.google-cloud-pubsub: 2.18.2 -> 2.18.3

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

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 14289f03690c2..79beffc5125db 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.18.2";
+  version = "2.18.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-W50UJJopwOW8a5jI18FmZEzBragwxA8AnyvLWIL1sQU=";
+    hash = "sha256-tAcSM55fgbegNbC+iyrpBmhKQWLhGaK5qzO8mUuhty8=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 4fe907b070a7ae96622889493807d9ca1b2baf31 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 19 Aug 2023 22:03:23 +0200
Subject: python311Packages.google-cloud-container: 2.29.0 -> 2.30.0

Changelog: https://github.com/googleapis/python-container/blob/v2.30.0/CHANGELOG.md
---
 pkgs/development/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 531e2819f9dc5..e9890447e46a6 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.29.0";
+  version = "2.30.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-kBcdzhfr5k5MiSJu3tVyE09a5whQgj6m1AsUEwcQxS4=";
+    hash = "sha256-iR6+A3ekRxl3zA1K7DMaw4dyMwjM/yxh/7tOH//mwXY=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From cd30fcbd0f305054068251f970873f0a778760c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 20:29:20 +0000
Subject: python310Packages.minio: 7.1.15 -> 7.1.16

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

diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index a036521a30e2c..e76ffe0c80902 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "minio";
-  version = "7.1.15";
+  version = "7.1.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "minio";
     repo = "minio-py";
     rev = "refs/tags/${version}";
-    hash = "sha256-eqQPOMEJOTdvYHaQ+ty+bDJn4/S5KnUOtF42O1wc+mw=";
+    hash = "sha256-avGCAaqP2gLlrLDFzUJZW/KaT2lrueVjgsAJSk1eyX0=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 91dd8b932457a45f08be3d4d355c12cbb1703774 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sat, 19 Aug 2023 23:33:55 +0300
Subject: make-squashfs: Only limit cores to 48 on i686

There shouldn't be a need to limit it on other systems
---
 nixos/lib/make-squashfs.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix
index d1260a48f2294..b7c7078b73b1b 100644
--- a/nixos/lib/make-squashfs.nix
+++ b/nixos/lib/make-squashfs.nix
@@ -1,4 +1,4 @@
-{ stdenv, squashfsTools, closureInfo
+{ lib, stdenv, squashfsTools, closureInfo
 
 , # The root directory of the squashfs filesystem is filled with the
   # closures of the Nix store paths listed here.
@@ -22,11 +22,13 @@ stdenv.mkDerivation {
       # for nix-store --load-db.
       cp $closureInfo/registration nix-path-registration
 
+    '' + lib.optionalString stdenv.buildPlatform.is32bit ''
       # 64 cores on i686 does not work
       # fails with FATAL ERROR: mangle2:: xz compress failed with error code 5
       if ((NIX_BUILD_CORES > 48)); then
         NIX_BUILD_CORES=48
       fi
+    '' + ''
 
       # Generate the squashfs image.
       mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \
-- 
cgit 1.4.1


From f008df3863548efaf2dce688fef9a314b9f3d744 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Wed, 16 Aug 2023 16:48:04 +0200
Subject: mkosi: init at 15.2-pre

Co-authored-by: Malte Poll <mp@edgeless.systems>
Co-authored-by: Jonas Heinrich <onny@project-insanity.org>
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/tools/virtualization/mkosi/default.nix | 69 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 71 insertions(+)
 create mode 100644 pkgs/tools/virtualization/mkosi/default.nix

diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix
new file mode 100644
index 0000000000000..345e65d04881c
--- /dev/null
+++ b/pkgs/tools/virtualization/mkosi/default.nix
@@ -0,0 +1,69 @@
+{ lib
+, fetchFromGitHub
+, setuptools
+, buildPythonApplication
+, pytestCheckHook
+, bubblewrap
+, systemd
+, stdenv
+}:
+let
+  # For systemd features used by mkosi, see
+  # https://github.com/systemd/mkosi/blob/19bb5e274d9a9c23891905c4bcbb8f68955a701d/action.yaml#L64-L72
+  systemdForMkosi = systemd.override {
+    # Will be added in #243242
+    # withRepart = true;
+    # withBootloader = true;
+    withEfi = true;
+    withUkify = true;
+  };
+in
+buildPythonApplication rec {
+  pname = "mkosi";
+  version = "15.2-pre"; # 15.1 is the latest release, but we require a newer commit
+  format = "pyproject";
+
+  src = fetchFromGitHub {
+    owner = "systemd";
+    repo = "mkosi";
+    # Fix from the commit is needed to run on NixOS,
+    # see https://github.com/systemd/mkosi/issues/1792
+    rev = "ca9673cbcbd9f293e5566cec4a1ba14bbcd075b8";
+    hash = "sha256-y5gG/g33HBpH1pTXfjHae25bc5p/BvlCm9QxOIYtcA8=";
+  };
+
+  # Fix ctypes finding library
+  # https://github.com/NixOS/nixpkgs/issues/7307
+  patchPhase = lib.optionalString stdenv.isLinux ''
+    substituteInPlace mkosi/run.py --replace \
+      'ctypes.util.find_library("c")' "'${stdenv.cc.libc}/lib/libc.so.6'"
+  '';
+
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+
+  propagatedBuildInputs = [
+    systemdForMkosi
+    bubblewrap
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/mkosi \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
+  meta = with lib; {
+    description = "Build legacy-free OS images";
+    homepage = "https://github.com/systemd/mkosi";
+    license = licenses.lgpl21Only;
+    mainProgram = "mkosi";
+    maintainers = with maintainers; [ malt3 katexochen ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9240c4306ca4..c573913ef5a6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1846,6 +1846,8 @@ with pkgs;
 
   mgmt = callPackage ../applications/system/mgmt { };
 
+  mkosi = python3Packages.callPackage ../tools/virtualization/mkosi { inherit systemd; };
+
   monica = callPackage ../servers/web-apps/monica { };
 
   mprocs = callPackage ../tools/misc/mprocs { };
-- 
cgit 1.4.1


From 397f008615c33ca78cd597c9bf1f936c7de6ba38 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 19 Aug 2023 17:14:36 -0400
Subject: risor: 0.13.0 -> 0.14.0

Diff: https://github.com/risor-io/risor/compare/v0.13.0...v0.14.0

Changelog: https://github.com/risor-io/risor/releases/tag/v0.14.0
---
 pkgs/development/interpreters/risor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/risor/default.nix b/pkgs/development/interpreters/risor/default.nix
index ac7ba0805f96b..61753ba2b99e2 100644
--- a/pkgs/development/interpreters/risor/default.nix
+++ b/pkgs/development/interpreters/risor/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "risor";
-  version = "0.13.0";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "risor-io";
     repo = "risor";
     rev = "v${version}";
-    hash = "sha256-lalT9kwq0+y3xaYAcl/DqcwGXE27lNuL1DCr1wEE8ZE=";
+    hash = "sha256-QhXIwFrApSkWY2YYYGlojKsByNA2xpyVTm0SpYWB/Ds=";
   };
 
   vendorHash = "sha256-diAbQwnlhMm43ZlLKq3llMl9mO3sIkc80aCI5UDn7F4=";
-- 
cgit 1.4.1


From baccda46cf04c8138537a0c834345cae039a3e77 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 19 Aug 2023 14:23:54 -0700
Subject: python3.pkgs.httpie: add pip as a test dependency

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

diff --git a/pkgs/development/python-modules/httpie/default.nix b/pkgs/development/python-modules/httpie/default.nix
index 04add67c8c848..22b6918bccc91 100644
--- a/pkgs/development/python-modules/httpie/default.nix
+++ b/pkgs/development/python-modules/httpie/default.nix
@@ -16,6 +16,7 @@
 , rich
 , pysocks
 # CheckInputs
+, pip
 , pytest-httpbin
 , pytest-lazy-fixture
 , pytest-mock
@@ -52,8 +53,10 @@ buildPythonPackage rec {
     rich
   ] ++ requests.optional-dependencies.socks;
 
+  __darwinAllowLocalNetworking = true;
 
   nativeCheckInputs = [
+    pip
     pytest-httpbin
     pytest-lazy-fixture
     pytest-mock
-- 
cgit 1.4.1


From aad5a8ba8dbc49724ab56913d0f8e7ff6d1a9825 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sat, 19 Aug 2023 16:26:52 -0500
Subject: plex-mpv-shim: rename dependency python-mpv -> mpv

---
 pkgs/applications/video/plex-mpv-shim/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix
index 00651deababc3..90f18613ca07e 100644
--- a/pkgs/applications/video/plex-mpv-shim/default.nix
+++ b/pkgs/applications/video/plex-mpv-shim/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonApplication, fetchFromGitHub, python, mpv, requests, python-mpv-jsonipc, pystray, tkinter
+{ lib, buildPythonApplication, fetchFromGitHub, fetchpatch, python, mpv, requests, python-mpv-jsonipc, pystray, tkinter
 , wrapGAppsHook, gobject-introspection, mpv-shim-default-shaders }:
 
 buildPythonApplication rec {
@@ -12,6 +12,14 @@ buildPythonApplication rec {
     sha256 = "sha256-hUGKOJEDZMK5uhHoevFt1ay6QQEcoN4F8cPxln5uMRo=";
   };
 
+  patches = [
+    # pull in upstream commit to fix python-mpv dependency name -- remove when version > 1.11.0
+    (fetchpatch {
+      url = "https://github.com/iwalton3/plex-mpv-shim/commit/d8643123a8ec79216e02850b08f63b06e4e0a2ea.diff";
+      hash = "sha256-nc+vwYnAtMjVzL2fIQeTAqhf3HBseL+2pFEtv8zNUXo=";
+    })
+  ];
+
   nativeBuildInputs = [
     wrapGAppsHook
     gobject-introspection
-- 
cgit 1.4.1


From 97b50ee0491c1287781894e7c0ed32ed1aab3ba0 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 19 Aug 2023 15:01:30 -0700
Subject: python3.pkgs.pyemd: add missing build dependencies

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

diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index bb178a5724153..72ec80c6b4a11 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -3,8 +3,11 @@
 , pythonOlder
 , fetchPypi
 , cython
+, oldest-supported-numpy
 , packaging
 , setuptools
+, setuptools-scm
+, wheel
 , numpy
 , pytestCheckHook
 }:
@@ -24,8 +27,12 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     cython
+    numpy
+    oldest-supported-numpy
     packaging
     setuptools
+    setuptools-scm
+    wheel
   ];
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From ac0c704c64d9e0245411642ab39dd7f26501de8e Mon Sep 17 00:00:00 2001
From: Robert Schütz <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 15:27:11 -0700
Subject: htmlhint: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix        |  1 +
 pkgs/development/node-packages/node-packages.json |  1 -
 pkgs/development/node-packages/node-packages.nix  | 50 -----------------------
 pkgs/development/tools/htmlhint/default.nix       | 27 ++++++++++++
 pkgs/top-level/all-packages.nix                   |  2 +
 5 files changed, 30 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/development/tools/htmlhint/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index d7e37e37033dc..630f1721e0831 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -55,6 +55,7 @@ mapAliases {
   eslint_d = pkgs.eslint_d; # Added 2023-05-26
   flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
+  inherit (pkgs) htmlhint; # added 2023-08-19
   hueadm = pkgs.hueadm; # added 2023-07-31
   karma = pkgs.karma-runner; # added 2023-07-29
   manta = pkgs.node-manta; # Added 2023-05-06
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 7d0e98e19ebb4..5ef1c5f08d4b7 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -160,7 +160,6 @@
 , "gulp-cli"
 , "he"
 , "html-minifier"
-, "htmlhint"
 , "http-server"
 , "hsd"
 , "hs-airdrop"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 301daa1bdaf09..65b2c0d021db3 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -108020,56 +108020,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  htmlhint = nodeEnv.buildNodePackage {
-    name = "htmlhint";
-    packageName = "htmlhint";
-    version = "1.1.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/htmlhint/-/htmlhint-1.1.4.tgz";
-      sha512 = "tSKPefhIaaWDk/vKxAOQbN+QwZmDeJCq3bZZGbJMoMQAfTjepudC+MkuT9MOBbuQI3dLLzDWbmU7fLV3JASC7Q==";
-    };
-    dependencies = [
-      sources."ansi-styles-4.3.0"
-      sources."async-3.2.3"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."chalk-4.1.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-9.5.0"
-      sources."concat-map-0.0.1"
-      sources."encoding-0.1.13"
-      sources."fs.realpath-1.0.0"
-      sources."glob-7.2.3"
-      sources."has-flag-4.0.0"
-      sources."iconv-lite-0.6.3"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."minimatch-3.1.2"
-      sources."node-fetch-2.6.12"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."safer-buffer-2.1.2"
-      sources."strip-json-comments-3.1.0"
-      sources."supports-color-7.2.0"
-      sources."tr46-0.0.3"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wrappy-1.0.2"
-      sources."xml-1.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "The Static Code Analysis Tool for your HTML";
-      homepage = "https://htmlhint.com";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   http-server = nodeEnv.buildNodePackage {
     name = "http-server";
     packageName = "http-server";
diff --git a/pkgs/development/tools/htmlhint/default.nix b/pkgs/development/tools/htmlhint/default.nix
new file mode 100644
index 0000000000000..162bb82b28cfc
--- /dev/null
+++ b/pkgs/development/tools/htmlhint/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "htmlhint";
+  version = "1.1.4";
+
+  src = fetchFromGitHub {
+    owner = "htmlhint";
+    repo = "HTMLHint";
+    rev = "v${version}";
+    hash = "sha256-6R+/uwqWpuTjUnFeUFMzZBzhlFBxYceYZfLLuaYhc6k=";
+  };
+
+  npmDepsHash = "sha256-m5hHxA2YTk7qNpc1Z6TXxNTfIMY5LCM9Il9JHJxQJlI=";
+
+  meta = {
+    changelog = "https://github.com/htmlhint/HTMLHint/blob/${src.rev}/CHANGELOG.md";
+    description = "Static code analysis tool for HTML";
+    homepage = "https://github.com/htmlhint/HTMLHint";
+    license = lib.licenses.mit;
+    mainProgram = "htmlhint";
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10cad6c59e3e2..38687401a1c61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19356,6 +19356,8 @@ with pkgs;
 
   confluent-cli = callPackage ../development/tools/confluent-cli { };
 
+  htmlhint = callPackage ../development/tools/htmlhint { };
+
   htmlunit-driver = callPackage ../development/tools/selenium/htmlunit-driver { };
 
   hyenae = callPackage ../tools/networking/hyenae { };
-- 
cgit 1.4.1


From adba145d402ade51026a395839798be80e465344 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <bigras.bruno@gmail.com>
Date: Sat, 19 Aug 2023 12:26:32 -0400
Subject: veilid: 0.1.7 -> 0.1.9

---
 pkgs/tools/networking/veilid/Cargo.lock  | 1014 ++++++++++++++----------------
 pkgs/tools/networking/veilid/default.nix |    4 +-
 2 files changed, 485 insertions(+), 533 deletions(-)

diff --git a/pkgs/tools/networking/veilid/Cargo.lock b/pkgs/tools/networking/veilid/Cargo.lock
index c8247f0efe1e2..8a9ca65d4716a 100644
--- a/pkgs/tools/networking/veilid/Cargo.lock
+++ b/pkgs/tools/networking/veilid/Cargo.lock
@@ -19,10 +19,11 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "aead"
-version = "0.4.3"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
 dependencies = [
+ "crypto-common",
  "generic-array 0.14.7",
 ]
 
@@ -63,9 +64,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
 dependencies = [
  "memchr",
 ]
@@ -87,18 +88,19 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
 
 [[package]]
 name = "android-logd-logger"
-version = "0.2.2"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53eff4527d2f64c8374a3bbe1d280ce660203e8c83e4a893231037a488639a7b"
+checksum = "89d7b9303373a56714732e3371513edd14d12987d04ff4f48527444e804bc3ae"
 dependencies = [
  "bytes 1.4.0",
- "env_logger 0.8.4",
+ "env_logger 0.10.0",
  "lazy_static",
  "libc",
  "log",
- "redox_syscall 0.2.16",
+ "parking_lot 0.12.1",
+ "redox_syscall 0.3.5",
  "thiserror",
- "time 0.2.27",
+ "time 0.3.25",
  "winapi",
 ]
 
@@ -154,11 +156,60 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "anyhow"
-version = "1.0.72"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "arboard"
@@ -294,9 +345,9 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.7.0"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
 dependencies = [
  "event-listener",
 ]
@@ -381,7 +432,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -390,19 +441,6 @@ version = "4.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
 
-[[package]]
-name = "async-tls"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f23d769dbf1838d5df5156e7b1ad404f4c463d1ac2c6aeb6cd943630f8a8400"
-dependencies = [
- "futures-core",
- "futures-io",
- "rustls 0.19.1",
- "webpki 0.21.4",
- "webpki-roots 0.21.1",
-]
-
 [[package]]
 name = "async-tls"
 version = "0.12.0"
@@ -411,21 +449,21 @@ checksum = "cfeefd0ca297cbbb3bd34fd6b228401c2a5177038257afd751bc29f0a2da4795"
 dependencies = [
  "futures-core",
  "futures-io",
- "rustls 0.20.8",
- "rustls-pemfile 1.0.3",
- "webpki 0.22.0",
+ "rustls",
+ "rustls-pemfile",
+ "webpki",
  "webpki-roots 0.22.6",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.72"
+version = "0.1.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
+checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -443,16 +481,16 @@ dependencies = [
 
 [[package]]
 name = "async-tungstenite"
-version = "0.22.2"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce01ac37fdc85f10a43c43bc582cbd566720357011578a935761075f898baf58"
+checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc"
 dependencies = [
- "async-tls 0.12.0",
+ "async-tls",
  "futures-io",
  "futures-util",
  "log",
  "pin-project-lite",
- "tungstenite 0.19.0",
+ "tungstenite 0.20.0",
 ]
 
 [[package]]
@@ -467,8 +505,8 @@ dependencies = [
  "futures-task",
  "futures-timer",
  "futures-util",
- "pin-project 1.1.2",
- "rustc_version 0.4.0",
+ "pin-project 1.1.3",
+ "rustc_version",
  "tokio",
  "wasm-bindgen-futures",
 ]
@@ -481,7 +519,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
 dependencies = [
  "futures",
  "pharos",
- "rustc_version 0.4.0",
+ "rustc_version",
 ]
 
 [[package]]
@@ -527,9 +565,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
 [[package]]
 name = "axum"
-version = "0.6.19"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a1de45611fdb535bfde7b7de4fd54f4fd2b17b1737c0a59b69bf9b92074b8c"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -585,12 +623,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "base-x"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270"
-
 [[package]]
 name = "base64"
 version = "0.12.3"
@@ -665,9 +697,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
 
 [[package]]
 name = "blake2"
@@ -700,7 +732,7 @@ checksum = "e0b121a9fe0df916e362fb3271088d071159cdf11db0e4182d02152850756eff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -822,9 +854,12 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.79"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01"
+dependencies = [
+ "libc",
+]
 
 [[package]]
 name = "cesu8"
@@ -862,18 +897,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
-[[package]]
-name = "chacha20"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c80e5460aa66fe3b91d40bcbdab953a597b60053e34d684ac6903f863b680a6"
-dependencies = [
- "cfg-if 1.0.0",
- "cipher 0.3.0",
- "cpufeatures",
- "zeroize",
-]
-
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -887,13 +910,13 @@ dependencies = [
 
 [[package]]
 name = "chacha20poly1305"
-version = "0.9.1"
+version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a18446b09be63d457bbec447509e85f662f32952b035ce892290396bc0b0cff5"
+checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
  "aead",
- "chacha20 0.8.2",
- "cipher 0.3.0",
+ "chacha20",
+ "cipher 0.4.4",
  "poly1305",
  "zeroize",
 ]
@@ -930,6 +953,7 @@ checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
 dependencies = [
  "crypto-common",
  "inout",
+ "zeroize",
 ]
 
 [[package]]
@@ -966,13 +990,48 @@ checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
  "atty",
  "bitflags 1.3.2",
- "clap_lex",
+ "clap_lex 0.2.4",
  "indexmap 1.9.3",
  "strsim 0.10.0",
  "termcolor",
  "textwrap 0.16.0",
 ]
 
+[[package]]
+name = "clap"
+version = "4.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03aef18ddf7d879c15ce20f04826ef8418101c7e528014c3eeea13321047dca3"
+dependencies = [
+ "clap_builder",
+ "clap_derive",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ce6fffb678c9b80a70b6b6de0aad31df727623a70fd9a842c30cd573e2fa98"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex 0.5.0",
+ "strsim 0.10.0",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "clap_lex"
 version = "0.2.4"
@@ -982,6 +1041,12 @@ dependencies = [
  "os_str_bytes",
 ]
 
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
 [[package]]
 name = "clipboard-win"
 version = "4.5.0"
@@ -1021,6 +1086,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
 [[package]]
 name = "combine"
 version = "4.6.6"
@@ -1106,10 +1177,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "const_fn"
-version = "0.4.9"
+name = "const-oid"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
 
 [[package]]
 name = "constant_time_eq"
@@ -1242,6 +1313,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array 0.14.7",
+ "rand_core 0.6.4",
  "typenum",
 ]
 
@@ -1294,7 +1366,7 @@ dependencies = [
  "flexi_logger",
  "lazy_static",
  "log",
- "time 0.3.24",
+ "time 0.3.25",
  "unicode-width",
 ]
 
@@ -1336,7 +1408,7 @@ dependencies = [
  "owning_ref",
  "serde_json",
  "serde_yaml",
- "time 0.3.24",
+ "time 0.3.25",
  "tokio",
  "toml 0.7.6",
  "unicode-segmentation",
@@ -1355,17 +1427,32 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek"
-version = "3.2.1"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90f9d052967f590a76e62eb387bd0bbb1b000182c3cefe5364db6b7211651bc0"
+checksum = "f711ade317dd348950a9910f81c5947e3d8907ebd2b83f76203ff1807e6a2bc2"
 dependencies = [
- "byteorder",
- "digest 0.9.0",
- "rand_core 0.5.1",
+ "cfg-if 1.0.0",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.7",
+ "fiat-crypto",
+ "platforms",
+ "rustc_version",
  "subtle",
  "zeroize",
 ]
 
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "daemonize"
 version = "0.5.0"
@@ -1419,7 +1506,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1441,7 +1528,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core 0.20.3",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1463,11 +1550,21 @@ version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
 
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
 [[package]]
 name = "deranged"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8810e7e2cf385b1e9b50d68264908ec367ba642c96d02edfe61c39e88e2a3c01"
+checksum = "7684a49fb1af197853ef7b2ee694bc1f5b4179556f1e5710e1760c5db6f5e929"
 
 [[package]]
 name = "derivative"
@@ -1506,7 +1603,16 @@ version = "4.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
 dependencies = [
- "dirs-sys",
+ "dirs-sys 0.3.7",
+]
+
+[[package]]
+name = "directories"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
+dependencies = [
+ "dirs-sys 0.4.1",
 ]
 
 [[package]]
@@ -1521,10 +1627,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "discard"
-version = "1.0.4"
+name = "dirs-sys"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
 name = "dlv-list"
@@ -1534,29 +1646,32 @@ checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"
 
 [[package]]
 name = "dyn-clone"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "304e6508efa593091e97a9abbc10f90aa7ca635b6d2784feff3c89d41dd12272"
+checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555"
 
 [[package]]
 name = "ed25519"
-version = "1.5.3"
+version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d"
 dependencies = [
+ "pkcs8",
  "signature",
 ]
 
 [[package]]
 name = "ed25519-dalek"
-version = "1.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "rand 0.7.3",
- "sha2 0.9.9",
+ "rand_core 0.6.4",
+ "serde",
+ "sha2 0.10.7",
+ "signature",
  "zeroize",
 ]
 
@@ -1580,22 +1695,22 @@ dependencies = [
 
 [[package]]
 name = "enum-map"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "017b207acb4cc917f4c31758ed95c0bc63ddb0f358b22eb38f80a2b2a43f6b1f"
+checksum = "9705d8de4776df900a4a0b2384f8b0ab42f775e93b083b42f8ce71bdc32a47e3"
 dependencies = [
  "enum-map-derive",
 ]
 
 [[package]]
 name = "enum-map-derive"
-version = "0.12.0"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8560b409800a72d2d7860f8e5f4e0b0bd22bea6a352ea2a9ce30ccdef7f16d2f"
+checksum = "ccb14d927583dd5c2eac0f2cf264fc4762aefe1ae14c47a8a20fc1939d3a5fc0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1638,17 +1753,7 @@ dependencies = [
  "darling 0.20.3",
  "proc-macro2",
  "quote",
- "syn 2.0.27",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
-dependencies = [
- "log",
- "regex",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -1795,6 +1900,12 @@ dependencies = [
  "log",
 ]
 
+[[package]]
+name = "fiat-crypto"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
+
 [[package]]
 name = "fixedbitset"
 version = "0.4.2"
@@ -1803,9 +1914,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1826,19 +1937,18 @@ dependencies = [
  "regex",
  "rustversion",
  "thiserror",
- "time 0.3.24",
+ "time 0.3.25",
 ]
 
 [[package]]
 name = "flume"
-version = "0.10.14"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
  "nanorand",
- "pin-project 1.1.2",
  "spin 0.9.8",
 ]
 
@@ -1959,7 +2069,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -2096,9 +2206,9 @@ dependencies = [
 
 [[package]]
 name = "gloo-utils"
-version = "0.1.7"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e"
+checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa"
 dependencies = [
  "js-sys",
  "serde",
@@ -2329,9 +2439,9 @@ checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
 
 [[package]]
 name = "httpdate"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
@@ -2448,9 +2558,9 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.24.6"
+version = "0.24.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a"
+checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -2552,6 +2662,17 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
 
+[[package]]
+name = "is-terminal"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+dependencies = [
+ "hermit-abi 0.3.2",
+ "rustix 0.38.8",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -2654,7 +2775,7 @@ dependencies = [
  "cfg-if 1.0.0",
  "core-foundation 0.9.3",
  "core-foundation-sys 0.8.4",
- "directories",
+ "directories 4.0.1",
  "fs4",
  "jni 0.20.0",
  "keychain-services",
@@ -2788,9 +2909,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
 
 [[package]]
 name = "lock_api"
@@ -2804,9 +2925,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.19"
+version = "0.4.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 dependencies = [
  "value-bag",
 ]
@@ -2858,9 +2979,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matchit"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67827e6ea8ee8a7c4a72227ef4fc08957040acffdb5f122733b24fa12daff41b"
+checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef"
 
 [[package]]
 name = "memchr"
@@ -3200,9 +3321,9 @@ dependencies = [
 
 [[package]]
 name = "num-complex"
-version = "0.4.3"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
 dependencies = [
  "num-traits",
 ]
@@ -3433,6 +3554,12 @@ dependencies = [
  "tokio-stream",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "ordered-multimap"
 version = "0.4.3"
@@ -3546,7 +3673,7 @@ dependencies = [
  "libc",
  "redox_syscall 0.3.5",
  "smallvec",
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -3586,9 +3713,9 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pest"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d2d1d55045829d65aad9d389139882ad623b33b904e7c9f1b10c5b8927298e5"
+checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
 dependencies = [
  "thiserror",
  "ucd-trie",
@@ -3596,9 +3723,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f94bca7e7a599d89dea5dfa309e217e7906c3c007fb9c3299c40b10d6a315d3"
+checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
 dependencies = [
  "pest",
  "pest_generator",
@@ -3606,22 +3733,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d490fe7e8556575ff6911e45567ab95e71617f43781e5c05490dc8d75c965c"
+checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.1"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2674c66ebb4b4d9036012091b537aae5878970d6999f81a265034d85b136b341"
+checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
 dependencies = [
  "once_cell",
  "pest",
@@ -3645,7 +3772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
 dependencies = [
  "futures",
- "rustc_version 0.4.0",
+ "rustc_version",
 ]
 
 [[package]]
@@ -3659,11 +3786,11 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "030ad2bc4db10a8944cb0d837f158bdfec4d4a4873ab701a95046770d11f8842"
+checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
 dependencies = [
- "pin-project-internal 1.1.2",
+ "pin-project-internal 1.1.3",
 ]
 
 [[package]]
@@ -3679,20 +3806,20 @@ dependencies = [
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec2e072ecce94ec471b13398d5402c188e76ac03cf74dd1a975161b23a3f6d9c"
+checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.10"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
+checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
 
 [[package]]
 name = "pin-utils"
@@ -3700,17 +3827,33 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
+[[package]]
+name = "platforms"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d7ddaed09e0eb771a79ab0fd64609ba0afb0a8366421957936ad14cbd13630"
+
 [[package]]
 name = "png"
-version = "0.17.9"
+version = "0.17.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11"
+checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -3737,9 +3880,9 @@ dependencies = [
 
 [[package]]
 name = "poly1305"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "048aeb476be11a4b6ca432ca569e375810de9294ae78f4774e78ea98a9246ede"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
 dependencies = [
  "cpufeatures",
  "opaque-debug",
@@ -3781,12 +3924,6 @@ dependencies = [
  "toml_edit",
 ]
 
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
 version = "1.0.66"
@@ -3864,9 +4001,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.32"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
 dependencies = [
  "proc-macro2",
 ]
@@ -3991,13 +4128,13 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.9.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.4",
+ "regex-automata 0.3.6",
  "regex-syntax 0.7.4",
 ]
 
@@ -4012,9 +4149,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4106,7 +4243,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "fallible-iterator",
  "fallible-streaming-iterator",
  "hashlink 0.8.3",
@@ -4114,25 +4251,6 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "rust-fsm"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021d7de715253e45ad24a2fbb0725a0f7f271fd8d3163b130bd65ce2816a860d"
-dependencies = [
- "rust-fsm-dsl",
-]
-
-[[package]]
-name = "rust-fsm-dsl"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a66b1273014079e4cf2b04aad1f3a2849e26e9a106f0411be2b1c15c23a791a"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "rust-ini"
 version = "0.18.0"
@@ -4155,22 +4273,13 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.18",
+ "semver",
 ]
 
 [[package]]
@@ -4189,30 +4298,17 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.4"
+version = "0.38.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
+checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f"
 dependencies = [
- "bitflags 2.3.3",
+ "bitflags 2.4.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.3",
+ "linux-raw-sys 0.4.5",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.19.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7"
-dependencies = [
- "base64 0.13.1",
- "log",
- "ring",
- "sct 0.6.1",
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "rustls"
 version = "0.20.8"
@@ -4221,17 +4317,8 @@ checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
 dependencies = [
  "log",
  "ring",
- "sct 0.7.0",
- "webpki 0.22.0",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5eebeaeb360c87bfb72e84abdb3447159c0eaececf1bef2aecd65a8be949d1c9"
-dependencies = [
- "base64 0.13.1",
+ "sct",
+ "webpki",
 ]
 
 [[package]]
@@ -4300,16 +4387,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
-[[package]]
-name = "sct"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "sct"
 version = "0.7.0"
@@ -4363,27 +4440,12 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "send_wrapper"
 version = "0.4.0"
@@ -4401,9 +4463,9 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.178"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60363bdd39a7be0266a520dab25fdc9241d2f987b08a01e01f0ec6d06a981348"
+checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
 dependencies = [
  "serde_derive",
 ]
@@ -4429,13 +4491,13 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.178"
+version = "1.0.183"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28482318d6641454cb273da158647922d1be6b5a2fcc6165cd89ebdd7ed576b"
+checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -4451,9 +4513,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
 dependencies = [
  "itoa",
  "ryu",
@@ -4468,7 +4530,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -4504,7 +4566,21 @@ dependencies = [
  "lazy_static",
  "log",
  "parking_lot 0.12.1",
- "serial_test_derive",
+ "serial_test_derive 0.10.0",
+]
+
+[[package]]
+name = "serial_test"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e56dd856803e253c8f298af3f4d7eb0ae5e23a737252cd90bb4f3b435033b2d"
+dependencies = [
+ "dashmap",
+ "futures",
+ "lazy_static",
+ "log",
+ "parking_lot 0.12.1",
+ "serial_test_derive 2.0.0",
 ]
 
 [[package]]
@@ -4518,6 +4594,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "serial_test_derive"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91d129178576168c589c9ec973feedf7d3126c01ac2bf08795109aa35b69fb8f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.29",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -4531,15 +4618,6 @@ dependencies = [
  "opaque-debug",
 ]
 
-[[package]]
-name = "sha1"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
-dependencies = [
- "sha1_smol",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.5"
@@ -4551,12 +4629,6 @@ dependencies = [
  "digest 0.10.7",
 ]
 
-[[package]]
-name = "sha1_smol"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
-
 [[package]]
 name = "sha2"
 version = "0.9.9"
@@ -4652,9 +4724,12 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "1.6.4"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
+dependencies = [
+ "digest 0.10.7",
+]
 
 [[package]]
 name = "simd-adler32"
@@ -4670,7 +4745,7 @@ checksum = "acee08041c5de3d5048c8b3f6f13fafb3026b24ba43c6a695a0c76179b844369"
 dependencies = [
  "log",
  "termcolor",
- "time 0.3.24",
+ "time 0.3.25",
 ]
 
 [[package]]
@@ -4734,19 +4809,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "stable_deref_trait"
-version = "1.2.0"
+name = "spki"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
 
 [[package]]
-name = "standback"
-version = "0.2.17"
+name = "stable_deref_trait"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
-dependencies = [
- "version_check 0.9.4",
-]
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
 name = "static_assertions"
@@ -4754,55 +4830,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
 
-[[package]]
-name = "stdweb"
-version = "0.4.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5"
-dependencies = [
- "discard",
- "rustc_version 0.2.3",
- "stdweb-derive",
- "stdweb-internal-macros",
- "stdweb-internal-runtime",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "stdweb-derive"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-macros"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11"
-dependencies = [
- "base-x",
- "proc-macro2",
- "quote",
- "serde",
- "serde_derive",
- "serde_json",
- "sha1 0.6.1",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "stdweb-internal-runtime"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0"
-
 [[package]]
 name = "stop-token"
 version = "0.7.0"
@@ -4852,9 +4879,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.27"
+version = "2.0.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4895,14 +4922,14 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.7.0"
+version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998"
+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if 1.0.0",
  "fastrand 2.0.0",
  "redox_syscall 0.3.5",
- "rustix 0.38.4",
+ "rustix 0.38.8",
  "windows-sys 0.48.0",
 ]
 
@@ -4932,22 +4959,22 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.44"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
+checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.44"
+version = "1.0.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
+checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -4962,9 +4989,9 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471"
+checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
 dependencies = [
  "flate2",
  "jpeg-decoder",
@@ -4984,24 +5011,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.2.27"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242"
-dependencies = [
- "const_fn",
- "libc",
- "standback",
- "stdweb",
- "time-macros 0.1.1",
- "version_check 0.9.4",
- "winapi",
-]
-
-[[package]]
-name = "time"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b79eabcd964882a646b3584543ccabeae7869e9ac32a46f6f22b7a5bd405308b"
+checksum = "b0fdd63d58b18d663fbdf70e049f00a22c8e42be082203be7f26589213cd75ea"
 dependencies = [
  "deranged",
  "itoa",
@@ -5009,7 +5021,7 @@ dependencies = [
  "num_threads",
  "serde",
  "time-core",
- "time-macros 0.2.11",
+ "time-macros",
 ]
 
 [[package]]
@@ -5018,16 +5030,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
 
-[[package]]
-name = "time-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1"
-dependencies = [
- "proc-macro-hack",
- "time-macros-impl",
-]
-
 [[package]]
 name = "time-macros"
 version = "0.2.11"
@@ -5037,19 +5039,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "time-macros-impl"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f"
-dependencies = [
- "proc-macro-hack",
- "proc-macro2",
- "quote",
- "standback",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "tinyvec"
 version = "1.6.0"
@@ -5067,11 +5056,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.29.1"
+version = "1.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
+checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
 dependencies = [
- "autocfg",
  "backtrace",
  "bytes 1.4.0",
  "libc",
@@ -5080,7 +5068,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.4.9",
+ "socket2 0.5.3",
  "tokio-macros",
  "tracing",
  "windows-sys 0.48.0",
@@ -5104,7 +5092,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -5195,7 +5183,7 @@ dependencies = [
  "hyper",
  "hyper-timeout",
  "percent-encoding",
- "pin-project 1.1.2",
+ "pin-project 1.1.3",
  "prost",
  "prost-derive",
  "tokio",
@@ -5226,7 +5214,7 @@ dependencies = [
  "hyper",
  "hyper-timeout",
  "percent-encoding",
- "pin-project 1.1.2",
+ "pin-project 1.1.3",
  "prost",
  "tokio",
  "tokio-stream",
@@ -5258,7 +5246,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "indexmap 1.9.3",
- "pin-project 1.1.2",
+ "pin-project 1.1.3",
  "pin-project-lite",
  "rand 0.8.5",
  "slab",
@@ -5301,7 +5289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
 dependencies = [
  "crossbeam-channel",
- "time 0.3.24",
+ "time 0.3.25",
  "tracing-subscriber",
 ]
 
@@ -5313,7 +5301,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
@@ -5342,7 +5330,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
 dependencies = [
- "pin-project 1.1.2",
+ "pin-project 1.1.3",
  "tracing",
 ]
 
@@ -5509,9 +5497,9 @@ dependencies = [
 
 [[package]]
 name = "tungstenite"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67"
+checksum = "e862a1c4128df0112ab625f55cd5c934bcb4312ba80b39ae4b4835a3fd58e649"
 dependencies = [
  "byteorder",
  "bytes 1.4.0",
@@ -5520,7 +5508,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.8.5",
- "sha1 0.10.5",
+ "sha1",
  "thiserror",
  "url",
  "utf-8",
@@ -5585,11 +5573,11 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
 [[package]]
 name = "universal-hash"
-version = "0.4.1"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
- "generic-array 0.14.7",
+ "crypto-common",
  "subtle",
 ]
 
@@ -5622,6 +5610,12 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -5648,14 +5642,14 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "veilid-cli"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "arboard",
  "async-std",
  "async-tungstenite 0.8.0",
  "bugsalot",
  "cfg-if 1.0.0",
- "clap 3.2.25",
+ "clap 4.3.23",
  "config",
  "crossbeam-channel",
  "cursive",
@@ -5663,7 +5657,7 @@ dependencies = [
  "cursive_buffered_backend",
  "cursive_table_view",
  "data-encoding",
- "directories",
+ "directories 4.0.1",
  "flexi_logger",
  "flume",
  "futures",
@@ -5674,7 +5668,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "serde",
  "serde_derive",
- "serial_test",
+ "serial_test 0.10.0",
  "stop-token",
  "thiserror",
  "tokio",
@@ -5684,15 +5678,15 @@ dependencies = [
 
 [[package]]
 name = "veilid-core"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "argon2",
  "async-io",
  "async-lock",
  "async-std",
  "async-std-resolver",
- "async-tls 0.11.0",
- "async-tungstenite 0.22.2",
+ "async-tls",
+ "async-tungstenite 0.23.0",
  "async_executors",
  "backtrace",
  "blake3",
@@ -5700,14 +5694,14 @@ dependencies = [
  "capnp",
  "capnpc",
  "cfg-if 1.0.0",
- "chacha20 0.9.1",
+ "chacha20",
  "chacha20poly1305",
  "chrono",
  "config",
  "console_error_panic_hook",
  "curve25519-dalek",
  "data-encoding",
- "directories",
+ "directories 5.0.1",
  "ed25519-dalek",
  "enum-as-inner",
  "enumset",
@@ -5745,14 +5739,14 @@ dependencies = [
  "range-set-blaze",
  "rtnetlink",
  "rusqlite",
- "rustls 0.19.1",
- "rustls-pemfile 0.2.1",
+ "rustls",
+ "rustls-pemfile",
  "schemars",
  "send_wrapper 0.6.0",
  "serde",
  "serde-big-array",
  "serde_json",
- "serial_test",
+ "serial_test 2.0.0",
  "shell-words",
  "simplelog",
  "socket2 0.5.3",
@@ -5775,11 +5769,11 @@ dependencies = [
  "wasm-logger",
  "weak-table",
  "web-sys",
- "webpki 0.22.0",
- "webpki-roots 0.25.1",
+ "webpki",
+ "webpki-roots 0.25.2",
  "wee_alloc",
  "winapi",
- "windows 0.38.0",
+ "windows 0.51.1",
  "windows-permissions",
  "ws_stream_wasm",
  "x25519-dalek",
@@ -5787,7 +5781,7 @@ dependencies = [
 
 [[package]]
 name = "veilid-flutter"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "allo-isolate",
  "async-std",
@@ -5816,11 +5810,11 @@ dependencies = [
 
 [[package]]
 name = "veilid-server"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "ansi_term",
  "async-std",
- "async-tungstenite 0.22.2",
+ "async-tungstenite 0.23.0",
  "backtrace",
  "bugsalot",
  "cfg-if 1.0.0",
@@ -5830,7 +5824,7 @@ dependencies = [
  "console-subscriber",
  "ctrlc",
  "daemonize",
- "directories",
+ "directories 4.0.1",
  "flume",
  "futures-util",
  "hostname",
@@ -5845,7 +5839,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_yaml",
- "serial_test",
+ "serial_test 0.10.0",
  "signal-hook",
  "signal-hook-async-std",
  "stop-token",
@@ -5866,7 +5860,7 @@ dependencies = [
 
 [[package]]
 name = "veilid-tools"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "android-logd-logger",
  "async-lock",
@@ -5892,12 +5886,12 @@ dependencies = [
  "once_cell",
  "oslog",
  "paranoid-android",
- "parking_lot 0.11.2",
- "rand 0.7.3",
+ "parking_lot 0.12.1",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
  "range-set-blaze",
- "rust-fsm",
  "send_wrapper 0.6.0",
- "serial_test",
+ "serial_test 2.0.0",
  "simplelog",
  "static_assertions",
  "stop-token",
@@ -5917,7 +5911,7 @@ dependencies = [
 
 [[package]]
 name = "veilid-wasm"
-version = "0.1.7"
+version = "0.1.9"
 dependencies = [
  "cfg-if 1.0.0",
  "console_error_panic_hook",
@@ -6017,7 +6011,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
  "wasm-bindgen-shared",
 ]
 
@@ -6051,7 +6045,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6113,16 +6107,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "webpki"
-version = "0.21.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
-dependencies = [
- "ring",
- "untrusted",
-]
-
 [[package]]
 name = "webpki"
 version = "0.22.0"
@@ -6133,29 +6117,20 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940"
-dependencies = [
- "webpki 0.21.4",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.22.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
 dependencies = [
- "webpki 0.22.0",
+ "webpki",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "0.25.1"
+version = "0.25.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9c6eda1c830a36f361e7721c87fd79ea84293b54f8c48c959f85ec636f0f196"
+checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
 
 [[package]]
 name = "wee_alloc"
@@ -6251,24 +6226,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.38.0"
+version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c47017195a790490df51a3e27f669a7d4f285920d90d03ef970c5d886ef0af1"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
 dependencies = [
- "windows_aarch64_msvc 0.38.0",
- "windows_i686_gnu 0.38.0",
- "windows_i686_msvc 0.38.0",
- "windows_x86_64_gnu 0.38.0",
- "windows_x86_64_msvc 0.38.0",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
 name = "windows"
-version = "0.48.0"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
+dependencies = [
+ "windows-core",
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.51.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6307,7 +6288,7 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
 dependencies = [
- "windows-targets 0.48.1",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -6327,17 +6308,17 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.48.1"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
- "windows_aarch64_msvc 0.48.0",
- "windows_i686_gnu 0.48.0",
- "windows_i686_msvc 0.48.0",
- "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
- "windows_x86_64_msvc 0.48.0",
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -6348,15 +6329,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b12add87e2fb192fff3f4f7e4342b3694785d79f3a64e2c20d5ceb5ccbcfc3cd"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -6366,15 +6341,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c98f2db372c23965c5e0f43896a8f0316dc0fbe48d1aa65bea9bdd295d43c15"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -6384,15 +6353,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf0569be0f2863ab6a12a6ba841fcfa7d107cbc7545a3ebd57685330db0a3ff"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -6402,15 +6365,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "905858262c8380a36f32cb8c1990d7e7c3b7a8170e58ed9a98ca6d940b7ea9f1"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -6420,9 +6377,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -6432,15 +6389,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.38.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "890c3c6341d441ffb38f705f47196e3665dc6dd79f6d72fa185d937326730561"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -6450,15 +6401,15 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.48.0"
+version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.5.2"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd122eb777186e60c3fdf765a58ac76e41c582f1f535fbf3314434c6b58f3f7"
+checksum = "d09770118a7eb1ccaf4a594a221334119a44a814fcb0d31c5b85e83e97227a97"
 dependencies = [
  "memchr",
 ]
@@ -6484,7 +6435,7 @@ dependencies = [
  "js-sys",
  "log",
  "pharos",
- "rustc_version 0.4.0",
+ "rustc_version",
  "send_wrapper 0.6.0",
  "thiserror",
  "wasm-bindgen",
@@ -6516,12 +6467,13 @@ dependencies = [
 
 [[package]]
 name = "x25519-dalek"
-version = "1.2.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2392b6b94a576b4e2bf3c5b2757d63f10ada8020a2e4d08ac849ebcf6ea8e077"
+checksum = "fb66477291e7e8d2b0ff1bcb900bf29489a9692816d79874bea351e7a8b6de96"
 dependencies = [
  "curve25519-dalek",
- "rand_core 0.5.1",
+ "rand_core 0.6.4",
+ "serde",
  "zeroize",
 ]
 
@@ -6592,9 +6544,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.3.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 dependencies = [
  "zeroize_derive",
 ]
@@ -6607,7 +6559,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.27",
+ "syn 2.0.29",
 ]
 
 [[package]]
diff --git a/pkgs/tools/networking/veilid/default.nix b/pkgs/tools/networking/veilid/default.nix
index cc14535bb8c62..ced8ec73d5770 100644
--- a/pkgs/tools/networking/veilid/default.nix
+++ b/pkgs/tools/networking/veilid/default.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "veilid";
-  version = "0.1.7";
+  version = "0.1.9";
 
   src = fetchFromGitLab {
     owner = "veilid";
     repo = pname;
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-wG8uxmohIOb8V+5gqhjM4hHG/6uHg0ehAtP2z5eoflU=";
+    sha256 = "sha256-mkb10JishprTyHV5lsFp/P57E2xTX+baHkJM4K2p4x4=";
   };
 
   cargoLock = {
-- 
cgit 1.4.1


From 84fbdb5255f4d1862464f01685c54f20cbd80180 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 19 Aug 2023 23:44:57 +0000
Subject: python310Packages.sphinx-material: 0.0.35 -> 0.0.36

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

diff --git a/pkgs/development/python-modules/sphinx-material/default.nix b/pkgs/development/python-modules/sphinx-material/default.nix
index f36db1ae87bd1..b735b746a33da 100644
--- a/pkgs/development/python-modules/sphinx-material/default.nix
+++ b/pkgs/development/python-modules/sphinx-material/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "sphinx-material";
-  version = "0.0.35";
+  version = "0.0.36";
 
   src = fetchPypi {
     pname = "sphinx_material";
     inherit version;
-    sha256 = "27f0f1084aa0201b43879aef24a0521b78dc8df4942b003a4e7d79ab11515852";
+    sha256 = "sha256-7v9ffT3AFq8yuv33DGbmcdFch1Tb4GE9+9Yp++2RKGk=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From 2393e9d763cb0a0c5ee0241d6c052b147c29c4b2 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 19 Aug 2023 20:10:20 -0300
Subject: trealla: 2.23.35 -> 2.23.48

- Set strictDeps
- checkInputs -> nativeCheckInputs
---
 pkgs/development/interpreters/trealla/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix
index 2fc3da05786b1..3369608605975 100644
--- a/pkgs/development/interpreters/trealla/default.nix
+++ b/pkgs/development/interpreters/trealla/default.nix
@@ -16,13 +16,13 @@
 assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.23.35";
+  version = "2.23.48";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yCVBjxO9tEKlyWo6RlK4EdyUxCkxp0z2EzJ2np0xOUU=";
+    hash = "sha256-uL8nRVzb/PxrVvIQYRUkePTZIM8DBnc8eAU/2yfDNuQ=";
   };
 
   postPatch = ''
@@ -41,9 +41,9 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional enableSSL openssl
     ++ lib.optional (lineEditingLibrary == "readline") readline;
 
-  checkInputs = lib.optionals finalAttrs.doCheck [ valgrind ];
+  nativeCheckInputs = lib.optionals finalAttrs.doCheck [ valgrind ];
 
-  dontConfigure = true;
+  strictDeps = true;
 
   makeFlags = [
     "GIT_VERSION=\"v${finalAttrs.version}\""
@@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     "test"
   ] ++ lib.optional checkLeaks "leaks";
 
-  meta =  {
+  meta = {
     homepage = "https://trealla-prolog.github.io/trealla/";
     description = "A compact, efficient Prolog interpreter written in ANSI C";
     longDescription = ''
-- 
cgit 1.4.1


From 25575ae935c01e883fe77b716fe4ad0ca58c1927 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 19 Aug 2023 21:00:31 -0300
Subject: trealla: 2.23.48 -> 2.24.0

- Set line editing library to isocline by default
- Set passthru.updateScript
---
 pkgs/development/interpreters/trealla/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix
index 3369608605975..05ac612d97744 100644
--- a/pkgs/development/interpreters/trealla/default.nix
+++ b/pkgs/development/interpreters/trealla/default.nix
@@ -6,23 +6,24 @@
 , readline
 , valgrind
 , xxd
+, gitUpdater
 , checkLeaks ? false
 , enableFFI ? true
 , enableSSL ? true
 , enableThreads ? true
-, lineEditingLibrary ? "readline"
+, lineEditingLibrary ? "isocline"
 }:
 
 assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.23.48";
+  version = "2.24.0";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-uL8nRVzb/PxrVvIQYRUkePTZIM8DBnc8eAU/2yfDNuQ=";
+    hash = "sha256-2VjghmQuOkPW335ryIZRSdOnYYhdJDacJ97TCizcVJ0=";
   };
 
   postPatch = ''
@@ -67,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
     "test"
   ] ++ lib.optional checkLeaks "leaks";
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     homepage = "https://trealla-prolog.github.io/trealla/";
     description = "A compact, efficient Prolog interpreter written in ANSI C";
-- 
cgit 1.4.1


From 70f9457e0f3e2fe50a1dde0d1a4f468bede36364 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 19 Aug 2023 20:11:16 -0400
Subject: changie: 1.12.0 -> 1.13.0

Diff: https://github.com/miniscruff/changie/compare/v1.12.0...v1.13.0

Changelog: https://github.com/miniscruff/changie/blob/v1.13.0/CHANGELOG.md
---
 pkgs/development/tools/changie/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/changie/default.nix b/pkgs/development/tools/changie/default.nix
index f4593cbedbf0f..4b7696e1fd641 100644
--- a/pkgs/development/tools/changie/default.nix
+++ b/pkgs/development/tools/changie/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "changie";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
-    rev = "v${version}";
     owner = "miniscruff";
-    repo = pname;
-    sha256 = "sha256-lc9G5qZHjO2TxBKYP3fVr8Ui+hskhVon3xG7RznGhaw=";
+    repo = "changie";
+    rev = "v${version}";
+    hash = "sha256-Ck86zgAtDm/hlz2kDvTRVcH4NS1LaxtseChOdcYE48g=";
   };
 
-  vendorSha256 = "sha256-sak9MMqMXBO3j5uMouuiVnT8aCw04pyikgqzvdygB7U=";
+  vendorHash = "sha256-kSV4ruvPcDyqt+LgKkcAGMUJy8CGG6xpFneK+vKdI0Q=";
 
   nativeBuildInputs = [
     installShellFiles
-- 
cgit 1.4.1


From 69f8e0853a6e114ba599ecfa2a738ec679c3b408 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Sat, 19 Aug 2023 21:13:39 -0300
Subject: trealla: 2.24.0 -> 2.24.21

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

diff --git a/pkgs/development/interpreters/trealla/default.nix b/pkgs/development/interpreters/trealla/default.nix
index 05ac612d97744..4c04940470e05 100644
--- a/pkgs/development/interpreters/trealla/default.nix
+++ b/pkgs/development/interpreters/trealla/default.nix
@@ -17,13 +17,13 @@
 assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.24.0";
+  version = "2.24.21";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2VjghmQuOkPW335ryIZRSdOnYYhdJDacJ97TCizcVJ0=";
+    hash = "sha256-zpHdZiDtNcQko+gn92fiGWSvYT4aQ4t6nYFwf6zu0cA=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From 5c0f7fc6c1f853d076b9c413bc91bb4a970be64a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 00:32:02 +0000
Subject: python310Packages.pystache: 0.6.0 -> 0.6.4

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

diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index 4c408d3ad6013..eea136f0a5c22 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pystache";
-  version = "0.6.0";
+  version = "0.6.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93bf92b2149a4c4b58d12142e2c4c6dd5c08d89e4c95afccd4b6efe2ee1d470d";
+    sha256 = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c=";
   };
 
   LC_ALL = "en_US.UTF-8";
-- 
cgit 1.4.1


From 04939367c9f1d418a7adfb400c35ba02aba1c497 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Wed, 19 Jul 2023 23:57:37 +0200
Subject: trimage: init at 1.0.7-dev

---
 pkgs/applications/graphics/trimage/default.nix | 70 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 +
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/applications/graphics/trimage/default.nix

diff --git a/pkgs/applications/graphics/trimage/default.nix b/pkgs/applications/graphics/trimage/default.nix
new file mode 100644
index 0000000000000..269ffa5852331
--- /dev/null
+++ b/pkgs/applications/graphics/trimage/default.nix
@@ -0,0 +1,70 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, substituteAll
+
+, python3
+, installShellFiles
+, makeWrapper
+, wrapQtAppsHook
+
+, advancecomp
+, jpegoptim
+, optipng
+, pngcrush
+}:
+
+let
+  pythonEnv = python3.withPackages (ps: with ps; [ pyqt5 ]);
+  binPath = lib.makeBinPath [
+    advancecomp
+    jpegoptim
+    optipng
+    pngcrush
+  ];
+in
+stdenv.mkDerivation {
+  pname = "trimage";
+  version = "1.0.7-dev";
+
+  src = fetchFromGitHub {
+    owner = "Kilian";
+    repo = "Trimage";
+    rev = "ad74684272a31eee6af289cc59fd90fd962d2806";
+    hash = "sha256-jdcGGTqr3f3Xnp6thYmASQYiZh9nagLUTmlFnJ5Hqmc=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+    makeWrapper
+    wrapQtAppsHook
+  ];
+
+  dontWrapQtApps = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir $out
+    cp -R trimage $out
+
+    installManPage doc/trimage.1
+    install -Dm444 desktop/trimage.desktop -t $out/share/applications
+    install -Dm444 desktop/trimage.svg -t $out/share/icons/hicolor/scalable/apps
+
+    makeWrapper ${pythonEnv}/bin/python $out/bin/trimage \
+          --add-flags "$out/trimage/trimage.py" \
+          --prefix PATH : ${binPath} \
+          "''${qtWrapperArgs[@]}"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A cross-platform tool for optimizing PNG and JPG files";
+    homepage = "https://github.com/Kilian/Trimage";
+    license = lib.licenses.mit;
+    mainProgram = "trimage";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a27f9e0bfbe8..630027232fbd3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1881,6 +1881,8 @@ with pkgs;
 
   trigger-control = callPackage ../tools/games/trigger-control { };
 
+  trimage = callPackage ../applications/graphics/trimage { inherit (qt5) wrapQtAppsHook; };
+
   ttchat = callPackage ../tools/misc/ttchat { };
 
   ukmm = callPackage ../tools/games/ukmm { };
-- 
cgit 1.4.1


From 268138b584c11034a13df14df9dedc315b002332 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 20 Aug 2023 10:06:38 +0800
Subject: broot: 1.24.2 -> 1.25.0

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

diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix
index 0bf96a6d63bca..8c9994e479db8 100644
--- a/pkgs/tools/misc/broot/default.nix
+++ b/pkgs/tools/misc/broot/default.nix
@@ -16,16 +16,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "broot";
-  version = "1.24.2";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-SdQOoixfSQdSS9SOc/U0Ay9VIRfsrgALhLT4cESgSLo=";
+    hash = "sha256-TLphJr1DhJ30Mu3x3/9pNe1IiI9prafFMg1dDtbgqlE=";
   };
 
-  cargoHash = "sha256-MZyNSgsz1pngEuYxmG/GUqQeTmA5D6Y0tcToafFu1F8=";
+  cargoHash = "sha256-dtNy3rWz6hMkatiV4z2gB4Z00gjtzREqjy7E48tmcdk=";
 
   nativeBuildInputs = [
     installShellFiles
-- 
cgit 1.4.1


From a1f5f3295fa262eaaca4651ab9a56c18e289f1d8 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 20 Aug 2023 10:21:19 +0800
Subject: ratt: unstable-2022-01-11 -> unstable-2023-02-12

---
 pkgs/applications/misc/ratt/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/ratt/default.nix b/pkgs/applications/misc/ratt/default.nix
index 8b49232051d11..15ce7a2e14092 100644
--- a/pkgs/applications/misc/ratt/default.nix
+++ b/pkgs/applications/misc/ratt/default.nix
@@ -1,17 +1,17 @@
 { buildGoModule, fetchFromSourcehut, lib }:
 buildGoModule rec {
   pname = "ratt";
-  version = "unstable-2022-01-11";
+  version = "unstable-2023-02-12";
 
   src = fetchFromSourcehut {
     owner = "~ghost08";
     repo = "ratt";
-    rev = "eac7e14b15ad4e916e7d072780397c414c740630";
-    hash = "sha256-/WzPF98MovNg4t5NJhL2Z1bAFDG/3I56M9YgRJF7Wjk=";
+    rev = "ed1a675685b9d86d6602e168199ba9b4260f5f06";
+    hash = "sha256-HfS97Lxt6FAj/2/WAzLI06F/h6TP5m2lHHOTAs8XNFY=";
   };
 
   proxyVendor = true;
-  vendorSha256 = "sha256-4TEdnJ7lCuBka6rtoKowf5X3VqCgfwvGHeJ5B5Q5C20=";
+  vendorHash = "sha256-6cpHDwnxdc/9YPj77JVuT5ZDFjKkF6nBX4RgZr/9fFY=";
 
   # tests try to access the internet to scrape websites
   doCheck = false;
@@ -21,6 +21,5 @@ buildGoModule rec {
     homepage = "https://git.sr.ht/~ghost08/ratt";
     license = licenses.mit;
     maintainers = with maintainers; [ kmein ];
-    platforms = platforms.linux ++ platforms.darwin;
   };
 }
-- 
cgit 1.4.1


From 444ef095c9bd6212cb54a7239553714ed48ac435 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 02:33:37 +0000
Subject: python310Packages.radish-bdd: 0.15.0 -> 0.16.1

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

diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 4aa36b38735d9..331cc7c5e05ba 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "radish-bdd";
-  version = "0.15.0";
+  version = "0.16.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "radish";
     rev = "refs/tags/v${version}";
-    hash = "sha256-SEW10ka0aQAXtW2UNCVJHMVhhZ9JTTj4IbskL87/Dn4=";
+    hash = "sha256-fzxjDMmz5NMFRTQchlCOx2igqmhS6Zg0IU5HFO5a/0k=";
   };
 
   propagatedBuildInputs = [
-- 
cgit 1.4.1


From b363e71fdafdcd0d8e0158e60427fd0e69ce1b60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 02:52:27 +0000
Subject: python310Packages.graphene-django: 3.1.3 -> 3.1.5

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

diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix
index 0e85af5045b2f..6379774590a4d 100644
--- a/pkgs/development/python-modules/graphene-django/default.nix
+++ b/pkgs/development/python-modules/graphene-django/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "graphene-django";
-  version = "3.1.3";
+  version = "3.1.5";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "graphql-python";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-33Z6W2dAsj5VXt3E7XJtUFiq7yFlCixnFnhbAUv+xgU=";
+    hash = "sha256-1vl1Yj9MVBej5aFND8A63JMIog8aIW9SdwiOLIUwXxI=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From d4ffcc940faffd9fb5986d3c86436e1ab9ac54ac Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 20 Aug 2023 11:06:18 +0800
Subject: imgcrypt: 1.1.7 -> 1.1.8

---
 pkgs/applications/virtualization/imgcrypt/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/imgcrypt/default.nix b/pkgs/applications/virtualization/imgcrypt/default.nix
index 058da0d5351bd..86c1da42a2221 100644
--- a/pkgs/applications/virtualization/imgcrypt/default.nix
+++ b/pkgs/applications/virtualization/imgcrypt/default.nix
@@ -2,20 +2,21 @@
 
 buildGoModule rec {
   pname = "imgcrypt";
-  version = "1.1.7";
+  version = "1.1.8";
 
   src = fetchFromGitHub {
     owner = "containerd";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-VGP63tGyYD/AtjEZD1uo8A2I/4Di7bfLeeaNat+coI4=";
+    hash = "sha256-FLqFzEEfgsKcjAevhF6+8mR3zOUjfXyfWwWsxVOcdJU=";
   };
 
+  vendorHash = null;
+
   ldflags = [
     "-X github.com/containerd/containerd/version.Version=${version}"
   ];
 
-  vendorSha256 = null;
   subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ];
 
   postFixup = ''
-- 
cgit 1.4.1


From 33dd914332a530d5d81024b44de5ac7cfeb6b2ef Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 20 Aug 2023 13:43:37 +1000
Subject: furnace: 0.6pre7 -> 0.6.pre8

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

diff --git a/pkgs/applications/audio/furnace/default.nix b/pkgs/applications/audio/furnace/default.nix
index e86bb4f2c2124..f865d7c69ca81 100644
--- a/pkgs/applications/audio/furnace/default.nix
+++ b/pkgs/applications/audio/furnace/default.nix
@@ -22,14 +22,14 @@
 
 stdenv.mkDerivation rec {
   pname = "furnace";
-  version = "0.6pre7";
+  version = "0.6pre8";
 
   src = fetchFromGitHub {
     owner = "tildearrow";
     repo = "furnace";
     rev = "v${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-Gr4XDfYaRUFdtnCJ6i0oRDszwAZYVW6Mbj4Sp7El5+8=";
+    sha256 = "sha256-kV3XlZAVkb+SfGqBi7I7Br58zjSAfh4kiUk2KCcXnFA=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
-- 
cgit 1.4.1


From 2694f430ac300b40a8714622c963d139f5367fe3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 03:58:08 +0000
Subject: python310Packages.py3exiv2: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index de8cc23c8fb8f..e8c5c6cd15160 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "py3exiv2";
-  version = "0.11.0";
+  version = "0.12.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ=";
+    hash = "sha256-crI+X3YMRzPPmpGNsI2U+9bZgwcR0qTowJuPNFY/Ooo=";
   };
 
   buildInputs = [
-- 
cgit 1.4.1


From 0174830eb6165ee888ee39bb71935691b3d0fafe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 03:59:32 +0000
Subject: iosevka-bin: 26.1.0 -> 26.2.0

---
 pkgs/data/fonts/iosevka/bin.nix      |   2 +-
 pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++++++------------------
 2 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 27a3a195c569a..4897a9f3772bd 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -11,7 +11,7 @@ let
     (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ]));
 in stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "26.1.0";
+  version = "26.2.0";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip";
diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix
index 59ba8fbc71e63..7046fb8db0171 100644
--- a/pkgs/data/fonts/iosevka/variants.nix
+++ b/pkgs/data/fonts/iosevka/variants.nix
@@ -1,95 +1,95 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  iosevka = "0698fzf03nss7wkaa0i3kp8f5f1gjbsknz18px616g7c3bgss582";
-  iosevka-aile = "1vaiznxyil5a4gc2hy1k1164fn15rk3814lwf5av830323rc7and";
-  iosevka-curly = "1rnyxbz62v34hbnaj3r74pl1ahk539b7bh0x175lv9j0fwrm73is";
-  iosevka-curly-slab = "1gcmzsh35ayb3bmrkcdpxii3l8r7qg0yvxjy37y2hp544f2drnkp";
-  iosevka-etoile = "0v3y8cr0w2q1xa4nmwmrh5rcxcfjj38rq6gwqsbvs2rlxls50yi4";
-  iosevka-slab = "179fydcaf72z01i9d54m7biq6i472rl84nsxghbmgrzghyblxck6";
-  iosevka-ss01 = "18b9cd95q2rnbm762mcfqqcqkffmw895khmsxqsd1dmkb9gj509w";
-  iosevka-ss02 = "1gg06d76yl2lv6lpcd9vszqf2yb3rz2w032ih9rjid1wcxccnn62";
-  iosevka-ss03 = "0hqwrqzvikb2xkgmn4zff8jw1czvm6zawf37hz2hnwnx0ffgzhz0";
-  iosevka-ss04 = "1gq79pfhwrag686r8symivn54pwcnnp5rxwyfswfyq72x6xxq0ri";
-  iosevka-ss05 = "1di9v2ka7v8l7gglv29zfrp3p7aznqnkwkzdn6pqz91p7y0kd1ck";
-  iosevka-ss06 = "0m7gazz4cq544qyv37mg08j0b1jv7vf1af17snxypzg6gi3l9l79";
-  iosevka-ss07 = "1nlxbraigk6wz46jr47zs3drsv87f4rviscfi6pa2x70fqfvxcvd";
-  iosevka-ss08 = "1ch3c27nzhnnn87jsl5rpl8cpnqdn8zsh2hfch0nkh8y8s6hc6jk";
-  iosevka-ss09 = "0gk0lm2212whr73ydjj0wdmjrvzp5mcawg7c035cyzfj4r35mh7l";
-  iosevka-ss10 = "0d7988z1zsqavd5j2vphkcyy98cfc7bam2bbh62qr99k7321y9dh";
-  iosevka-ss11 = "0a89wmn5f1a97rvl2fa7slqw95mx1a95i5jjrbdslwifycrbv0j8";
-  iosevka-ss12 = "065l9bnhjcracyz73y57mv9bxhxlakvgy2xjwmrayg9a8mnqdl40";
-  iosevka-ss13 = "15miz16fsrl21y2c63gvkngbm7v99s5w9wzcb6x2pl3whfwdm5hh";
-  iosevka-ss14 = "1sbm3m61m4k1wz588axm1w94869fxh0y06gldwivnz460cads42j";
-  iosevka-ss15 = "0w8xm6vv8k95rw5q81d2nw34hllbjlixfqwvrjyj0gpxxw8kkcgy";
-  iosevka-ss16 = "1y64daxpbjwjsakkya9j1x9inn7kq1dpy0y1mldig2dd7i5f49rd";
-  iosevka-ss17 = "1pads0rraq6dxgbra6ss5ilxil988ypcwgfiild9pzb8y5ljgvqr";
-  iosevka-ss18 = "0vf7nvawm9yaip2nvsxc56br1v5q7dqk39i9c813ff5bakwkskiw";
-  sgr-iosevka = "08wrm2ynkw95n7762ay2iak15bj15j0v60pw6p29s5q2fli3cdlj";
-  sgr-iosevka-aile = "117fz5a2p9q1mw6221b04xq4x16lnp6p54vm53jz01pd5s0yg7zn";
-  sgr-iosevka-curly = "1lmp69ppzc7vzi11zlk2y2wg74m19w0jwq482ax024bgm939fxvr";
-  sgr-iosevka-curly-slab = "00gi8i7rq14s1yaz37x2vnxrg78rj1mxfxcii1q1bdmzpnxzvlsh";
-  sgr-iosevka-etoile = "1hw7xfhb666k5n3ay17b33lg09cvsq9wibbgy2x1mmxv1dwxswi8";
-  sgr-iosevka-fixed = "069j0q2g8qdg7akycxsclgxknifg26xd392wcfvm9hwj4j3yscw0";
-  sgr-iosevka-fixed-curly = "1f3gfvkpng044s40pvhw8xmrbdayphav7jnbif3y87ipb2vkah02";
-  sgr-iosevka-fixed-curly-slab = "1zpwqmhck2ym4nh2d4rixqyg7n1jq7xnrqndnjs24nkzk41kg793";
-  sgr-iosevka-fixed-slab = "0bvnp6szadwwyn2l8hms6wfv2pvncb67y4gw9xnwz3xzfwin53bn";
-  sgr-iosevka-fixed-ss01 = "1v8xnyfvq9gjk7xxk465iam2mjb13rj1yibiacp26cn7pz29rdqi";
-  sgr-iosevka-fixed-ss02 = "0ygy6124896cacpqgnpckxw5h9qj8z61drmkcrwk55qjs2gnzgky";
-  sgr-iosevka-fixed-ss03 = "07z7wqg9hgf47aqlb2rqbww9nvr8yhvsaibjmab4xp0c9spibgc9";
-  sgr-iosevka-fixed-ss04 = "1chfswa79zbw1p47dqlh176aq7vrvyziflzm4w30ribk86p6z17d";
-  sgr-iosevka-fixed-ss05 = "0nqqffadk65six8xa6gy3as7ir84lb2gs3bii75iwzy84xiw4ky3";
-  sgr-iosevka-fixed-ss06 = "1996bmsvjs4x35wx98qb7qp998gj1w718kp7rpalls7460796lb8";
-  sgr-iosevka-fixed-ss07 = "0bmrfw0kwdar7ah7pwdf5i7lzgrxfqjwzw8962n801znngccy90d";
-  sgr-iosevka-fixed-ss08 = "03l0gzrivsy8jrdyvyhl5cv6ndk85p9lxfpzkjbhf29dxbd2wg5q";
-  sgr-iosevka-fixed-ss09 = "0dmg5nr23kx3b8cqiha8a8hhq7dysk4s8zwg8c2xwymm39sh77bg";
-  sgr-iosevka-fixed-ss10 = "0kg4bbn9r500fwirr9glwyd26hwyzlplhxmjbzbkqwa39zwl6h1a";
-  sgr-iosevka-fixed-ss11 = "1my2kf7hvara3xv1x5qq8vvr6ywq7w17b0phy63mbn6qc4k179xl";
-  sgr-iosevka-fixed-ss12 = "0g9xkp0l2wadxni5ax0ir2qh7cp4924xa57k33lk25i8pgc4bban";
-  sgr-iosevka-fixed-ss13 = "0jhvfffh6i8g817z594dg7igawxfbwn3dv11xhh2rac9njxyiz3m";
-  sgr-iosevka-fixed-ss14 = "1c1sxyzdipr025zkabxsy5m2aplnpj1sv62bp54w86xaddj3386i";
-  sgr-iosevka-fixed-ss15 = "14a89q4gys44bng51nbnl6z5dhzddx8pnwl4l3l2qkjlqja1f4jr";
-  sgr-iosevka-fixed-ss16 = "04r4aljb9ikd3i4pxniyrlybx29l6v52q80kcg59ymaa20gaqadr";
-  sgr-iosevka-fixed-ss17 = "1ia45a47n5gxrfin48xyfgz0r7nkj66hz27vl4lkzvscv75igqmp";
-  sgr-iosevka-fixed-ss18 = "0mbz6d8w9ija55nh7vdp24hi6i5fs0d5bfm3580yx1a2iphrkwbr";
-  sgr-iosevka-slab = "1xnz4jhxap7lmvxqrngsvsmafdi026v3rzrmya28f3iwq37d6kf8";
-  sgr-iosevka-ss01 = "1vwm199q642d90l52k3jvaz9acqq7i6wk8bpnfq94xl1d8z2jl4g";
-  sgr-iosevka-ss02 = "0l6igwh9g0y9x8lwyvdn6x6qakv8gvlswi3148ghwp0d8hxwy79v";
-  sgr-iosevka-ss03 = "1a8vfdzcq2dikv48ccl3smn0kw2w88ddgwi3hr68x8jp84rpjg6c";
-  sgr-iosevka-ss04 = "19gj3wpqzhhnnmrmyz4jpnz0db397bx433agy0hmyjnk50vdbw5w";
-  sgr-iosevka-ss05 = "0wg2fr10bwmmm1bhjrwadfrvzvbwcayjfg49791x9gzkdvxmc1y9";
-  sgr-iosevka-ss06 = "1jkcl6ngkdkr9v2x6lsslxfqbn9kn9zmw504ihfl4dii84rk8l83";
-  sgr-iosevka-ss07 = "093bhgh1lvabf3xmh8flsy1daabmq1hq4j1czhbqcairzjlk30i2";
-  sgr-iosevka-ss08 = "1a9l4jlndsf6bdy7cy0c1x23cdms3aw0gq43k9nv2k19fn5mklmc";
-  sgr-iosevka-ss09 = "0bcr8mrb958470ilbla9xpmlgf03g0x4rfzz72lr2aln8rja5sdi";
-  sgr-iosevka-ss10 = "0lnj2v6hng13wmbf55kar8yzj6c11adkh2x1j6s3nfz18gbaa4yg";
-  sgr-iosevka-ss11 = "111nbmwrvxd4yzjnbv0vp7hlgbif4zycbiw4ll8zqnibqf3zynb6";
-  sgr-iosevka-ss12 = "1n8jy9haqd9xg14szl0k2fbxxydkkb2z5lighsh569qjcjh17vyw";
-  sgr-iosevka-ss13 = "1kdq1xwwvcf8gi3122sg211dgijk0q72zxbpxk1cj3f2cimbi87h";
-  sgr-iosevka-ss14 = "1i4f6k7gpzzxkia81qfkhx9rwzpg29n9k3i3lbqf0y9fj01kwgax";
-  sgr-iosevka-ss15 = "0agzapx40qv0pixxijfa5m94w5p90adjyfh0qp4kx37hvidzcplq";
-  sgr-iosevka-ss16 = "0lc4bs89g2840m0mkcxagc694mx5ydh2zvcrvh1316snz6gqmqbv";
-  sgr-iosevka-ss17 = "0wsd2jck9pgrivr93d64krkdkqdwm21mgz52pijwr51bwci41xy3";
-  sgr-iosevka-ss18 = "00ml8w11n9dc5ykraz3hcacwvhsjx1z100risi3aw81vfwq0z1xg";
-  sgr-iosevka-term = "0zvpj73ddk36g9ggw2bngmhzpdixpnnjhvzzyw7ff4xbgaxlkrrs";
-  sgr-iosevka-term-curly = "0b0a2ipjwj1mf2042658z6rsnn5jiva32aw9wrq7rs56p7drf33c";
-  sgr-iosevka-term-curly-slab = "0dvh9kykb80p6g689wxcfsxya9n959j3l7a9q9bz92nddyny45wp";
-  sgr-iosevka-term-slab = "06mbfcjcghd5dc3k2y1bf39xhdni7dvsasm3rgj0cjzylg7c9rkv";
-  sgr-iosevka-term-ss01 = "0bpqbnp2njn8q1vqpy3iaqxzwm4zb50spyk1drdnk5v4j8rnxr86";
-  sgr-iosevka-term-ss02 = "0g3kdwlaii8vja3p5y91pmawzj7hn59y35gixvgkqpnrkpp3y6bm";
-  sgr-iosevka-term-ss03 = "139psybgajsyszpz811kxvgfi08ia54dk011dx359kk6gj72wmnz";
-  sgr-iosevka-term-ss04 = "0aix3x98id9zc86qmbmbqh60a9s6928y26lcz1sms88p2nnnliqp";
-  sgr-iosevka-term-ss05 = "10gbkay5fff1k91r1jhibh3gialif6m7fyqlw5sphjxn75qpkxm4";
-  sgr-iosevka-term-ss06 = "0bxachp1qsnzgavap30nsbqpa75hd5pzk2gfj8l1b6q3cpmvnlyf";
-  sgr-iosevka-term-ss07 = "028fkmz1yb1g30idszz0bdjhsn1iq845pxkf0iwq409y2qs8xh8s";
-  sgr-iosevka-term-ss08 = "11yvq67lql3q249k1b9gdc3g1q48q6sihj62kgk7l9qh4cv3wmnh";
-  sgr-iosevka-term-ss09 = "1r87wznw3nbry0ddl20k7gqxbmiz0pnmf5qb01jfdnhsnq9fdr4a";
-  sgr-iosevka-term-ss10 = "0xivpfm736jp4326bwbcnc7gq2sik3f3r46sqka1r33vvlwmcq0m";
-  sgr-iosevka-term-ss11 = "1j03vhbqgff59qi4sw11y49gkmzamv94vlwicg8idbnqbkxkhr8r";
-  sgr-iosevka-term-ss12 = "0mcixkpb5680f9jrbk4hrzvf7nlh2hppb8ar1w8a1lvx7qyr3wxc";
-  sgr-iosevka-term-ss13 = "19nzxs9r2br3n3ibi15b7acarlgd2mriyzi318dmis0dxfdqd27l";
-  sgr-iosevka-term-ss14 = "18gqq1ysjw8fx9insy06wi7wbfzsha5vcq72j89iac67jlr3qdp0";
-  sgr-iosevka-term-ss15 = "0l5hhq3kcrg7jhzlpsakx150gsn9l9018vydv5ln84lxfg16hc0m";
-  sgr-iosevka-term-ss16 = "0lhq56r8anw2dqny3wgmw0jb8fcsk4idsb7li09m87rkikfd2igr";
-  sgr-iosevka-term-ss17 = "0ylgk2bzxb65cb9rma0a17bz8n1w0r9pk16nlm01bglp79cin9a0";
-  sgr-iosevka-term-ss18 = "0ld3f3a06r4kjbdppx5yml855af3cz2kia124jjzx6x5j5ybn87y";
+  iosevka = "1hbh2s718c2abp404rginas3bqlddgw3bl4k3hv6yi76sdd5wmkw";
+  iosevka-aile = "08l7hidkfc9xwavmcvwis7zma1shyqb9p6n2bcwnrs22826hgn0f";
+  iosevka-curly = "0sm77rfhqjf5iwvn8fc7cqr8g7q6nyycal8bqx8h4wyin8mac6ss";
+  iosevka-curly-slab = "1kvakcscpsfkwfgk8j1pk44xzq5lkhp1m6f6q75cpcrbakmfdw0y";
+  iosevka-etoile = "0vgf3jigdysxhp24kzyhhxmi84sxmnvy99r4l4vjk9fhnpzkhv28";
+  iosevka-slab = "127w2ysvv2cnc5zdyz5znwawfmnvpm4by35igkzlcyplgsygdi16";
+  iosevka-ss01 = "0gl79saa0k1x9b01khxip7wmw2lvaf1glcpsj5733ywwiy381k7d";
+  iosevka-ss02 = "0rc4lf7bx61zs17rd9chnszlbzjpdh867mxvv9gwcm5biyn56zxv";
+  iosevka-ss03 = "0vpz5djxbjca1hq233bl78bbaw7wnky3mjgk5va4mbwvscszpq7d";
+  iosevka-ss04 = "06zf1mccd5082a3cqga46g82dm14asv4x7ljnv21nxqwqb54xrar";
+  iosevka-ss05 = "1r5pxm2gyj1s7qvdsnydczqlpwdqc4c27wfh70gj83s6sn0xaszr";
+  iosevka-ss06 = "08cm7zb0ha16ldh7cy337c226s9vjkr14w9b6v025wq2f7l0axv4";
+  iosevka-ss07 = "1qcc19i5m3hkgkp89a02g2xcyx3xbgwdav88fw3cn5cq9cd32nvg";
+  iosevka-ss08 = "1cd2f3aagikdhh8zh54ijfy0qkmkadpxx9ikc65i0mdwqvrq66qs";
+  iosevka-ss09 = "04gwpk1blrhlakg9253l69d2n5xp7bvy6s1va535z08yln6m2zzq";
+  iosevka-ss10 = "1cxazjh94p4dqsfhs7xb0jfdxyg17w0fi6kvns62scprl11spbah";
+  iosevka-ss11 = "1jgxc03vg45hj2y61kp0hplz4b3v13i9x98j3v5m07m5w4pvz92v";
+  iosevka-ss12 = "0i2h2kdrhq610ca8clsmpfn4c71qvm23fpn389c0kxls8wg5z7h4";
+  iosevka-ss13 = "0mxkxa68krhwlpxn00msir4za5zldhqilnzb2rhsbgwsla5vx0y4";
+  iosevka-ss14 = "0fhg8jdkin4m9fj1d96n9521cx7ffz230abcrkgffas8404x4c6l";
+  iosevka-ss15 = "17fxkh3vl9wb7ajyda6dhwzym71i5gn1qzarnaalabqrrg9vg8aq";
+  iosevka-ss16 = "0w3j91963hh6nlnfy6igz5bj7k81gw4grcsvl58p81z3fb4n4wcc";
+  iosevka-ss17 = "04fmk1wwhh9snmpz9k07acjyjibi7d2l7yjlpbzzc0kwy3i7x37z";
+  iosevka-ss18 = "0k90yhz9a44h8r9kiknnxhm94f9s7xk0m074g4wh07ngc80npaqb";
+  sgr-iosevka = "0hiz1a3gjl684m0wq0i328j0ryrpa5436j6g5agfvdsima60dknv";
+  sgr-iosevka-aile = "18jbnig6shvqcvwmpjc9z14z9am9wsl8ybm7mrw7b237jkfy9839";
+  sgr-iosevka-curly = "1ljs1k0xrd91n1n8chcb0jmcpgjjvgc9qwdxnk1i2zbds515hbsh";
+  sgr-iosevka-curly-slab = "1iqngf3a0mkx52ljmxwsd0088x6zpac6dyz9502wfmp5wrp7y4wf";
+  sgr-iosevka-etoile = "0w8zs73xl4arkksb9xd4g8nyf8n90ya0hb0yg35dqzqqdsf9b5mp";
+  sgr-iosevka-fixed = "1j62gdc1d8rcakg1a46q2bhnnlyzvfnmiz0gp8ia91vz51j9s8vy";
+  sgr-iosevka-fixed-curly = "1sdvbyi7h486drvqi1nccz05nn93wzhi6wwn889kgxawrimpbars";
+  sgr-iosevka-fixed-curly-slab = "1q96b285kxih0lrqrmy16hiwniq7vx6f07l3h9xqhinln8g2mvi8";
+  sgr-iosevka-fixed-slab = "14j718phwai25fwgva3xhz816h9gkds3lhnfmrdxmlj1z5rnsk5z";
+  sgr-iosevka-fixed-ss01 = "1gi9hhzsfrjl5bykyswi882blndggb28b0isdhyhvv5rsjpl6vrq";
+  sgr-iosevka-fixed-ss02 = "1l9k878199nclzmfhc52qcll7x7i4fq71mj495sr4024vm7dgns1";
+  sgr-iosevka-fixed-ss03 = "1vpn6sfz8ps64ysxcviwziw2qhazjj94vx962pvahwd991lgdila";
+  sgr-iosevka-fixed-ss04 = "11847shnrdzfgj4rryk22ba16bxmdsj2qf9vah6qnivsdaw9ymc1";
+  sgr-iosevka-fixed-ss05 = "1n2whdxrlmxgvdqhxgq0qyxrnidgbaw2mmw8s3a06qpcpqi20d3v";
+  sgr-iosevka-fixed-ss06 = "15lhkka5slax5c0vawprfdbdhbbiqapv4d2b02w7fp9g8p0s1ljc";
+  sgr-iosevka-fixed-ss07 = "0ijhsmlp66a1la299w5jvrfnykasznybb22fhq7lkjzdn1blgim9";
+  sgr-iosevka-fixed-ss08 = "1q8d54a7a1xq5a1jkc0c8qns6nq3gyldabjaplczq5p79s2j2fca";
+  sgr-iosevka-fixed-ss09 = "1p86b22v8mn5xs9vxyary8jz1jfy0hy1g7yc4lwmslkvxndjvfld";
+  sgr-iosevka-fixed-ss10 = "1y3rlr3b5bfx97mr7kpg2x2wgk88z7jhx0vh3b33d9q4sd626vcr";
+  sgr-iosevka-fixed-ss11 = "0i6zajhdnfml9ja613jmy3gb6als2chrigkjyzxm0aih4wfm7lly";
+  sgr-iosevka-fixed-ss12 = "0f4p7gmb2g991v1858y53wlxvsnd7fmrsp8d9jxj4nlzpl7giazj";
+  sgr-iosevka-fixed-ss13 = "1230ss6fxk5py0fkn3mcdc1ky1jfp31hz8fqlvkwz3vf954yfqj1";
+  sgr-iosevka-fixed-ss14 = "0hhpmby5jzb839yldzlaj90h1d0d53agxcdiphp9vbmrr3mp3ycd";
+  sgr-iosevka-fixed-ss15 = "1dq7f72zi094hvgpdm912f5ijp8nrcxsd78wsk35nllv4cggswma";
+  sgr-iosevka-fixed-ss16 = "0jlbc0xx3pf3bnlw5p7rpjw6a7hj75lhh78c9qldhdxpiyks2jwk";
+  sgr-iosevka-fixed-ss17 = "0vbqwvn604njd09lc8g4nxq6isjpzv984345l76cpz3hhn22a986";
+  sgr-iosevka-fixed-ss18 = "1xznqj1wwvk9rclgr0nx0p5wx1p3a9sbdbigirmifhjn77mrji9c";
+  sgr-iosevka-slab = "0wmh2dg12gd05vsr8jsx4mflczpyw6prvlap173yll0rif80dwxd";
+  sgr-iosevka-ss01 = "0h93n0v2xzph0j2xq289ssi69dvlbqqz0f9yb41khq6bfz2y6ra7";
+  sgr-iosevka-ss02 = "0vk3h1wxdrgjhy999ikmpkakd8xwsad06q3bbk74q2m9ld3m48jl";
+  sgr-iosevka-ss03 = "0bs4nrvzfmmbh7f8liyd94d47kqgz3iw3mbi5q0cavh4vylhlz6c";
+  sgr-iosevka-ss04 = "0dhz9a2nl4ydj0gdxa9xhvbqf68h3d3yr81zh8gxkj2c84g3lyrn";
+  sgr-iosevka-ss05 = "1q9fvi4kpgjxz03c2jlxbxcw8qvj7h20xdmkgk7kgbvkvvrgmyam";
+  sgr-iosevka-ss06 = "09hf8g8hrw2q6lc60x5fdq0xvic0hx2g7y200p5jj2ghdw6jb7zr";
+  sgr-iosevka-ss07 = "09pn58i1gprrvrq1b5i5sc83ly8gpcxds35kj1l4p8x0h5zz5ffr";
+  sgr-iosevka-ss08 = "19lr6zp4j9wrn9xwffqyrrdy35gfl6fk27i03w07gx4hbl1x45nn";
+  sgr-iosevka-ss09 = "06654zmjf406lzbn3q9f1212r5raw56npii5cc0mn6cfka8lhiyb";
+  sgr-iosevka-ss10 = "0qi00x4vmxvzqyh1556f0fgc9cplapnri3vn10ky7pmmypwlzicf";
+  sgr-iosevka-ss11 = "105l97zm4kmacacqdasac601r04cxj2w6vbciamb3id4yjkr5lqq";
+  sgr-iosevka-ss12 = "1sd02jb4wpw0ax7yd0l2lzkdgl6sv7j64myfzmpgf79n38ik3x6c";
+  sgr-iosevka-ss13 = "0jyizpqxbnkf8ac299brahacjxp0h0hzwhaz5bd11439gkwjpff4";
+  sgr-iosevka-ss14 = "02p2fscj5zvypb1mcnhx7cr09dx4d0gmyhnyvlxw3d8l7r600x7k";
+  sgr-iosevka-ss15 = "0ihmgn49i13xki0ikw1acj0p8vg8siyrgr48apq0vfj9d8yb1fnq";
+  sgr-iosevka-ss16 = "0ggaqg0z63x9x1jp4dw4zi3nm44bfq5v3z22fi2fmkrd9w2l3sl8";
+  sgr-iosevka-ss17 = "1bdk2rwqs68738acl1g5afz1vpaq11qfck54vdphidmppg6fflib";
+  sgr-iosevka-ss18 = "0s336j7wi8rys4kc7zpz9xfq3fcvhajlmpjzkb1qhjxwrsxzk2g9";
+  sgr-iosevka-term = "0329698yx6nagmc9pjil5g3bcd4chng4685bllgzwn6751y3w74p";
+  sgr-iosevka-term-curly = "16p82qiqkimy1przl7hxyd9lh7qkff8q8k1y8339gf35drjs0yii";
+  sgr-iosevka-term-curly-slab = "0vqbhaq107ka798jz84r2ipmf68j511dimkrzqwxcy223nmwh5wm";
+  sgr-iosevka-term-slab = "0gb8vk3hf7fj1wj0n14ha01cxwg767xwhklraq8iz4hj71axj9n2";
+  sgr-iosevka-term-ss01 = "1gnbza11zs4c4zalmpf7yz4wqhx322vd7gsaz1c97hszh11az9hl";
+  sgr-iosevka-term-ss02 = "12hfn784lwz7ldw3siqxk47b2j9yrd4lx9xs56cd9p44wdvspiaq";
+  sgr-iosevka-term-ss03 = "0h56ch2hhp70djbp13a9zr99imr6jincqqwkmpn3pm5z9kr82y9b";
+  sgr-iosevka-term-ss04 = "1nnf8pzdra4xqvvwi487f83blpapyfmpjzm0mqpndws11chl6ndw";
+  sgr-iosevka-term-ss05 = "0g3znbjjh1kjm02bmaf28gqdgk7b0l9sx3hcg0pfyfs9iv05fh8a";
+  sgr-iosevka-term-ss06 = "1v7w15k7s0qrm307lkkrmzy3g09q20d6ws7jmbp7xswxvibfhxkl";
+  sgr-iosevka-term-ss07 = "1i3cg20xz230chw3l3q4bzlp6m62563bgy599cfjjp1si2inx734";
+  sgr-iosevka-term-ss08 = "1jspdgrkszgqzzm04q5l21583j6vfh01qv6f0jr2z9235877f2xw";
+  sgr-iosevka-term-ss09 = "0gc201k5z4kfpsdbkn7kn163cpvxasg01gx9brwypkydsr5m8imz";
+  sgr-iosevka-term-ss10 = "0k4q749vgyz1wpxdg2hg7np52h9b1nx50pw9s0k73fl2n45g7559";
+  sgr-iosevka-term-ss11 = "1s2gqdac7ckw574vwbryfab8hgkjr72yf3s2pc4gr5gcyd97863a";
+  sgr-iosevka-term-ss12 = "0js64ad31vi0zcr07qyamyv7my1cz1dym3jiw3dkcrm3lmi6b65d";
+  sgr-iosevka-term-ss13 = "0kz3166n81h7fzif89mad2g2blvm8hd69ww76k3zivx3rzxvl6m6";
+  sgr-iosevka-term-ss14 = "15nah0qmrp0z0x159yyh848yy2874yx9ijyfwy6cvs7ildzd0fkv";
+  sgr-iosevka-term-ss15 = "05p8is5qwji723gxjffx6si1rcsfspizpn0gr6cvdkz9cwcv0sqv";
+  sgr-iosevka-term-ss16 = "0dp22hbvxj4sjmz1hw4qiqf70fj95zr0mw6f38wvy79813101c14";
+  sgr-iosevka-term-ss17 = "1nbv2p8ddajrymm8a5556xjcx5aia6f1zqrgpjsf6pq0qs06x3di";
+  sgr-iosevka-term-ss18 = "115s4lvh3ml374815w3c2649js29ba5vpq375fd24vlysr147zxd";
 }
-- 
cgit 1.4.1


From 287f1b4fb84a56188a25f1456c51a36f095bc325 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 05:14:58 +0000
Subject: python310Packages.debugpy: 1.6.7 -> 1.6.7.post1

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

diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
index 58bdec7ebc615..eff66b3607158 100644
--- a/pkgs/development/python-modules/debugpy/default.nix
+++ b/pkgs/development/python-modules/debugpy/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.6.7";
+  version = "1.6.7.post1";
   format = "setuptools";
 
   # Currently doesn't support 3.11:
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-porQTFvcLaIkvhWPM4vWR0ohlcFRkRwSLpQJNg25Tj4=";
+    hash = "sha256-zsF6XUSAAKhwmUZkroRWvOBWXjTWzWuRYOhnYuN3KrY=";
   };
 
   patches = [
-- 
cgit 1.4.1


From 584f38509503251ebe60943c109cf11d6da87bd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 05:36:28 +0000
Subject: python310Packages.pybase64: 1.2.3 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix
index 8231aed035536..1cd04164ba787 100644
--- a/pkgs/development/python-modules/pybase64/default.nix
+++ b/pkgs/development/python-modules/pybase64/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "pybase64";
-  version = "1.2.3";
+  version = "1.3.0";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dtB035p7mJs1iZJqsZRmd7uzmez+IwcUsTFX4mM2Ee0=";
+    hash = "sha256-1MZHKrAITr1O4AW7mFFym9xk2PYsb65b2wdrICn0iO4=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
-- 
cgit 1.4.1


From 5e01c2cb3562b538405feb75cc79d238977a333d Mon Sep 17 00:00:00 2001
From: Robert Schütz <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 18:35:39 -0700
Subject: nodePackages.indium: drop

According to https://github.com/NicolasPetton/Indium/issues/275 it is
broken.
---
 pkgs/development/node-packages/aliases.nix        |  1 +
 pkgs/development/node-packages/node-packages.json |  1 -
 pkgs/development/node-packages/node-packages.nix  | 33 -----------------------
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 863fc68dd0408..a889cc8cba7d1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -58,6 +58,7 @@ mapAliases {
   flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
   hueadm = pkgs.hueadm; # added 2023-07-31
+  indium = throw "indium was removed because it was broken"; # added 2023-08-19
   karma = pkgs.karma-runner; # added 2023-07-29
   manta = pkgs.node-manta; # Added 2023-05-06
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 156e1c5f3c9de..1ce5bece44180 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -168,7 +168,6 @@
 , "inliner"
 , "imapnotify"
 , "immich"
-, "indium"
 , "insect"
 , "intelephense"
 , "ionic"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 4d2856fc429ba..57a7d28a6fd2d 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -108697,39 +108697,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  indium = nodeEnv.buildNodePackage {
-    name = "indium";
-    packageName = "indium";
-    version = "5.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/indium/-/indium-5.0.0.tgz";
-      sha512 = "NGgQYdtKoh6zXoo1Sp3cvBur7SMud1JU6ghMQTBUxmPGlRmoB0esc3qVlLbK8f0d8j7OZgUUYkfGd0+xTYGvOw==";
-    };
-    dependencies = [
-      sources."async-limiter-1.0.1"
-      sources."chrome-remote-interface-0.27.2"
-      sources."commander-2.11.0"
-      sources."encoding-0.1.13"
-      sources."iconv-lite-0.6.3"
-      sources."node-fetch-2.6.12"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.7.2"
-      sources."source-map-0.7.4"
-      sources."tr46-0.0.3"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."ws-6.2.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Indium server";
-      homepage = "https://github.com/NicolasPetton/Indium#readme";
-      license = "GPL-3.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   insect = nodeEnv.buildNodePackage {
     name = "insect";
     packageName = "insect";
-- 
cgit 1.4.1


From e1f55593bda84135811ea47fa71145048a6f2cd8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 05:55:55 +0000
Subject: python310Packages.dvc-data: 2.14.0 -> 2.15.1

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

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index d59d7361408b1..66fbce0c8d29b 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-data";
-  version = "2.14.0";
+  version = "2.15.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-tXUGQI3TwBEHW+wxNn14zUx6PhzAwe5NX+78JIdTI5c=";
+    hash = "sha256-5Lu/YSLmqWXFQ6w6egALqdePWYwWrDIahVkQn3iQCnA=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
-- 
cgit 1.4.1


From 1f8285990b8865a92837867dc7e906ab9f9fd8a7 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Sat, 19 Aug 2023 23:35:10 +0200
Subject: proot: add meta.mainProgram

For lib.getExe.
---
 pkgs/tools/system/proot/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index 665be5cbabfe4..a43b2ff7f2023 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2;
     maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ];
+    mainProgram = "proot";
   };
 }
-- 
cgit 1.4.1


From 2987c1b26423c93c067a0d1152e674a0f5580109 Mon Sep 17 00:00:00 2001
From: Olli Helenius <liff@iki.fi>
Date: Sat, 19 Aug 2023 11:49:17 +0300
Subject: gradle: 8.2.1 -> 8.3

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 24fb2460069ff..b0b5e10729bf2 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -128,9 +128,9 @@ rec {
   # https://docs.gradle.org/current/userguide/compatibility.html
 
   gradle_8 = gen {
-    version = "8.2.1";
+    version = "8.3";
     nativeVersion = "0.22-milestone-24";
-    sha256 = "1lasx96qgh1pjmjjk8a5a772ppgqmp33mp6axyfsjalg71nigv03";
+    sha256 = "09cjyss4bcnig1wzhxpwyn4kznkawzaha7fy0jg5nqzw2ysma62r";
     defaultJava = jdk17;
   };
 
-- 
cgit 1.4.1


From f696376fa75526ccfe39b13d88f2663c3a531be0 Mon Sep 17 00:00:00 2001
From: Bjørn Forsman <bjorn.forsman@gmail.com>
Date: Wed, 16 Aug 2023 20:27:05 +0200
Subject: virtualbox: include Guest Additions ISO

Although virtualbox has code to download it at runtime, I'd like to have
it included at build time because:

* I like programs that are fully functional even when offline.
* Runtime downloading doesn't work, it results in error message
  "During certificate downloading: Unknown reason".

This change increases the closure size 5 % (969 -> 1020 MiB).
---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index b814386067227..b425ccedb28f3 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -4,6 +4,7 @@
 , qttools, qtsvg, qtwayland, pkg-config, which, docbook_xsl, docbook_xml_dtd_43
 , alsa-lib, curl, libvpx, nettools, dbus, substituteAll, gsoap, zlib
 , yasm, glslang
+, linuxPackages
 # If open-watcom-bin is not passed, VirtualBox will fall back to use
 # the shipped alternative sources (assembly).
 , open-watcom-bin
@@ -215,6 +216,7 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/share/virtualbox"
     cp -rv src/VBox/Main/UnattendedTemplates "$out/share/virtualbox"
+    ln -s "${linuxPackages.virtualboxGuestAdditions.src}" "$out/share/virtualbox/VBoxGuestAdditions.iso"
   '';
 
   preFixup = optionalString (!headless) ''
-- 
cgit 1.4.1


From 2f2d11e22b51782dadcf08cef964b0ad7ac10fea Mon Sep 17 00:00:00 2001
From: Robert Schütz <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 19:23:58 -0700
Subject: javascript-typescript-langserver: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix         |  1 +
 pkgs/development/node-packages/node-packages.json  |  1 -
 pkgs/development/node-packages/node-packages.nix   | 87 ----------------------
 .../javascript-typescript-langserver/default.nix   | 25 +++++++
 pkgs/top-level/all-packages.nix                    |  2 +
 5 files changed, 28 insertions(+), 88 deletions(-)
 create mode 100644 pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a889cc8cba7d1..cd946932a7d14 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -59,6 +59,7 @@ mapAliases {
   gtop = pkgs.gtop; # added 2023-07-31
   hueadm = pkgs.hueadm; # added 2023-07-31
   indium = throw "indium was removed because it was broken"; # added 2023-08-19
+  inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   karma = pkgs.karma-runner; # added 2023-07-29
   manta = pkgs.node-manta; # Added 2023-05-06
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1ce5bece44180..d98a0d2c59ed1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -172,7 +172,6 @@
 , "intelephense"
 , "ionic"
 , "jake"
-, "javascript-typescript-langserver"
 , "joplin"
 , "js-beautify"
 , "js-yaml"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 57a7d28a6fd2d..47135cfe52ca7 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -109427,93 +109427,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  javascript-typescript-langserver = nodeEnv.buildNodePackage {
-    name = "javascript-typescript-langserver";
-    packageName = "javascript-typescript-langserver";
-    version = "2.11.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/javascript-typescript-langserver/-/javascript-typescript-langserver-2.11.3.tgz";
-      sha512 = "j2dKPq5tgSUyM2AOXWh2O7pNWzXzKI/3W02X1OrEZnV3B9yt9IM+snuGt/mk1Nryxyy7OZnhdL0XqHe4xx7Qzw==";
-    };
-    dependencies = [
-      sources."ansi-color-0.2.1"
-      sources."ansi-styles-3.2.1"
-      sources."any-promise-1.3.0"
-      sources."assertion-error-1.1.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."bufrw-1.3.0"
-      sources."chai-4.3.7"
-      sources."chai-as-promised-7.1.1"
-      sources."chalk-2.4.2"
-      sources."check-error-1.0.2"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."commander-2.20.3"
-      sources."concat-map-0.0.1"
-      sources."deep-eql-4.1.3"
-      sources."error-7.0.2"
-      sources."escape-string-regexp-1.0.5"
-      sources."fast-deep-equal-2.0.1"
-      sources."fast-json-patch-2.2.1"
-      sources."fs.realpath-1.0.0"
-      sources."get-func-name-2.0.0"
-      sources."glob-7.2.3"
-      sources."has-flag-3.0.0"
-      sources."hexer-1.5.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."iterare-1.2.1"
-      sources."jaeger-client-3.19.0"
-      sources."lodash-4.17.21"
-      sources."long-2.4.0"
-      sources."loupe-2.3.6"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mz-2.7.0"
-      sources."node-int64-0.4.0"
-      sources."object-assign-4.1.1"
-      sources."object-hash-1.3.1"
-      sources."once-1.4.0"
-      sources."opentracing-0.14.7"
-      sources."path-is-absolute-1.0.1"
-      sources."pathval-1.1.1"
-      sources."process-0.10.1"
-      sources."rxjs-5.5.12"
-      sources."semaphore-async-await-1.5.1"
-      sources."string-similarity-2.0.0"
-      sources."string-template-0.2.1"
-      sources."supports-color-5.5.0"
-      sources."symbol-observable-1.0.1"
-      sources."thenify-3.3.1"
-      sources."thenify-all-1.6.0"
-      sources."thriftrw-3.12.0"
-      sources."type-detect-4.0.8"
-      sources."typescript-3.0.3"
-      sources."uuid-8.3.2"
-      sources."vscode-jsonrpc-4.0.0"
-      sources."vscode-languageserver-5.2.1"
-      (sources."vscode-languageserver-protocol-3.14.1" // {
-        dependencies = [
-          sources."vscode-languageserver-types-3.14.0"
-        ];
-      })
-      sources."vscode-languageserver-types-3.17.3"
-      sources."vscode-uri-1.0.8"
-      sources."wrappy-1.0.2"
-      sources."xorshift-1.2.0"
-      sources."xtend-4.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Implementation of the Language Server Protocol for JavaScript and TypeScript";
-      homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
-      license = "Apache-2.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
diff --git a/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix b/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix
new file mode 100644
index 0000000000000..bdfc1d8f40c87
--- /dev/null
+++ b/pkgs/development/tools/language-servers/javascript-typescript-langserver/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "javascript-typescript-langserver";
+  version = "2.11.3";
+
+  src = fetchFromGitHub {
+    owner = "sourcegraph";
+    repo = "javascript-typescript-langserver";
+    rev = "v${version}";
+    hash = "sha256-vd7Hj0jPFgK0u3CBlMfOFERmW+w9CnKIY9nvs48KqsI=";
+  };
+
+  npmDepsHash = "sha256-nHGTi1aH9YY01dzBeNyUEUEswrdjZPWaoycDVZZmIAA=";
+
+  meta = {
+    description = "JavaScript and TypeScript code intelligence through the Language Server Protocol";
+    homepage = "https://github.com/sourcegraph/javascript-typescript-langserver";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dywedir ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d9a0880fdffa..1f51c38ff5318 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18357,6 +18357,8 @@ with pkgs;
 
   helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
 
+  javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { };
+
   jdt-language-server = callPackage ../development/tools/language-servers/jdt-language-server { };
 
   jsonnet-language-server = callPackage ../development/tools/language-servers/jsonnet-language-server { };
-- 
cgit 1.4.1


From 5ff791b8fd3fe4e5dbc4f50fcc39732ef7e6d328 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Sat, 19 Aug 2023 23:57:17 -0700
Subject: python3.pkgs.linear_operator: use setuptools-scm to get version
 (#250240)

---
 .../python-modules/linear_operator/default.nix     | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/linear_operator/default.nix b/pkgs/development/python-modules/linear_operator/default.nix
index baecb5a732f6f..f42522016c1f1 100644
--- a/pkgs/development/python-modules/linear_operator/default.nix
+++ b/pkgs/development/python-modules/linear_operator/default.nix
@@ -2,9 +2,12 @@
 , buildPythonPackage
 , fetchFromGitHub
 , jaxtyping
+, pytestCheckHook
 , scipy
+, setuptools
+, setuptools-scm
 , torch
-, pytestCheckHook
+, wheel
 }:
 
 buildPythonPackage rec {
@@ -19,10 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-7NkcvVDwFaLHBZZhq7aKY3cWxe90qeKmodP6cVsdrPM=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace 'find_version("linear_operator", "version.py")' \"$version\"
-  '';
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+    wheel
+  ];
 
   propagatedBuildInputs = [
     jaxtyping
@@ -30,10 +36,12 @@ buildPythonPackage rec {
     torch
   ];
 
-  checkInputs = [
+  pythonImportsCheck = [ "linear_operator" ];
+
+  nativeCheckInputs = [
     pytestCheckHook
   ];
-  pythonImportsCheck = [ "linear_operator" ];
+
   disabledTests = [
     # flaky numerical tests
     "test_svd"
-- 
cgit 1.4.1


From e7463a4d9f34e4af2f6f0c1de6ed8c3b2b2820cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 07:24:50 +0000
Subject: libcef: 115.3.13 -> 116.0.14

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

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 0b045a0bd3cbd..38a62255b15e6 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -66,16 +66,16 @@ let
       projectArch = "x86_64";
     };
   };
-  platforms."aarch64-linux".sha256 = "06f7dm3k04ij2jczlvwkmfrb977x46lx0n0vyz8xl4kvf2x5psp8";
-  platforms."x86_64-linux".sha256 = "09flbhddnl85m63rv70pmnfi2v8axjicad5blbrvdh2gj09g7y1r";
+  platforms."aarch64-linux".sha256 = "0iqih0fbafzlcfq3kljjr3pkywamwvahgm6b7b0z0xdbzq0idxdx";
+  platforms."x86_64-linux".sha256 = "1cc7lmp984653b9909pnk4brs96bmgq7hd6p9i6xgxy2y4n3887m";
 
   platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms;
 in
 stdenv.mkDerivation rec {
   pname = "cef-binary";
-  version = "115.3.13";
-  gitRevision = "749b4d4";
-  chromiumVersion = "115.0.5790.171";
+  version = "116.0.14";
+  gitRevision = "376a780";
+  chromiumVersion = "116.0.5845.97";
 
   src = fetchurl {
     url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2";
-- 
cgit 1.4.1


From 41edb36674f8fc44b0adc72dae678fa6cb0ab88d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Aug 2023 10:27:49 +0200
Subject: python310Packages.pystache: add format

- disable on unsupported Python releases
---
 .../python-modules/pystache/default.nix            | 26 +++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index eea136f0a5c22..3586be89a08ca 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -1,27 +1,37 @@
-{ lib, buildPythonPackage, unittestCheckHook, fetchPypi, isPy3k, glibcLocales }:
+{ lib
+, buildPythonPackage
+, unittestCheckHook
+, fetchPypi
+, pythonOlder
+, glibcLocales
+}:
 
 buildPythonPackage rec {
   pname = "pystache";
   version = "0.6.4";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c=";
+    hash = "sha256-4CkCIzBJsW4L4alPDHOJ6AViX2c1eD9FM7AgtaOKJ8c=";
   };
 
   LC_ALL = "en_US.UTF-8";
 
-  buildInputs = [ glibcLocales ];
-
-  # SyntaxError Python 3
-  # https://github.com/defunkt/pystache/issues/181
-  doCheck = !isPy3k;
+  buildInputs = [
+    glibcLocales
+  ];
 
-  nativeCheckInputs = [ unittestCheckHook ];
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
 
   meta = with lib; {
     description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
     homepage = "https://github.com/defunkt/pystache";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }
-- 
cgit 1.4.1


From 57c56874739923c8f915b1ceda44251730166743 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Aug 2023 10:29:22 +0200
Subject: python310Packages.pystache: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix
index 3586be89a08ca..19d9b2cdf4909 100644
--- a/pkgs/development/python-modules/pystache/default.nix
+++ b/pkgs/development/python-modules/pystache/default.nix
@@ -28,6 +28,10 @@ buildPythonPackage rec {
     unittestCheckHook
   ];
 
+  pythonImportsCheck = [
+    "pystache"
+  ];
+
   meta = with lib; {
     description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
     homepage = "https://github.com/defunkt/pystache";
-- 
cgit 1.4.1


From e7ceccbb87d31bf6fe4216fdcd9f05fe8533153b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Aug 2023 10:34:15 +0200
Subject: python310Packages.sphinx-material: add format

- disable on unsupported Python releases
---
 .../python-modules/sphinx-material/default.nix         | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-material/default.nix b/pkgs/development/python-modules/sphinx-material/default.nix
index b735b746a33da..9cbcb31d33478 100644
--- a/pkgs/development/python-modules/sphinx-material/default.nix
+++ b/pkgs/development/python-modules/sphinx-material/default.nix
@@ -1,22 +1,26 @@
 { lib
+, beautifulsoup4
 , buildPythonPackage
+, css-html-js-minify
 , fetchPypi
-, sphinx
-, beautifulsoup4
+, lxml
 , python-slugify
+, pythonOlder
+, sphinx
 , unidecode
-, css-html-js-minify
-, lxml
 }:
 
 buildPythonPackage rec {
   pname = "sphinx-material";
   version = "0.0.36";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "sphinx_material";
     inherit version;
-    sha256 = "sha256-7v9ffT3AFq8yuv33DGbmcdFch1Tb4GE9+9Yp++2RKGk=";
+    hash = "sha256-7v9ffT3AFq8yuv33DGbmcdFch1Tb4GE9+9Yp++2RKGk=";
   };
 
   propagatedBuildInputs = [
@@ -30,7 +34,9 @@ buildPythonPackage rec {
 
   doCheck = false; # no tests
 
-  pythonImportsCheck = [ "sphinx_material" ];
+  pythonImportsCheck = [
+    "sphinx_material"
+  ];
 
   meta = with lib; {
     description = "A material-based, responsive theme inspired by mkdocs-material";
-- 
cgit 1.4.1


From 37b82444129052fe44919310c9b23398f0a44888 Mon Sep 17 00:00:00 2001
From: Evils <evils.devils@protonmail.com>
Date: Sun, 13 Aug 2023 20:31:57 +0200
Subject: kicad-unstable: 2023-06-24 -> 2023-08-15

---
 .../science/electronics/kicad/versions.nix           | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix
index f93253351d923..9c98d7302f2bc 100644
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -25,23 +25,23 @@
   };
   "kicad-unstable" = {
     kicadVersion = {
-      version =			"2023-06-24";
+      version =			"2023-08-15";
       src = {
-        rev =			"1c1849ec1a6614247abe4c623c086def2b3192e0";
-        sha256 =		"0faf4fw7nrfwdrl4pjqdyfzqbvb9jd4nk4aq83v1w358yqyk7zg9";
+        rev =			"e0d4cf2d5b023a7e5b70d854452376aa3510acd8";
+        sha256 =		"0666j4q3vz24smcjw9m4ib3ca2dqiqgx2amhv7ys4rzqb6v2pvn2";
       };
     };
     libVersion = {
-      version =			"2023-06-24";
+      version =			"2023-08-15";
       libSources = {
-        symbols.rev =		"43456780d309682f6da4a6f14710355b06fc4c5d";
-        symbols.sha256 =	"1ql2w3q3dv13ascw8s0hzwda486763qma7i2m877jw3p78gjhldr";
+        symbols.rev =		"06d20a4b9f7e5375329194d141b096dcdcb7518a";
+        symbols.sha256 =	"1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf";
         templates.rev =		"867eef383a0f61015cb69677d5c632d78a2ea01a";
         templates.sha256 =	"1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
-        footprints.rev =	"6a59a2d3940dbab7b3e8254a5b9bf06cc5330301";
-        footprints.sha256 =	"0jlz0ln9vzj1av1fmw8ma8kfqlb8w0r9vrfng19bkc3cgh9lvh9x";
-        packages3d.rev =	"8a2c5c4c85457832f3320902456d066d29561806";
-        packages3d.sha256 =	"0dmssyhqd94d9wj8w7g7xjan560b2rwcs540sgl0rc77cw2jify8";
+        footprints.rev =	"5d2ac73ae72bfe8b8ee9eeb081a7851b2ca84c24";
+        footprints.sha256 =	"1qg016ysf0ddm3bd5bkjawlrc0z4r3zhmdjkqkwaaaydnpwp23qz";
+        packages3d.rev =	"f1dae9f95e59216f3b974f585e5b420db853da9e";
+        packages3d.sha256 =	"0ciri6lhnh0w9i00z167snj5acnjndi1rgmyls08p45zj4rma8y2";
       };
     };
   };
-- 
cgit 1.4.1


From 0cdbae7c34df97f6ba28bb45fd1a43f542f55e45 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <ludovicopiero@pm.me>
Date: Sat, 19 Aug 2023 13:39:46 +1000
Subject: vscode-extensions.ms-vscode.cpptools: 1.11.0 -> 1.17.3

---
 .../editors/vscode/extensions/ms-vscode.cpptools/default.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
index c51a86f888e42..1729256670c3f 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix
@@ -31,12 +31,12 @@
 let
   gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb";
 in
-vscode-utils.buildVscodeMarketplaceExtension rec {
+vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "cpptools";
     publisher = "ms-vscode";
-    version = "1.11.0";
-    sha256 = "c0725d3914aeb2515627691727455cc27e7a75031fa02ca957be02cc210bd64d";
+    version = "1.17.3";
+    sha256 = "sha256-4mKCBqUCOndKEfsJqTIsfwEt+0CZI8QAhBj3Y4+wKlg=";
     arch = "linux-x64";
   };
 
-- 
cgit 1.4.1


From cee0ecbea4495e8664a244dee7a7cbc7f422393a Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Sun, 20 Aug 2023 15:49:18 +0700
Subject: lightningcss: 1.21.5 → 1.21.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/tools/lightningcss/default.nix b/pkgs/development/tools/lightningcss/default.nix
index c31f80e27053f..56fb8e0a037c7 100644
--- a/pkgs/development/tools/lightningcss/default.nix
+++ b/pkgs/development/tools/lightningcss/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lightningcss";
-  version = "1.21.5";
+  version = "1.21.6";
 
   src = fetchFromGitHub {
     owner = "parcel-bundler";
     repo = "lightningcss";
     rev = "refs/tags/v${version}";
-    sha256 = "PEYrXykSdmLKhbhDgQNCQvp9wWos86WjWGZk3V84pew=";
+    sha256 = "esLPAKdqYdpB3/ffsV/NAmfjGU9G8y13f/59bWD0yR0=";
   };
 
-  cargoHash = "sha256-iCMG5Vfewotb5C0Gwtz/Py9B1hD28ssSy7C5ZiicFbU=";
+  cargoHash = "sha256-8k6BhhBQ8X08vW0a8x8v1YNwiXFrzvWxcL47XdaqWJs=";
 
   buildFeatures = [
     "cli"
-- 
cgit 1.4.1


From 322970626d5f9ec3a3e18d26ed9fc513f0f6fb99 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Aug 2023 10:51:06 +0200
Subject: python311Packages.django-ckeditor: add changelog to meta

---
 pkgs/development/python-modules/django-ckeditor/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix
index 93710f606d1e7..2a916868e169a 100644
--- a/pkgs/development/python-modules/django-ckeditor/default.nix
+++ b/pkgs/development/python-modules/django-ckeditor/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = " Django admin CKEditor integration";
     homepage = "https://github.com/django-ckeditor/django-ckeditor";
+    changelog = "https://github.com/django-ckeditor/django-ckeditor/blob/${version}/CHANGELOG.rst";
     license = licenses.bsd3;
     maintainers = with maintainers; [ onny ];
   };
-- 
cgit 1.4.1


From 4c9179371261aecad99dd26b8f2214c1ab1d2dec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Aug 2023 10:55:03 +0200
Subject: python311Packages.django-ckeditor: disable on unsupported Python
 releases

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

diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix
index 2a916868e169a..b741102f958e0 100644
--- a/pkgs/development/python-modules/django-ckeditor/default.nix
+++ b/pkgs/development/python-modules/django-ckeditor/default.nix
@@ -1,13 +1,14 @@
 { lib
 , buildPythonPackage
 , django
+, django-extensions
 , django-js-asset
 , fetchFromGitHub
+, pillow
 , python
-, setuptools-scm
-, django-extensions
+, pythonOlder
 , selenium
-, pillow
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
@@ -15,6 +16,8 @@ buildPythonPackage rec {
   version = "6.5.1";
   format = "pyproject";
 
+  disabled = pythonOlder "3.8";
+
   src = fetchFromGitHub {
     owner = "django-ckeditor";
     repo = pname;
-- 
cgit 1.4.1


From 9c13e0e042c875663ee1eafc47e7e300aec2d511 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 20 Aug 2023 10:56:02 +0200
Subject: python311Packages.django-ckeditor: 6.5.1 -> 6.7

Diff: https://github.com/django-ckeditor/django-ckeditor/compare/refs/tags/6.5.1...6.7

Changelog: https://github.com/django-ckeditor/django-ckeditor/blob/6.7/CHANGELOG.rst
---
 pkgs/development/python-modules/django-ckeditor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-ckeditor/default.nix b/pkgs/development/python-modules/django-ckeditor/default.nix
index b741102f958e0..b0df11aefd0c8 100644
--- a/pkgs/development/python-modules/django-ckeditor/default.nix
+++ b/pkgs/development/python-modules/django-ckeditor/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "django-ckeditor";
-  version = "6.5.1";
+  version = "6.7";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "django-ckeditor";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-Gk8mAG0WIMQZolaE1sRDmzSkfiNHi/BWiotEtIC4WLk=";
+    hash = "sha256-mZQ5s3YbumYmT0zRWPFIvzt2TbtDLvVcJjZVAwn31E8=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
-- 
cgit 1.4.1


From 49ea05466bdb1ed2ad3e6d4953907f872cd3ca18 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 19 Aug 2023 01:38:19 -0400
Subject: cartridges: 2.1.1 -> 2.2.1

Diff: https://github.com/kra-mo/cartridges/compare/v2.1.1...v2.2.1
---
 pkgs/applications/misc/cartridges/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/cartridges/default.nix b/pkgs/applications/misc/cartridges/default.nix
index ad95480c642e6..319d0a39be389 100644
--- a/pkgs/applications/misc/cartridges/default.nix
+++ b/pkgs/applications/misc/cartridges/default.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cartridges";
-  version = "2.1.1";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "kra-mo";
     repo = "cartridges";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jycTLKTHKhxd4t+3NB23Tf1oAvqiDHHsNmS6uLikgGA=";
+    sha256 = "sha256-LCO3GSRNi1alP9rRwBAfVAF49i4FmhsMOG9LW4PGB3s=";
   };
 
   buildInputs = [
-- 
cgit 1.4.1


From 9da128a8b39d875a371194f27e843b719b23722f Mon Sep 17 00:00:00 2001
From: Anselm Schüler <mail@anselmschueler.com>
Date: Fri, 18 Aug 2023 22:19:10 +0200
Subject: nvidia-persistenced: set mainProgram

---
 pkgs/os-specific/linux/nvidia-x11/persistenced.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
index febae91106444..03ad03a472d42 100644
--- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix
@@ -44,5 +44,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfreeRedistributable;
     platforms = nvidia_x11.meta.platforms;
     maintainers = with maintainers; [ abbradar ];
+    mainProgram = pname;
   };
 }
-- 
cgit 1.4.1


From eee12c67f9a91f9db4328fec9d03f7130df6ec63 Mon Sep 17 00:00:00 2001
From: toastal <toastal@posteo.net>
Date: Sun, 16 Jul 2023 01:09:19 +0700
Subject: sarabun-font: init at unstable-2018-08-24

This font is used in a lot of official documents and websites.
---
 pkgs/data/fonts/sarabun/default.nix | 41 +++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/data/fonts/sarabun/default.nix

diff --git a/pkgs/data/fonts/sarabun/default.nix b/pkgs/data/fonts/sarabun/default.nix
new file mode 100644
index 0000000000000..42bc349effe27
--- /dev/null
+++ b/pkgs/data/fonts/sarabun/default.nix
@@ -0,0 +1,41 @@
+{ lib, stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  pname = "sarabun";
+  version = "unstable-2018-08-24";
+
+  src = fetchFromGitHub {
+    owner = "cadsondemak";
+    repo = pname;
+    rev = "854cdbc6afa002ff8c2ce6aa7b86f99c7f71c9eb";
+    sha256 = "jcSQ72WK0GucZPgG7IQKrKzCOEbGgbQVl21RIKSF6A0=";
+  };
+
+  outputs = [ "out" "doc" ];
+
+  buildPhase = ''
+    mkdir -p $doc/${pname} $out/share/fonts/truetype
+
+    cp -r $src/OFL.txt $src/docs/* $doc/${pname}
+    cp $src/fonts/*.ttf $out/share/fonts/truetype
+  '';
+
+  meta = {
+    homepage = "https://cadsondemak.github.io/${pname}/";
+    description = "A slightly-condensed looped Thai and sans serif Latin typeface for communications";
+    longDescription = ''
+      The most popular typeface from the 13 fonts from SIPA Thailand’s National
+      fonts project. Sarabun was designed by Suppakit Chalermlarp to be a
+      serious text face. Great choice for a long reading formal text. This font
+      was selected by the royal Thai government to be the official typeface for
+      documentation purpose. It was also adopted by many private organizations
+      to be used as a communication font. Sarabun has a slightly condensed
+      proportion which fits perfectly with Thai legibility. It also carries a
+      neutral Thai traditional loop design which can easily fit in with any
+      occasion. Probably one of the most today’s familiar Thai loop typefaces.
+    '';
+    license = lib.licenses.ofl;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ toastal ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99556e5d08bc2..edc2fef850e2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29804,6 +29804,8 @@ with pkgs;
 
   sampradaya = callPackage ../data/fonts/sampradaya { };
 
+  sarabun-font = callPackage ../data/fonts/sarabun { };
+
   sarasa-gothic = callPackage ../data/fonts/sarasa-gothic { };
 
   savepagenow = callPackage ../tools/misc/savepagenow { };
-- 
cgit 1.4.1


From f2fa1b2c0c7d36d1ae45c7854be70761f951cb58 Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Sat, 19 Aug 2023 02:24:38 +0200
Subject: streamlink: 6.0.1 -> 6.1.0

https://github.com/streamlink/streamlink/releases/tag/6.1.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 873354ab897d2..896476c0580df 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.0.1";
+  version = "6.1.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0Qpil/bh2F+WaG0zv4yxEzx6e1fv3t9xed+nhT+NC7U=";
+    hash = "sha256-FwsgJ9TYBzCHxYlBwxrsOEy/mQH8tAH4JOkZrjh8Q4U=";
   };
 
   nativeCheckInputs = with python3Packages; [
-- 
cgit 1.4.1


From 7f5b5911bd4786b77788851cefe09bc426037d6b Mon Sep 17 00:00:00 2001
From: Mostly Void <7rat13@gmail.com>
Date: Sun, 20 Aug 2023 12:34:24 +0300
Subject: sqlpage: init at 0.9.5

---
 pkgs/servers/sqlpage/default.nix | 99 ++++++++++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 +
 2 files changed, 101 insertions(+)
 create mode 100644 pkgs/servers/sqlpage/default.nix

diff --git a/pkgs/servers/sqlpage/default.nix b/pkgs/servers/sqlpage/default.nix
new file mode 100644
index 0000000000000..2ca2f1bd8d75b
--- /dev/null
+++ b/pkgs/servers/sqlpage/default.nix
@@ -0,0 +1,99 @@
+{ lib
+, rustPlatform
+, fetchFromGitHub
+, pkg-config
+, sqlite
+, zstd
+, stdenv
+, darwin
+, fetchurl
+}:
+
+let
+  apexcharts = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js";
+    sha256 = "sha256-JvfrbG0Jkj1XzwMu28wweq4DTzHgRAQHmC5f0stdU5Q=";
+  };
+  tablerCss = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css";
+    sha256 = "sha256-vvqPe3OoUsri+/z6/s3a9LZ/u0tM07VNmVWopaXS3Uk=";
+  };
+  tablerVendorsCss = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css";
+    sha256 = "sha256-Pxz9YzwGJIUlHDNZMU9h7Lz/7qA/t0ehlRfC1P8wzxE=";
+  };
+  tablerJs = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js";
+    sha256 = "sha256-xnY4FSLoAEy0TVjo/xv488tAXOrI+hvXGvEVVQdMDk8=";
+  };
+  listJsFixed = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js";
+    sha256 = "sha256-mwE8YX5fgYlI9M7zCNDlPxT7pb7NJPkOyo1Y+4At85s=";
+  };
+  tablerIcons = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg";
+    sha256 = "sha256-xRHWlHNQraZpiRlgVswkfgN1qMrjQOtRYAq1N/DccgQ=";
+  };
+in
+
+rustPlatform.buildRustPackage rec {
+  pname = "sqlpage";
+  version = "0.9.5";
+
+  src = fetchFromGitHub {
+    owner = "lovasoa";
+    repo = "SQLpage";
+    rev = "v${version}";
+    hash = "sha256-6KJ3phhOf10S0EMdolUw3sdXm1G7yuF+Ii/AjdgBE+s=";
+  };
+
+  postPatch = ''
+    substituteInPlace sqlpage/apexcharts.js \
+      --replace '/* !include https://cdn.jsdelivr.net/npm/apexcharts@3.41.0/dist/apexcharts.min.js */' \
+      "$(cat ${apexcharts})"
+    substituteInPlace sqlpage/sqlpage.css \
+      --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css */' \
+      "$(cat ${tablerCss})"
+    substituteInPlace sqlpage/sqlpage.css \
+      --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler-vendors.min.css */' \
+      "$(cat ${tablerVendorsCss})"
+    substituteInPlace sqlpage/sqlpage.js \
+      --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js */' \
+      "$(cat ${tablerJs})"
+    substituteInPlace sqlpage/sqlpage.js \
+      --replace '/* !include https://cdn.jsdelivr.net/npm/list.js-fixed@2.3.2/dist/list.min.js */' \
+      "$(cat ${listJsFixed})"
+    substituteInPlace sqlpage/tabler-icons.svg \
+      --replace '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons@2.30.0/tabler-sprite.svg */' \
+      "$(cat ${tablerIcons})"
+  '';
+
+  cargoHash = "sha256-kJzBvZSh6jkSJ4um+KYp7fKklDPlvOgz5NQb7j99brw=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs =
+    [
+      sqlite
+      zstd
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.CoreFoundation
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];
+
+  env = {
+    ZSTD_SYS_USE_PKG_CONFIG = true;
+  };
+
+  meta = {
+    description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly";
+    homepage = "https://github.com/lovasoa/SQLpage";
+    changelog = "https://github.com/lovasoa/SQLpage/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dit7ya ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9ead406f346d8..8853c618905c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19963,6 +19963,8 @@ with pkgs;
 
   sqlmap = with python3Packages; toPythonApplication sqlmap;
 
+  sqlpage = callPackage ../servers/sqlpage { };
+
   src-cli = callPackage ../development/tools/misc/src-cli { };
 
   sselp = callPackage ../tools/X11/sselp{ };
-- 
cgit 1.4.1


From 9795cc83b9da2b2960dac25db1c025f977c22f51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 20 Aug 2023 09:37:05 +0000
Subject: python310Packages.chart-studio: 5.15.0 -> 5.16.1

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

diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index 5bcc3050497a9..1632d41fee67e 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "chart-studio";
-  version = "5.15.0";
+  version = "5.16.1";
 
   # chart-studio was split from plotly
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-H+p2fPBXn+VqrW63KkdmPn2xqxC9uAOzQUV1ruKEUSs=";
+    hash = "sha256-R94fmkz9cydOHKQbXMBR47OCdHHsR25uGiGszcr7AQQ=";
   };
 
   sourceRoot = "${src.name}/packages/python/chart-studio";
-- 
cgit 1.4.1


From 85b1a326f4d800aa27e313d9f37225c5681e60c0 Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 20 Aug 2023 17:46:06 +0800
Subject: podman-tui: 0.9.1 -> 0.11.0

---
 pkgs/applications/virtualization/podman-tui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/podman-tui/default.nix b/pkgs/applications/virtualization/podman-tui/default.nix
index 170e9656f0327..ce1a439b73cec 100644
--- a/pkgs/applications/virtualization/podman-tui/default.nix
+++ b/pkgs/applications/virtualization/podman-tui/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "podman-tui";
-  version = "0.9.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman-tui";
     rev = "v${version}";
-    hash = "sha256-0iI417mwmwph4wjuusaWY0kGtVsQy7i+eZvE1tYiINY=";
+    hash = "sha256-XaZgvy8b/3XUjO/GAQV6fxfqlR+eSMeosC7ugoYsEJM=";
   };
 
   vendorHash = null;
-- 
cgit 1.4.1