From daafc70f711124dcd71add0d5bdfefba15e079ed Mon Sep 17 00:00:00 2001
From: uima <uimataso@proton.me>
Date: Sun, 1 Sep 2024 19:03:19 +0800
Subject: [PATCH 01/55] tmuxPlugins.extrakto: unstable-2021-04-04 ->
 0-unstable-2024-08-26

The Tmux plugin extrakto has added clipboard support for Wayland via `wl-copy`, so I added the `wl-clipboard` package as a dependency. The way extrakto executes Python scripts has also changed, so I directly changed the shebang of the Python script to the Python3 path to make sure the Python path is correctly set.
---
 pkgs/misc/tmux-plugins/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 6343c5b1b9dd..2cb977572db7 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -216,22 +216,23 @@ in rec {
 
   extrakto = mkTmuxPlugin {
     pluginName = "extrakto";
-    version = "unstable-2021-04-04";
+    version = "0-unstable-2024-08-26";
     src = fetchFromGitHub {
       owner = "laktak";
       repo = "extrakto";
-      rev = "de8ac3e8a9fa887382649784ed8cae81f5757f77";
-      sha256 = "0mkp9r6mipdm7408w7ls1vfn6i3hj19nmir2bvfcp12b69zlzc47";
+      rev = "bf9e666f2a6a8172ebe99fff61b574ba740cffc2";
+      sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
     postInstall = ''
-    for f in extrakto.sh open.sh tmux-extrakto.sh; do
-      wrapProgram $target/scripts/$f \
-        --prefix PATH : ${with pkgs; lib.makeBinPath (
-        [ pkgs.fzf pkgs.python3 pkgs.xclip ]
-        )}
-    done
+      for f in extrakto.py extrakto_plugin.py; do
+        sed -i -e 's|#!/usr/bin/env python3|#!${pkgs.python3}/bin/python3|g' $target/$f
+      done
 
+      wrapProgram $target/scripts/open.sh \
+        --prefix PATH : ${ with pkgs; lib.makeBinPath
+          [ fzf xclip wl-clipboard ]
+        }
     '';
     meta = {
       homepage = "https://github.com/laktak/extrakto";

From 226b0bf800d99f9664cf8a1d9fa317b626381497 Mon Sep 17 00:00:00 2001
From: Asier Armenteros <me@exploitoverload.com>
Date: Thu, 26 Sep 2024 15:19:12 +0000
Subject: [PATCH 02/55] adcskiller: init at 0-unstable-2024-05-19

---
 pkgs/by-name/ad/adcskiller/package.nix | 46 ++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/ad/adcskiller/package.nix

diff --git a/pkgs/by-name/ad/adcskiller/package.nix b/pkgs/by-name/ad/adcskiller/package.nix
new file mode 100644
index 000000000000..210795136602
--- /dev/null
+++ b/pkgs/by-name/ad/adcskiller/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  coercer,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "adcskiller";
+  version = "0-unstable-2024-05-19";
+  format = "other";
+
+  src = fetchFromGitHub {
+    owner = "grimlockx";
+    repo = "ADCSKiller";
+    rev = "d74bfea91f24a09df74262998d60f213609b45c6";
+    hash = "sha256-ekyGDM9up3h6h21uLEstgn33x+KngX4tOLMhL4B6BA8=";
+  };
+
+  buildInputs = [
+    coercer
+  ];
+
+  propagatedBuildInputs = with python3.pkgs; [
+    ldap3
+    certipy
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -vD $pname.py $out/bin/$pname
+
+    substituteInPlace $out/bin/$pname --replace '"Coercer"' '"coercer"'
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Python-based tool designed to automate the process of discovering and exploiting Active Directory Certificate Services (ADCS) vulnerabilities";
+    homepage = "https://github.com/grimlockx/ADCSKiller";
+    license = licenses.mit;
+    maintainers = with maintainers; [ exploitoverload ];
+    mainProgram = "ADCSKiller";
+  };
+}

From a3b838beddab49d78547ef898100d4ccfb660f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Thu, 3 Oct 2024 07:48:55 +0200
Subject: [PATCH 03/55] local-ai: 2.20.1 -> 2.21.1

---
 pkgs/by-name/lo/local-ai/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix
index 8a1b4394d76a..c423a0d8c74f 100644
--- a/pkgs/by-name/lo/local-ai/package.nix
+++ b/pkgs/by-name/lo/local-ai/package.nix
@@ -15,7 +15,7 @@
   ffmpeg,
   cmake,
   pkg-config,
-  buildGoModule,
+  buildGo123Module,
   makeWrapper,
   ncurses,
   which,
@@ -147,8 +147,8 @@ let
         src = fetchFromGitHub {
           owner = "ggerganov";
           repo = "llama.cpp";
-          rev = "fc54ef0d1c138133a01933296d50a36a1ab64735";
-          hash = "sha256-o87EhrA2Oa98pwyb6GSUgwERY0/GWJiX7kvlxDv4zb4=";
+          rev = "70392f1f81470607ba3afef04aa56c9f65587664";
+          hash = "sha256-PgdH3Q4lM45a7aLeN/19i0Ld4NuTfzh/caYOSdooFao=";
           fetchSubmodules = true;
         };
         postPatch =
@@ -299,8 +299,8 @@ let
     src = fetchFromGitHub {
       owner = "ggerganov";
       repo = "whisper.cpp";
-      rev = "9e3c5345cd46ea718209db53464e426c3fe7a25e";
-      hash = "sha256-JOptyveuaKRLzeZ6GuB3A70IM7dk4we95g5o25XVXJI=";
+      rev = "0d2e2aed80109e8696791083bde3b58e190b7812";
+      hash = "sha256-HE9FLwLGVCggEF7VjWtdNhNnhe7c1RQp30spEIkK4TI=";
     };
 
     nativeBuildInputs = [
@@ -431,12 +431,12 @@ let
       stdenv;
 
   pname = "local-ai";
-  version = "2.20.1";
+  version = "2.21.1";
   src = fetchFromGitHub {
     owner = "go-skynet";
     repo = "LocalAI";
     rev = "v${version}";
-    hash = "sha256-FeZZC0Tg9JT9Yj0e27GOLSdHEtWl17AHK3j7epwPyY8=";
+    hash = "sha256-UlXBg/FKv/GNz2PCEVvzhILNdyQvTfkw157sNpunf2I=";
   };
 
   prepare-sources =
@@ -457,10 +457,10 @@ let
       ${cp} ${if with_tinydream then go-tiny-dream else go-tiny-dream.src} sources/go-tiny-dream
     '';
 
-  self = buildGoModule.override { stdenv = effectiveStdenv; } {
+  self = buildGo123Module.override { stdenv = effectiveStdenv; } {
     inherit pname version src;
 
-    vendorHash = "sha256-mDxp5frUIECSHKjxaJVqIP7mnIusvdT45Xlxc9+P5tE=";
+    vendorHash = "sha256-tb2nVUCUdaOWHpJz4zMqgfJ4PYUqGwV/0lj76n36sUg=";
 
     env.NIX_CFLAGS_COMPILE = lib.optionalString with_stablediffusion " -isystem ${opencv}/include/opencv4";
 

From bb3cc10c983e755ede7d2be507da4c134d6a1a2f Mon Sep 17 00:00:00 2001
From: mangoiv <contact@mangoiv.com>
Date: Thu, 3 Oct 2024 15:30:41 +0200
Subject: [PATCH 04/55] wire-desktop: do not force wayland platform in
 gappsWrapperArgs

---
 .../networking/instant-messengers/wire-desktop/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index 22bf7fb11e6c..2030a3f467b4 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -6,7 +6,7 @@
 , stdenv
 , lib
 , udev
-, wrapGAppsHook3
+, buildPackages
 , cpio
 , xar
 , libdbusmenu
@@ -97,7 +97,7 @@ let
       autoPatchelfHook
       dpkg
       makeWrapper
-      wrapGAppsHook3
+      (buildPackages.wrapGAppsHook3.override { makeWrapper = buildPackages.makeShellWrapper; })
     ];
 
     buildInputs = [
@@ -137,7 +137,7 @@ let
     ];
 
     preFixup = ''
-      gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --ozone-platform=wayland --enable-features=WaylandWindowDecorations}}")
+      gappsWrapperArgs+=(--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}")
     '';
 
     postFixup = ''

From 022df70a89153e3536ab8aec66018461947870e7 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 3 Oct 2024 13:43:44 -0400
Subject: [PATCH 05/55] makemkv: alphabetize params

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

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index cb568d07cbf3..e1a6162a8794 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,12 +1,12 @@
 {
+  autoPatchelfHook,
+  curl,
+  fetchurl,
+  ffmpeg,
   lib,
   mkDerivation,
-  fetchurl,
-  autoPatchelfHook,
-  pkg-config,
-  curl,
-  ffmpeg,
   openssl,
+  pkg-config,
   qtbase,
   zlib,
 

From ed9d88e5ee5dd5aa71c807c6f60c9c5cf58d3676 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 3 Oct 2024 14:04:25 -0400
Subject: [PATCH 06/55] makemkv: add updateScript

We exit early when the versions are the same to avoid unnecessary work
in the second `update-source-version` call that has
`--ignore-same-version`. That arg is necessary as otherwise it becomes a
no-op since the version was updated in the previous
`update-source-version` invocation.
---
 pkgs/applications/video/makemkv/default.nix | 32 +++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index e1a6162a8794..69e90d8c94e2 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -1,5 +1,6 @@
 {
   autoPatchelfHook,
+  common-updater-scripts,
   curl,
   fetchurl,
   ffmpeg,
@@ -8,6 +9,8 @@
   openssl,
   pkg-config,
   qtbase,
+  rubyPackages,
+  writeShellApplication,
   zlib,
 
   withJava ? true,
@@ -83,6 +86,35 @@ mkDerivation {
     runHook postInstall
   '';
 
+  passthru = {
+    srcs = {
+      inherit src_bin src_oss;
+    };
+    updateScript = lib.getExe (writeShellApplication {
+      name = "update-makemkv";
+      runtimeInputs = [
+        common-updater-scripts
+        curl
+        rubyPackages.nokogiri
+      ];
+      text = ''
+        get_version() {
+          # shellcheck disable=SC2016
+          curl --fail --silent 'https://forum.makemkv.com/forum/viewtopic.php?f=3&t=224' \
+            | nokogiri -e 'puts $_.css("head title").first.text.match(/\bMakeMKV (\d+\.\d+\.\d+) /)[1]'
+        }
+        oldVersion=${lib.escapeShellArg version}
+        newVersion=$(get_version)
+        if [[ $oldVersion == $newVersion ]]; then
+          echo "$0: New version same as old version, nothing to do." >&2
+          exit
+        fi
+        update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_bin
+        update-source-version makemkv "$newVersion" --source-key=passthru.srcs.src_oss --ignore-same-version
+      '';
+    });
+  };
+
   meta = with lib; {
     description = "Convert blu-ray and dvd to mkv";
     longDescription = ''

From 98e703bdef010382fc4b8c5f68566e2ae5d50847 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 4 Oct 2024 10:48:13 -0400
Subject: [PATCH 07/55] makemkv: 1.17.7 -> 1.17.8

---
 pkgs/applications/video/makemkv/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix
index 69e90d8c94e2..81a1160af205 100644
--- a/pkgs/applications/video/makemkv/default.nix
+++ b/pkgs/applications/video/makemkv/default.nix
@@ -18,21 +18,21 @@
 }:
 
 let
-  version = "1.17.7";
+  version = "1.17.8";
   # Using two URLs as the first one will break as soon as a new version is released
   src_bin = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz"
     ];
-    hash = "sha256-jFvIMbyVKx+HPMhFDGTjktsLJHm2JtGA8P/JZWaJUdA=";
+    hash = "sha256-jg9UdDDZr+7ZdseJtb7N+y7Prhyq3hLo4+EZpzRxcEE=";
   };
   src_oss = fetchurl {
     urls = [
       "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz"
       "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz"
     ];
-    hash = "sha256-di5VLUb57HWnxi3LfZfA/Z5qFRINDvb1oIDO4pHToO8=";
+    hash = "sha256-knUrzj/J+Xk5N1tg0q9iIXT+hqStkkjL3Yc2Yp5tvIo=";
   };
 in
 mkDerivation {
@@ -105,7 +105,7 @@ mkDerivation {
         }
         oldVersion=${lib.escapeShellArg version}
         newVersion=$(get_version)
-        if [[ $oldVersion == $newVersion ]]; then
+        if [[ $oldVersion == "$newVersion" ]]; then
           echo "$0: New version same as old version, nothing to do." >&2
           exit
         fi

From d915be9dd85daa546adf7aefda2a06c732ca3865 Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Sat, 5 Oct 2024 11:30:30 +0200
Subject: [PATCH 08/55] errands: 46.2.4 -> 46.2.5

---
 pkgs/by-name/er/errands/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/er/errands/package.nix b/pkgs/by-name/er/errands/package.nix
index 8886e2fa3d91..d983a41b29aa 100644
--- a/pkgs/by-name/er/errands/package.nix
+++ b/pkgs/by-name/er/errands/package.nix
@@ -17,7 +17,7 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "errands";
-  version = "46.2.4";
+  version = "46.2.5";
 
   pyproject = false;
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "mrvladus";
     repo = "Errands";
     rev = "refs/tags/${version}";
-    hash = "sha256-qk3CbxMj3PiuK7KkgtmH/A549mpNd70gYAW56P5nmu8=";
+    hash = "sha256-peIsTSmqjLHdmd5Xrqh6XKXjEbwhNE+FOH/pEY0QqdI=";
   };
 
   nativeBuildInputs = [

From 3b465e8a1e95da03f71d614889f0e536f1119c2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 6 Oct 2024 15:09:19 +0000
Subject: [PATCH 09/55] ssdfs-utils: 4.45 -> 4.46

---
 pkgs/tools/filesystems/ssdfs-utils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix
index 1f5127ae5ac4..38efbad0f2c3 100644
--- a/pkgs/tools/filesystems/ssdfs-utils/default.nix
+++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix
@@ -12,13 +12,13 @@ stdenv.mkDerivation {
   # as ssdfs-utils, not ssdfs-tools.
   pname = "ssdfs-utils";
   # The version is taken from `configure.ac`, there are no tags.
-  version = "4.45";
+  version = "4.46";
 
   src = fetchFromGitHub {
     owner = "dubeyko";
     repo = "ssdfs-tools";
-    rev = "f78ebf2a19eb338ae6858aa4f28133b117507df7";
-    hash = "sha256-RKVcXZakYDd7Vfd1w0pNs9/oMRzvzRr8VabpUBRcKc8=";
+    rev = "7528ee1d923115c1536d97b119fd2a0ee978b59e";
+    hash = "sha256-SL5BY+vLxRWRHkIp0hTQsi3w/fXRGe4OHpaapZFZBZo=";
   };
 
   strictDeps = true;

From 0d02f0bb4db6c3b5a54a9ef9ba1b4c7049ee8936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 6 Oct 2024 20:09:10 +0200
Subject: [PATCH 10/55] chrpath: 0.16 -> 0.17

https://codeberg.org/pere/chrpath/releases/tag/release-0.17

The project moved to Codeberg since Alioth shut down.
---
 pkgs/development/tools/misc/chrpath/default.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix
index 32cb4864a357..3b8bba72578e 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/pkgs/development/tools/misc/chrpath/default.nix
@@ -1,14 +1,18 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   pname = "chrpath";
-  version = "0.16";
+  version = "0.17";
 
   src = fetchurl {
-    url = "https://alioth-archive.debian.org/releases/${pname}/${pname}/${version}/${pname}-${version}.tar.gz";
-    sha256 = "0yvfq891mcdkf8g18gjjkn2m5rvs8z4z4cl1vwdhx6f2p9a4q3dv";
+    url = "https://codeberg.org/pere/chrpath/archive/release-${version}.tar.gz";
+    hash = "sha256-Sh2syR9OrxyMP3Z/2IHrH+OlCaINBii/l2DZCsEkvQw=";
   };
 
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
   meta = with lib; {
     description = "Command line tool to adjust the RPATH or RUNPATH of ELF binaries";
     mainProgram = "chrpath";
@@ -17,7 +21,7 @@ stdenv.mkDerivation rec {
       binary. The rpath, or runpath if it is present, is where the runtime
       linker should look for the libraries needed for a program.
     '';
-    homepage = "https://tracker.debian.org/pkg/chrpath";
+    homepage = "https://codeberg.org/pere/chrpath";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];

From 232b5613c98abf24ecd7e4d65e9b5ed8f57edbb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2024 01:21:03 +0000
Subject: [PATCH 11/55] darcs-to-git: 0-unstable-2024-02-20 ->
 0-unstable-2024-09-30

---
 pkgs/by-name/da/darcs-to-git/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/darcs-to-git/package.nix b/pkgs/by-name/da/darcs-to-git/package.nix
index e3abd5d2e484..8ab4a7d63f85 100644
--- a/pkgs/by-name/da/darcs-to-git/package.nix
+++ b/pkgs/by-name/da/darcs-to-git/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "darcs-to-git";
-  version = "0-unstable-2024-02-20";
+  version = "0-unstable-2024-09-30";
 
   src = fetchFromGitHub {
     owner = "purcell";
     repo = "darcs-to-git";
-    rev = "2a31a95726658fef1b48e1f0010928fc2a69d5bf";
-    hash = "sha256-ep36lAYUnO3kX0ff3PxrBHog5CIGsJaERiNN5DmmAQI=";
+    rev = "9d556cb7daa06b9de3cb97487b98bab2869a7fe7";
+    hash = "sha256-0GKSzqgJgi1w4uZOqixp/F6i7hK2ZmuQI0px8FEDFXM=";
   };
 
   patchPhase =

From 066aa5b587c9fdc67c2c1134dc3ec0eddffa7d3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2024 14:51:01 +0000
Subject: [PATCH 12/55] protoc-gen-go: 1.34.2 -> 1.35.1

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

diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix
index 52a54fbeeaa1..a80430e5a68f 100644
--- a/pkgs/development/tools/protoc-gen-go/default.nix
+++ b/pkgs/development/tools/protoc-gen-go/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "protoc-gen-go";
-  version = "1.34.2";
+  version = "1.35.1";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "protobuf-go";
     rev = "v${version}";
-    hash = "sha256-467+AhA3tADBg6+qbTd1SvLW+INL/1QVR8PzfAMYKFA=";
+    hash = "sha256-SYSGC7LtKHdGuEQnjTzqRo8NxyxYXs4nMMflztRwJok=";
   };
 
   vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E=";

From 34d4a3a83efa7ec5a7c345135ad06004d3f0fdd7 Mon Sep 17 00:00:00 2001
From: Leandro Emmanuel Reina Kiperman <leandro@kip93.net>
Date: Wed, 9 Oct 2024 00:53:00 +0200
Subject: [PATCH 13/55] python311Packages.flask-simpleldap: init at 2.0.0

---
 .../flask-simpleldap/default.nix              | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/flask-simpleldap/default.nix

diff --git a/pkgs/development/python-modules/flask-simpleldap/default.nix b/pkgs/development/python-modules/flask-simpleldap/default.nix
new file mode 100644
index 000000000000..9ba36f1b4d25
--- /dev/null
+++ b/pkgs/development/python-modules/flask-simpleldap/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  flask,
+  python-ldap,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "flask-simpleldap";
+  version = "2.0.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "alexferl";
+    repo = "flask-simpleldap";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-WcedTtEwaSc3BYFE3L0FZrtKKdbwk7r3qSPP8evtYlc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+  dependencies = [
+    flask
+    python-ldap
+  ];
+
+  pythonImportsCheck = [ "flask_simpleldap" ];
+
+  meta = with lib; {
+    description = "LDAP authentication extension for Flask";
+    homepage = "https://github.com/alexferl/flask-simpleldap";
+    license = licenses.mit;
+    maintainers = with maintainers; [ kip93 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ec548731554..2fade755f555 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4569,6 +4569,8 @@ self: super: with self; {
 
   flask-silk = callPackage ../development/python-modules/flask-silk { };
 
+  flask-simpleldap = callPackage ../development/python-modules/flask-simpleldap { };
+
   flask-sock = callPackage ../development/python-modules/flask-sock { };
 
   flask-socketio = callPackage ../development/python-modules/flask-socketio { };

From b7faa00c01d4724c2824744667ed4b4a218f0bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 01:59:28 +0000
Subject: [PATCH 14/55] upbound: 0.33.0 -> 0.34.0

---
 pkgs/by-name/up/upbound/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/up/upbound/package.nix b/pkgs/by-name/up/upbound/package.nix
index 076761cf49ff..9bf2b100c910 100644
--- a/pkgs/by-name/up/upbound/package.nix
+++ b/pkgs/by-name/up/upbound/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "upbound";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "up";
     rev = "v${version}";
-    hash = "sha256-PJMOR/XpWqtSIb3x61o0iLwETCHA5e07etmEZYQtzXw=";
+    hash = "sha256-npWCGR0/iXAF7efreWhpwqboXJ24lqk5TPaB7glwEFI=";
   };
 
-  vendorHash = "sha256-WLRXj4G49JEbQc2aFAjLLCpQrDhN94jazWxfM70hHqs=";
+  vendorHash = "sha256-f/RPyjrC5FsOjC5wnBtqEbLeVX7VeiVYFpRXcQ2lTc4=";
 
   subPackages = [ "cmd/docker-credential-up" "cmd/up" ];
 

From b87b8119db5f1d231de118dd973530f67c12f127 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 04:08:54 +0000
Subject: [PATCH 15/55] weaviate: 1.26.4 -> 1.26.6

---
 pkgs/servers/search/weaviate/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/search/weaviate/default.nix b/pkgs/servers/search/weaviate/default.nix
index ca7f8e33c7ec..788e2ddecb40 100644
--- a/pkgs/servers/search/weaviate/default.nix
+++ b/pkgs/servers/search/weaviate/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.26.4";
+  version = "1.26.6";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-JnzQ+B5zxbKZQ/jzOsD7r58f+TaCivN4BTJyNImi9xE=";
+    hash = "sha256-Vi8jcWfG3MvzXDcVFd6wC+KEpPQUL1uBCk7GJwyO0gU=";
   };
 
-  vendorHash = "sha256-QwB97LNUFK8yuKK8JSy1uH2hu+8ZAlvc+9VlTIld83U=";
+  vendorHash = "sha256-HzEnt/eagDw6/7HV0MRMQDcp56mLv1kE9HCfBouxDRs=";
 
   subPackages = [ "cmd/weaviate-server" ];
 

From 30ab7bf05ec687bf525fab9ab7c80462a9401003 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 04:49:05 +0000
Subject: [PATCH 16/55] bngblaster: 0.9.7 -> 0.9.8

---
 pkgs/by-name/bn/bngblaster/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 5fb86282c392..cda862c0bfd6 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.7";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-h4m/tPiLFRi3Dwh6QPmnCCZR4XNOZaz9xoDhOXAcIEQ=";
+    hash = "sha256-6pOkFu5BQHyESGW4Yxq5QjUG+fZOGxT2OAnglrav6fE=";
   };
 
   nativeBuildInputs = [ cmake ];

From 1799029f279d4d623d79ad1bb6fa431687386e98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 07:25:56 +0000
Subject: [PATCH 17/55] dracula-theme: 4.0.0-unstable-2024-09-24 ->
 4.0.0-unstable-2024-10-03

---
 pkgs/data/themes/dracula-theme/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/dracula-theme/default.nix b/pkgs/data/themes/dracula-theme/default.nix
index 29d3e6a2cda2..67f472323aa1 100644
--- a/pkgs/data/themes/dracula-theme/default.nix
+++ b/pkgs/data/themes/dracula-theme/default.nix
@@ -2,7 +2,7 @@
 
 let
   themeName = "Dracula";
-  version = "4.0.0-unstable-2024-09-24";
+  version = "4.0.0-unstable-2024-10-03";
 in
 stdenvNoCC.mkDerivation {
   pname = "dracula-theme";
@@ -11,8 +11,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "dracula";
     repo = "gtk";
-    rev = "f2d2ea560a83ebdef6734b70dd9683272b47894d";
-    hash = "sha256-/xgvlcMC4AHITy15dVHhdTIeu1mcA6Luhdanpr1as4Q=";
+    rev = "b5b7f3aed7060e14b848ca449a1d575c872f4e73";
+    hash = "sha256-hsWyvmxEBJKdNem+eYbGF+UBopP3p90SdFNP7wBuE74=";
   };
 
   propagatedUserEnvPkgs = [

From 69bc7c632f1331685166c2b15cd53fe3a11a299c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 12:58:51 +0000
Subject: [PATCH 18/55] fh: 0.1.17 -> 0.1.18

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

diff --git a/pkgs/tools/nix/fh/default.nix b/pkgs/tools/nix/fh/default.nix
index bc02bac41d58..ba745f60b6f8 100644
--- a/pkgs/tools/nix/fh/default.nix
+++ b/pkgs/tools/nix/fh/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fh";
-  version = "0.1.17";
+  version = "0.1.18";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
     rev = "v${version}";
-    hash = "sha256-+Q7mZ2uzMjShKWVvYLz9qH8g0w8oP93lNlJiYxFFoAI=";
+    hash = "sha256-McfJXbr/oadsfQV7hzB6sEMy9sfXthHcjsbOiQs2+rU=";
   };
 
-  cargoHash = "sha256-DJOj9EJswnPIm66u585k4ZWSi6Su/naQ+myQuLiGLFE=";
+  cargoHash = "sha256-PGXd4spD2gNyQIloVZuhWZ1VQtacXPLMCQiBekZbEp4=";
 
   nativeBuildInputs = [
     installShellFiles

From 12635d1918704bde5357279c80e1bf32b26cbd5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 9 Oct 2024 17:09:07 +0200
Subject: [PATCH 19/55] chrpath: clarify license

https://codeberg.org/pere/chrpath/issues/1
---
 pkgs/development/tools/misc/chrpath/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix
index 3b8bba72578e..f4dc6d9148be 100644
--- a/pkgs/development/tools/misc/chrpath/default.nix
+++ b/pkgs/development/tools/misc/chrpath/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       linker should look for the libraries needed for a program.
     '';
     homepage = "https://codeberg.org/pere/chrpath";
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };

From 6973e29a9b521bd83b2adfc1fb5997a519c6e832 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 16:05:28 +0000
Subject: [PATCH 20/55] prometheus-pgbouncer-exporter: 0.9.0 -> 0.10.0

---
 pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
index 90ffdb48f0d1..4bb0c595162f 100644
--- a/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/pgbouncer-exporter.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pgbouncer-exporter";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "prometheus-community";
     repo = "pgbouncer_exporter";
     rev = "v${version}";
-    hash = "sha256-fKoyRHYLwVefsZ014eazVCD5B9eV8/CUkuHE4mbUqVo=";
+    hash = "sha256-9Sa9BimyKwYTjh0ELlDlUS3kc5gnkK1i7xiO84vVPYA=";
   };
 
-  vendorHash = "sha256-IxmxfF9WsF0Hbym4G0UecyW8hAvucoaCFUE1kXUljJs=";
+  vendorHash = "sha256-PjoS56MdYpDOuSTHHo5lGL9KlWlu3ycA08qim8jrnSU=";
 
   meta = with lib; {
     description = "Prometheus exporter for PgBouncer";

From 5035c8338ae53bdc7bbe499b4387884382082bb2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 17:15:44 +0000
Subject: [PATCH 21/55] python312Packages.ncclient: 0.6.15 -> 0.6.16

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

diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix
index 11f3424083cb..69b24ff3e9d5 100644
--- a/pkgs/development/python-modules/ncclient/default.nix
+++ b/pkgs/development/python-modules/ncclient/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "ncclient";
-  version = "0.6.15";
+  version = "0.6.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-mdFoSTUS4QhY05rY0fqKTpRQTR9oLvOMTVr4kWJbiUQ=";
+    hash = "sha256-IMCMlGt5/G4PRz525ZomsovU55vBnGhHndBtC7ym6lc=";
   };
 
   propagatedBuildInputs = [

From 4b7573f17fa2052e7b17da4ab0218143ab532a24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 17:23:38 +0000
Subject: [PATCH 22/55] python312Packages.shippinglabel: 2.0.0 -> 2.1.0

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

diff --git a/pkgs/development/python-modules/shippinglabel/default.nix b/pkgs/development/python-modules/shippinglabel/default.nix
index c523714e4ff2..c0ae4fa635e9 100644
--- a/pkgs/development/python-modules/shippinglabel/default.nix
+++ b/pkgs/development/python-modules/shippinglabel/default.nix
@@ -11,12 +11,12 @@
 }:
 buildPythonPackage rec {
   pname = "shippinglabel";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hZYsK+IX/a4bZMtD+hMEYDnwgqhdkkEHkG0MPkAgy20=";
+    hash = "sha256-XwE/b7TQ7i+2hMSdZJhyVjl2lieweZLbA6PXcSJTnFE=";
   };
 
   build-system = [ setuptools ];

From 4ce49bc6b2654b591667773f1d792f666d88e348 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 17:24:02 +0000
Subject: [PATCH 23/55] redis-plus-plus: 1.3.12 -> 1.3.13

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

diff --git a/pkgs/development/libraries/redis-plus-plus/default.nix b/pkgs/development/libraries/redis-plus-plus/default.nix
index bd40330194a7..e2ead0137228 100644
--- a/pkgs/development/libraries/redis-plus-plus/default.nix
+++ b/pkgs/development/libraries/redis-plus-plus/default.nix
@@ -8,13 +8,13 @@ assert enableShared || enableStatic;
 
 stdenv.mkDerivation rec {
   pname = "redis-plus-plus";
-  version = "1.3.12";
+  version = "1.3.13";
 
   src = fetchFromGitHub {
     owner = "sewenew";
     repo = "redis-plus-plus";
     rev = version;
-    sha256 = "sha256-RI7lLvRmS5BglvwRQ8OzSpYIyaKkf/DKrJ3fn1mWYfs=";
+    sha256 = "sha256-bZxs1qnVAkh0BO0CyP1zL/+K3NZYmFy9ryg1QcRLcmg=";
   };
 
   patches = [

From b450a95d705bd26e9aa4b98ad54e6a69de9eefd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 17:25:28 +0000
Subject: [PATCH 24/55] python312Packages.scikit-posthocs: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/scikit-posthocs/default.nix b/pkgs/development/python-modules/scikit-posthocs/default.nix
index 7072fb03234a..2a25488c1557 100644
--- a/pkgs/development/python-modules/scikit-posthocs/default.nix
+++ b/pkgs/development/python-modules/scikit-posthocs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-posthocs";
-  version = "0.9.0";
+  version = "0.9.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "maximtrp";
     repo = "scikit-posthocs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sRop5DKakrZEBswzTvumn68wKqU15zM5aCLfZ/PdsFg=";
+    hash = "sha256-ssaTd+A7lzd4tlKHGkgKixi3XjZLQBcPs6UOEzX/hrk=";
   };
 
   nativeBuildInputs = [

From e29ccb42f6855cd712d6829c434def9f78c87d85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 18:38:11 +0000
Subject: [PATCH 25/55] python312Packages.nox: 2024.04.15 -> 2024.10.09

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

diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index 2f60f1199180..b56c256ea526 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "nox";
-  version = "2024.04.15";
+  version = "2024.10.09";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "wntrblm";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-PagZR2IdS1gS/ukl4b0Al9sdEsFnFwP8oy0eOGKJHMs=";
+    hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
   };
 
   nativeBuildInputs = [ hatchling ];

From 0f4e523cd730c80a04de9a16fd8b99cce1a13e03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 18:40:00 +0000
Subject: [PATCH 26/55] python312Packages.hcloud: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index f3e0ae54c4ab..eb9be89cd857 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-3Bcvj+VkIdoU2AiGtbkgwrqwgb8RjHMqQxjBf03iWG4=";
+    hash = "sha256-6QHSmLES8dLUVo2DAPPOGd/ngr3vP/nEFwJqgeFu6VY=";
   };
 
   build-system = [ setuptools ];

From 50ac9105509fb98f44a0f9714e3204f820d39f45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 19:05:07 +0000
Subject: [PATCH 27/55] python312Packages.yosys: 0.45 -> 0.46

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

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index 43e941824fa7..cdb23470ca99 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -75,13 +75,13 @@ let
 
 in stdenv.mkDerivation (finalAttrs: {
   pname   = "yosys";
-  version = "0.45";
+  version = "0.46";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo  = "yosys";
     rev   = "refs/tags/${finalAttrs.version}";
-    hash  = "sha256-NF4NQ7mCfARuMsMTJVBbJk39puJ8+D41woYEPgthfUI=";
+    hash  = "sha256-OnSKsX5G8Tc6AMFCmuWg6AekJvvG+K5Zr5rZZll+c/o=";
     fetchSubmodules = true;
     leaveDotGit = true;
     postFetch = ''

From 143224d4e5a700e0fac0c226af7563bf7b7b2924 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 19:54:43 +0000
Subject: [PATCH 28/55] python312Packages.uxsim: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index 15d10eb5fe62..56800a5199b7 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -17,14 +17,14 @@
 }:
 buildPythonPackage rec {
   pname = "uxsim";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+nJsP/XAp6F7LZQI559rI3OCFnMTXJ4eFKEEJyEDHDg=";
+    hash = "sha256-FZ8eGA3sSKaUqAd+jTlIIZDeEoXeqdpsSgJ+ZHuWyJM=";
   };
 
   patches = [ ./add-qt-plugin-path-to-env.patch ];

From ccf065264d13462242805f1283dfb812ff24a942 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 19:56:03 +0000
Subject: [PATCH 29/55] sqldef: 0.17.19 -> 0.17.20

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

diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix
index 5b357fb11ee6..0ace1d81a2a5 100644
--- a/pkgs/development/tools/sqldef/default.nix
+++ b/pkgs/development/tools/sqldef/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "0.17.19";
+  version = "0.17.20";
 
   src = fetchFromGitHub {
     owner = "k0kubun";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-euIP6ev1qc+75MA9vlTZHY7LT03AM8hya+sPWohvCWI=";
+    hash = "sha256-r175nhzPLoU4CBjEiktsQIuQTgRJ64uW1MhDKHEDR+4=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-+5vfQoTRCbwY/Ydq21VG/xt6CeOWHIup8bxWI/2v24A=";
+  vendorHash = "sha256-reYZUuZTNeNFrbrDQPVXwx+UuBGdEmTdSowbneZc/No=";
 
   ldflags = [ "-s" "-w" "-X main.version=${version}" ];
 

From 570454c2954243d624b2e29854ed076ae161a049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Ci=C4=99=C5=BCarkiewicz?= <dpc@dpc.pw>
Date: Wed, 9 Oct 2024 14:24:06 -0700
Subject: [PATCH 30/55] nixos/fedimintd: make nginx url forwarding path
 configurable

Some users would like to customize it.

Also, in current versions of fedimint p2p port in the URL
must be set, due to some bug, so update the example value
to reflect that.
---
 nixos/modules/services/networking/fedimintd.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/fedimintd.nix b/nixos/modules/services/networking/fedimintd.nix
index 1ede3a50553d..c7d93854e21a 100644
--- a/nixos/modules/services/networking/fedimintd.nix
+++ b/nixos/modules/services/networking/fedimintd.nix
@@ -63,7 +63,7 @@ let
           };
           url = mkOption {
             type = types.str;
-            example = "fedimint://p2p.myfedimint.com";
+            example = "fedimint://p2p.myfedimint.com:8173";
             description = ''
               Public address for p2p connections from peers
             '';
@@ -159,6 +159,12 @@ let
             example = "api.myfedimint.com";
             description = "Public domain of the API address of the reverse proxy/tls terminator.";
           };
+          path = mkOption {
+            type = types.str;
+            example = "/";
+            default = "/ws/";
+            description = "Path to host the API on and forward to the daemon's api port";
+          };
           config = mkOption {
             type = types.submodule (
               recursiveUpdate (import ../web-servers/nginx/vhost-options.nix {
@@ -286,8 +292,7 @@ in
               # overriden by default value from vhost-options.nix
               enableACME = mkOverride 99 true;
               forceSSL = mkOverride 99 true;
-              # Currently Fedimint API only support JsonRPC on `/ws/` endpoint, so no need to handle `/`
-              locations."/ws/" = {
+              locations.${cfg.nginx.path} = {
                 proxyPass = "http://127.0.0.1:${toString cfg.api.port}/";
                 proxyWebsockets = true;
                 extraConfig = ''

From 974bb3484e318693ceb63fe84e3a7cbc0c0d7369 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 22:05:51 +0000
Subject: [PATCH 31/55] lomiri.mediascanner2: 0.115 -> 0.116

---
 pkgs/desktops/lomiri/services/mediascanner2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/mediascanner2/default.nix b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
index b8d562367e61..28dc57c3d31b 100644
--- a/pkgs/desktops/lomiri/services/mediascanner2/default.nix
+++ b/pkgs/desktops/lomiri/services/mediascanner2/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mediascanner2";
-  version = "0.115";
+  version = "0.116";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/mediascanner2";
     rev = finalAttrs.version;
-    hash = "sha256-UEwFe65VB2asxQhuWGEAVow/9rEvZxry4dd2/60fXN4=";
+    hash = "sha256-aRNT3DSPxz/vf6gqipf5Qc5zyDGFMHWONevAslwOrCY=";
   };
 
   outputs = [

From 04a34cb15ab4a245766cc36027d3b88f80c169f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?=
 <ereslibre@ereslibre.es>
Date: Thu, 10 Oct 2024 01:16:53 +0200
Subject: [PATCH 32/55] wasmtime: 25.0.1 -> 25.0.2

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

diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix
index 73d2e4f99e5d..e5894476e9f8 100644
--- a/pkgs/development/interpreters/wasmtime/default.nix
+++ b/pkgs/development/interpreters/wasmtime/default.nix
@@ -2,19 +2,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wasmtime";
-  version = "25.0.1";
+  version = "25.0.2";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-l0tkEV4roec3xK57oXV49ofNdpuZ+hCuzde6YazYPZc=";
+    hash = "sha256-5Wu5gK3g7nkMDwUGkwnx400PRkb0jknX/GKeEAJ9Vgg=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
-  cargoHash = "sha256-0pt3wZlhLuN0E6f6AU0uC0qmkuII2OXxUTChuzQjvqI=";
+  cargoHash = "sha256-jLdVxWjfJSkfHcmw5i02gXI2uEUB7KxiEfdFtfc020U=";
   cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];
 
   outputs = [ "out" "dev" ];

From 5ef3f5f41df78377b166a65ccde0f6e4134c4b4c Mon Sep 17 00:00:00 2001
From: redyf <mateusalvespereira7@gmail.com>
Date: Wed, 9 Oct 2024 21:41:17 -0300
Subject: [PATCH 33/55] devbox: 0.13.3 -> 0.13.4

https://github.com/jetify-com/devbox/releases/tag/0.13.4
---
 pkgs/development/tools/devbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index 6615bcb71a50..5df6117abedf 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "devbox";
-  version = "0.13.3";
+  version = "0.13.4";
 
   src = fetchFromGitHub {
     owner = "jetpack-io";
     repo = pname;
     rev = version;
-    hash = "sha256-A1dl5bQ7+Qe+MxzplQ2duGqWwgZYHd6M2MQUPPFlx14=";
+    hash = "sha256-+3AKBhxf1m6cBNtEx8xmUmJ2PUk0LNPaS+cZhsXJoTs=";
   };
 
   ldflags = [

From 16486e49f626ad11f02f901561ba65ade9411b90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 03:57:55 +0000
Subject: [PATCH 34/55] python312Packages.xknxproject: 3.8.0 -> 3.8.1

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

diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix
index 1973c26c0620..5e1e58649e1b 100644
--- a/pkgs/development/python-modules/xknxproject/default.nix
+++ b/pkgs/development/python-modules/xknxproject/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xknxproject";
-  version = "3.8.0";
+  version = "3.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "XKNX";
     repo = "xknxproject";
     rev = "refs/tags/${version}";
-    hash = "sha256-TiFeyXgu7JKrCEzGCnamguWEP+HN4DRzYOErmdlWZFY=";
+    hash = "sha256-iuW83gKDJTgFkfSW32OPOuwyGLyFoZGKQGUDJkVUGAM=";
   };
 
   build-system = [ setuptools ];

From 440ab7ee9c4d9c3d816af5edfb4813a8827bd3a5 Mon Sep 17 00:00:00 2001
From: ozwaldorf <self@ossian.dev>
Date: Thu, 10 Oct 2024 00:18:23 -0400
Subject: [PATCH 35/55] lutgen: 0.11.0 -> 0.11.1

---
 pkgs/by-name/lu/lutgen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index 5c1cd965ef22..2467ed05c35a 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lutgen";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "ozwaldorf";
     repo = "lutgen-rs";
     rev = "v${version}";
-    hash = "sha256-ybaapL9OUUQ+sO8P0JH1MuxCFmTihKp9gXJpM7KLY7U=";
+    hash = "sha256-l5fhQr57BJ7PWEdGRtgGtmjZxazq8nfKwC7zq7UVlJc=";
   };
 
-  cargoHash = "sha256-Fxecnq7QKcDe6aAsKj9uye3sFdfkgFEKYmdqnvQDiAQ=";
+  cargoHash = "sha256-lu14+bHL2ur8lXyjMEhaS86/JBAEFISdCjfiB0oYsPc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bb3f76b4467e2cc7e4149babbb41ce6786e2ebc0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 04:19:02 +0000
Subject: [PATCH 36/55] python312Packages.conda-package-handling: 2.3.0 ->
 2.4.0

---
 .../python-modules/conda-package-handling/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/conda-package-handling/default.nix b/pkgs/development/python-modules/conda-package-handling/default.nix
index 75ccc6039fff..2c5563d2ea1f 100644
--- a/pkgs/development/python-modules/conda-package-handling/default.nix
+++ b/pkgs/development/python-modules/conda-package-handling/default.nix
@@ -7,12 +7,12 @@
 }:
 buildPythonPackage rec {
   pname = "conda-package-handling";
-  version = "2.3.0";
+  version = "2.4.0";
   src = fetchFromGitHub {
     owner = "conda";
     repo = "conda-package-handling";
     rev = "refs/tags/${version}";
-    hash = "sha256-Mo3qCNA/NtVtrsJmJ96ST6GMt2basSh5KlFBkrJ4pGE=";
+    hash = "sha256-AvuxHl3gUH7zIyMhZGeXqpMy0rJ99wj1/SrdTvlaX9A=";
   };
 
   pyproject = true;

From 8eab3789cb6d8f491ebb67477d3570282bf2ecb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 04:19:53 +0000
Subject: [PATCH 37/55] picard-tools: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index e8786fe4b9c0..5435503e7f14 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "picard-tools";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "sha256-4lj6Lj9fphzWeZ7I4HP0mpX73OrxY9imCXGyYZuG+kE=";
+    sha256 = "sha256-WIGadmBka3SzTigvXU0hyNuuoi3e/5bjJYdV2voPhtw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a86c899e3152a3aea1b8b79c6272295712f6f503 Mon Sep 17 00:00:00 2001
From: ozwaldorf <self@ossian.dev>
Date: Thu, 10 Oct 2024 00:41:44 -0400
Subject: [PATCH 38/55] lutgen: 0.11.1 -> 0.11.2

---
 pkgs/by-name/lu/lutgen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lu/lutgen/package.nix b/pkgs/by-name/lu/lutgen/package.nix
index 2467ed05c35a..151b01cb7bda 100644
--- a/pkgs/by-name/lu/lutgen/package.nix
+++ b/pkgs/by-name/lu/lutgen/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lutgen";
-  version = "0.11.1";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "ozwaldorf";
     repo = "lutgen-rs";
     rev = "v${version}";
-    hash = "sha256-l5fhQr57BJ7PWEdGRtgGtmjZxazq8nfKwC7zq7UVlJc=";
+    hash = "sha256-jmMVeDDVb/TuxulDYj+8y4Kl42EJTAWb3tAsanfWduE=";
   };
 
-  cargoHash = "sha256-lu14+bHL2ur8lXyjMEhaS86/JBAEFISdCjfiB0oYsPc=";
+  cargoHash = "sha256-cT999TukdiKmmNUpK7SE1uiuNoLhmjdtz/2cYXFC6dk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 04ba5bbfa7156866822c395a6a9661a6c0f0baa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 05:04:34 +0000
Subject: [PATCH 39/55] python312Packages.plotly: 5.24.0 -> 5.24.1

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

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 8bd265181aa1..b520d99545c4 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "5.24.0";
+  version = "5.24.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-frSUybQxst4wG8g8U43Nay9dYCUXuR3dBealwPVyFdI=";
+    hash = "sha256-ONuX5/GlirPF8+7bZtib1Xsv5llcXcSelFfGyeTc5L8=";
   };
 
   sourceRoot = "${src.name}/packages/python/plotly";

From d712d4c688b10df82dc6aa3862383ad50778512e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 05:04:37 +0000
Subject: [PATCH 40/55] python312Packages.conda-package-streaming: 0.10.0 ->
 0.11.0

---
 .../python-modules/conda-package-streaming/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/conda-package-streaming/default.nix b/pkgs/development/python-modules/conda-package-streaming/default.nix
index 462660cce15f..ef4b6f3fa9d2 100644
--- a/pkgs/development/python-modules/conda-package-streaming/default.nix
+++ b/pkgs/development/python-modules/conda-package-streaming/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "conda-package-streaming";
-  version = "0.10.0";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "conda";
     repo = "conda-package-streaming";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3TSjVISnUTReyKtt58RXCD30VodhiDDfJssM3PkP5Yk=";
+    hash = "sha256-Y0moewJROhybbyo263akbO20Q6As245ULKJikkWU4XE=";
   };
 
   build-system = [ flit-core ];

From a22dbde14e826c9ed0f84acf3b1352ccad3fdc0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 07:33:58 +0000
Subject: [PATCH 41/55] jumppad: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix
index ee521f6b5260..4ededb4c2832 100644
--- a/pkgs/tools/virtualization/jumppad/default.nix
+++ b/pkgs/tools/virtualization/jumppad/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "jumppad";
-  version = "0.14.0";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "jumppad-labs";
     repo = "jumppad";
     rev = version;
-    hash = "sha256-f9V3dws4zvjh3H61FWNv9r/G9EplWR0aA2af2EdjhBs=";
+    hash = "sha256-UO1a8CoHLNoo74zJkzgSlTkB7XWWHWu2EUiqCvLOQj8=";
   };
   vendorHash = "sha256-S4SyuidH8sxJbuG7yHgSP/iHcuP1h5EHaW8X6gG4GNw=";
 

From d387d76e955228dcffb9749c1d07e0217546d544 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 10 Oct 2024 07:34:17 +0000
Subject: [PATCH 42/55] devspace: 6.3.13 -> 6.3.14

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

diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix
index 33e37cb77e73..01da33fd7486 100644
--- a/pkgs/development/tools/misc/devspace/default.nix
+++ b/pkgs/development/tools/misc/devspace/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "devspace";
-  version = "6.3.13";
+  version = "6.3.14";
 
   src = fetchFromGitHub {
     owner = "devspace-sh";
     repo = "devspace";
     rev = "v${version}";
-    hash = "sha256-MWFDAyr4oHBe1K9ag5mC3iJAyJgs3ePa6W9//6T2G9A=";
+    hash = "sha256-Qdx7x42QKfyEu2PB350mek2MwYO/ClFAwKC9UHftaKE=";
   };
 
   vendorHash = null;

From 2749a6819bf7dcbe548782b53c1a243d18ab682e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 10 Oct 2024 11:08:23 +0200
Subject: [PATCH 43/55] python312Packages.nox: refactor

---
 .../python-modules/nox/default.nix            | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index b56c256ea526..2751d971c175 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -5,55 +5,64 @@
   colorlog,
   fetchFromGitHub,
   hatchling,
-  importlib-metadata,
   jinja2,
   packaging,
   pytestCheckHook,
   pythonOlder,
+  tomli,
   tox,
-  typing-extensions,
+  uv,
   virtualenv,
 }:
 
 buildPythonPackage rec {
   pname = "nox";
   version = "2024.10.09";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "wntrblm";
-    repo = pname;
+    repo = "nox";
     rev = "refs/tags/${version}";
     hash = "sha256-GdNz34A8IKwPG/270sY5t3SoggGCZMWfDq/Wyhk0ez8=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs =
+  dependencies =
     [
       argcomplete
       colorlog
       packaging
       virtualenv
     ]
-    ++ lib.optionals (pythonOlder "3.8") [
-      typing-extensions
-      importlib-metadata
+    ++ lib.optionals (pythonOlder "3.11") [
+      tomli
     ];
 
-  nativeCheckInputs = [
-    jinja2
-    tox
-    pytestCheckHook
-  ];
+  optional-dependencies = {
+    tox_to_nox = [
+      jinja2
+      tox
+    ];
+    uv = [ uv ];
+  };
+
+  nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
 
   pythonImportsCheck = [ "nox" ];
 
   disabledTests = [
     # our conda is not available on 3.11
     "test__create_venv_options"
+    # Assertion errors
+    "test_uv"
   ];
 
   disabledTestPaths = [

From 3b66f6f8fd7615971fc08992342bed2c0d12d40f Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 10 Oct 2024 13:23:12 +0300
Subject: [PATCH 44/55] raycast: 1.83.2 -> 1.84.2

Changelog: https://www.raycast.com/changelog/1-84-0
---
 pkgs/os-specific/darwin/raycast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix
index f22b80a77682..6379e9e853a4 100644
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@@ -11,12 +11,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "raycast";
-  version = "1.83.2";
+  version = "1.84.2";
 
   src = fetchurl {
     name = "Raycast.dmg";
     url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-/oFzkC4I4fuHIaw6V6YyhmlHb/nGVeeqnawr3GjgAGw=";
+    hash = "sha256-9bONKZyOEPj6eGQKx6IyZSf7ZZhwL985AzN/imNsoys=";
   };
 
   dontPatch = true;

From 484832887ec1a9e00ddad20c863360c83a39b082 Mon Sep 17 00:00:00 2001
From: uima <43342441+uimataso@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:54:38 +0800
Subject: [PATCH 45/55] Apply suggestions from code review that use
 `patchShebangs` instead of `sed`

Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
---
 pkgs/misc/tmux-plugins/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 2cb977572db7..059e3762bbbe 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -224,10 +224,9 @@ in rec {
       sha256 = "sha256-kIhJKgo1BDTeFyAPa//f/TrhPfV9Rfk9y4qMhIpCydk=";
     };
     nativeBuildInputs = [ pkgs.makeWrapper ];
+    buildInputs = [ pkgs.python3 ];
     postInstall = ''
-      for f in extrakto.py extrakto_plugin.py; do
-        sed -i -e 's|#!/usr/bin/env python3|#!${pkgs.python3}/bin/python3|g' $target/$f
-      done
+     patchShebangs extrakto.py extrakto_plugin.py
 
       wrapProgram $target/scripts/open.sh \
         --prefix PATH : ${ with pkgs; lib.makeBinPath

From 921e8400dc7dcc3b716e32bdd9ddcba1dede0e55 Mon Sep 17 00:00:00 2001
From: uima <43342441+uimataso@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:59:58 +0800
Subject: [PATCH 46/55] fix: fix the updated version from 2024-08-25 to
 2024-08-26

Due to the timezone, I misread the upstream commit as 2024-08-26, but it actually is 2024-08-25
---
 pkgs/misc/tmux-plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix
index 059e3762bbbe..ea08f49dd4e4 100644
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@@ -216,7 +216,7 @@ in rec {
 
   extrakto = mkTmuxPlugin {
     pluginName = "extrakto";
-    version = "0-unstable-2024-08-26";
+    version = "0-unstable-2024-08-25";
     src = fetchFromGitHub {
       owner = "laktak";
       repo = "extrakto";

From ad6bc0db3da7d4736b926144296abc848870ccf2 Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 10 Oct 2024 08:01:26 -0600
Subject: [PATCH 47/55] python3Packages.rns: 0.8.2 -> 0.8.3

Changelog: https://github.com/markqvist/Reticulum/releases/tag/0.8.3
---
 pkgs/development/python-modules/rns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 05c294115c14..8a1b10b93254 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "0.8.2";
+  version = "0.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "Reticulum";
     rev = "refs/tags/${version}";
-    hash = "sha256-H3n3TywMkyefX5X6QhjX73dy9xCnLRjJh0cmx8HSdVU=";
+    hash = "sha256-A1ZDyYHjbC2jz+m4EHRPlOMzkpwCCxo902bMK4I/+I4=";
   };
 
   patches = [

From 1e77c1c6b03a1cb00c983eaab93457d74875183a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20B=C3=BCchau?= <nobodyinperson@posteo.de>
Date: Thu, 10 Oct 2024 16:12:22 +0200
Subject: [PATCH 48/55] teamviewer: Update download url

It seems the Teamviewer company has changed their download links.
---
 pkgs/applications/networking/remote/teamviewer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index edebb6859193..c88f380961de 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
 
   src =
     let
-       base_url = "https://dl.tvcdn.de/download/linux/version_${lib.versions.major version}x";
+       base_url = "https://dl.teamviewer.com/download/linux/version_${lib.versions.major version}x";
     in
       {
        x86_64-linux = fetchurl {

From 120ea3ae2a9f1f55765c066129d16b19a54ebb0c Mon Sep 17 00:00:00 2001
From: Aaron Bieber <aaron@bolddaemon.com>
Date: Thu, 10 Oct 2024 08:02:32 -0600
Subject: [PATCH 49/55] python3Packages.rns: add qbit to maintainers

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

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 8a1b10b93254..64d63ce24f97 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -49,6 +49,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/markqvist/Reticulum";
     changelog = "https://github.com/markqvist/Reticulum/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    maintainers = with maintainers; [
+      fab
+      qbit
+    ];
   };
 }

From f5bbd2c822a87fd023b94884991931997fb17748 Mon Sep 17 00:00:00 2001
From: Icy-Thought <icy-thought@pm.me>
Date: Thu, 10 Oct 2024 17:03:19 +0200
Subject: [PATCH 50/55] picom: v12.1 -> v12.2

---
 pkgs/by-name/pi/picom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/picom/package.nix b/pkgs/by-name/pi/picom/package.nix
index 200ad56d1e2b..7e1f5fb4ff84 100644
--- a/pkgs/by-name/pi/picom/package.nix
+++ b/pkgs/by-name/pi/picom/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "picom";
-  version = "12.1";
+  version = "12.2";
 
   src = fetchFromGitHub {
     owner = "yshui";
     repo = "picom";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XBFSPSrG6C4n5oQUQbWXyy9iCuEdrdaxU0CPR73juzk=";
+    hash = "sha256-tT4OIzIX+phbze2+9f3WQN6RuGKlSQ+Ocp4xodvdPC0=";
     fetchSubmodules = true;
   };
 

From dbb8380392146a0ca8f933bc960a79fa1a29ea1a Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Thu, 10 Oct 2024 21:22:45 +0300
Subject: [PATCH 51/55] warp-terminal: 0.2024.09.24.08.02.stable_01 ->
 0.2024.10.08.08.02.stable_01

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 73a360b88f05..b8424a4593db 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-zbnOkld+6UnSeMfvc6P6qZ474KaHcx1Qzyr4HCWsv98=",
-    "version": "0.2024.09.24.08.02.stable_01"
+    "hash": "sha256-Awr2NvXsWaEeJpdCA94q7kxQ04IDpwNxnm7GxB4J09w=",
+    "version": "0.2024.10.08.08.02.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-SeTzKFsY+p0oJFTmBEmj64tOPS7BlBLtYdoIJ9jmTD0=",
-    "version": "0.2024.09.24.08.02.stable_01"
+    "hash": "sha256-fNY+wXqlqUSdRVptDNuk1ouddSlIKQrBFPIij9Qa0jM=",
+    "version": "0.2024.10.08.08.02.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-lAiu20udBEJhu29vqiS8vYauuu0fcX1LlvqEqYN5WXU=",
-    "version": "0.2024.09.24.08.02.stable_01"
+    "hash": "sha256-EdQjc8uXG4cpkgnIYRaBXLeuYqhbN7rs4bU+L/Cc7XA=",
+    "version": "0.2024.10.08.08.02.stable_01"
   }
 }

From f4a1842ad5da3a9ff7d0cd2a763136720c389684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 10 Oct 2024 17:13:29 +0200
Subject: [PATCH 52/55] homebox: add passthru.tests

---
 pkgs/by-name/ho/homebox/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix
index 2745805fbc6e..2f546a7a4238 100644
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@@ -7,6 +7,7 @@
   go,
   git,
   cacert,
+  nixosTests,
 }:
 let
   pname = "homebox";
@@ -72,6 +73,12 @@ buildGoModule {
     "-X main.commit=${version}"
   ];
 
+  passthru = {
+    tests = {
+      inherit (nixosTests) homebox;
+    };
+  };
+
   meta = {
     mainProgram = "api";
     homepage = "https://homebox.software/";

From 9a34180788642b599b442aad94a630ae07a72f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 10 Oct 2024 17:15:38 +0200
Subject: [PATCH 53/55] homebox: 0.13.0 -> 0.15.2

The new version requires go-1.23+.
---
 pkgs/by-name/ho/homebox/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ho/homebox/package.nix b/pkgs/by-name/ho/homebox/package.nix
index 2f546a7a4238..a0bb01845f2e 100644
--- a/pkgs/by-name/ho/homebox/package.nix
+++ b/pkgs/by-name/ho/homebox/package.nix
@@ -1,34 +1,34 @@
 {
   lib,
-  buildGoModule,
+  buildGo123Module,
   fetchFromGitHub,
   pnpm,
   nodejs,
-  go,
+  go_1_23,
   git,
   cacert,
   nixosTests,
 }:
 let
   pname = "homebox";
-  version = "0.13.0";
+  version = "0.15.2";
   src = fetchFromGitHub {
     owner = "sysadminsmedia";
     repo = "homebox";
     rev = "v${version}";
-    hash = "sha256-mhb4q0ja94TjvOzl28WVb3uzkR9MKlqifFJgUo6hfrA=";
+    hash = "sha256-2jB2Oo0dK36n5tQPrGNyPO3Q0yNkUms4RPQzXiDzuks=";
   };
 in
-buildGoModule {
+buildGo123Module {
   inherit pname version src;
 
-  vendorHash = "sha256-QRmP6ichKjwDWEx13sEs1oetc4nojGyJnKafAATTNTA=";
+  vendorHash = "sha256-Ftm5tR3w8S3mjYLJG0+17nYP5kDbaAd8QkbZpNt7WuE=";
   modRoot = "backend";
   # the goModules derivation inherits our buildInputs and buildPhases
   # Since we do pnpm thing in those it fails if we don't explicitely remove them
   overrideModAttrs = _: {
     nativeBuildInputs = [
-      go
+      go_1_23
       git
       cacert
     ];
@@ -38,7 +38,7 @@ buildGoModule {
   pnpmDeps = pnpm.fetchDeps {
     inherit pname version;
     src = "${src}/frontend";
-    hash = "sha256-MdTZJ/Ichpwc54r7jZjiFD12YOdRzHSuzRZ/PnDk2mY=";
+    hash = "sha256-SyKET+W9Fn1WETzF4KlAtLOzNI/DOavHUbC7Yfv6kFw=";
   };
   pnpmRoot = "../frontend";
 

From 45093dff80ae7cdefc55abb77075d2931d6b47ca Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 5 Oct 2024 00:40:58 +0400
Subject: [PATCH 54/55] =?UTF-8?q?josm:=2019207=20=E2=86=92=2019230?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/jo/josm/package.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/jo/josm/package.nix b/pkgs/by-name/jo/josm/package.nix
index 920b294562d1..35f395b69d31 100644
--- a/pkgs/by-name/jo/josm/package.nix
+++ b/pkgs/by-name/jo/josm/package.nix
@@ -1,22 +1,23 @@
-{ lib, stdenv, fetchurl, fetchsvn, makeWrapper, unzip, jre, libXxf86vm
+{ lib, stdenv, fetchurl, fetchFromGitHub, makeWrapper, unzip, jre, libXxf86vm
 , extraJavaOpts ? "-Djosm.restart=true -Djava.net.useSystemProxies=true"
 }:
 let
   pname = "josm";
-  version = "19207";
+  version = "19230";
   srcs = {
     jar = fetchurl {
       url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-      hash = "sha256-dYDJmGXIKd2GhjyKBpQjoIfz9giBsgFdC0TaKplxiPY=";
+      hash = "sha256-d2KyTPIw7N+ZveNUa5W3yiV6pCouigTq+GICSEkTiis=";
     };
     macosx = fetchurl {
       url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java21.zip";
-      hash = "sha256-A34nd+RBipON5zOKBD57L1l2KACYEUHNjxs0N6xqoXc=";
+      hash = "sha256-IrFtRlNdXZI6ucfZC6yEancV4E5lEP7+VNhaZ6p9t4I=";
     };
-    pkg = fetchsvn {
-      url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
-      rev = version;
-      hash = "sha256-L7P6FtqKLB4e+ezPzXePM33qj5esNoRlTFXi0/GhdsA=";
+    pkg = fetchFromGitHub {
+      owner = "JOSM";
+      repo = "josm";
+      rev = "refs/tags/${version}-tested";
+      hash = "sha256-s6vc09qdQbJb2b0j4t7CVPmbfWpjc5Pl3JBCPgGVZMY=";
     };
   };
 
@@ -41,7 +42,7 @@ stdenv.mkDerivation rec {
       ${unzip}/bin/unzip ${srcs.macosx} 'JOSM.app/*' -d $out/Applications
     '' else ''
       install -Dm644 ${srcs.jar} $out/share/josm/josm.jar
-      cp -R ${srcs.pkg}/usr/share $out
+      cp -R ${srcs.pkg}/native/linux/tested/usr/share $out
 
       # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
       makeWrapper ${jre}/bin/java $out/bin/josm \
@@ -49,14 +50,14 @@ stdenv.mkDerivation rec {
         --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
     '';
 
-  meta = with lib; {
+  meta = {
     description = "Extensible editor for OpenStreetMap";
     homepage = "https://josm.openstreetmap.de/";
     changelog = "https://josm.openstreetmap.de/wiki/Changelog";
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ rycee sikmir ];
-    platforms = platforms.all;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ rycee sikmir ];
+    platforms = lib.platforms.all;
     mainProgram = "josm";
   };
 }

From aa848de8f34e78e2e22ba81750fcf345a8c492f2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 11 Oct 2024 00:13:38 +0200
Subject: [PATCH 55/55] python312Packages.xknxproject: use hashlib instead of
 cryptography

---
 pkgs/development/python-modules/xknxproject/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/xknxproject/default.nix b/pkgs/development/python-modules/xknxproject/default.nix
index 5e1e58649e1b..3244c7d0c622 100644
--- a/pkgs/development/python-modules/xknxproject/default.nix
+++ b/pkgs/development/python-modules/xknxproject/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  cryptography,
   fetchFromGitHub,
   pytestCheckHook,
   pythonOlder,
@@ -27,7 +26,6 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    cryptography
     pyzipper
     striprtf
   ];