From 13a041b1746da698ea4e1ad5994c42a817403170 Mon Sep 17 00:00:00 2001
From: Andrey Albershteyn <aalbersh@kernel.org>
Date: Mon, 21 Jul 2025 14:08:52 +0200
Subject: [PATCH 01/84] headscale: support PKCE verifier

The headscale 0.24.0 introduced support for PKCE verifier. Add options
to set these parameters in the config.
---
 .../modules/services/networking/headscale.nix | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix
index 33336ebdd119..4291eae7f4f8 100644
--- a/nixos/modules/services/networking/headscale.nix
+++ b/nixos/modules/services/networking/headscale.nix
@@ -406,6 +406,31 @@ in
                 '';
                 example = [ "alice@example.com" ];
               };
+
+              pkce = {
+                enabled = lib.mkOption {
+                  type = lib.types.bool;
+                  default = false;
+                  description = ''
+                    Enable or disable PKCE (Proof Key for Code Exchange) support.
+                    PKCE adds an additional layer of security to the OAuth 2.0
+                    authorization code flow by preventing authorization code
+                    interception attacks
+                    See https://datatracker.ietf.org/doc/html/rfc7636
+                  '';
+                  example = true;
+                };
+
+                method = lib.mkOption {
+                  type = lib.types.str;
+                  default = "S256";
+                  description = ''
+                    PKCE method to use:
+                      - plain: Use plain code verifier
+                      - S256: Use SHA256 hashed code verifier (default, recommended)
+                  '';
+                };
+              };
             };
 
             tls_letsencrypt_hostname = lib.mkOption {

From 9e30dc38aa41e9aa9664df8ae9bbf5f4e3eeb13a Mon Sep 17 00:00:00 2001
From: Daniel Nagy <danielnagy@posteo.de>
Date: Thu, 24 Jul 2025 13:15:00 +0200
Subject: [PATCH 02/84] freenet: 01501 -> 01503

---
 pkgs/by-name/fr/freenet/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fr/freenet/package.nix b/pkgs/by-name/fr/freenet/package.nix
index 1bde1b90fb98..394a76eab253 100644
--- a/pkgs/by-name/fr/freenet/package.nix
+++ b/pkgs/by-name/fr/freenet/package.nix
@@ -26,8 +26,8 @@ let
     name = "freenet-seednodes";
     owner = "hyphanet";
     repo = "seedrefs";
-    rev = "9df1bf93ab64aba634bdfc5f4d0e960571ce4ba5";
-    hash = "sha256-nvwJvKw5IPhItPe4k/jnOGaa8H4DtOi8XxKFOKFMAuY=";
+    rev = "8e8b3574b63e649e03f67d23d3dfa461b7a0ba4a";
+    hash = "sha256-OCXBfhgheOH8XZjUhvJpNQ1I73rCwUfgyl/xkZt3JeM=";
     postFetch = ''
       cat $out/* > $out/seednodes.fref
     '';
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "freenet";
-  version = "01501";
+  version = "01503";
 
   src = fetchFromGitHub {
     owner = "freenet";
     repo = "fred";
     tag = "build${version}";
-    hash = "sha256-XtcTQlgUNv6IQD89oelCyjb9r6wIbT3hCH+QHkjtgP8=";
+    hash = "sha256-SjHQssCwPjSoaxsLmaov4bRoz+6XSlHfiOoxWxlRn60=";
   };
 
   nativeBuildInputs = [

From 8d64b8c77a4a13538fed6fcaf5435c88d8ea229e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Mon, 18 Aug 2025 13:08:24 +0000
Subject: [PATCH 03/84] python3Packages.ttfautohint-py: 0.5.1 -> 0.6.0

---
 .../python-modules/ttfautohint-py/default.nix        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ttfautohint-py/default.nix b/pkgs/development/python-modules/ttfautohint-py/default.nix
index 9e43acab06b9..69c0b33a9eb4 100644
--- a/pkgs/development/python-modules/ttfautohint-py/default.nix
+++ b/pkgs/development/python-modules/ttfautohint-py/default.nix
@@ -13,23 +13,19 @@
 
 buildPythonPackage rec {
   pname = "ttfautohint-py";
-  version = "0.5.1";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fonttools";
     repo = "ttfautohint-py";
     tag = "v${version}";
-    hash = "sha256-NTog461RpyHKo/Qpicj3tflehaKj9LlZEN9qeCMM6JQ=";
+    hash = "sha256-wA8su7HEQnDbCShrX9fiP/VKNMtMqeayHbQXHqy8iOA=";
   };
 
   postPatch = ''
     substituteInPlace src/python/ttfautohint/__init__.py \
-      --replace-fail 'find_library("ttfautohint")' '"${lib.getLib ttfautohint}/lib/libttfautohint${stdenv.hostPlatform.extensions.sharedLibrary}"'
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    substituteInPlace src/python/ttfautohint/memory.py \
-      --replace-fail 'find_library("c")' '"${lib.getLib stdenv.cc.libc}/lib/libc.so.6"'
+      --replace-fail '_exe_full_path = None' '_exe_full_path = "${lib.getExe ttfautohint}"'
   '';
 
   env.TTFAUTOHINTPY_BUNDLE_DLL = false;
@@ -56,7 +52,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python wrapper for ttfautohint, a free auto-hinter for TrueType fonts";
     homepage = "https://github.com/fonttools/ttfautohint-py";
-    changelog = "https://github.com/fonttools/ttfautohint-py/releases/tag/v${version}";
+    changelog = "https://github.com/fonttools/ttfautohint-py/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ jopejoe1 ];
   };

From 3a5eb03d6248f0a51ebf34fcb4f4bf15b27b564b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 17:12:07 +0000
Subject: [PATCH 04/84] codeql: 2.22.3 -> 2.22.4

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

diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index 2aa198e42e5d..3fa523161e90 100644
--- a/pkgs/by-name/co/codeql/package.nix
+++ b/pkgs/by-name/co/codeql/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "codeql";
-  version = "2.22.3";
+  version = "2.22.4";
 
   dontConfigure = true;
   dontBuild = true;
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   src = fetchzip {
     url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip";
-    hash = "sha256-75ayL/TftTM1nfwIFsVOhfqFi//ts6o8GeK/mYez04k=";
+    hash = "sha256-g1544Y+TiJE814HaneTDOuRTAux9RWsLgMRruI/CVTg=";
   };
 
   nativeBuildInputs = [

From 36bfc27d8dbdcecc56e65187da829ff51255e76e Mon Sep 17 00:00:00 2001
From: Nico Felbinger <nico@felbinger.eu>
Date: Fri, 22 Aug 2025 18:28:25 +0200
Subject: [PATCH 05/84] python3Packages.netbox-contextmenus: init at 1.4.8

---
 .../netbox-contextmenus/default.nix           | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/netbox-contextmenus/default.nix

diff --git a/pkgs/development/python-modules/netbox-contextmenus/default.nix b/pkgs/development/python-modules/netbox-contextmenus/default.nix
new file mode 100644
index 000000000000..b27c3a534322
--- /dev/null
+++ b/pkgs/development/python-modules/netbox-contextmenus/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  netbox,
+  python,
+}:
+
+buildPythonPackage rec {
+  pname = "netbox-contextmenus";
+  version = "1.4.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "PieterL75";
+    repo = "netbox_contextmenus";
+    tag = "v${version}";
+    hash = "sha256-wK8IQ+vYFP9cWcazTOzP1eoKBU0YXwbQrtfM7tGNTXI=";
+  };
+
+  build-system = [ setuptools ];
+
+  # pythonImportsCheck fails due to improperly configured django app
+
+  meta = {
+    description = "Netbox plugin to add context buttons to the links, making navigating less clicky";
+    homepage = "https://github.com/PieterL75/netbox_contextmenus/";
+    changelog = "https://github.com/PieterL75/netbox_contextmenus/releases/tag/${src.tag}";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ felbinger ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 39db370c8547..3336a58271db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10135,6 +10135,8 @@ self: super: with self; {
 
   netbox-bgp = callPackage ../development/python-modules/netbox-bgp { };
 
+  netbox-contextmenus = callPackage ../development/python-modules/netbox-contextmenus { };
+
   netbox-contract = callPackage ../development/python-modules/netbox-contract { };
 
   netbox-dns = callPackage ../development/python-modules/netbox-dns { };

From bcaf8667d8b906aaf8789b5726b090f0f10e4544 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 10 Aug 2025 01:38:25 +0100
Subject: [PATCH 06/84] klee: 3.1 -> 3.1-unstable-2025-07-11

---
 pkgs/applications/science/logic/klee/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index fd618fec2026..c44cf44f5209 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -60,13 +60,13 @@ let
 in
 llvmPackages.stdenv.mkDerivation rec {
   pname = "klee";
-  version = "3.1";
+  version = "3.1-unstable-2025-07-11";
 
   src = fetchFromGitHub {
     owner = "klee";
     repo = "klee";
-    rev = "v${version}";
-    hash = "sha256-5js1N8qVF0lCkahSU3ojT7+p/a9IaUpPWhIyFHEzqto=";
+    rev = "1c9fbc1013a6000b39615cc9a5aba83e43a4bf75";
+    hash = "sha256-D93T0mBBrIhQTS42ScUHPrMoqCI55Y6Yp7snLmlriQM=";
   };
 
   nativeBuildInputs = [ cmake ];

From 97ebc87ea0584ec2fc8dac8b1faf4f54d715a594 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 10 Aug 2025 01:38:25 +0100
Subject: [PATCH 07/84] klee: disable assertions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Our LLVM is no longer built with these, so the build system actually
warns about the current default (and it breaks use with LLVM ≥ 18).
---
 pkgs/applications/science/logic/klee/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index c44cf44f5209..c85e961d6bf3 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -21,7 +21,7 @@
   includeDebugInfo ? true,
 
   # Enable KLEE asserts. Defaults to true, since LLVM is built with them.
-  asserts ? true,
+  asserts ? false,
 
   # Build the KLEE runtime in debug mode. Defaults to true, as this improves
   # stack traces of the software under test.

From 13a49270e5802216269ad7924bdba09a3821952a Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 10 Aug 2025 01:38:25 +0100
Subject: [PATCH 08/84] klee: make tests more verbose

---
 pkgs/applications/science/logic/klee/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index c85e961d6bf3..ebaa2c88f40a 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -111,6 +111,7 @@ llvmPackages.stdenv.mkDerivation rec {
       "-DENABLE_POSIX_RUNTIME=${onOff true}"
       "-DENABLE_UNIT_TESTS=${onOff true}"
       "-DENABLE_SYSTEM_TESTS=${onOff true}"
+      "-DLIT_ARGS=--verbose"
       "-DGTEST_SRC_DIR=${gtest.src}"
       "-DGTEST_INCLUDE_DIR=${gtest.src}/googletest/include"
       "-Wno-dev"
@@ -119,6 +120,8 @@ llvmPackages.stdenv.mkDerivation rec {
   # Silence various warnings during the compilation of fortified bitcode.
   env.NIX_CFLAGS_COMPILE = toString [ "-Wno-macro-redefined" ];
 
+  env.FILECHECK_OPTS = "--dump-input-filter=all";
+
   prePatch = ''
     patchShebangs --build .
   '';

From 4c8227f166c23505ebd1931e325595a371a4ac49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 24 Aug 2025 03:36:57 +0000
Subject: [PATCH 09/84] python3Packages.stups-cli-support: 1.1.20 -> 1.1.22

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

diff --git a/pkgs/development/python-modules/stups-cli-support/default.nix b/pkgs/development/python-modules/stups-cli-support/default.nix
index 7b37464a69be..1f8247b6bd21 100644
--- a/pkgs/development/python-modules/stups-cli-support/default.nix
+++ b/pkgs/development/python-modules/stups-cli-support/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "stups-cli-support";
-  version = "1.1.20";
+  version = "1.1.22";
   pyproject = true;
   disabled = !isPy3k;
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "zalando-stups";
     repo = "stups-cli-support";
     rev = version;
-    sha256 = "1r6g29gd009p87m8a6wv4rzx7f0564zdv67qz5xys4wsgvc95bx0";
+    sha256 = "sha256-/UsQzV1Ljd+K8AIj55UmiVXAshX+rUbYxFeSK7YGgn8=";
   };
 
   build-system = [ setuptools ];

From 96c91f1f26bae33eda0f38c820fae9e8b5602626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 Aug 2025 07:34:27 +0000
Subject: [PATCH 10/84] equibop: 2.1.5 -> 2.1.6

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

diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index d13e39f570c6..d0bf4846a87e 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equibop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uod94pP261Alq+dby+/diiLT0KFjXswVapwXYAAAkbs=";
+    hash = "sha256-0OtCxz7g1xMmnkDke34deaS3dx5b8bGOC0Vbq6BIObg=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 1;
-    hash = "sha256-0UNScJAdpcMOcBHGGG+SeGQon89qLXTCNmaxEswNFBI=";
+    hash = "sha256-MDqAncWdU2rIQAGF/wx2gWxDf74P3fp3w4nA8b6AITw=";
   };
 
   nativeBuildInputs = [

From e4e6cc242db3ace23cae472ba60f53a817378e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 24 Aug 2025 09:42:34 +0200
Subject: [PATCH 11/84] equibop: remove broken withSystemEquicord argument

---
 pkgs/by-name/eq/equibop/package.nix             | 10 +---------
 .../eq/equibop/use_system_equicord.patch        | 17 -----------------
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/by-name/eq/equibop/use_system_equicord.patch

diff --git a/pkgs/by-name/eq/equibop/package.nix b/pkgs/by-name/eq/equibop/package.nix
index d0bf4846a87e..0a083416cbea 100644
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@@ -17,9 +17,6 @@
   nix-update-script,
   withTTS ? true,
   withMiddleClickScroll ? false,
-  # Enables the use of Equicord from nixpkgs instead of
-  # letting Equibop manage it's own version
-  withSystemEquicord ? false,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "equibop";
@@ -65,12 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./disable_update_checking.patch
-  ]
-  ++ lib.optional withSystemEquicord (
-    replaceVars ./use_system_equicord.patch {
-      inherit equicord;
-    }
-  );
+  ];
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/eq/equibop/use_system_equicord.patch b/pkgs/by-name/eq/equibop/use_system_equicord.patch
deleted file mode 100644
index 3401e10ba331..000000000000
--- a/pkgs/by-name/eq/equibop/use_system_equicord.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git i/src/main/constants.ts w/src/main/constants.ts
-index afb171f..c6a014e 100644
---- i/src/main/constants.ts
-+++ w/src/main/constants.ts
-@@ -30,10 +30,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
- 
- // needs to be inline require because of circular dependency
- // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
--export const VENCORD_DIR = (() => {
--    const { State } = require("./settings") as typeof import("./settings");
--    return State.store.equicordDir ? join(State.store.equicordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar");
--})();
-+export const VENCORD_DIR = "@equicord@";
- 
- export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`;
- 
-

From 821e8edd5ee791e7afd196033f472d85fd5f2227 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 10 Aug 2025 01:38:25 +0100
Subject: [PATCH 12/84] klee: bump to LLVM 18

---
 .../science/logic/klee/default.nix            | 122 +++++++++++++++++-
 pkgs/top-level/all-packages.nix               |   2 +-
 2 files changed, 116 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix
index ebaa2c88f40a..6cf24445c6c4 100644
--- a/pkgs/applications/science/logic/klee/default.nix
+++ b/pkgs/applications/science/logic/klee/default.nix
@@ -37,13 +37,6 @@
   extraKleeuClibcConfig ? { },
 }:
 
-# Klee supports these LLVM versions.
-let
-  llvmVersion = llvmPackages.llvm.version;
-  inherit (lib.strings) versionAtLeast versionOlder;
-in
-assert versionAtLeast llvmVersion "11" && versionOlder llvmVersion "17";
-
 let
   # The chosen version of klee-uclibc.
   chosenKleeuClibc =
@@ -122,6 +115,105 @@ llvmPackages.stdenv.mkDerivation rec {
 
   env.FILECHECK_OPTS = "--dump-input-filter=all";
 
+  env.LIT_XFAIL = lib.concatStringsSep ";" [
+    "KLEE :: ArrayOpt/test_expr_arbitrary.c"
+    "KLEE :: CXX/SimpleVirtual.cpp"
+    "KLEE :: CXX/StaticConstructor.cpp"
+    "KLEE :: CXX/StaticDestructor.cpp"
+    "KLEE :: Concrete/ConstantExpr.ll"
+    "KLEE :: Concrete/OverlappingPhiNodes.ll"
+    "KLEE :: Concrete/UnorderedPhiNodes.ll"
+    "KLEE :: DeterministicAllocation/nullpage-read.c"
+    "KLEE :: DeterministicAllocation/nullpage-write.c"
+    "KLEE :: DeterministicAllocation/use-after-free-loh.c"
+    "KLEE :: DeterministicAllocation/use-after-free.c"
+    "KLEE :: Dogfood/ImmutableSet.cpp"
+    "KLEE :: Feature/Atomic.c"
+    "KLEE :: Feature/DivCheck.c"
+    "KLEE :: Feature/ExtCall.c"
+    "KLEE :: Feature/ExtCallWarnings.c"
+    "KLEE :: Feature/FunctionAlias.c"
+    "KLEE :: Feature/FunctionAliasExit.c"
+    "KLEE :: Feature/LargeArrayBecomesSym.c"
+    "KLEE :: Feature/LowerSwitch.c"
+    "KLEE :: Feature/MakeSymbolicName.c"
+    "KLEE :: Feature/NoExternalCallsAllowed.c"
+    "KLEE :: Feature/Optimize.c"
+    "KLEE :: Feature/OvershiftCheck.c"
+    "KLEE :: Feature/ReadStringAtAddress.c"
+    "KLEE :: Feature/SeedConcretizeExternalCall.c"
+    "KLEE :: Feature/ShiftCheck.c"
+    "KLEE :: Feature/consecutive_divide_by_zero.c"
+    "KLEE :: Feature/srem.c"
+    "KLEE :: InlineAsm/RaiseAsm.c"
+    "KLEE :: InlineAsm/asm_lifting.ll"
+    "KLEE :: Intrinsics/IntrinsicTrap.ll"
+    "KLEE :: Intrinsics/IsConstant.ll"
+    "KLEE :: Intrinsics/Missing.ll"
+    "KLEE :: Intrinsics/Overflow.ll"
+    "KLEE :: Intrinsics/OverflowMul.ll"
+    "KLEE :: Intrinsics/Saturating.ll"
+    "KLEE :: Intrinsics/noalias-scope-decl.ll"
+    "KLEE :: Intrinsics/objectsize.ll"
+    "KLEE :: Replay/klee-replay/KleeZesti.c"
+    "KLEE :: Replay/libkleeruntest/replay_posix_runtime.c"
+    "KLEE :: Runtime/FreeStanding/memcpy_chk_err.c"
+    "KLEE :: Runtime/POSIX/CanonicalizeFileName.c"
+    "KLEE :: Runtime/POSIX/DirConsistency.c"
+    "KLEE :: Runtime/POSIX/DirSeek.c"
+    "KLEE :: Runtime/POSIX/Envp.c"
+    "KLEE :: Runtime/POSIX/FDNumbers.c"
+    "KLEE :: Runtime/POSIX/FD_Fail.c"
+    "KLEE :: Runtime/POSIX/FD_Fail2.c"
+    "KLEE :: Runtime/POSIX/Fcntl.c"
+    "KLEE :: Runtime/POSIX/FilePerm.c"
+    "KLEE :: Runtime/POSIX/FreeArgv.c"
+    "KLEE :: Runtime/POSIX/Futimesat.c"
+    "KLEE :: Runtime/POSIX/Getenv.c"
+    "KLEE :: Runtime/POSIX/Ioctl.c"
+    "KLEE :: Runtime/POSIX/Isatty.c"
+    "KLEE :: Runtime/POSIX/MixedConcreteSymbolic.c"
+    "KLEE :: Runtime/POSIX/Openat.c"
+    "KLEE :: Runtime/POSIX/PrgName.c"
+    "KLEE :: Runtime/POSIX/Read1.c"
+    "KLEE :: Runtime/POSIX/Replay.c"
+    "KLEE :: Runtime/POSIX/SeedAndFail.c"
+    "KLEE :: Runtime/POSIX/Stdin.c"
+    "KLEE :: Runtime/POSIX/SymFileConsistency.c"
+    "KLEE :: Runtime/POSIX/TestMain.c"
+    "KLEE :: Runtime/POSIX/Usage.c"
+    "KLEE :: Runtime/POSIX/Write1.c"
+    "KLEE :: Runtime/POSIX/Write2.c"
+    "KLEE :: Runtime/POSIX/_exit.c"
+    "KLEE :: Runtime/Uclibc/2007-10-08-optimization-calls-wrong-libc-functions.c"
+    "KLEE :: Runtime/klee-libc/mempcpy.c"
+    "KLEE :: Solver/Z3ConstantArray.c"
+    "KLEE :: UBSan/ubsan_alignment-type-mismatch.c"
+    "KLEE :: UBSan/ubsan_array_bounds.c"
+    "KLEE :: UBSan/ubsan_pointer_overflow-pointer_arithmetic.c"
+    "KLEE :: UBSan/ubsan_signed_integer_overflow.c"
+    "KLEE :: UBSan/ubsan_unsigned_integer_overflow.c"
+    "KLEE :: UBSan/ubsan_unsigned_shift_base.c"
+    "KLEE :: UBSan/ubsan_vla_bound.c"
+    "KLEE :: VarArgs/FunctionAliasVarArg.c"
+    "KLEE :: VarArgs/VarArg.c"
+    "KLEE :: VarArgs/VarArgAlignment.c"
+    "KLEE :: VarArgs/VarArgByVal.c"
+    "KLEE :: VarArgs/VarArgByValReported.c"
+    "KLEE :: VarArgs/VarArgLongDouble.c"
+    "KLEE :: VectorInstructions/floating_point_ops_constant.c"
+    "KLEE :: VectorInstructions/integer_ops_constant.c"
+    "KLEE :: VectorInstructions/integer_ops_signed_symbolic.c"
+    "KLEE :: VectorInstructions/integer_ops_unsigned_symbolic.c"
+    "KLEE :: VectorInstructions/memset.c"
+    "KLEE :: VectorInstructions/oob-write.c"
+    "KLEE :: VectorInstructions/shuffle_element.c"
+    "KLEE :: klee-stats/KleeStatsTermClasses.c"
+    "KLEE :: regression/2008-03-11-free-of-malloc-zero.c"
+    "KLEE :: regression/2014-07-04-unflushed-error-report.c"
+    "KLEE :: regression/2016-11-24-bitcast-weak-alias.c"
+  ];
+
   prePatch = ''
     patchShebangs --build .
   '';
@@ -143,6 +235,8 @@ llvmPackages.stdenv.mkDerivation rec {
     uclibc = chosenKleeuClibc;
   };
 
+  __structuredAttrs = true;
+
   meta = with lib; {
     mainProgram = "klee";
     description = "Symbolic virtual machine built on top of LLVM";
@@ -169,5 +263,19 @@ llvmPackages.stdenv.mkDerivation rec {
     license = licenses.ncsa;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ numinit ];
+    # Upstream is still working on support for LLVM ≥ 16; see:
+    #
+    # * <https://github.com/klee/klee/pull/1664>
+    # * <https://github.com/klee/klee/pull/1745>
+    # * <https://github.com/klee/klee/pull/1751>
+    # * <https://github.com/klee/klee/issues/1754>
+    #
+    # The package builds with LLVM 18 but 23% of the tests unexpectedly
+    # fail due to missing functionality for newer LLVM versions. We
+    # mark them as expected failures above to allow the package to
+    # build for those who want to experiment with KLEE, but mark it
+    # broken to avoid giving the impression that this is the expected
+    # user experience and level of support.
+    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01ca7d904597..d920894a0f13 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12212,7 +12212,7 @@ with pkgs;
   klayout = libsForQt5.callPackage ../applications/misc/klayout { };
 
   klee = callPackage ../applications/science/logic/klee {
-    llvmPackages = llvmPackages_13;
+    llvmPackages = llvmPackages_18;
   };
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };

From ddf79c56e694a384c807e840c64b03add51629e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 20:10:52 +0000
Subject: [PATCH 13/84] steampipePackages.steampipe-plugin-aws: 1.22.0 ->
 1.23.0

---
 .../steampipe-packages/steampipe-plugin-aws/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
index b2f9a741c4d7..39c354a100ed 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-aws";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-aws";
     tag = "v${version}";
-    hash = "sha256-KnKcrbvLf8pX6Jj+HUq+VQTFKOUTFb2kq9z4YWJPPx4=";
+    hash = "sha256-T4Qew3GgJbgyNrx5oSXLtfA8ilfegybJqJ+zx0jLf7E=";
   };
 
-  vendorHash = "sha256-8hqesnVwLA0dX70/xQvSSz3fpZKiCpNifEL1YUpbHnM=";
+  vendorHash = "sha256-9Kl4aTQQNQVIkFTLnXVEyN5WYxgihSeYlnL/r/vsGKU=";
 
   ldflags = [
     "-s"

From 7082943360f5f195c472f4e57bd6a5595affacc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 15:01:18 +0000
Subject: [PATCH 14/84] easyrsa: 3.2.3 -> 3.2.4

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

diff --git a/pkgs/by-name/ea/easyrsa/package.nix b/pkgs/by-name/ea/easyrsa/package.nix
index a45bf2306e77..54cf6d87c256 100644
--- a/pkgs/by-name/ea/easyrsa/package.nix
+++ b/pkgs/by-name/ea/easyrsa/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "easyrsa";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "OpenVPN";
     repo = "easy-rsa";
     rev = "v${version}";
-    hash = "sha256-TAJAwvcIkAB4YShK9NItw14UTvuxtNd/OxLDkO8p0d0=";
+    hash = "sha256-X/EXiiSLDSxxSSNnb6lkPsvdA0vSp/zPN+wSNuUMzrg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From e419db9fc248d8aee6d97cb360ff5e77321c45d9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Wed, 27 Aug 2025 17:21:44 +0200
Subject: [PATCH 15/84] rcu: 4.0.24 -> 4.0.25

---
 ...o-3.x.patch => Port-to-paramiko-4.x.patch} | 86 +++++++++++++------
 pkgs/by-name/rc/rcu/package.nix               |  6 +-
 2 files changed, 64 insertions(+), 28 deletions(-)
 rename pkgs/by-name/rc/rcu/{Port-to-paramiko-3.x.patch => Port-to-paramiko-4.x.patch} (55%)

diff --git a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch b/pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch
similarity index 55%
rename from pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch
rename to pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch
index 760d23cea18d..dd8f76c33379 100644
--- a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch
+++ b/pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch
@@ -1,17 +1,15 @@
-From aad61b320d65953fddec10b019a186fc67f57a5d Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Sat, 10 Feb 2024 12:20:29 +0100
-Subject: [PATCH] src/model/transport.py: Port to paramiko 3.x
-
----
- src/model/transport.py | 19 +++++++++----------
- 1 file changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/src/model/transport.py b/src/model/transport.py
-index 0c2ee16..5a2bd22 100644
---- a/src/model/transport.py
-+++ b/src/model/transport.py
-@@ -117,7 +117,6 @@ from paramiko.kex_gss import KexGSSGex, KexGSSGroup1, KexGSSGroup14
+diff '--color=auto' -ruN a/src/model/transport.py b/src/model/transport.py
+--- a/src/model/transport.py	2025-08-27 17:12:23.761436314 +0200
++++ b/src/model/transport.py	2025-08-27 17:17:35.723006746 +0200
+@@ -105,7 +105,6 @@
+     MSG_NAMES,
+ )
+ from paramiko.compress import ZlibCompressor, ZlibDecompressor
+-from paramiko.dsskey import DSSKey
+ from paramiko.ed25519key import Ed25519Key
+ from paramiko.kex_curve25519 import KexCurve25519
+ from paramiko.kex_gex import KexGex, KexGexSHA256
+@@ -117,7 +116,6 @@
  from paramiko.message import Message
  from paramiko.packet import Packetizer, NeedRekeyException
  from paramiko.primes import ModulusPack
@@ -19,7 +17,7 @@ index 0c2ee16..5a2bd22 100644
  from paramiko.rsakey import RSAKey
  from paramiko.ecdsakey import ECDSAKey
  from paramiko.server import ServerInterface
-@@ -128,7 +127,7 @@ from paramiko.ssh_exception import (
+@@ -128,7 +126,7 @@
      ChannelException,
      ProxyCommandFailure,
  )
@@ -28,7 +26,24 @@ index 0c2ee16..5a2bd22 100644
  
  
  # for thread cleanup
-@@ -396,7 +395,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -192,7 +190,6 @@
+         "ecdsa-sha2-nistp384",
+         "ecdsa-sha2-nistp521",
+         "ssh-rsa",
+-        "ssh-dss",
+     )
+     _preferred_kex = (
+         "ecdh-sha2-nistp256",
+@@ -273,8 +270,6 @@
+     _key_info = {
+         "ssh-rsa": RSAKey,
+         "ssh-rsa-cert-v01@openssh.com": RSAKey,
+-        "ssh-dss": DSSKey,
+-        "ssh-dss-cert-v01@openssh.com": DSSKey,
+         "ecdsa-sha2-nistp256": ECDSAKey,
+         "ecdsa-sha2-nistp256-cert-v01@openssh.com": ECDSAKey,
+         "ecdsa-sha2-nistp384": ECDSAKey,
+@@ -396,7 +391,7 @@
          self.active = False
          self.hostname = None
  
@@ -37,7 +52,7 @@ index 0c2ee16..5a2bd22 100644
              # convert "host:port" into (host, port)
              hl = sock.split(":", 1)
              self.hostname = hl[0]
-@@ -419,7 +418,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -419,7 +414,7 @@
                      sock = socket.socket(af, socket.SOCK_STREAM)
                      sock.settimeout(1)
                      try:
@@ -46,7 +61,7 @@ index 0c2ee16..5a2bd22 100644
                      except socket.error as e:
                          reason = str(e)
                      else:
-@@ -542,7 +541,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -542,7 +537,7 @@
          """
          Returns a string representation of this object, for debugging.
          """
@@ -55,7 +70,31 @@ index 0c2ee16..5a2bd22 100644
          out = "<paramiko.Transport at {}".format(id_)
          if not self.active:
              out += " (unconnected)"
-@@ -1123,7 +1122,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -749,11 +744,11 @@
+         as a server, the host key is used to sign certain packets during the
+         SSH2 negotiation, so that the client can trust that we are who we say
+         we are.  Because this is used for signing, the key must contain private
+-        key info, not just the public half.  Only one key of each type (RSA or
+-        DSS) is kept.
++        key info, not just the public half.  Only one key of each type (i.e.
++        RSA) is kept.
+ 
+         :param .PKey key:
+-            the host key to add, usually an `.RSAKey` or `.DSSKey`.
++            the host key to add, usually an `.RSAKey`.
+         """
+         self.server_key_dict[key.get_name()] = key
+ 
+@@ -763,7 +758,7 @@
+         client, this method will return the negotiated host key.  If only one
+         type of host key was set with `add_server_key`, that's the only key
+         that will ever be returned.  But in cases where you have set more than
+-        one type of host key (for example, an RSA key and a DSS key), the key
++        one type of host key (for example, an RSA key and another key), the key
+         type will be negotiated by the client, and this method will return the
+         key of the type agreed on.  If the host key has not been negotiated
+         yet, ``None`` is returned.  In client mode, the behavior is undefined.
+@@ -1123,7 +1118,7 @@
          m = Message()
          m.add_byte(cMSG_IGNORE)
          if byte_count is None:
@@ -64,7 +103,7 @@ index 0c2ee16..5a2bd22 100644
          m.add_bytes(os.urandom(byte_count))
          self._send_user_message(m)
  
-@@ -1802,7 +1801,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -1802,7 +1797,7 @@
      def stop_thread(self):
          self.active = False
          self.packetizer.close()
@@ -73,7 +112,7 @@ index 0c2ee16..5a2bd22 100644
              # Original join logic; #520 doesn't appear commonly present under
              # Python 2.
              while self.is_alive() and self is not threading.current_thread():
-@@ -1909,7 +1908,7 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -1909,7 +1904,7 @@
          m = Message()
          m.add_mpint(self.K)
          m.add_bytes(self.H)
@@ -82,7 +121,7 @@ index 0c2ee16..5a2bd22 100644
          m.add_bytes(self.session_id)
          # Fallback to SHA1 for kex engines that fail to specify a hex
          # algorithm, or for e.g. transport tests that don't run kexinit.
-@@ -2037,14 +2036,14 @@ class Transport(threading.Thread, ClosingContextManager):
+@@ -2037,14 +2032,14 @@
  
          # active=True occurs before the thread is launched, to avoid a race
          _active_threads.append(self)
@@ -99,6 +138,3 @@ index 0c2ee16..5a2bd22 100644
                  self._log(
                      DEBUG,
                      "Local version/idstring: {}".format(self.local_version),
--- 
-2.42.0
-
diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index a4f37c7b3a45..2f22ce09fc63 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -23,7 +23,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.24";
+  version = "4.0.25";
 
   format = "other";
 
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-3rZiqg8Uuta3kI2m+2rBZ1XzN9bFds+emhivH5X7sJg=";
+        hash = "sha256-8xcYAQxUmY8beUrRYmOn5UeWibr0EUZLOG4pFfeeSdw=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in
@@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec {
     '';
 
   patches = [
-    ./Port-to-paramiko-3.x.patch
+    ./Port-to-paramiko-4.x.patch
   ];
 
   postPatch = ''

From 07284d9e7b62586b8beb7bc8e52fda99e24bc221 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 22:02:23 +0200
Subject: [PATCH 16/84] youtube-dl: switch license to Unlicense

https://github.com/ytdl-org/youtube-dl/blob/master/LICENSE
---
 pkgs/tools/misc/youtube-dl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 0ebe54dc3e83..2591f562a403 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -106,7 +106,7 @@ buildPythonPackage rec {
       the public domain, which means you can modify it, redistribute it or use
       it however you like.
     '';
-    license = licenses.publicDomain;
+    license = licenses.unlicense;
     maintainers = with maintainers; [
       fpletz
     ];

From 32cc7d3c93a8eb17534648bbe1d467d67f2605c7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 22:09:14 +0200
Subject: [PATCH 17/84] xe: switch license to cc0

https://github.com/leahneukirchen/xe?tab=readme-ov-file#copyright
---
 pkgs/by-name/xe/xe/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xe/xe/package.nix b/pkgs/by-name/xe/xe/package.nix
index 7e9ee62af433..7cafdd4b2932 100644
--- a/pkgs/by-name/xe/xe/package.nix
+++ b/pkgs/by-name/xe/xe/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Simple xargs and apply replacement";
     homepage = "https://github.com/leahneukirchen/xe";
-    license = lib.licenses.publicDomain;
+    license = lib.licenses.cc0;
     platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.pbsds ];
     mainProgram = "xe";

From 1d7006fe99672bac50d1533ccbdfe2b00ed11a7b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 23:15:53 +0200
Subject: [PATCH 18/84] socklog: switch license to bsd3

https://github.com/g-pape/socklog/blob/main/package/COPYING
---
 pkgs/by-name/so/socklog/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/socklog/package.nix b/pkgs/by-name/so/socklog/package.nix
index dd47ebfd69ce..523a9f03aebf 100644
--- a/pkgs/by-name/so/socklog/package.nix
+++ b/pkgs/by-name/so/socklog/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "System and kernel logging services";
     homepage = "https://smarden.org/socklog/";
-    license = lib.licenses.publicDomain;
+    license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ joachifm ];
   };

From 1d83f10fdb18946d1cbd3576e2d8e3f4c299d32e Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 23:19:40 +0200
Subject: [PATCH 19/84] sct: switch license to isc

see $src/sct.c
---
 pkgs/by-name/sc/sct/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sc/sct/package.nix b/pkgs/by-name/sc/sct/package.nix
index 3ec751145421..4be102d0eb93 100644
--- a/pkgs/by-name/sc/sct/package.nix
+++ b/pkgs/by-name/sc/sct/package.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
       raskin
       somasis
     ];
-    license = licenses.publicDomain;
+    license = licenses.isc;
     platforms = with platforms; linux ++ freebsd ++ openbsd;
   };
 }

From 747d0aee49e86a185b2e46db6ac72405d2e9aad3 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 22:10:54 +0200
Subject: [PATCH 20/84] wgetpaste: switch license to mit

https://github.com/zlin/wgetpaste/blob/master/LICENSE
---
 pkgs/by-name/wg/wgetpaste/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wg/wgetpaste/package.nix b/pkgs/by-name/wg/wgetpaste/package.nix
index 0a2b34490864..23841e256e4e 100644
--- a/pkgs/by-name/wg/wgetpaste/package.nix
+++ b/pkgs/by-name/wg/wgetpaste/package.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Command-line interface to various pastebins";
     mainProgram = "wgetpaste";
     homepage = "https://github.com/zlin/wgetpaste";
-    license = lib.licenses.publicDomain;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       qknight
     ];

From 290a166e06ed2462fc193aa9a5b331c373d70b29 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 23:33:53 +0200
Subject: [PATCH 21/84] sope: switch license to lgpl2Plus

https://github.com/Alinto/sope/blob/master/sope-core/COPYING
---
 pkgs/by-name/so/sope/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix
index 2643c33b600e..98824e29040d 100644
--- a/pkgs/by-name/so/sope/package.nix
+++ b/pkgs/by-name/so/sope/package.nix
@@ -80,7 +80,7 @@ clangStdenv.mkDerivation rec {
 
   meta = {
     description = "Extensive set of frameworks which form a complete Web application server environment";
-    license = lib.licenses.publicDomain;
+    license = lib.licenses.lgpl2Plus;
     homepage = "https://github.com/Alinto/sope";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ jceb ];

From 4c475554d99c8ce39c85e8584e80afc8cb7d428b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Wed, 27 Aug 2025 23:34:44 +0200
Subject: [PATCH 22/84] stb: switch license to mit or unlicense

https://github.com/nothings/stb/blob/master/LICENSE
---
 pkgs/by-name/st/stb/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/stb/package.nix b/pkgs/by-name/st/stb/package.nix
index 1ecd89a52db9..881eff8b8bc1 100644
--- a/pkgs/by-name/st/stb/package.nix
+++ b/pkgs/by-name/st/stb/package.nix
@@ -44,7 +44,11 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Single-file public domain libraries for C/C++";
     homepage = "https://github.com/nothings/stb";
-    license = licenses.publicDomain;
+    license = with licenses; [
+      mit
+      # OR
+      unlicense
+    ];
     platforms = platforms.all;
     maintainers = [ ];
   };

From 398f31cc66a618f9e62f5648262142f46ce193cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 21:49:27 +0000
Subject: [PATCH 23/84] grafanaPlugins.grafana-lokiexplore-app: 1.0.25 ->
 1.0.26

---
 .../grafana/plugins/grafana-lokiexplore-app/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index e574a43f8380..321fe4e51cd4 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "1.0.25";
-  zipHash = "sha256-aSwuzg3Y4/swz+AAf4dAH15Vr1sr7vxRyBIeCWpOnrU=";
+  version = "1.0.26";
+  zipHash = "sha256-7EztpeZIpDu/ner9EOiOjoh3J/GBgYWpZoh3usXyPqo=";
   meta = with lib; {
     description = "Browse Loki logs without the need for writing complex queries";
     license = licenses.agpl3Only;

From 0f2126e69cce219c2131ba6a4a8030149cc8f58b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 22:08:31 +0000
Subject: [PATCH 24/84] grafanaPlugins.grafana-oncall-app: 1.16.4 -> 1.16.5

---
 .../monitoring/grafana/plugins/grafana-oncall-app/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix
index 1e90b2574278..9dd9fdbe099d 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-oncall-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-oncall-app";
-  version = "1.16.4";
-  zipHash = "sha256-sz8jdUBEUpvfvYo0dZU1KVW/65MI5rcheTCia2m4cjU=";
+  version = "1.16.5";
+  zipHash = "sha256-SKekXNYI00M/2f2/iX6+G3B30C1gwpUFa7zzlv8d92Q=";
   meta = with lib; {
     description = "Developer-friendly incident response for Grafana";
     license = licenses.agpl3Only;

From b26f7f0097c1b48b698a24cb58d94ccd1113b777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Aug 2025 22:10:27 +0000
Subject: [PATCH 25/84] grafanaPlugins.grafana-pyroscope-app: 1.7.0 -> 1.8.1

---
 .../grafana/plugins/grafana-pyroscope-app/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
index 732d95158052..fd2ec7dbff1e 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-pyroscope-app";
-  version = "1.7.0";
-  zipHash = "sha256-lLzOV3pTjdW5thOTX0t+OwpxXqFJNlF5db0xpmw3fd8=";
+  version = "1.8.1";
+  zipHash = "sha256-dAjvcWUtk518lx4eHalJJxUVSna9+A/Ow9mmsrBX+nQ=";
   meta = with lib; {
     description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data";
     license = licenses.agpl3Only;

From 3a911c1572072e1990a311a48866206c328cb3b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 00:33:56 +0000
Subject: [PATCH 26/84] chrony: 4.7 -> 4.8

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

diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index 5e9f5758b656..602da83f6b2f 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "chrony";
-  version = "4.7";
+  version = "4.8";
 
   src = fetchurl {
     url = "https://chrony-project.org/releases/${pname}-${version}.tar.gz";
-    hash = "sha256-wN5BqMBR5dMrEBtfcBS5jKl4sY5ZLzDOaEC21GAtlHs=";
+    hash = "sha256-M+qOsqTa6qUG6Pyv1dbYkCftby8GCWRcbxSbVg0wFwY=";
   };
 
   outputs = [

From c70b58962e8cd454173901ca04a2deef83a420bf Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 25 Aug 2025 10:04:28 +0000
Subject: [PATCH 27/84] python3Packages.telethon: 1.37.0 -> 1.40.0

fix tests in new version
---
 .../python-modules/telethon/default.nix       | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix
index 71cabb331870..b48ef2157e4f 100644
--- a/pkgs/development/python-modules/telethon/default.nix
+++ b/pkgs/development/python-modules/telethon/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   openssl,
   rsa,
   pyaes,
@@ -14,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "telethon";
-  version = "1.37.0";
+  version = "1.40.0";
   pyproject = true;
 
   disabled = pythonOlder "3.5";
@@ -23,10 +24,26 @@ buildPythonPackage rec {
     owner = "LonamiWebs";
     repo = "Telethon";
     tag = "v${version}";
-    hash = "sha256-P7FP+Wqi3dqbBCFpI9aCDvK4k3mWv8076RO6MXg+jFQ=";
+    hash = "sha256-y8nMh2dAy5ixATYGjH04FtfpvhO2HU5HRTXBr7Z+Dds=";
   };
 
-  patchPhase = ''
+  patches = [
+    # https://github.com/LonamiWebs/Telethon/pull/4670
+    (fetchpatch {
+      url = "https://github.com/LonamiWebs/Telethon/commit/8e2a46568ef9193f5887aea1abf919ac4ca6d31e.patch";
+      name = "fix_async_test.patch";
+      hash = "sha256-oVpLnO4OxNam/mq945OskVEHkbS5TDSUXk/0xPHVv3I=";
+    })
+  ]
+  ++ lib.optionals (lib.versionOlder version "1.40.1") [
+    (fetchpatch {
+      url = "https://github.com/LonamiWebs/Telethon/commit/ae9c798e2c3648ff40dee1b3f371f5d66851642e.patch";
+      name = "fix_test_messages_test.patch";
+      hash = "sha256-8SJm8EE6w7zRQxt1NuTX6KP1MTYPiYO/maJ5tOA2I9w=";
+    })
+  ];
+
+  postPatch = ''
     substituteInPlace telethon/crypto/libssl.py --replace-fail \
       "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'"
   '';
@@ -49,16 +66,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # https://github.com/LonamiWebs/Telethon/issues/4254
-    "test_all_methods_present"
-    "test_private_get_extension"
-  ];
-
   meta = {
     homepage = "https://github.com/LonamiWebs/Telethon";
     description = "Full-featured Telegram client library for Python 3";
     license = lib.licenses.mit;
+    changelog = "https://github.com/LonamiWebs/Telethon/blob/${src.tag}/readthedocs/misc/changelog.rst";
     maintainers = with lib.maintainers; [ nyanloutre ];
   };
 }

From e1515b900b6a5323b3e20a41773596041ed8eb28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 09:45:05 +0000
Subject: [PATCH 28/84] postgresqlPackages.pgddl: 0.29 -> 0.30

---
 pkgs/servers/sql/postgresql/ext/pgddl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgddl.nix b/pkgs/servers/sql/postgresql/ext/pgddl.nix
index 56b4f617df04..e76058f1d320 100644
--- a/pkgs/servers/sql/postgresql/ext/pgddl.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgddl.nix
@@ -8,13 +8,13 @@
 }:
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgddl";
-  version = "0.29";
+  version = "0.30";
 
   src = fetchFromGitHub {
     owner = "lacanoid";
     repo = "pgddl";
     tag = finalAttrs.version;
-    hash = "sha256-W3G6TGtkj+zXXdGZZR0bmZhsLuFJvuGTlDoo8kL8sf0=";
+    hash = "sha256-w08IgnobIhlwRGrz+feEnZbI1KrWrMRI4BvNVUZFSSg=";
   };
 
   nativeBuildInputs = [

From 9d0e807b19259003a3fc62be9112242199696606 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 28 Aug 2025 21:18:27 +0200
Subject: [PATCH 29/84] openttd-ttf: 0.7 -> 0.8

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

diff --git a/pkgs/by-name/op/openttd-ttf/package.nix b/pkgs/by-name/op/openttd-ttf/package.nix
index cecf21ffe70c..29c995ee948f 100644
--- a/pkgs/by-name/op/openttd-ttf/package.nix
+++ b/pkgs/by-name/op/openttd-ttf/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openttd-ttf";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "zephyris";
     repo = "openttd-ttf";
     tag = finalAttrs.version;
-    hash = "sha256-HKOG3Ov0LBCW7Z0FK5BrZRycn2S5gVRnwyU9fM3hb5M=";
+    hash = "sha256-ZV74ZQ4Z4jw2tjG3kXj4Vo1J+W3BF0SJIFIae9DWLAc=";
   };
 
   nativeBuildInputs = [

From ee56f797a4a4d1de200cfaafc563bf01f9264ad3 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 28 Aug 2025 22:45:10 +0200
Subject: [PATCH 30/84] rcu: 4.0.25 -> 4.0.26

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

diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 2f22ce09fc63..6ce7d03ac7b9 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -23,7 +23,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.25";
+  version = "4.0.26";
 
   format = "other";
 
@@ -31,7 +31,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-8xcYAQxUmY8beUrRYmOn5UeWibr0EUZLOG4pFfeeSdw=";
+        hash = "sha256-yY3OFZVHxhVurfjSEeR+UUNHQdpc08jhgaDEvMWRsLA=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in

From e8901347c8e4e51c2a13e492e8d25468c43346f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Aug 2025 20:57:49 +0000
Subject: [PATCH 31/84] phpPackages.grumphp: 2.14.0 -> 2.15.0

---
 pkgs/development/php-packages/grumphp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 256ec59ff242..ff775c2b6247 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.14.0";
+  version = "2.15.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-p8xhfu1tjSvGybA9QuqiduPS6loaWTZN5zKrcrtc4h0=";
+    hash = "sha256-48seCSiYvlNWPu9xP1kGKNwK+98F6wf602dxMjYLVio=";
   };
 
-  vendorHash = "sha256-5h+7yw6S2T9HehdO91TojjoCRIrACRRhan6cvJo6pcY=";
+  vendorHash = "sha256-1sDvUuB5XsCqD23IDI4kVFZUiYhaqrwDg4xQgb2kC38=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 9c61bedc9f202d390e39c53998ff34c6b46a72d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 00:33:07 +0000
Subject: [PATCH 32/84] unifi: 9.3.45 -> 9.4.19

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

diff --git a/pkgs/by-name/un/unifi/package.nix b/pkgs/by-name/un/unifi/package.nix
index 2a7aba23d999..1a1410a26c12 100644
--- a/pkgs/by-name/un/unifi/package.nix
+++ b/pkgs/by-name/un/unifi/package.nix
@@ -10,12 +10,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "unifi-controller";
-  version = "9.3.45";
+  version = "9.4.19";
 
   # see https://community.ui.com/releases / https://www.ui.com/download/unifi
   src = fetchurl {
     url = "https://dl.ui.com/unifi/${finalAttrs.version}/unifi_sysvinit_all.deb";
-    hash = "sha256-9gpXY9+XiUnpyRuMdvXGkbiqJ3SlJ6PZ7k1Rj5pbFqs=";
+    hash = "sha256-lbveHJjORpARa+EU54OtvIk7x1WFGKrwFWL3b+A35XA=";
   };
 
   nativeBuildInputs = [

From 74bb634fb5abd3fe2a09bd3a0a2152f2c13ccfae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 04:21:35 +0000
Subject: [PATCH 33/84] python3Packages.langsmith: 0.4.14 -> 0.4.20

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

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index a4458016d74e..74a88c8ee07e 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.14";
+  version = "0.4.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-9CBEVe3FCpqUMtoTQKikgDmSvqqppTPWYrhElPh6UcA=";
+    hash = "sha256-XAN0DTKZcT8SAwPNI6lDrpmgvr1a5KsTAeRvw7OYVCo=";
   };
 
   sourceRoot = "${src.name}/python";

From 3deb3f78d9c173fde416a1facec2a648431002ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 08:13:41 +0000
Subject: [PATCH 34/84] python3Packages.webdataset: 0.2.107 -> 0.3.2

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

diff --git a/pkgs/development/python-modules/webdataset/default.nix b/pkgs/development/python-modules/webdataset/default.nix
index 50cea1cba689..9e152dd5483f 100644
--- a/pkgs/development/python-modules/webdataset/default.nix
+++ b/pkgs/development/python-modules/webdataset/default.nix
@@ -22,14 +22,14 @@
 }:
 buildPythonPackage rec {
   pname = "webdataset";
-  version = "0.2.107";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "webdataset";
     repo = "webdataset";
     tag = "v${version}";
-    hash = "sha256-L9RUQItmW/7O/eTst2Sl/415EP4Jo662bKWbYA6p5bk=";
+    hash = "sha256-gjZTLf0MqSNCxyAd0H1vCF4ZptIRlY2G3l6KGTwp/Ek=";
   };
 
   build-system = [

From 9a2f99bcf063ab7c0924a850a41ca3ec8e9696ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 19:56:12 +0000
Subject: [PATCH 35/84] python3Packages.segments: 2.2.1 -> 2.3.0

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

diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 2430355860a0..94063cfdcaf9 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "segments";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
   disabled = isPy27;
 
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "cldf";
     repo = "segments";
     rev = "v${version}";
-    sha256 = "sha256-Z9AQnsK/0HUCZDzdpQKNfSBWxfAOjWNBytcfI6yBY84=";
+    sha256 = "sha256-5VgjaWeinXimpoCBhKBvVOmvcCIWrOqYMQegVDGJAKo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From de8af9a3dcf2da3d489d18b0aaf3ae3014f6d0f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 00:20:17 +0000
Subject: [PATCH 36/84] python3Packages.certomancer: 0.12.3 -> 0.13.0

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

diff --git a/pkgs/development/python-modules/certomancer/default.nix b/pkgs/development/python-modules/certomancer/default.nix
index 1fae518cb3e4..6022ed98849f 100644
--- a/pkgs/development/python-modules/certomancer/default.nix
+++ b/pkgs/development/python-modules/certomancer/default.nix
@@ -29,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "certomancer";
-  version = "0.12.3";
+  version = "0.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     owner = "MatthiasValvekens";
     repo = "certomancer";
     tag = "v${version}";
-    hash = "sha256-2BjLoGUWU0RaWVI9JA3s/Hf5aVtmv8hn+fB2jkWdQNY=";
+    hash = "sha256-2/qTTN/UuSMHjkSsOs/KbfzKLBjJSLHY51XtgQ6x1Wo=";
   };
 
   build-system = [

From 2fa696716950e20ea700da95fc773280ceb628c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 01:51:17 +0000
Subject: [PATCH 37/84] etherpad-lite: 2.4.2 -> 2.5.0

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

diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index 56ec20758624..bbeeecc224d5 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "etherpad-lite";
-  version = "2.4.2";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "ether";
     repo = "etherpad-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BUgWx6SVpQ6qIJnb6EoiogRXuKo9uDRrl7bPuXTGQy8=";
+    hash = "sha256-11fNDAR6zmHv1O5nL0GhGJj6eHwDc8zT0Tvrba7qBpw=";
   };
 
   patches = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-/o2WaB63lcWbbe8nCwMSYhGr9zra7QPL1Er78vW8Kjw=";
+    hash = "sha256-PZD55V/3dvNLx39tD4I00IzURhuyqMX4uObnQfnSBtk=";
   };
 
   nativeBuildInputs = [

From 5fa08c496dd3a52d365ea7e2104b646696f04edc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 06:10:36 +0000
Subject: [PATCH 38/84] cherry-studio: 1.5.6 -> 1.5.7

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

diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 913b151781bd..34be4c9e06e4 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.5.6";
+  version = "1.5.7";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OstKirf8rOlGodoMkjQHcSPOWuZx/n2EApHdN+4NpUE=";
+    hash = "sha256-wC4fNDG5xx4uBiBZu7KjuATlSpESwI0dRO/8nZ7DXas=";
   };
 
   postPatch = ''
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-w1EfJ9N0V2aresLLGcpM2l3L/wajn3rNgljzcGHkIFs=";
+    hash = "sha256-hNgiqU4pM0xEBAK6HGArMhAD8My2qIh5gyPV9sDnoeg=";
   };
 
   nativeBuildInputs = [

From 98241caed0dee8931046410b94a970c08834fab9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 07:36:41 +0000
Subject: [PATCH 39/84] jan: 0.6.8 -> 0.6.9

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

diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix
index 5659b97d13e1..c3b1b2797695 100644
--- a/pkgs/by-name/ja/jan/package.nix
+++ b/pkgs/by-name/ja/jan/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "Jan";
-  version = "0.6.8";
+  version = "0.6.9";
   src = fetchurl {
     url = "https://github.com/menloresearch/jan/releases/download/v${version}/jan_${version}_amd64.AppImage";
-    hash = "sha256-JCG4ONJ4Ym/jMJnPJYYk0b+IYKtmWfrk8JxPy2k73hM=";
+    hash = "sha256-633tZXjKWwXW7VZoHz8GpGX5GWsEoZM3FbfjUJdntOs=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From d9c8614245ed5ff28d51fa56ecaf4bc9dc47019a Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sat, 30 Aug 2025 21:25:25 +0800
Subject: [PATCH 40/84] starpls: 0.1.22-unstable-2025-12-30 -> 0.1.22

---
 pkgs/by-name/st/starpls/package.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/st/starpls/package.nix b/pkgs/by-name/st/starpls/package.nix
index 190132b18cc1..0f115597fae8 100644
--- a/pkgs/by-name/st/starpls/package.nix
+++ b/pkgs/by-name/st/starpls/package.nix
@@ -7,12 +7,12 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "starpls";
-  version = "0.1.22-unstable-2025-12-30";
+  version = "0.1.22";
 
   src = fetchFromGitHub {
     owner = "withered-magic";
     repo = "starpls";
-    rev = "db21acd3cb24893315dd601484c7d40689589e9a";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-t9kdpBKyGM61CKhtfO5urVVzyKpL0bX0pZuf0djDdCw=";
   };
 
@@ -30,9 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
       command = "starpls version";
-      version = "v${
-        lib.strings.substring 0 (builtins.stringLength finalAttrs.version - 6) finalAttrs.version
-      }";
+      version = "v${finalAttrs.version}";
     };
   };
 

From 47289576ce2c8bb84ae0c02ba194c5f8c2f14d37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 15:47:43 +0000
Subject: [PATCH 41/84] python3Packages.optuna-dashboard: 0.19.0 -> 0.20.0b1

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

diff --git a/pkgs/development/python-modules/optuna-dashboard/default.nix b/pkgs/development/python-modules/optuna-dashboard/default.nix
index a5c2b932bcac..f3cbcf6dd40b 100644
--- a/pkgs/development/python-modules/optuna-dashboard/default.nix
+++ b/pkgs/development/python-modules/optuna-dashboard/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "optuna-dashboard";
-  version = "0.19.0";
+  version = "0.20.0b1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "optuna";
     repo = "optuna-dashboard";
     tag = "v${version}";
-    hash = "sha256-UTl3X0laEHyc9YjL2RPBeCle0WRKjOU7Bt58BMRXIlU=";
+    hash = "sha256-+mS9D71cwVkO0AqtU0pxK0PBvwCOxA6dPJyTVps4X+g=";
   };
 
   dependencies = [

From 4b2fffef22d058389f86ac61269242414fb5cb8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Aug 2025 16:30:51 +0000
Subject: [PATCH 42/84] glitchtip: 5.1.0 -> 5.1.1

---
 pkgs/by-name/gl/glitchtip/frontend.nix | 6 +++---
 pkgs/by-name/gl/glitchtip/package.nix  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix
index dbdc71537529..c9f0cf3eeeea 100644
--- a/pkgs/by-name/gl/glitchtip/frontend.nix
+++ b/pkgs/by-name/gl/glitchtip/frontend.nix
@@ -9,18 +9,18 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "glitchtip-frontend";
-  version = "5.1.0";
+  version = "5.1.1";
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8l/V2u/j3nF6GqFlQwK33pQuRAPXmqitmrNq6Z8p7ZQ=";
+    hash = "sha256-WKh5w6AVyKhkGvGsy2Wv4Z01UaKTctDSfEhOek2Y84w=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-Lvhf80O/UTFABIGHjSVz4olBkEMUoE7XX66PD6P/FiA=";
+    hash = "sha256-G2DZhHfTWi0qCAMs+IP7T2XEecBwTX12Dk3O0pD8ZJw=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix
index 9233d83bfab1..89aecb2f3bb8 100644
--- a/pkgs/by-name/gl/glitchtip/package.nix
+++ b/pkgs/by-name/gl/glitchtip/package.nix
@@ -84,14 +84,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glitchtip";
-  version = "5.1.0";
+  version = "5.1.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "glitchtip";
     repo = "glitchtip-backend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-okX/bWZNe5ypkfUYm7usNXa7HpBgZoj2vLEq+oGHKiM=";
+    hash = "sha256-P5J4nFXQHt+vP2W1bzdw4V9Pq+YnYsjgJPnU89RYofI=";
   };
 
   propagatedBuildInputs = pythonPackages;

From b9d2f67b72fe82770337f8f24182ae20c273579d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 01:58:50 +0000
Subject: [PATCH 43/84] papermc: 1.21.8-40 -> 1.21.8-56

---
 pkgs/games/papermc/versions.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index efa82ecda03d..a1e77557c309 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -84,7 +84,7 @@
         "version": "1.21.7-32"
     },
     "1.21.8": {
-        "hash": "sha256-t2t9DU2NiUY4WUepUj4BnVbhKEIGxxvHjCy1BoX0gjI=",
-        "version": "1.21.8-40"
+        "hash": "sha256-F5jeXV+B9qpN7t+DcjJuF3lqJWbUalVIa/vJ+8R8c5Q=",
+        "version": "1.21.8-56"
     }
 }

From b407cd44106af6c4ce79b6cc7345c21ea623caa6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 03:29:09 +0000
Subject: [PATCH 44/84] nagiosPlugins.check_systemd: 4.1.0 -> 5.0.0

---
 .../monitoring/nagios-plugins/check_systemd/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix b/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix
index f1d8425d9dbf..2c8c33e0498b 100644
--- a/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix
+++ b/pkgs/servers/monitoring/nagios-plugins/check_systemd/default.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "check-systemd";
-  version = "4.1.0";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Josef-Friedrich";
     repo = "check_systemd";
     tag = "v${version}";
-    hash = "sha256-1e1WtWRTmOxozuOP2ndfsozuiy9LCT/Lsvb+yKH+8eY=";
+    hash = "sha256-i9lMF8SZwTxVCQaHQcEWqdKiOQ4ghcp5H/S+frfZXRw=";
   };
 
   postPatch = ''

From 936c94e4ed50ea78b4801480df3f4514ae3b0a8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 13:50:02 +0000
Subject: [PATCH 45/84] lune: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index 04fecadc8c30..7f0ec9b1faea 100644
--- a/pkgs/by-name/lu/lune/package.nix
+++ b/pkgs/by-name/lu/lune/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lune";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "filiptibell";
     repo = "lune";
     tag = "v${version}";
-    hash = "sha256-Kk3ZIF+kQzsg/ApUm12bbWlIthj5cpVefAqEGhgxb3w=";
+    hash = "sha256-td+rzfM4MtvuwnxDZbJOJAFMPzc/KzTWsHSiqJg2+a4=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-zGXxck/cH8nIS1B/bPTJf1LLCl1viOGSDL0TRQSNaRk=";
+  cargoHash = "sha256-vgnt76GyKYJhrnMqJNKj5YMXubDzSgsab07nd5Y8+qY=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 8cf6121da45ee28a4683d286fd2de12a474448e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 14:23:18 +0000
Subject: [PATCH 46/84] python3Packages.pyomo: 6.9.3 -> 6.9.4

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

diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix
index 2171e5263db5..469c667942cb 100644
--- a/pkgs/development/python-modules/pyomo/default.nix
+++ b/pkgs/development/python-modules/pyomo/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "pyomo";
-  version = "6.9.3";
+  version = "6.9.4";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     repo = "pyomo";
     owner = "pyomo";
     tag = version;
-    hash = "sha256-lKjxPYlVCRew1SHYvehcGWKlLz6DsCG9Bocg6G+491c=";
+    hash = "sha256-iH6vxxA/CdPCXqiw3BUmhUwhS2hfwaJy5jIic4id0Jw=";
   };
 
   build-system = [

From a29f3139624c601eea7dce9a314c1eac54ac8daa Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Sun, 31 Aug 2025 17:56:14 -0500
Subject: [PATCH 47/84] lmstudio: 0.3.23.3 -> 0.3.24.6

---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 1f3d4c6dbdd4..d7f236d48efc 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.23-3";
-  hash_aarch64-darwin = "sha256-Jfx4Fx9mlrdGckE2ML3eTQHfgglEELOYJYxibRiAB7c=";
-  version_x86_64-linux = "0.3.23-3";
-  hash_x86_64-linux = "sha256-FG3CzD6UjuPYXImjTkKTozpTQVGk8JLqxhJxTS9qjuo=";
+  version_aarch64-darwin = "0.3.24-6";
+  hash_aarch64-darwin = "sha256-1SNiyxpjEaxzlIcotgNiCW3LLIqRI55jTKzj2T9PtNs=";
+  version_x86_64-linux = "0.3.24-6";
+  hash_x86_64-linux = "sha256-TjfrNPr8xRUOmRRx2rLJEh3D/kV3OOfqgRTVstOd6AE=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";

From 978fdb569acf506798d7b9575563ec9d324527ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 23:32:45 +0000
Subject: [PATCH 48/84] firebase-tools: 14.13.0 -> 14.15.1

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 0da75c4d7efd..412d32c9e8d0 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.13.0";
+  version = "14.15.1";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-3nDile9gDnaCLWqUYiK3TdiPF2gXzurphHawVO3ZQE8=";
+    hash = "sha256-+wYvxsBnZBvCh98E6Th+uEnxnKnZTKv807mqST8wbJo=";
   };
 
-  npmDepsHash = "sha256-+T2zfUs8vvHnFtBimQtF4UUyLVwp+RpeklcZQxfHxHM=";
+  npmDepsHash = "sha256-EhUJj1kSMslCXhgzCEiVn+4DSmRfvj/nh3OmaZCh/bk=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 47fcf2302680625abd6750f86e0abf6694266d8c Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Mon, 1 Sep 2025 09:43:15 +0800
Subject: [PATCH 49/84] nixos/kanboard: remove X-XSS-Protection

---
 nixos/modules/services/web-apps/kanboard.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/kanboard.nix b/nixos/modules/services/web-apps/kanboard.nix
index e422c3191cbb..6c12cb6e2bb7 100644
--- a/nixos/modules/services/web-apps/kanboard.nix
+++ b/nixos/modules/services/web-apps/kanboard.nix
@@ -157,7 +157,6 @@ in
           locations."~ \\.(js|css|ttf|woff2?|png|jpe?g|svg)$".extraConfig = ''
             add_header Cache-Control "public, max-age=15778463";
             add_header X-Content-Type-Options nosniff;
-            add_header X-XSS-Protection "1; mode=block";
             add_header X-Robots-Tag none;
             add_header X-Download-Options noopen;
             add_header X-Permitted-Cross-Domain-Policies none;

From 943d380f81967b1c11a58e5eb400e21ab7c0a079 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 28 Aug 2025 14:19:51 +0530
Subject: [PATCH 50/84] warp-plus: 1.2.6 -> 1.2.6-unstable-2025-08-13

fix version test

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/wa/warp-plus/fix-endpoints.patch | 95 +++++++++++++++++++
 pkgs/by-name/wa/warp-plus/package.nix         | 21 ++--
 2 files changed, 110 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/wa/warp-plus/fix-endpoints.patch

diff --git a/pkgs/by-name/wa/warp-plus/fix-endpoints.patch b/pkgs/by-name/wa/warp-plus/fix-endpoints.patch
new file mode 100644
index 000000000000..177509d38064
--- /dev/null
+++ b/pkgs/by-name/wa/warp-plus/fix-endpoints.patch
@@ -0,0 +1,95 @@
+From b1bc81051810899189b071349443d82fdc1caebe Mon Sep 17 00:00:00 2001
+From: NImaism <nima.gholamyy@gmail.com>
+Date: Sat, 16 Aug 2025 22:20:15 +0330
+Subject: [PATCH] fix: warp endpoints issues
+
+---
+ app/app.go               | 18 ++++++++++++++----
+ cmd/warp-plus/rootcmd.go | 10 ----------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/app/app.go b/app/app.go
+index 770c58b536e11be3ebdb098c54cf74228139cb51..0197655d681539ed1dd1915ed65107cb7c007b17 100644
+--- a/app/app.go
++++ b/app/app.go
+@@ -56,6 +56,16 @@ func RunWarp(ctx context.Context, l *slog.Logger, opts WarpOptions) error {
+ 		return errors.New("must provide country for psiphon")
+ 	}
+ 
++	if opts.Endpoint == "" {
++		ident, err := warp.LoadOrCreateIdentity(l, path.Join(opts.CacheDir, "primary"), opts.License)
++		if err != nil {
++			l.Error("failed to load or create primary warp identity")
++			return err
++		}
++
++		opts.Endpoint = ident.Config.Peers[0].Endpoint.V4[:len(ident.Config.Peers[0].Endpoint.V4)-2] + ":500"
++	}
++
+ 	// Decide Working Scenario
+ 	endpoints := []string{opts.Endpoint, opts.Endpoint}
+ 
+@@ -96,7 +106,7 @@ func RunWarp(ctx context.Context, l *slog.Logger, opts WarpOptions) error {
+ 	case opts.Gool:
+ 		l.Info("running in warp-in-warp (gool) mode")
+ 		// run warp in warp
+-		warpErr = runWarpInWarp(ctx, l, opts, endpoints)
++		warpErr = runWarpInWarp(ctx, l, opts, endpoints[0])
+ 	default:
+ 		l.Info("running in normal warp mode")
+ 		// just run primary warp on bindAddress
+@@ -237,7 +247,7 @@ func runWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoint str
+ 	return nil
+ }
+ 
+-func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoints []string) error {
++func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoint string) error {
+ 	// make primary identity
+ 	ident1, err := warp.LoadOrCreateIdentity(l, path.Join(opts.CacheDir, "primary"), opts.License)
+ 	if err != nil {
+@@ -254,7 +264,7 @@ func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoi
+ 
+ 	// Enable trick and keepalive on all peers in config
+ 	for i, peer := range conf.Peers {
+-		peer.Endpoint = endpoints[0]
++		peer.Endpoint = endpoint
+ 		peer.Trick = true
+ 		peer.KeepAlive = 5
+ 
+@@ -297,7 +307,7 @@ func runWarpInWarp(ctx context.Context, l *slog.Logger, opts WarpOptions, endpoi
+ 	}
+ 
+ 	// Create a UDP port forward between localhost and the remote endpoint
+-	addr, err := wiresocks.NewVtunUDPForwarder(ctx, netip.MustParseAddrPort("127.0.0.1:0"), endpoints[0], tnet1, singleMTU)
++	addr, err := wiresocks.NewVtunUDPForwarder(ctx, netip.MustParseAddrPort("127.0.0.1:0"), endpoint, tnet1, singleMTU)
+ 	if err != nil {
+ 		return err
+ 	}
+diff --git a/cmd/warp-plus/rootcmd.go b/cmd/warp-plus/rootcmd.go
+index 87642c3708d5084d89771808c0ff7e96f6da1014..87eec817a35390cae4b66ad51fd152fce55670f6 100644
+--- a/cmd/warp-plus/rootcmd.go
++++ b/cmd/warp-plus/rootcmd.go
+@@ -13,7 +13,6 @@ import (
+ 	"github.com/adrg/xdg"
+ 	"github.com/bepass-org/warp-plus/app"
+ 	p "github.com/bepass-org/warp-plus/psiphon"
+-	"github.com/bepass-org/warp-plus/warp"
+ 	"github.com/bepass-org/warp-plus/wiresocks"
+ 	"github.com/peterbourgon/ff/v4"
+ 	"github.com/peterbourgon/ff/v4/ffval"
+@@ -205,15 +204,6 @@ func (c *rootConfig) exec(ctx context.Context, args []string) error {
+ 		opts.Scan = &wiresocks.ScanOptions{V4: c.v4, V6: c.v6, MaxRTT: c.rtt}
+ 	}
+ 
+-	// If the endpoint is not set, choose a random warp endpoint
+-	if opts.Endpoint == "" {
+-		addrPort, err := warp.RandomWarpEndpoint(c.v4, c.v6)
+-		if err != nil {
+-			fatal(l, err)
+-		}
+-		opts.Endpoint = addrPort.String()
+-	}
+-
+ 	go func() {
+ 		if err := app.RunWarp(ctx, l, opts); err != nil {
+ 			fatal(l, err)
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 0bd38a45d10a..72d0d2c97def 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "warp-plus";
-  version = "1.2.6";
+  version = "1.2.6-unstable-2025-08-13";
 
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    rev = "v${version}";
-    hash = "sha256-Zi428QI0DBIPEywXPi0TwDQWJuQyQcB6N5nqtYkkpHk=";
+    rev = "08d43e9e4c079534e47ba19fb2965c968c9621b2";
+    hash = "sha256-MHz8b1whSzUJO0YogxMPuXMaQRfR+xxSYhFxq412EmE=";
   };
 
-  vendorHash = "sha256-cCMbda2dVZypGqy9zoh0D3lVHWw/HNbCaSe0Nj5wL6s=";
+  vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";
 
   ldflags = [
     "-s"
@@ -27,10 +27,16 @@ buildGoModule rec {
     "-X main.version=${version}"
   ];
 
+  patches = [
+    # https://github.com/bepass-org/warp-plus/pull/291
+    ./fix-endpoints.patch
+  ];
+
   checkFlags =
     let
       # Skip tests that require network access
       skippedTests = [
+        "TestStdNetBindReceiveFuncAfterClose"
         "TestConcurrencySafety"
         "TestNoiseHandshake"
         "TestTwoDevicePing"
@@ -39,8 +45,11 @@ buildGoModule rec {
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   passthru = {
-    updateScript = nix-update-script { };
-    tests.version = testers.testVersion { package = warp-plus; };
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+    tests.version = testers.testVersion {
+      package = warp-plus;
+      command = "warp-plus version";
+    };
   };
 
   meta = {

From 34a54d92acc74220e033e69234c0ee728ab0d667 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 28 Aug 2025 14:54:45 +0530
Subject: [PATCH 51/84] warp-plus: add phanirithvij as maintainer, unbreak

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/wa/warp-plus/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 72d0d2c97def..760aeec0a1ec 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -56,10 +56,7 @@ buildGoModule rec {
     description = "Warp + Psiphon, an anti censorship utility for Iran";
     homepage = "https://github.com/bepass-org/warp-plus";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "warp-plus";
-    # Doesn't work with Go toolchain >1.22, runtime error:
-    # 'panic: tls.ConnectionState doesn't match'
-    broken = true;
   };
 }

From 224305569450d9e847a56a4e4b06a9b3080fd8f7 Mon Sep 17 00:00:00 2001
From: Hugh O'Brien <github@hughobrien.ie>
Date: Sat, 14 Dec 2024 14:53:03 -0500
Subject: [PATCH 52/84] binary-object-scanner: init at 3.3.1

---
 .../by-name/bi/binary-object-scanner/deps.nix | 101 ++++++++++++++++++
 .../bi/binary-object-scanner/package.nix      |  41 +++++++
 2 files changed, 142 insertions(+)
 create mode 100644 pkgs/by-name/bi/binary-object-scanner/deps.nix
 create mode 100644 pkgs/by-name/bi/binary-object-scanner/package.nix

diff --git a/pkgs/by-name/bi/binary-object-scanner/deps.nix b/pkgs/by-name/bi/binary-object-scanner/deps.nix
new file mode 100644
index 000000000000..9dd0a370273a
--- /dev/null
+++ b/pkgs/by-name/bi/binary-object-scanner/deps.nix
@@ -0,0 +1,101 @@
+# This file was automatically generated by passthru.fetch-deps.
+# Please dont edit it manually, your changes might get overwritten!
+
+{ fetchNuGet }:
+[
+  (fetchNuGet {
+    pname = "Blake3";
+    version = "1.1.0";
+    hash = "sha256-gSXmXolZOlon1UG2miI9bdS1542vGR8EyukwIkqXdoE=";
+  })
+  (fetchNuGet {
+    pname = "Newtonsoft.Json";
+    version = "13.0.3";
+    hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
+  })
+  (fetchNuGet {
+    pname = "OpenMcdf";
+    version = "2.3.1";
+    hash = "sha256-7Mjp7oAQCy+X/UG/40NzzDdYho3CbOd0HW2w0bE21QI=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.ASN1";
+    version = "1.5.0";
+    hash = "sha256-vYo3lxzFjP1MytGmR+ceMfLeSR8wxTt8JNG2j7JFKK4=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.Compression";
+    version = "0.6.1";
+    hash = "sha256-6EzPxtTJO2uwUBi/qr4M67YM7giXymSU8EsbdWTZWrY=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.Hashing";
+    version = "1.4.0";
+    hash = "sha256-Kqsol001/D1WmPt/2hsxrtb+rBePXrmWmHHdC/qawt8=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.IO";
+    version = "1.5.1";
+    hash = "sha256-ISuFfyc3R4kl5KR5ZUozKm35QLL5K+IuqCUQMHedFkc=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.IO";
+    version = "1.6.0";
+    hash = "sha256-b1H4eEff7XH0upG9GjbRW+Kwgl6+d4EENQv6r6PO40Q=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.IO";
+    version = "1.6.1";
+    hash = "sha256-Hu/paV5x06rFgTRydQ1Lsqu7EVimw6W4Z+v2UkM8W7M=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.Matching";
+    version = "1.5.0";
+    hash = "sha256-4YTQx+4CU/yoPfm85LRBe4daP04BTzmcHeiMNn5ugvM=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.Models";
+    version = "1.5.1";
+    hash = "sha256-xOA0TyqX7ZhwnGEp0ZUW+2SheVVJmWSsUQcxr/a603U=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.Models";
+    version = "1.5.5";
+    hash = "sha256-6ATn7ZGL8Il/KGhRL0KhJD0dhQDU7jEwMW1c08wczMI=";
+  })
+  (fetchNuGet {
+    pname = "SabreTools.Serialization";
+    version = "1.8.1";
+    hash = "sha256-Fmiv6E2k6TC8ezIGrUPUh/hxBrPFdktGXtgtfQ6jY7Y=";
+  })
+  (fetchNuGet {
+    pname = "SharpCompress";
+    version = "0.38.0";
+    hash = "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM=";
+  })
+  (fetchNuGet {
+    pname = "System.IO.Hashing";
+    version = "8.0.0";
+    hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=";
+  })
+  (fetchNuGet {
+    pname = "System.Text.Encoding.CodePages";
+    version = "8.0.0";
+    hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=";
+  })
+  (fetchNuGet {
+    pname = "UnshieldSharp";
+    version = "1.9.2";
+    hash = "sha256-xkg3szfT+Dc8E4HLluhuuHDZJAdqVjIy2w1bGPPv+hU=";
+  })
+  (fetchNuGet {
+    pname = "WiseUnpacker";
+    version = "1.5.4";
+    hash = "sha256-A2TWAS+hRzzOHwWDYOzWwAn/oGymvvG3Ok6//6jypGo=";
+  })
+  (fetchNuGet {
+    pname = "ZstdSharp.Port";
+    version = "0.8.1";
+    hash = "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg=";
+  })
+]
diff --git a/pkgs/by-name/bi/binary-object-scanner/package.nix b/pkgs/by-name/bi/binary-object-scanner/package.nix
new file mode 100644
index 000000000000..aa312b520298
--- /dev/null
+++ b/pkgs/by-name/bi/binary-object-scanner/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+}:
+
+buildDotnetModule rec {
+  pname = "BinaryObjectScanner";
+  version = "3.3.1";
+
+  src = fetchFromGitHub {
+    owner = "SabreTools";
+    repo = "BinaryObjectScanner";
+    tag = version;
+    hash = "sha256-rEtWJ87AQOrEXe4k6geWZ1pAOgC/HnPe7iJ5xVyMC1M=";
+  };
+
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.runtime_9_0;
+  dotnetFlags = [ "-p:TargetFramework=net9.0" ];
+  nugetDeps = ./deps.nix;
+
+  projectFile = [
+    "ProtectionScan/ProtectionScan.csproj"
+    "ExtractionTool/ExtractionTool.csproj"
+  ];
+  executables = [
+    "ProtectionScan"
+    "ExtractionTool"
+  ];
+
+  meta = {
+    homepage = "https://github.com/SabreTools/BinaryObjectScanner";
+    description = "C# protection, packer, and archive scanning library. Provides ProtectionScan and ExtractionTool";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ hughobrien ];
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+    mainProgram = "ProtectionScan";
+  };
+}

From 36ec0d8e834904c4f48c969e5d4a0a9bb10ca4ab Mon Sep 17 00:00:00 2001
From: Hugh O'Brien <github@hughobrien.ie>
Date: Fri, 20 Dec 2024 19:00:20 -0500
Subject: [PATCH 53/84] binary-object-scanner: 3.3.1 -> 3.3.3

---
 .../by-name/bi/binary-object-scanner/deps.nix | 49 +++++++------------
 .../bi/binary-object-scanner/package.nix      |  4 +-
 2 files changed, 19 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/bi/binary-object-scanner/deps.nix b/pkgs/by-name/bi/binary-object-scanner/deps.nix
index 9dd0a370273a..0f1b842582be 100644
--- a/pkgs/by-name/bi/binary-object-scanner/deps.nix
+++ b/pkgs/by-name/bi/binary-object-scanner/deps.nix
@@ -20,53 +20,38 @@
   })
   (fetchNuGet {
     pname = "SabreTools.ASN1";
-    version = "1.5.0";
-    hash = "sha256-vYo3lxzFjP1MytGmR+ceMfLeSR8wxTt8JNG2j7JFKK4=";
+    version = "1.5.1";
+    hash = "sha256-J6Iw44x6DGSAWmo4q1+sTrkcIc41eEBjChYNdazhvwM=";
   })
   (fetchNuGet {
     pname = "SabreTools.Compression";
-    version = "0.6.1";
-    hash = "sha256-6EzPxtTJO2uwUBi/qr4M67YM7giXymSU8EsbdWTZWrY=";
+    version = "0.6.3";
+    hash = "sha256-ZgoJzy7QpIl5Qqlk8O4DYXpV6kIaf04zStaV8SvzJNE=";
   })
   (fetchNuGet {
     pname = "SabreTools.Hashing";
-    version = "1.4.0";
-    hash = "sha256-Kqsol001/D1WmPt/2hsxrtb+rBePXrmWmHHdC/qawt8=";
+    version = "1.4.1";
+    hash = "sha256-tCOMMhRtdW16NWi7fCkqXWls5Tb108LawDjWAqBIaLg=";
   })
   (fetchNuGet {
     pname = "SabreTools.IO";
-    version = "1.5.1";
-    hash = "sha256-ISuFfyc3R4kl5KR5ZUozKm35QLL5K+IuqCUQMHedFkc=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.IO";
-    version = "1.6.0";
-    hash = "sha256-b1H4eEff7XH0upG9GjbRW+Kwgl6+d4EENQv6r6PO40Q=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.IO";
-    version = "1.6.1";
-    hash = "sha256-Hu/paV5x06rFgTRydQ1Lsqu7EVimw6W4Z+v2UkM8W7M=";
+    version = "1.6.2";
+    hash = "sha256-RrSr9yGfqUGIu5iG0AAv0MwZ2/+9a/2XNYaPOPFsNzM=";
   })
   (fetchNuGet {
     pname = "SabreTools.Matching";
-    version = "1.5.0";
-    hash = "sha256-4YTQx+4CU/yoPfm85LRBe4daP04BTzmcHeiMNn5ugvM=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.Models";
     version = "1.5.1";
-    hash = "sha256-xOA0TyqX7ZhwnGEp0ZUW+2SheVVJmWSsUQcxr/a603U=";
+    hash = "sha256-YrcdBXJKFfoD3+S4XkoAUH4LhN1rPk5DMY6z9UwTXQ8=";
   })
   (fetchNuGet {
     pname = "SabreTools.Models";
-    version = "1.5.5";
-    hash = "sha256-6ATn7ZGL8Il/KGhRL0KhJD0dhQDU7jEwMW1c08wczMI=";
+    version = "1.5.8";
+    hash = "sha256-6Erd8nBwLVK3KVmZPAH2P58NQbinCMW98gveqoo1WL8=";
   })
   (fetchNuGet {
     pname = "SabreTools.Serialization";
-    version = "1.8.1";
-    hash = "sha256-Fmiv6E2k6TC8ezIGrUPUh/hxBrPFdktGXtgtfQ6jY7Y=";
+    version = "1.8.4";
+    hash = "sha256-LjtX79eJGeD1Bz+SWeZP/8BMGo+ZEHNnLEa3MQ2d3rU=";
   })
   (fetchNuGet {
     pname = "SharpCompress";
@@ -85,13 +70,13 @@
   })
   (fetchNuGet {
     pname = "UnshieldSharp";
-    version = "1.9.2";
-    hash = "sha256-xkg3szfT+Dc8E4HLluhuuHDZJAdqVjIy2w1bGPPv+hU=";
+    version = "1.9.4";
+    hash = "sha256-ie1OBWmOYoAx0u8gzUj+ay/K/h96XessaGMsxRlI6WM=";
   })
   (fetchNuGet {
     pname = "WiseUnpacker";
-    version = "1.5.4";
-    hash = "sha256-A2TWAS+hRzzOHwWDYOzWwAn/oGymvvG3Ok6//6jypGo=";
+    version = "1.5.6";
+    hash = "sha256-zsAEUN1/4mdl+J2Vk8kA/1XXzomiMQ72hjHgndB6ZrY=";
   })
   (fetchNuGet {
     pname = "ZstdSharp.Port";
diff --git a/pkgs/by-name/bi/binary-object-scanner/package.nix b/pkgs/by-name/bi/binary-object-scanner/package.nix
index aa312b520298..f065954deb11 100644
--- a/pkgs/by-name/bi/binary-object-scanner/package.nix
+++ b/pkgs/by-name/bi/binary-object-scanner/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "BinaryObjectScanner";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src = fetchFromGitHub {
     owner = "SabreTools";
     repo = "BinaryObjectScanner";
     tag = version;
-    hash = "sha256-rEtWJ87AQOrEXe4k6geWZ1pAOgC/HnPe7iJ5xVyMC1M=";
+    hash = "sha256-5kah3O8qAfke8beAi5AhBrK/T23Tv+OZjpbdpmHaVtU=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_9_0;

From 18f688a8dd6a751e132ab48d6ee993dfe79242d2 Mon Sep 17 00:00:00 2001
From: Hugh O'Brien <github@hughobrien.ie>
Date: Mon, 1 Sep 2025 01:57:05 -0700
Subject: [PATCH 54/84] binary-object-scanner: 3.3.3 -> 3.3.4

---
 .../bi/binary-object-scanner/deps.json        | 87 +++++++++++++++++++
 .../by-name/bi/binary-object-scanner/deps.nix | 86 ------------------
 .../bi/binary-object-scanner/package.nix      |  6 +-
 3 files changed, 90 insertions(+), 89 deletions(-)
 create mode 100644 pkgs/by-name/bi/binary-object-scanner/deps.json
 delete mode 100644 pkgs/by-name/bi/binary-object-scanner/deps.nix

diff --git a/pkgs/by-name/bi/binary-object-scanner/deps.json b/pkgs/by-name/bi/binary-object-scanner/deps.json
new file mode 100644
index 000000000000..cb5de06b1945
--- /dev/null
+++ b/pkgs/by-name/bi/binary-object-scanner/deps.json
@@ -0,0 +1,87 @@
+[
+  {
+    "pname": "Blake3",
+    "version": "1.1.0",
+    "hash": "sha256-gSXmXolZOlon1UG2miI9bdS1542vGR8EyukwIkqXdoE="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "OpenMcdf",
+    "version": "2.3.1",
+    "hash": "sha256-7Mjp7oAQCy+X/UG/40NzzDdYho3CbOd0HW2w0bE21QI="
+  },
+  {
+    "pname": "SabreTools.ASN1",
+    "version": "1.5.1",
+    "hash": "sha256-J6Iw44x6DGSAWmo4q1+sTrkcIc41eEBjChYNdazhvwM="
+  },
+  {
+    "pname": "SabreTools.Compression",
+    "version": "0.6.3",
+    "hash": "sha256-ZgoJzy7QpIl5Qqlk8O4DYXpV6kIaf04zStaV8SvzJNE="
+  },
+  {
+    "pname": "SabreTools.Hashing",
+    "version": "1.4.1",
+    "hash": "sha256-tCOMMhRtdW16NWi7fCkqXWls5Tb108LawDjWAqBIaLg="
+  },
+  {
+    "pname": "SabreTools.IO",
+    "version": "1.6.2",
+    "hash": "sha256-RrSr9yGfqUGIu5iG0AAv0MwZ2/+9a/2XNYaPOPFsNzM="
+  },
+  {
+    "pname": "SabreTools.Matching",
+    "version": "1.5.1",
+    "hash": "sha256-YrcdBXJKFfoD3+S4XkoAUH4LhN1rPk5DMY6z9UwTXQ8="
+  },
+  {
+    "pname": "SabreTools.Models",
+    "version": "1.5.8",
+    "hash": "sha256-6Erd8nBwLVK3KVmZPAH2P58NQbinCMW98gveqoo1WL8="
+  },
+  {
+    "pname": "SabreTools.Serialization",
+    "version": "1.8.4",
+    "hash": "sha256-LjtX79eJGeD1Bz+SWeZP/8BMGo+ZEHNnLEa3MQ2d3rU="
+  },
+  {
+    "pname": "SabreTools.Serialization",
+    "version": "1.8.6",
+    "hash": "sha256-zJRpTturGPiFSm05XMxOEg5G1gdT05VhuLgNyikXLBM="
+  },
+  {
+    "pname": "SharpCompress",
+    "version": "0.38.0",
+    "hash": "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM="
+  },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "8.0.0",
+    "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "8.0.0",
+    "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
+  },
+  {
+    "pname": "UnshieldSharp",
+    "version": "1.9.4",
+    "hash": "sha256-ie1OBWmOYoAx0u8gzUj+ay/K/h96XessaGMsxRlI6WM="
+  },
+  {
+    "pname": "WiseUnpacker",
+    "version": "1.5.6",
+    "hash": "sha256-zsAEUN1/4mdl+J2Vk8kA/1XXzomiMQ72hjHgndB6ZrY="
+  },
+  {
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.1",
+    "hash": "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg="
+  }
+]
diff --git a/pkgs/by-name/bi/binary-object-scanner/deps.nix b/pkgs/by-name/bi/binary-object-scanner/deps.nix
deleted file mode 100644
index 0f1b842582be..000000000000
--- a/pkgs/by-name/bi/binary-object-scanner/deps.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-# This file was automatically generated by passthru.fetch-deps.
-# Please dont edit it manually, your changes might get overwritten!
-
-{ fetchNuGet }:
-[
-  (fetchNuGet {
-    pname = "Blake3";
-    version = "1.1.0";
-    hash = "sha256-gSXmXolZOlon1UG2miI9bdS1542vGR8EyukwIkqXdoE=";
-  })
-  (fetchNuGet {
-    pname = "Newtonsoft.Json";
-    version = "13.0.3";
-    hash = "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=";
-  })
-  (fetchNuGet {
-    pname = "OpenMcdf";
-    version = "2.3.1";
-    hash = "sha256-7Mjp7oAQCy+X/UG/40NzzDdYho3CbOd0HW2w0bE21QI=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.ASN1";
-    version = "1.5.1";
-    hash = "sha256-J6Iw44x6DGSAWmo4q1+sTrkcIc41eEBjChYNdazhvwM=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.Compression";
-    version = "0.6.3";
-    hash = "sha256-ZgoJzy7QpIl5Qqlk8O4DYXpV6kIaf04zStaV8SvzJNE=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.Hashing";
-    version = "1.4.1";
-    hash = "sha256-tCOMMhRtdW16NWi7fCkqXWls5Tb108LawDjWAqBIaLg=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.IO";
-    version = "1.6.2";
-    hash = "sha256-RrSr9yGfqUGIu5iG0AAv0MwZ2/+9a/2XNYaPOPFsNzM=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.Matching";
-    version = "1.5.1";
-    hash = "sha256-YrcdBXJKFfoD3+S4XkoAUH4LhN1rPk5DMY6z9UwTXQ8=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.Models";
-    version = "1.5.8";
-    hash = "sha256-6Erd8nBwLVK3KVmZPAH2P58NQbinCMW98gveqoo1WL8=";
-  })
-  (fetchNuGet {
-    pname = "SabreTools.Serialization";
-    version = "1.8.4";
-    hash = "sha256-LjtX79eJGeD1Bz+SWeZP/8BMGo+ZEHNnLEa3MQ2d3rU=";
-  })
-  (fetchNuGet {
-    pname = "SharpCompress";
-    version = "0.38.0";
-    hash = "sha256-bQL3kazuqbuqn+Csy9RYMMUsNMtqkGXF7x32s787UBM=";
-  })
-  (fetchNuGet {
-    pname = "System.IO.Hashing";
-    version = "8.0.0";
-    hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=";
-  })
-  (fetchNuGet {
-    pname = "System.Text.Encoding.CodePages";
-    version = "8.0.0";
-    hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE=";
-  })
-  (fetchNuGet {
-    pname = "UnshieldSharp";
-    version = "1.9.4";
-    hash = "sha256-ie1OBWmOYoAx0u8gzUj+ay/K/h96XessaGMsxRlI6WM=";
-  })
-  (fetchNuGet {
-    pname = "WiseUnpacker";
-    version = "1.5.6";
-    hash = "sha256-zsAEUN1/4mdl+J2Vk8kA/1XXzomiMQ72hjHgndB6ZrY=";
-  })
-  (fetchNuGet {
-    pname = "ZstdSharp.Port";
-    version = "0.8.1";
-    hash = "sha256-PeQvyz3lUrK+t+n1dFtNXCLztQtAfkqUuM6mOqBZHLg=";
-  })
-]
diff --git a/pkgs/by-name/bi/binary-object-scanner/package.nix b/pkgs/by-name/bi/binary-object-scanner/package.nix
index f065954deb11..e110461a69f7 100644
--- a/pkgs/by-name/bi/binary-object-scanner/package.nix
+++ b/pkgs/by-name/bi/binary-object-scanner/package.nix
@@ -7,19 +7,19 @@
 
 buildDotnetModule rec {
   pname = "BinaryObjectScanner";
-  version = "3.3.3";
+  version = "3.3.4";
 
   src = fetchFromGitHub {
     owner = "SabreTools";
     repo = "BinaryObjectScanner";
     tag = version;
-    hash = "sha256-5kah3O8qAfke8beAi5AhBrK/T23Tv+OZjpbdpmHaVtU=";
+    hash = "sha256-FiSBJO4ic/KjokUEP0uB1WNfFRcOWH/x0y9yJMKnl4Q=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
   dotnetFlags = [ "-p:TargetFramework=net9.0" ];
-  nugetDeps = ./deps.nix;
+  nugetDeps = ./deps.json;
 
   projectFile = [
     "ProtectionScan/ProtectionScan.csproj"

From ca3c28d65b4181545936767d28563115c3659c0b Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Mon, 1 Sep 2025 12:03:07 +0200
Subject: [PATCH 55/84] nodejs: fix hydra builds

---
 pkgs/development/web/nodejs/gyp-patches.nix | 27 +++++++++++++++++++--
 pkgs/development/web/nodejs/v24.nix         |  2 +-
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/gyp-patches.nix b/pkgs/development/web/nodejs/gyp-patches.nix
index b1d074df437f..48b47d19f7dc 100644
--- a/pkgs/development/web/nodejs/gyp-patches.nix
+++ b/pkgs/development/web/nodejs/gyp-patches.nix
@@ -1,13 +1,19 @@
 {
   lib,
+  stdenv,
   fetchpatch2,
   patch_npm ? true,
   patch_tools ? true,
+  patch_npm_catch_oserror ? patch_npm,
+  patch_tools_catch_oserror ? patch_tools,
+  patch_npm_regex_handling ? patch_npm && stdenv.buildPlatform.isDarwin,
+  patch_tools_regex_handling ? patch_tools && stdenv.buildPlatform.isDarwin,
 }:
 let
   url = "https://github.com/nodejs/gyp-next/commit/8224deef984add7e7afe846cfb82c9d3fa6da1fb.patch?full_index=1";
+  url_regex_handling = "https://github.com/nodejs/gyp-next/commit/b21ee3150eea9fc1a8811e910e5ba64f42e1fb77.patch?full_index=1";
 in
-lib.optionals patch_tools ([
+lib.optionals patch_tools_catch_oserror ([
   # Fixes builds with Nix sandbox on Darwin for gyp.
   (fetchpatch2 {
     inherit url;
@@ -16,7 +22,7 @@ lib.optionals patch_tools ([
     extraPrefix = "tools/gyp/";
   })
 ])
-++ lib.optionals patch_npm ([
+++ lib.optionals patch_npm_catch_oserror ([
   (fetchpatch2 {
     inherit url;
     hash = "sha256-cXTwmCRHrNhuY1+3cD/EvU0CJ+1Nk4TRh6c3twvfaW8=";
@@ -24,3 +30,20 @@ lib.optionals patch_tools ([
     extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
   })
 ])
+++ lib.optionals patch_tools_regex_handling ([
+  # Fixes builds with Nix sandbox on Darwin for gyp.
+  (fetchpatch2 {
+    url = url_regex_handling;
+    hash = "sha256-xDZO8GgZLPvCeTrCu6RVVFV5bmbuz9UPgHiaAJE6im0=";
+    stripLen = 1;
+    extraPrefix = "tools/gyp/";
+  })
+])
+++ lib.optionals patch_npm_regex_handling ([
+  (fetchpatch2 {
+    url = url_regex_handling;
+    hash = "sha256-fW5kQh+weCK0g3wzTJLZgAuXxetb14UAf6yxW6bIgbU=";
+    stripLen = 1;
+    extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
+  })
+])
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index 4982172f2ef2..948343586419 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -17,7 +17,7 @@ let
 
   gypPatches =
     if stdenv.buildPlatform.isDarwin then
-      callPackage ./gyp-patches.nix { patch_tools = false; }
+      callPackage ./gyp-patches.nix { patch_tools_catch_oserror = false; }
       ++ [
         ./gyp-patches-set-fallback-value-for-CLT.patch
       ]

From 3f0207c08727eac156f74241ac6dd7eb9884b593 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 1 Sep 2025 18:37:20 +0800
Subject: [PATCH 56/84] bandwidth: drop

No active upstream support.
---
 pkgs/by-name/ba/bandwidth/package.nix | 65 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 2 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/by-name/ba/bandwidth/package.nix

diff --git a/pkgs/by-name/ba/bandwidth/package.nix b/pkgs/by-name/ba/bandwidth/package.nix
deleted file mode 100644
index 8f0965b2ea27..000000000000
--- a/pkgs/by-name/ba/bandwidth/package.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  lib,
-  stdenv,
-  requireFile,
-  nasm,
-}:
-
-let
-  arch = "bandwidth${toString stdenv.hostPlatform.parsed.cpu.bits}";
-in
-stdenv.mkDerivation (finalAttrs: {
-  pname = "bandwidth";
-  version = "1.11.2d";
-
-  src = requireFile {
-    message = "This file does not have a valid url.";
-    name = "bandwidth-${finalAttrs.version}.tar.gz";
-    hash = "sha256-7IrNiCXKf1vyRGl73Ccu3aYMqPVc4PpEr6lnSqIa4Q8=";
-  };
-
-  postPatch = ''
-    sed -i 's,ar ,$(AR) ,g' OOC/Makefile
-    # Remove unnecessary -m32 for 32-bit targets
-    sed -i 's,-m32,,g' OOC/Makefile
-    # Replace arm64 with aarch64
-    sed -i 's#,arm64#,aarch64#g' Makefile
-    # Fix wrong comment character
-    sed -i 's,# 32,; 32,g' routines-x86-32bit.asm
-    # Fix missing symbol exports for macOS clang
-    echo global _VectorToVector128 >> routines-x86-64bit.asm
-    echo global _VectorToVector256 >> routines-x86-64bit.asm
-    # Fix unexpected token on macOS
-    sed -i '/.section .note.GNU-stack/d' *-64bit.asm
-    sed -i '/.section code/d' *-arm-64bit.asm
-    sed -i 's#-Wl,-z,noexecstack##g' Makefile-arm64
-  '';
-
-  nativeBuildInputs = [ nasm ];
-
-  buildFlags = [
-    "AR=${stdenv.cc.targetPrefix}ar"
-    "CC=${stdenv.cc.targetPrefix}cc"
-    "ARM_AS=${stdenv.cc.targetPrefix}as"
-    "ARM_CC=$(CC)"
-    "UNAMEPROC=${stdenv.hostPlatform.parsed.cpu.name}"
-    "UNAMEMACHINE=${stdenv.hostPlatform.parsed.cpu.name}"
-    arch
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 ${arch} $out/bin/bandwidth
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Artificial benchmark for identifying weaknesses in the memory subsystem";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64;
-    maintainers = with lib.maintainers; [ r-burns ];
-    mainProgram = "bandwidth";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7155fddfd0d3..725c3ba4c790 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -498,6 +498,7 @@ mapAliases {
   badtouch = authoscope; # Project was renamed, added 20210626
   badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
   baget = throw "'baget' has been removed due to being unmaintained";
+  bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
   banking = saldo; # added 2025-08-29
   base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
   baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02

From 17c24ab0759b95d90166bdde01ead0a97ff62306 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 1 Sep 2025 13:01:27 +0200
Subject: [PATCH 57/84] android-translation-layer: update art-standalone patch

---
 .../configure-art-path.patch                  | 32 ++++++++++++-------
 .../an/android-translation-layer/package.nix  |  2 ++
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/an/android-translation-layer/configure-art-path.patch b/pkgs/by-name/an/android-translation-layer/configure-art-path.patch
index d3f4cb18dba3..d14a8f4394f6 100644
--- a/pkgs/by-name/an/android-translation-layer/configure-art-path.patch
+++ b/pkgs/by-name/an/android-translation-layer/configure-art-path.patch
@@ -1,25 +1,26 @@
 diff --git a/meson.build b/meson.build
-index 8f525118..c1761a2d 100644
+index 8f525118..ba8027c2 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -11,8 +11,8 @@ dir_base = meson.current_source_dir()
+@@ -9,22 +9,15 @@ add_project_dependencies(incdir_dep, language: 'c')
+ cc = meson.get_compiler('c')
+ dir_base = meson.current_source_dir()
  builddir_base = meson.current_build_dir()
- # FIXME: make art install a pkgconfig file
- libart_dep = [
+-# FIXME: make art install a pkgconfig file
+-libart_dep = [
 -	cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]),
 -     	cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ])
-+	cc.find_library('art', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art', '@artStandalonePackageDir@' / get_option('libdir') / 'art' ]),
-+     	cc.find_library('nativebridge', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art', '@artStandalonePackageDir@' / get_option('libdir') / 'art' ])
- ]
+-]
++libart_dep = dependency('art-standalone')
  libdl_bio_dep = [
  	cc.find_library('dl_bio')
-@@ -21,10 +21,10 @@ libc_bio_dep = [
+ ]
+ libc_bio_dep = [
  	cc.find_library('c_bio')
  ]
- libandroidfw_dep = [
+-libandroidfw_dep = [
 -	cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art' ]),
-+	cc.find_library('androidfw', dirs : [ '/usr' / get_option('libdir') / 'art', '/usr/local' / get_option('libdir') / 'art', get_option('prefix') / get_option('libdir') / 'art', '@artStandalonePackageDir@' / 'lib' / 'art' ]),
- ]
+-]
 -if fs.is_file('/usr' / get_option('libdir') / 'java/core-all_classes.jar')
 -  bootclasspath_dir = '/usr' / get_option('libdir') / 'java'
 +if fs.is_file('@artStandalonePackageDir@' / get_option('libdir') / 'java/core-all_classes.jar')
@@ -27,3 +28,12 @@ index 8f525118..c1761a2d 100644
  elif fs.is_file('/usr/local' / get_option('libdir') / 'java/core-all_classes.jar')
    bootclasspath_dir = '/usr/local' / get_option('libdir') / 'java'
  elif fs.is_file(get_option('prefix') / get_option('libdir') / 'java/core-all_classes.jar')
+@@ -179,7 +172,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
+                                                                   	dependency('gtk4', version: '>=4.14'), dependency('gl'), dependency('egl'), dependency('wayland-client'), dependency('jni'),
+                                                                   	dependency('libportal'), dependency('sqlite3'), dependency('libavcodec', version: '>=59'), dependency('libdrm'),
+                                                                   	dependency('gudev-1.0'), dependency('libswscale'), dependency('webkitgtk-6.0'),
+-                                                                  	libandroidfw_dep, wayland_protos_dep
++                                                                        libart_dep, wayland_protos_dep
+                                                                   ],
+                                                                   link_with: [ libandroid_so ],
+                                                                   link_args: [
diff --git a/pkgs/by-name/an/android-translation-layer/package.nix b/pkgs/by-name/an/android-translation-layer/package.nix
index 98dc236170db..6542e9ebd9c7 100644
--- a/pkgs/by-name/an/android-translation-layer/package.nix
+++ b/pkgs/by-name/an/android-translation-layer/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
   };
 
   patches = [
+    # meson: use pkg-config from art-standalone instead of manual library search
+    # See: https://gitlab.com/android_translation_layer/android_translation_layer/-/merge_requests/164
     (replaceVars ./configure-art-path.patch {
       artStandalonePackageDir = "${art-standalone}";
     })

From 6f2a943d4f5a69d447d3fb0a9ccab42bd5430c1f Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 1 Sep 2025 13:04:59 +0200
Subject: [PATCH 58/84] art-standalone: add pkg-config support

---
 pkgs/by-name/ar/art-standalone/package.nix    |  4 ++
 .../art-standalone/pkg-config-support.patch   | 45 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/ar/art-standalone/pkg-config-support.patch

diff --git a/pkgs/by-name/ar/art-standalone/package.nix b/pkgs/by-name/ar/art-standalone/package.nix
index 0082c97a37c2..ad1809ae242a 100644
--- a/pkgs/by-name/ar/art-standalone/package.nix
+++ b/pkgs/by-name/ar/art-standalone/package.nix
@@ -35,6 +35,10 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Do not hardocde addr2line binary path
     ./no-hardcode-path-addr2line.patch
+
+    # Add support for pkg-config
+    # See: https://gitlab.com/android_translation_layer/art_standalone/-/merge_requests/37
+    ./pkg-config-support.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ar/art-standalone/pkg-config-support.patch b/pkgs/by-name/ar/art-standalone/pkg-config-support.patch
new file mode 100644
index 000000000000..8b3929572757
--- /dev/null
+++ b/pkgs/by-name/ar/art-standalone/pkg-config-support.patch
@@ -0,0 +1,45 @@
+diff --git a/Makefile b/Makefile
+index 42df5b18..3321adae 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,6 +32,8 @@ ____dalvikvm_bin_64 := $(____TOPDIR)/out/host/linux-x86/bin/dalvikvm64
+ __RPATH_BIN := \$${ORIGIN}/../$(____LIBDIR)/art/:\$${ORIGIN}/../$(____LIBDIR)/java/dex/art/natives
+ __RPATH_LIB := \$${ORIGIN}
+ 
++__VERSION ?= 0.0.0
++
+ # Jack compiler was google's first attempt at a solution for desugaring Java 8 and newer bytecode into bytecode compatible with older dex file formats.
+ # Thankfully, google realized that this was a bad idea, and in a typical google fashion, axed the project.
+ # They experimented with other approaches, but currently (2022) the way to do this is to use d8/r8 instead of dx;
+@@ -112,6 +114,15 @@ install:
+ # our stable C API for libandroidfw, used by ATL
+ 	install -Dt $(____INSTALL_INCLUDEDIR)/androidfw $(____TOPDIR)/libandroidfw/include/androidfw/androidfw_c_api.h
+ 
++	# install pkg-config file
++	mkdir -p $(____INSTALL_LIBDIR)/pkgconfig
++	sed -e 's|@prefix@|$(____PREFIX)|g' \
++	    -e 's|@libdir@|$(____LIBDIR)|g' \
++	    -e 's|@includedir@|$(____INCLUDEDIR)|g' \
++	    -e 's|@version@|$(__VERSION)|g' \
++	    art-standalone.pc.in > $(____INSTALL_LIBDIR)/pkgconfig/art-standalone.pc
++
++
+ # TODO: figure out sharing dependencies and have this in a separate repo
+ install_adbd:
+ 	install -Dt $(____INSTALL_BINDIR) $(____TOPDIR)/out/host/linux-x86/bin/adbd
+diff --git a/art-standalone.pc.in b/art-standalone.pc.in
+new file mode 100644
+index 00000000..210cd031
+--- /dev/null
++++ b/art-standalone.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=${prefix}
++libdir=${prefix}/@libdir@
++includedir=${prefix}/@includedir@
++
++Name: art-standalone
++Description: Android ART runtime (standalone build, minimal ATL deps)
++Version: @version@
++Libs: -L${libdir}/art -lart -lnativebridge -landroidfw
++Cflags: -I${includedir} -I${includedir}/androidfw

From 0b84d12a7f17d1c5bcc116096af45ca71e2ad615 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 1 Sep 2025 13:05:50 +0200
Subject: [PATCH 59/84] android-translation-layer: 0-unstable-2025-07-14 ->
 0-unstable-2025-08-06

---
 .../an/android-translation-layer/add-gio-unix-dep.patch     | 6 +++---
 pkgs/by-name/an/android-translation-layer/package.nix       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/an/android-translation-layer/add-gio-unix-dep.patch b/pkgs/by-name/an/android-translation-layer/add-gio-unix-dep.patch
index dfac46ada366..2be2e07123b8 100644
--- a/pkgs/by-name/an/android-translation-layer/add-gio-unix-dep.patch
+++ b/pkgs/by-name/an/android-translation-layer/add-gio-unix-dep.patch
@@ -1,13 +1,13 @@
 diff --git a/meson.build b/meson.build
-index 8f525118..658cd9e5 100644
+index ba8027c2..fb21e317 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -178,7 +178,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
+@@ -171,7 +171,7 @@ libtranslationlayer_so = shared_library('translation_layer_main', [
                                                                          extra_deps,
                                                                    	dependency('gtk4', version: '>=4.14'), dependency('gl'), dependency('egl'), dependency('wayland-client'), dependency('jni'),
                                                                    	dependency('libportal'), dependency('sqlite3'), dependency('libavcodec', version: '>=59'), dependency('libdrm'),
 -                                                                  	dependency('gudev-1.0'), dependency('libswscale'), dependency('webkitgtk-6.0'),
 +                                                                  	dependency('gudev-1.0'), dependency('libswscale'), dependency('webkitgtk-6.0'), dependency('gio-unix-2.0'),
-                                                                   	libandroidfw_dep, wayland_protos_dep
+                                                                         libart_dep, wayland_protos_dep
                                                                    ],
                                                                    link_with: [ libandroid_so ],
diff --git a/pkgs/by-name/an/android-translation-layer/package.nix b/pkgs/by-name/an/android-translation-layer/package.nix
index 6542e9ebd9c7..0116658b90d2 100644
--- a/pkgs/by-name/an/android-translation-layer/package.nix
+++ b/pkgs/by-name/an/android-translation-layer/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation {
   pname = "android-translation-layer";
-  version = "0-unstable-2025-07-14";
+  version = "0-unstable-2025-08-06";
 
   src = fetchFromGitLab {
     owner = "android_translation_layer";
     repo = "android_translation_layer";
-    rev = "828f779c4f7170f608047c500d6d3b64b480df7f";
-    hash = "sha256-1KYZWlzES3tbskqvA8qSQCegE0uLTLCq4q2CX6uix4o=";
+    rev = "d52985a6df81d73a8f6dfbdee337f7ff90b724cb";
+    hash = "sha256-fJ8S04YucoCzHiIQdiQd+Il0YGNFsOkSiGWjZKNMTIM=";
   };
 
   patches = [

From 5248b1367bf6b08651dc75c7e375bc2fe5592ebb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 1 Sep 2025 13:21:36 +0200
Subject: [PATCH 60/84] android-translation-layer: add bintools to PATH

---
 pkgs/by-name/an/android-translation-layer/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/an/android-translation-layer/package.nix b/pkgs/by-name/an/android-translation-layer/package.nix
index 0116658b90d2..81be75c2c607 100644
--- a/pkgs/by-name/an/android-translation-layer/package.nix
+++ b/pkgs/by-name/an/android-translation-layer/package.nix
@@ -25,6 +25,7 @@
   makeWrapper,
   replaceVars,
   nixosTests,
+  bintools,
 }:
 
 stdenv.mkDerivation {
@@ -86,7 +87,8 @@ stdenv.mkDerivation {
 
   postFixup = ''
     wrapProgram $out/bin/android-translation-layer \
-      --prefix LD_LIBRARY_PATH : ${art-standalone}/lib/art
+      --prefix LD_LIBRARY_PATH : ${art-standalone}/lib/art \
+      --prefix PATH : ${lib.makeBinPath [ bintools ]}
   '';
 
   passthru.tests = {

From 95809ba5dd0776fd84d97004f8abc0313f7b7440 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 11:55:20 +0000
Subject: [PATCH 61/84] jp-zip-codes: 0-unstable-2025-08-01 ->
 0-unstable-2025-09-01

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

diff --git a/pkgs/by-name/jp/jp-zip-codes/package.nix b/pkgs/by-name/jp/jp-zip-codes/package.nix
index c5f36962f301..578b2f74b6ce 100644
--- a/pkgs/by-name/jp/jp-zip-codes/package.nix
+++ b/pkgs/by-name/jp/jp-zip-codes/package.nix
@@ -7,15 +7,15 @@
 
 stdenvNoCC.mkDerivation {
   pname = "jp-zip-code";
-  version = "0-unstable-2025-08-01";
+  version = "0-unstable-2025-09-01";
 
   # This package uses a mirror as the source because the
   # original provider uses the same URL for updated content.
   src = fetchFromGitHub {
     owner = "musjj";
     repo = "jp-zip-codes";
-    rev = "e3f5e6c1509e2dc5f2e60c88324a72635923fcbc";
-    hash = "sha256-bGBQ/S6U6agVxlKk3ZZ2ffiO1JipzQt+ctpLt6laLPk=";
+    rev = "87a760cee8a6b103d834197caca72c3392ccbcde";
+    hash = "sha256-7vOcScEk4fKIeUa+FGCnBczlAwUC00E7EKQq7wQ2bUI=";
   };
 
   installPhase = ''

From 5d5cf81be9519c1fbb6e90ea5769f5e8e2d47ed6 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 1 Sep 2025 14:06:38 +0200
Subject: [PATCH 62/84] art-standalone: disable failing wolfssl tests

---
 pkgs/by-name/ar/art-standalone/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ar/art-standalone/package.nix b/pkgs/by-name/ar/art-standalone/package.nix
index ad1809ae242a..1d542f71850f 100644
--- a/pkgs/by-name/ar/art-standalone/package.nix
+++ b/pkgs/by-name/ar/art-standalone/package.nix
@@ -72,6 +72,14 @@ stdenv.mkDerivation (finalAttrs: {
       configureFlags = oldAttrs.configureFlags ++ [
         "--enable-jni"
       ];
+      # Disable failing tests when jni enabled
+      postPatch = oldAttrs.postPatch or "" + ''
+        sed -i '/TEST_DECL(test_wolfSSL_Tls13_ECH)/d;
+                /TEST_DECL(test_wolfSSL_Tls13_ECH_HRR)/d;
+                /TEST_DECL(test_TLSX_CA_NAMES_bad_extension)/d' tests/api.c
+        sed -i '/quic/d' tests/include.am
+        sed -i '300,305d' tests/unit.c
+      '';
     }))
     xz
     zlib

From a629f770b5133b6ba0f158badf882796a0b21cc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 12:38:25 +0000
Subject: [PATCH 63/84] proton-pass: 1.32.3 -> 1.32.5

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

diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index 81a55dfabf8f..dcd7ebfd3c48 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.32.3";
+  version = "1.32.5";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-tVjiY+AwzCTPAb9rB7/gnRjElf2vhHRcX3kLUj6lwIg=";
+    hash = "sha256-nf24oCLeJ0FoWPCB1NKFEDfzLkRWvvgzMFItFw4dikY=";
   };
 
   dontConfigure = true;

From 2ed2556c04493ca429d8391784d91d1655962409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 1 Sep 2025 14:49:18 +0200
Subject: [PATCH 64/84] vital: clarify license

---
 pkgs/by-name/vi/vital/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vital/package.nix b/pkgs/by-name/vi/vital/package.nix
index a5c964cde693..e52b265c8bb7 100644
--- a/pkgs/by-name/vi/vital/package.nix
+++ b/pkgs/by-name/vi/vital/package.nix
@@ -73,8 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://vital.audio/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = with licenses; [
-      unfree
-      gpl3Plus
+      unfree # https://vital.audio/eula/
     ];
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ PowerUser64 ];

From d4e52ac55bbaec78b294de710a97f7d760214ef0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 13:48:04 +0000
Subject: [PATCH 65/84] python3Packages.langgraph-sdk: 0.2.3 -> 0.2.4

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

diff --git a/pkgs/development/python-modules/langgraph-sdk/default.nix b/pkgs/development/python-modules/langgraph-sdk/default.nix
index 8e55808fdf54..bfe9f549af95 100644
--- a/pkgs/development/python-modules/langgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/langgraph-sdk/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-sdk";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "sdk==${version}";
-    hash = "sha256-X8ysXd5CwMiJMZ6GdiPjjjlm6x88Ibub04fhjDzi59M=";
+    hash = "sha256-CBX9tDYDrLCe/q+QS6ze4B6E5dVJhfsd6QB4U6kObTM=";
   };
 
   sourceRoot = "${src.name}/libs/sdk-py";

From b61d0aa2f05a7814f2c97398defd8cfc4b53e1aa Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 1 Sep 2025 09:21:11 -0400
Subject: [PATCH 66/84] nixos/tests/openvswitch: improve ping check resiliency

(cherry picked from commit 03a9484617e33660fe3d72cada4ee46fb17eaa24)
---
 nixos/tests/openvswitch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/openvswitch.nix b/nixos/tests/openvswitch.nix
index 679641717a1f..cd725ccb4071 100644
--- a/nixos/tests/openvswitch.nix
+++ b/nixos/tests/openvswitch.nix
@@ -56,7 +56,7 @@
       node2.wait_for_unit("ovsdb.service")
       node2.wait_for_unit("ovs-vswitchd.service")
 
-      node1.succeed("ping -c3 10.0.0.2")
-      node2.succeed("ping -c3 10.0.0.1")
+      node1.wait_until_succeeds("ping -c1 10.0.0.2", timeout=30)
+      node2.wait_until_succeeds("ping -c1 10.0.0.1", timeout=30)
     '';
 }

From a5c0180ff5c93259bc6a4b5e9af5811d3cf921a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 29 Aug 2025 21:54:47 +0000
Subject: [PATCH 67/84] python3Packages.sphinx-hoverxref: 1.3.0 -> 1.5.0

---
 .../sphinx-hoverxref/default.nix              | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/sphinx-hoverxref/default.nix b/pkgs/development/python-modules/sphinx-hoverxref/default.nix
index af5f7ad7facc..a476099165d4 100644
--- a/pkgs/development/python-modules/sphinx-hoverxref/default.nix
+++ b/pkgs/development/python-modules/sphinx-hoverxref/default.nix
@@ -20,8 +20,9 @@
 
 buildPythonPackage rec {
   pname = "sphinx-hoverxref";
-  version = "1.3.0";
-  format = "pyproject";
+  version = "1.5.0";
+  pyproject = true;
+
   outputs = [
     "out"
     "doc"
@@ -31,35 +32,37 @@ buildPythonPackage rec {
     owner = "readthedocs";
     repo = "sphinx-hoverxref";
     rev = version;
-    hash = "sha256-DJ+mHu9IeEYEyf/SD+nDNtWpTf6z7tQzG0ogaECDpkU=";
+    hash = "sha256-JHNJGUkO/HXnnnROYBd1pAcoAEYo6b7eK4tyC+ujc+A=";
   };
 
   postPatch = ''
     substituteInPlace docs/conf.py --replace-fail "sphinx-prompt" "sphinx_prompt"
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     flit-core
+  ];
 
+  nativeBuildInputs = [
     sphinxHook
-    sphinx-notfound-page
-    sphinx-prompt
+    sphinx-autoapi
     sphinx-rtd-theme
     sphinx-tabs
+    sphinx-prompt
     sphinx-version-warning
-    sphinx-autoapi
+    sphinx-notfound-page
     sphinxcontrib-bibtex
     sphinxemoji
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     sphinx
     sphinxcontrib-jquery
   ];
 
   pythonImportsCheck = [ "hoverxref" ];
 
-  meta = with lib; {
+  meta = {
     description = "Sphinx extension for creating tooltips on the cross references of the documentation";
     longDescription = ''
       sphinx-hoverxref is a Sphinx extension to show a floating window
@@ -70,7 +73,7 @@ buildPythonPackage rec {
       in there.
     '';
     homepage = "https://github.com/readthedocs/sphinx-hoverxref";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kaction ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kaction ];
   };
 }

From 5f29356038421e52d52bdf3e76b880dc10ba758a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 14:21:41 +0000
Subject: [PATCH 68/84] python3Packages.jproperties: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix
index f629bdeaf4ba..6f8512b92d04 100644
--- a/pkgs/development/python-modules/jproperties/default.nix
+++ b/pkgs/development/python-modules/jproperties/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "jproperties";
-  version = "2.1.1";
+  version = "2.1.2";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "Tblue";
     repo = "python-jproperties";
     rev = "v${version}";
-    hash = "sha256-O+ALeGHMNjW1dc9IRyLzO81k8DW2vbGjuZqXxgrhYjo=";
+    hash = "sha256-wnhEcPWAFUXR741/LZT3TXqxrU70JZe+90AkVEA3A+k=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From c1a260ee1bedc3f3e8f43179ad3acce6157c2944 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 15:07:32 +0000
Subject: [PATCH 69/84] super-productivity: 14.3.3 -> 14.4.1

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

diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 93eb4afb8fe4..f0e1eef1a17f 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -14,13 +14,13 @@
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "14.3.3";
+  version = "14.4.1";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-gJ6hG5nAzT708GFMjArN/F1Mz/K4gg1R0QeHmM6jc0c=";
+    hash = "sha256-TW3HbwNIrcfA1W+fmBMfD0NGKBF/vTKJFuCzzaVfX6I=";
 
     postFetch = ''
       find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -63,7 +63,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-+e53npbip3BGdw4S6mpkxc9g6AVc+QbJxfPYK6IglSA=";
+      hash = "sha256-AYbvyqvKmhP+2NHxzzcSZFiPBgeh0YOQ2a6t+3fZwYk=";
     }
   );
 

From 234eddda0d068e886f7466ea6d1feb3a6102a0f9 Mon Sep 17 00:00:00 2001
From: staticdev <staticdev-support@proton.me>
Date: Mon, 1 Sep 2025 18:01:17 +0200
Subject: [PATCH 70/84] dbeaver-bin: 25.1.5 -> 25.2.0

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index e6b4f16fbe3a..4a0916701282 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -18,7 +18,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.1.5";
+  version = "25.2.0";
 
   src =
     let
@@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-kyZi24hcHgpW5Hcp3bjU1fTHeo2sXnZV9DFiYyZCqJM=";
-        aarch64-linux = "sha256-CVMUkpjAvWnphsxTXXu/0N2k8o5gDX4KH+PXneOXlFw=";
-        x86_64-darwin = "sha256-SxlMSCXC3gCKC0MuKvyHg4iLRVm/c4COjmpJzySD/a0=";
-        aarch64-darwin = "sha256-0m26hOqmmqAPutMx0rQsenM8vNRjUvP/ZkIPuH6U7/A=";
+        x86_64-linux = "sha256-JGqzoqCkZjrV1SNrJSXNotd3YaOUtqXJYhHDy7/xZSU=";
+        aarch64-linux = "sha256-+byvDpqaijxt0LnGJuWg1ooVnb1bLdaFfvEmlaEmBCA=";
+        x86_64-darwin = "sha256-59mrDs00XxIjfiqm3OsoHqbuNQI3VdB1ff3l/51lzEg=";
+        aarch64-darwin = "sha256-jUWZr5DwUv6aFfGEox62r+PRoEqZIvdP6YHCsWshYJA=";
       };
     in
     fetchurl {

From c4a5576f7bdd10916321d8d580881368f7fe9f85 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 1 Sep 2025 19:23:56 +0200
Subject: [PATCH 71/84] haskellPackages.llvm-ffi: always use default LLVM
 version

The previous approach of selecting the highest possible LLVM version
brought complications, especially when the latest LLVM release candidate
was properly released and the llvm-ffi version on master didn't support
this properly, yet. This would result in an eval failure that was
impossible to properly solve on master.

We only introduced the logic of selecting the latest LLVM version,
because we didn't know about the cabal flags supporting lower LLVM
versions at first. We then stuck with this approach. However, we can
also just always use the default LLVM version that is present in
`llvmPackages`. This is more in the spirit of a *default* version
anyway.

This will not result in any eval failures / warnings. There is only one
failure mode: `haskellPackages.llvm-ffi` not supporting the new default
LLVM version. In this case it's perfectly fine to wait for an update of
llvm-ffi via `haskell-updates`.
---
 .../haskell-modules/configuration-nix.nix     | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 86844adf8d90..b52629711680 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -507,24 +507,21 @@ builtins.intersectAttrs super {
   # LLVM input that llvm-ffi declares.
   llvm-ffi =
     let
-      chosenLlvmVersion = 20;
-      nextLlvmAttr = "llvmPackages_${toString (chosenLlvmVersion + 1)}";
-      shouldUpgrade =
-        pkgs ? ${nextLlvmAttr} && (lib.strings.match ".+rc.+" pkgs.${nextLlvmAttr}.llvm.version) == null;
+      currentDefaultVersion = lib.versions.major pkgs.llvmPackages.llvm.version;
+      latestSupportedVersion = lib.versions.major super.llvm-ffi.version;
     in
-    lib.warnIf shouldUpgrade
-      "haskellPackages.llvm-ffi: ${nextLlvmAttr} is available in Nixpkgs, consider updating."
-      lib.pipe
-      super.llvm-ffi
+    lib.pipe super.llvm-ffi (
       [
-        # ATTN: There is no matching flag for the latest supported LLVM version,
-        # so you may need to remove this when updating chosenLlvmVersion
-        (enableCabalFlag "LLVM${toString chosenLlvmVersion}00")
         (addBuildDepends [
-          pkgs."llvmPackages_${toString chosenLlvmVersion}".llvm.lib
-          pkgs."llvmPackages_${toString chosenLlvmVersion}".llvm.dev
+          pkgs.llvmPackages.llvm.lib
+          pkgs.llvmPackages.llvm.dev
         ])
-      ];
+      ]
+      # There is no matching flag for the latest supported LLVM version.
+      ++ lib.optional (currentDefaultVersion != latestSupportedVersion) (
+        enableCabalFlag "LLVM${currentDefaultVersion}00"
+      )
+    );
 
   # Needs help finding LLVM.
   spaceprobe = addBuildTool self.buildHaskellPackages.llvmPackages.llvm super.spaceprobe;

From 396a01814ddde78d179b0eb5f7d0c5ece849807e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 1 Sep 2025 19:54:35 +0200
Subject: [PATCH 72/84] tlsx: 1.2.0 -> 1.2.1

Diff: https://github.com/projectdiscovery/tlsx/compare/v1.2.0...v1.2.1

Changelog: https://github.com/projectdiscovery/tlsx/releases/tag/v1.2.1
---
 pkgs/by-name/tl/tlsx/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tl/tlsx/package.nix b/pkgs/by-name/tl/tlsx/package.nix
index 0da6965982fd..9617b69b5db4 100644
--- a/pkgs/by-name/tl/tlsx/package.nix
+++ b/pkgs/by-name/tl/tlsx/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "tlsx";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "tlsx";
     tag = "v${version}";
-    hash = "sha256-5ffJ7UzIP3qZoEAxJFGce5BaWHnkqtPnQOHpuJmQC50=";
+    hash = "sha256-VpdAf2oe7X8NldZ033BPxyl0ra5HGAfeqtxI5beSXi8=";
   };
 
-  vendorHash = "sha256-hSCzpvciuI8zJgD2xgWTK+UiVthXgrPl6AeU/7QLg4c=";
+  vendorHash = "sha256-EzTz8WP3Sadg6Tu8Tf0n2s+YOJqRVbPQrkW3JEntwBg=";
 
   ldflags = [
     "-s"

From fcb95a4719a08bfa790d1db9969ea1f201e52f5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 1 Sep 2025 18:19:50 +0000
Subject: [PATCH 73/84] python3Packages.pyezvizapi: 1.0.1.6 -> 1.0.1.7

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

diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix
index ddbf51bcb9d0..14abe233865d 100644
--- a/pkgs/development/python-modules/pyezvizapi/default.nix
+++ b/pkgs/development/python-modules/pyezvizapi/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyezvizapi";
-  version = "1.0.1.6";
+  version = "1.0.1.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RenierM26";
     repo = "pyEzvizApi";
     tag = version;
-    hash = "sha256-3HiL/l4fYb1T2JSuUgMdws3ae2YofzqDCF4zkmRY2+c=";
+    hash = "sha256-bcgy8NBW+AQDYHYo+E+7studQK6/6UgjkT75URyzSi0=";
   };
 
   build-system = [ setuptools ];

From d1461bacd2d7031991045e55fb74e5eab8a9575c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 1 Sep 2025 20:39:58 +0200
Subject: [PATCH 74/84] python313Packages.jproperties: modernize

---
 .../python-modules/jproperties/default.nix    | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/jproperties/default.nix b/pkgs/development/python-modules/jproperties/default.nix
index 6f8512b92d04..1705f73d2605 100644
--- a/pkgs/development/python-modules/jproperties/default.nix
+++ b/pkgs/development/python-modules/jproperties/default.nix
@@ -6,24 +6,33 @@
   six,
   pytest-cov-stub,
   pytest-datadir,
+  setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "jproperties";
   version = "2.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Tblue";
     repo = "python-jproperties";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-wnhEcPWAFUXR741/LZT3TXqxrU70JZe+90AkVEA3A+k=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "setuptools_scm ~= 3.3" "setuptools_scm"
+  '';
 
-  propagatedBuildInputs = [ six ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [ six ];
 
   nativeCheckInputs = [
     pytest-cov-stub
@@ -31,11 +40,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "setuptools_scm ~= 3.3" "setuptools_scm"
-  '';
-
   disabledTestPaths = [
     # TypeError: 'PosixPath' object...
     "tests/test_simple_utf8.py"
@@ -45,9 +49,9 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Java Property file parser and writer for Python";
-    mainProgram = "propconv";
     homepage = "https://github.com/Tblue/python-jproperties";
-    license = with licenses; [ bsd3 ];
+    license = licenses.bsd3;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "propconv";
   };
 }

From 455fa0b191623a8f2c0f50df5cf7b3cdb9f838d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 1 Sep 2025 21:00:51 +0200
Subject: [PATCH 75/84] python313Packages.typer-shell: 0.2.1 -> 1.0.3

---
 .../development/python-modules/typer-shell/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix
index cdc436273118..973d481fff7d 100644
--- a/pkgs/development/python-modules/typer-shell/default.nix
+++ b/pkgs/development/python-modules/typer-shell/default.nix
@@ -1,11 +1,11 @@
 {
   lib,
   buildPythonPackage,
-  click,
   click-shell,
+  click,
   fetchFromGitHub,
+  hatchling,
   iterfzf,
-  poetry-core,
   pythonOlder,
   pyyaml,
   rich,
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "typer-shell";
-  version = "0.2.1";
+  version = "1.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "FergusFettes";
     repo = "typer-shell";
     tag = "v${version}";
-    hash = "sha256-ch5xElSIIIYNtE1Wb6aWUvbV0gT5MU1sLIY+suYzjHE=";
+    hash = "sha256-vjinzBCaEPWbroxT7OmUQIvtwlPivYO0soGqvyRXVc4=";
   };
 
   pythonRelaxDeps = [
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     "typer"
   ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     click

From de2fd96686b4c39ecdb51a08da402bc7ee8c31f5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 29 Aug 2025 15:35:46 +0200
Subject: [PATCH 76/84] =?UTF-8?q?jasmin-compiler:=202025.06.0=20=E2=86=92?=
 =?UTF-8?q?=202025.06.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ja/jasmin-compiler/package.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix
index ecbba2c2fd0f..c2aae034b044 100644
--- a/pkgs/by-name/ja/jasmin-compiler/package.nix
+++ b/pkgs/by-name/ja/jasmin-compiler/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "jasmin-compiler";
-  version = "2025.06.0";
+  version = "2025.06.1";
 
   src = fetchurl {
     url = "https://github.com/jasmin-lang/jasmin/releases/download/v${version}/jasmin-compiler-v${version}.tar.bz2";
-    hash = "sha256-VjWNvg/aF+omobF8b4YpRwVYM5K/b0GLoe1P/83ilk8=";
+    hash = "sha256-6StC+mnafHMLDCbaz4QqcrT+vK9PIVeh3BizzOH4Wfo=";
   };
 
   nativeBuildInputs = with ocamlPackages; [
@@ -47,15 +47,9 @@ stdenv.mkDerivation rec {
     "out"
   ];
 
-  installPhase = ''
-    runHook preInstall
-    pushd compiler
-    dune build @install
-    dune install --prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib
-    popd
-    mkdir -p $lib/lib/jasmin/easycrypt
-    cp eclib/*.ec $lib/lib/jasmin/easycrypt
-    runHook postInstall
+  preInstall = ''
+    export PREFIX=$lib
+    export DUNE_OPTS="--prefix=$bin --libdir=$out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib"
   '';
 
   meta = {

From 2d6f552a2167c2ae83f6faa2ba4542b1ec1d7cb0 Mon Sep 17 00:00:00 2001
From: Nicolas Goudry <goudry.nicolas@gmail.com>
Date: Mon, 1 Sep 2025 22:13:43 +0200
Subject: [PATCH 77/84] python3Packages.osc-sdk-python: remove maintainer

---
 pkgs/development/python-modules/osc-sdk-python/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/osc-sdk-python/default.nix b/pkgs/development/python-modules/osc-sdk-python/default.nix
index d7ee910f3e36..6ab012d85de1 100644
--- a/pkgs/development/python-modules/osc-sdk-python/default.nix
+++ b/pkgs/development/python-modules/osc-sdk-python/default.nix
@@ -44,6 +44,6 @@ buildPythonPackage rec {
     description = "SDK to perform actions on Outscale API";
     homepage = "https://github.com/outscale/osc-sdk-python";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ nicolas-goudry ];
+    maintainers = [ ];
   };
 }

From 7f99e08ccb7e4b745737607b2c7f8ca1e32f2d6c Mon Sep 17 00:00:00 2001
From: averyv <avery@averyv.me>
Date: Mon, 1 Sep 2025 21:10:32 +0100
Subject: [PATCH 78/84] nixos/pihole-ftl: fix privacyLevel option

It's currently setting the wrong TOML value
---
 nixos/modules/services/networking/pihole-ftl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/pihole-ftl.nix b/nixos/modules/services/networking/pihole-ftl.nix
index 5a8c361adfeb..f170da405e70 100644
--- a/nixos/modules/services/networking/pihole-ftl.nix
+++ b/nixos/modules/services/networking/pihole-ftl.nix
@@ -53,7 +53,7 @@ in
         query logging.
       '';
       default = 0;
-      example = "3";
+      example = 3;
     };
 
     openFirewallDNS = mkOption {
@@ -240,7 +240,7 @@ in
       (mkDefaults {
         misc.readOnly = true; # Prevent config changes via API or CLI by default
         webserver.port = ""; # Disable the webserver by default
-        misc.privacyLevel = cfg.privacyLevel;
+        misc.privacylevel = cfg.privacyLevel;
       })
 
       # Move state files to cfg.stateDirectory

From 8c4b4fc42cfd7abe5e086ef0f20cdf9653fbfe93 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Sep 2025 23:30:16 +0200
Subject: [PATCH 79/84] zigbee2mqtt: 2.6.0 -> 2.6.1

https://github.com/Koenkk/zigbee2mqtt/releases/tag/2.6.1
---
 pkgs/by-name/zi/zigbee2mqtt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
index 3401827e0c77..72e9489ab40f 100644
--- a/pkgs/by-name/zi/zigbee2mqtt/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix
@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zigbee2mqtt";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     tag = finalAttrs.version;
-    hash = "sha256-syzrH3hJinAcpdyVlwEevqzi0LZ+gBMvJOXncuafzjE=";
+    hash = "sha256-rf6Y3d0Yg4jQiPLFgSGj4JtB/XJ5lQYx4kkGpOvEdFU=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-EJgR1xjQJGKBdgJ2BGFiumVwZViXn7GJNa4GPkkscDg=";
+    hash = "sha256-mgaZSN4SDjQBAeevFglh2ZV+RLsiBdzrjz8QRx8qMnA=";
   };
 
   nativeBuildInputs = [

From 2ad5124a6f2c2764da1acabd0582b1a66e1c660a Mon Sep 17 00:00:00 2001
From: ibizaman <ibizaman@tiserbox.com>
Date: Mon, 1 Sep 2025 20:23:43 +0200
Subject: [PATCH 80/84] wyoming-piper: relax constraint on regex dependency

---
 pkgs/by-name/wy/wyoming-piper/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/wy/wyoming-piper/package.nix b/pkgs/by-name/wy/wyoming-piper/package.nix
index 28d417db6c5c..e32c5689a98c 100644
--- a/pkgs/by-name/wy/wyoming-piper/package.nix
+++ b/pkgs/by-name/wy/wyoming-piper/package.nix
@@ -21,6 +21,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   pythonRelaxDeps = [
+    "regex"
     "wyoming"
   ];
 

From 71701ca8a54608a30455fd91b06672bace2376de Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 1 Sep 2025 21:38:53 +0000
Subject: [PATCH 81/84] chhoto-url: 6.3.0 -> 6.3.1

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.3.1
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.3.0...6.3.1
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 2772443a8e3a..36ace0d78e50 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.3.0";
+  version = "6.3.1";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-y7koflkcQv9JsTqbUzyK0S3lClU9188532J5UVWrM4g=";
+    hash = "sha256-ks/jfqtU/R3i6LHZtWr0gY3zuElxABtvygCIbK9GYng=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-eB56ZEWAp5RBY4EFyuGzwamDRxDz0Ip3mzuzLwyZR/I=";
+  cargoHash = "sha256-9KLpI9CM5LDsZCRGgcvHvbt7Q6yIAQuMR2SpN5uBTOE=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From bd531a25851820457c4eddc5747017b91c3d748e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 1 Sep 2025 23:54:35 +0200
Subject: [PATCH 82/84] python3Packages.kanidm: 1.0.0-2024-04-22 -> 1.2.0

---
 .../python-modules/kanidm/default.nix         | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/kanidm/default.nix b/pkgs/development/python-modules/kanidm/default.nix
index 042ac0c0188a..fe62e6cff1a1 100644
--- a/pkgs/development/python-modules/kanidm/default.nix
+++ b/pkgs/development/python-modules/kanidm/default.nix
@@ -2,10 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
 
   # build
-  poetry-core,
+  pdm-backend,
 
   # propagates
   aiohttp,
@@ -19,28 +18,23 @@
   pytestCheckHook,
 }:
 
-let
-  pname = "kanidm";
-  version = "1.0.0-2024-04-22";
-in
 buildPythonPackage rec {
-  inherit pname version;
+  pname = "kanidm";
+  version = "1.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "kanidm";
     repo = "kanidm";
-    rev = "a0f743d8c8e7a6b6b0775e64774fc5175464cab6";
-    hash = "sha256-W2v3/osDrjRQqz2DqoG90SGcu4K6G2ypMTfE6Xq5qNI=";
+    rev = "1774f9428ccdc357d514652acbcae49f6b16687a";
+    hash = "sha256-SE3b9Ug0EZFygGf9lsmVsQzmop9qOMiCUsbO//1QWF8=";
   };
 
   sourceRoot = "${src.name}/pykanidm";
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ pdm-backend ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     authlib
     pydantic

From ce6c940c90a2886f0dbabaecc4b892762fd91c9a Mon Sep 17 00:00:00 2001
From: TakodaS <austen.bolitho@protonmail.com>
Date: Tue, 4 Mar 2025 18:25:53 +0000
Subject: [PATCH 83/84] nixos/tests/headscale: test dns records config

---
 nixos/tests/headscale.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/tests/headscale.nix b/nixos/tests/headscale.nix
index a4368838e87a..7dc93870e0b3 100644
--- a/nixos/tests/headscale.nix
+++ b/nixos/tests/headscale.nix
@@ -45,6 +45,13 @@ in
               };
               dns = {
                 base_domain = "tailnet";
+                extra_records = [
+                  {
+                    name = "foo.bar";
+                    type = "A";
+                    value = "100.64.0.2";
+                  }
+                ];
                 override_local_dns = false;
               };
             };
@@ -90,5 +97,6 @@ in
     # Check that they are reachable from the tailnet
     peer1.wait_until_succeeds("tailscale ping peer2")
     peer2.wait_until_succeeds("tailscale ping peer1.tailnet")
+    assert (res := peer1.wait_until_succeeds("${lib.getExe pkgs.dig} +short foo.bar").strip()) == "100.64.0.2", f"Domain {res} did not match 100.64.0.2"
   '';
 }

From c8b076cb07e9a55e3d3389e3253a5f6715300cb1 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 24 Aug 2025 15:00:36 +0200
Subject: [PATCH 84/84] libwebp: set meta.pkgConfigModules

Using the package from the pkgs fixpoint instead of
finalAttrs.finalPackage to mirror the other tests which
also (indirectly) use pkgs.libwebp. Slight disadvantage of this is that
it's not possible to test overridden variants of libwebp this way.
---
 pkgs/by-name/li/libwebp/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix
index 9eb826d4061d..b814308b8ae0 100644
--- a/pkgs/by-name/li/libwebp/package.nix
+++ b/pkgs/by-name/li/libwebp/package.nix
@@ -29,6 +29,8 @@
   opencv,
   python3,
   vips,
+  testers,
+  libwebp,
 }:
 
 stdenv.mkDerivation rec {
@@ -79,6 +81,7 @@ stdenv.mkDerivation rec {
       ;
     inherit (python3.pkgs) pillow imread;
     haskell-webp = haskellPackages.webp;
+    pkg-config = testers.hasPkgConfigModules { package = libwebp; };
   };
 
   meta = with lib; {
@@ -87,5 +90,15 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ ajs124 ];
+    pkgConfigModules = [
+      # configure_pkg_config() calls for these are unconditional
+      "libwebp"
+      "libwebpdecoder"
+      "libwebpdemux"
+      "libsharpyuv"
+    ]
+    ++ lib.optionals libwebpmuxSupport [
+      "libwebpmux"
+    ];
   };
 }