From 017d9ee23684ac222e40028238a2fcf287edc4c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Mar 2026 08:26:13 +0000
Subject: [PATCH 001/172] seclists: 2025.3 -> 2026.1

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

diff --git a/pkgs/by-name/se/seclists/package.nix b/pkgs/by-name/se/seclists/package.nix
index bc205ace8cc3..8d1907d70676 100644
--- a/pkgs/by-name/se/seclists/package.nix
+++ b/pkgs/by-name/se/seclists/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "seclists";
-  version = "2025.3";
+  version = "2026.1";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "SecLists";
-    rev = "2025.3";
-    hash = "sha256-o4Va+OJCrDwHhmuN3HbURAOhPLCJGHnJW7RcOkaYPOQ=";
+    rev = "2026.1";
+    hash = "sha256-S1C+/gX3mvCC9OVxzCO6PrzbvxCz5mTWEXrBqzSuKps=";
   };
 
   installPhase = ''

From ff73638f0bce6e9b8d3c7e9f9f9bf9917de549bc Mon Sep 17 00:00:00 2001
From: Nick Blumenauer <nicknb@posteo.com>
Date: Fri, 6 Feb 2026 15:47:30 +0100
Subject: [PATCH 002/172] keyfinder-cli: 1.1.2 -> 1.2.0

Upstream switched to CMake, for which parallel building is enabled by
default. No need to specify that manually anymore.
---
 pkgs/by-name/ke/keyfinder-cli/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix
index 55f600863587..884874fed958 100644
--- a/pkgs/by-name/ke/keyfinder-cli/package.nix
+++ b/pkgs/by-name/ke/keyfinder-cli/package.nix
@@ -5,29 +5,32 @@
   ffmpeg,
   libkeyfinder,
   fftw,
+  cmake,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyfinder-cli";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
     owner = "EvanPurkhiser";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA=";
+    hash = "sha256-WdZ5jiq5bfwiq1RK4XDRhqh2gAukq3hLCA56K/f+84g=";
   };
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
   buildInputs = [
     ffmpeg
     libkeyfinder
     fftw
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  enableParallelBuilding = true;
-
   meta = {
     inherit (finalAttrs.src.meta) homepage;
     description = "Musical key detection for digital audio (command-line tool)";

From 4c802b67ad534def924a250699c4e5c7b9f9c32c Mon Sep 17 00:00:00 2001
From: Thomas Butter <tbutter@gmail.com>
Date: Mon, 4 May 2026 07:06:47 +0000
Subject: [PATCH 003/172] sh earlybird: 4.0.0 -> 4.6.0

---
 pkgs/by-name/ea/earlybird/package.nix | 39 +++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix
index d9b50c704da9..d9a0d8cf3769 100644
--- a/pkgs/by-name/ea/earlybird/package.nix
+++ b/pkgs/by-name/ea/earlybird/package.nix
@@ -2,32 +2,61 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  gitMinimal,
+  poppler-utils,
+  wv,
+  unrtf,
+  html-tidy,
+  makeWrapper,
+  # TODO add justext when github.com/JalfResi/justext becomes available
+  # justext
 }:
 
 buildGoModule (finalAttrs: {
   pname = "earlybird";
-  version = "4.0.0";
+  version = "4.6.0";
 
   src = fetchFromGitHub {
     owner = "americanexpress";
     repo = "earlybird";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-P8kA9MJA+2jtVOYLBu0oG9xTUTGCtiX4R+4ecmXDAAw=";
   };
 
-  vendorHash = "sha256-39jXqCXAwg/C+9gEXiS1X58OD61nMNQifnhgVGEF6ck=";
+  vendorHash = "sha256-pQ8gSDHsdDT/cgvRB0OSqnMZz2W5vAzFBzph0xksC2o=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  nativeBuildInputs = [
+    makeWrapper
+    gitMinimal
+  ];
+
+  checkFlags = [
+    "--skip=Test_parseGitFiles"
+  ];
+
+  postFixup = ''
+    wrapProgram $out/bin/earlybird \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          poppler-utils
+          wv
+          unrtf
+          html-tidy
+        ]
+      }
+  '';
+
   meta = {
     description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more";
     mainProgram = "earlybird";
     homepage = "https://github.com/americanexpress/earlybird";
     changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ tbutter ];
   };
 })

From 5b38f3020078df01e26e094847d0d57bc0fc6868 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Jun 2026 10:44:10 +0000
Subject: [PATCH 004/172] nushell-plugin-bson: 26.1100.0 -> 26.1130.0

---
 pkgs/by-name/nu/nushell-plugin-bson/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-bson/package.nix b/pkgs/by-name/nu/nushell-plugin-bson/package.nix
index df0ab8b9d969..2b2b89d144e1 100644
--- a/pkgs/by-name/nu/nushell-plugin-bson/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-bson/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_bson";
-  version = "26.1100.0";
+  version = "26.1130.0";
 
   src = fetchFromGitHub {
     owner = "Kissaki";
     repo = "nu_plugin_bson";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Uu2YF5fnNvRP4+9GpLYjzZt7lg0kCbBl4bk4l5rEuY=";
+    hash = "sha256-H+pgAckWFW/jPnIL6i90BBothX5zT3/hbcDhmdvdZmY=";
   };
 
-  cargoHash = "sha256-iORPlIP9kDLlJkm09SZn2lO3bWcj/Q/g+dBd2CPWiOg=";
+  cargoHash = "sha256-aGUlItPfrr3Uz/t1XEXBtGM285up3A5Wva1QMKwBrg0=";
 
   nativeBuildInputs = [
     llvmPackages.libclang

From 95654b8d44175d1a5b42909f0d67fb6b38467830 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:15:41 +0700
Subject: [PATCH 005/172] python3Packages.bap: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index a00924865711..b1ca8888542c 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   bap,
   requests,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "bap";
   version = "1.3.1";
-  format = "setuptools";
+  pyproject = true;
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
@@ -17,7 +18,9 @@ buildPythonPackage rec {
     sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     bap
     requests
   ];

From 78d7d740c9fa83d4e67cadafd1b94e3265b56a31 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Sat, 6 Jun 2026 01:26:18 +0700
Subject: [PATCH 006/172] python3Packages.bap: modernize

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

diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix
index b1ca8888542c..4767c63c4216 100644
--- a/pkgs/development/python-modules/bap/default.nix
+++ b/pkgs/development/python-modules/bap/default.nix
@@ -7,15 +7,18 @@
   requests,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "bap";
   version = "1.3.1";
   pyproject = true;
+
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "BinaryAnalysisPlatform";
     repo = "bap-python";
-    rev = version;
-    sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp";
+    tag = finalAttrs.version;
+    hash = "sha256-d9HST4AF5Jxycfbv/033GAtcU+Moqxf03VHhY1nNE6o=";
   };
 
   build-system = [ setuptools ];
@@ -33,4 +36,4 @@ buildPythonPackage rec {
     maintainers = [ lib.maintainers.maurer ];
     license = lib.licenses.mit;
   };
-}
+})

From 14403d56305e7592b7c9f7f08ae06439bdffd466 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 19 May 2026 01:17:34 +0300
Subject: [PATCH 007/172] makePythonWriter: remove a useless pypy check

---
 pkgs/build-support/writers/scripts.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index 01afb249d407..572409a45f31 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -1192,15 +1192,12 @@ rec {
       ])
       // {
         interpreter =
-          if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then
-            if libraries == [ ] then
-              python.interpreter
-            else if (lib.isFunction libraries) then
-              (python.withPackages libraries).interpreter
-            else
-              (python.withPackages (ps: libraries)).interpreter
+          if libraries == [ ] then
+            python.interpreter
+          else if (lib.isFunction libraries) then
+            (python.withPackages libraries).interpreter
           else
-            python.interpreter;
+            (python.withPackages (ps: libraries)).interpreter;
         check = optionalString (python.isPy3k && doCheck) (
           writeDash "pythoncheck.sh" ''
             exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1"

From 908c0cff7eb0bfb9e5d68a3f69bfc48b84611217 Mon Sep 17 00:00:00 2001
From: Adrian Grucza <adrian.grucza@iress.com>
Date: Tue, 9 Jun 2026 15:55:35 +1000
Subject: [PATCH 008/172] sonar-scanner-cli-minimal: add required modules

---
 pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix b/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
index 5b31c0da9048..3066332879b9 100644
--- a/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
+++ b/pkgs/by-name/so/sonar-scanner-cli-minimal/package.nix
@@ -10,8 +10,11 @@ sonar-scanner-cli.override {
     jdk = jdk_headless;
     modules = [
       "java.base"
+      "java.desktop"
       "java.logging"
+      "java.management"
       "java.naming"
+      "java.net.http"
       "java.sql"
       "java.xml"
       "jdk.crypto.ec"

From 3af751c6de5a576aebbe2f3f8ae902e754bfa2d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 11 Jun 2026 08:22:51 +0000
Subject: [PATCH 009/172] nushell-plugin-highlight: 1.4.12+0.110.0 ->
 1.4.15+0.113.1

---
 pkgs/by-name/nu/nushell-plugin-highlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
index 716eba425c10..3b6ac7f9588c 100644
--- a/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
+++ b/pkgs/by-name/nu/nushell-plugin-highlight/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_highlight";
-  version = "1.4.12+0.110.0";
+  version = "1.4.15+0.113.1";
 
   src = fetchFromGitHub {
     owner = "cptpiepmatz";
     repo = "nu-plugin-highlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-20b+EiB95BzDVWibWQuG8ozPRV8LbxG7fHEbyTk3xTE=";
+    hash = "sha256-zJYbtGpQU0CrAu7sEQWv06hJj/PCD/iYCLOLrNmsL5U=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-pkLcTjZYLERMhK18zPdfldHrECHXQpcg5i6rsyxw7nQ=";
+  cargoHash = "sha256-oJtmmKRylOZQjBBifvWBx7ikwK2inGg8rGb/rPZ/t/s=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 

From c64a69ac8d59bb7665a6c94b1abefffd0d793d28 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 16 Jun 2026 15:16:57 -0300
Subject: [PATCH 010/172] dotnetCorePackages.dotnet_{8..11}.vmr: reintroduce
 fix for intermittent compiler error

---
 pkgs/development/compilers/dotnet/source/vmr.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/compilers/dotnet/source/vmr.nix b/pkgs/development/compilers/dotnet/source/vmr.nix
index d18695163353..cd1bfa303a3c 100644
--- a/pkgs/development/compilers/dotnet/source/vmr.nix
+++ b/pkgs/development/compilers/dotnet/source/vmr.nix
@@ -186,6 +186,16 @@ stdenv.mkDerivation {
       -s //Project -t elem -n PropertyGroup \
       -s \$prev -t elem -n NoWarn -v '$(NoWarn);NU1603' \
       src/nuget-client/src/NuGet.Core/NuGet.CommandLine.XPlat/NuGet.CommandLine.XPlat.csproj
+
+    # AD0001 crashes intermittently in source-build-reference-packages with
+    # CSC : error AD0001: Analyzer 'Microsoft.NetCore.CSharp.Analyzers.Runtime.CSharpDetectPreviewFeatureAnalyzer' threw an exception of type 'System.NullReferenceException' with message 'Object reference not set to an instance of an object.'.
+    # https://github.com/dotnet/roslyn/issues/81645
+    xmlstarlet ed \
+      --inplace \
+      -s //Project -t elem -n PropertyGroup \
+      -s \$prev -t elem -n NoWarn -v '$(NoWarn);AD0001' \
+      src/source-build-assets/src/referencePackages/Directory.Build.props
+
   ''
   + lib.optionalString (lib.versionOlder version "10") ''
     # https://github.com/microsoft/ApplicationInsights-dotnet/issues/2848

From 0e1200be2a9b4e422907bd43defc9d3bf480454e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jun 2026 00:14:55 +0000
Subject: [PATCH 011/172] protonmail-desktop: 1.13.0 -> 1.13.3

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

diff --git a/pkgs/by-name/pr/protonmail-desktop/package.nix b/pkgs/by-name/pr/protonmail-desktop/package.nix
index 3b9df20572d8..2220665c5616 100644
--- a/pkgs/by-name/pr/protonmail-desktop/package.nix
+++ b/pkgs/by-name/pr/protonmail-desktop/package.nix
@@ -10,9 +10,9 @@
 }:
 let
   mainProgram = "proton-mail";
-  version = "1.13.0";
-  linuxHash = "sha256-ehvDkemVmKQuNm9FgKtUM/M/z4YMjXA8qtLt94SN73U=";
-  darwinHash = "sha256-YtLlW+fSRd3hJMjHOA3kXKKq2j71Edc8NW/55zTLywY=";
+  version = "1.13.3";
+  linuxHash = "sha256-ZG3l9QhNtSXjkJ4wa/bJ15Kd7MIgw68tJTPP653HTIg=";
+  darwinHash = "sha256-C0URhmxcbQfP8uMe8nRuUx5f0JL0BMvvrWFfXHCVR90=";
 in
 stdenv.mkDerivation {
   pname = "protonmail-desktop";

From 9a9ef8510964a85ad58dd0c0361166c22019f038 Mon Sep 17 00:00:00 2001
From: Eric Wolf <robo-eric@gmx.de>
Date: Wed, 24 Jun 2026 01:36:10 +0200
Subject: [PATCH 012/172] maintainers: add Deric-W

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 26d7e7fa77b5..3a61d3519a7f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6716,6 +6716,13 @@
     githubId = 77843198;
     name = "Vasilis Manetas";
   };
+  Deric-W = {
+    email = "robo-eric@gmx.de";
+    github = "Deric-W";
+    githubId = 42873573;
+    name = "Eric Wolf";
+    keys = [ { fingerprint = "ADAA B6F3 A955 5589 D66C  CE61 80D2 DA42 8A4A 537F"; } ];
+  };
   DerickEddington = {
     email = "derick.eddington@pm.me";
     github = "DerickEddington";

From 168a9c3adfc8cb0e77c29f991fce6e665ff5ee16 Mon Sep 17 00:00:00 2001
From: Eric Wolf <robo-eric@gmx.de>
Date: Wed, 24 Jun 2026 01:38:10 +0200
Subject: [PATCH 013/172] fail2ban: add Deric-W to maintainers

---
 pkgs/by-name/fa/fail2ban/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix
index e851036fbafa..739a79c530e0 100644
--- a/pkgs/by-name/fa/fail2ban/package.nix
+++ b/pkgs/by-name/fa/fail2ban/package.nix
@@ -113,6 +113,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     homepage = "https://www.fail2ban.org/";
     description = "Program that scans log files for repeated failing login attempts and bans IP addresses";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      Deric-W
+    ];
   };
 })

From 25decb1a4dde0082408d2dbf0a99022af13b2534 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Thu, 25 Jun 2026 11:00:41 +0200
Subject: [PATCH 014/172] open5gs: 2.7.7 -> 2.8.0

---
 pkgs/by-name/op/open5gs-webui/package.nix | 2 +-
 pkgs/by-name/op/open5gs/package.nix       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/open5gs-webui/package.nix b/pkgs/by-name/op/open5gs-webui/package.nix
index 872f7ccf77f2..a61c76de621c 100644
--- a/pkgs/by-name/op/open5gs-webui/package.nix
+++ b/pkgs/by-name/op/open5gs-webui/package.nix
@@ -9,5 +9,5 @@ buildNpmPackage (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/webui";
 
-  npmDepsHash = "sha256-Epz+pCbgejkj7vcdwbPC2RfAkp2HRqGV0urXiiBrjZQ=";
+  npmDepsHash = "sha256-PtZzC9PWIAAuh4Hy/whZHgzzlnXykevhGT2f1Mc+VFM=";
 })
diff --git a/pkgs/by-name/op/open5gs/package.nix b/pkgs/by-name/op/open5gs/package.nix
index f934093ffc48..462b464f8837 100644
--- a/pkgs/by-name/op/open5gs/package.nix
+++ b/pkgs/by-name/op/open5gs/package.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open5gs";
-  version = "2.7.7";
+  version = "2.8.0";
 
   diameter = fetchFromGitHub {
     owner = "open5gs";
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "open5gs";
     repo = "open5gs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZK4q6m/9v+us+6dWpi0k188KfFu1b6G9pGE4VGAe4+4=";
+    hash = "sha256-e8iCcgJRJFEdVN3TeNwFFbBkShZebxKqvsCpBv/WLVk=";
   };
 
   nativeBuildInputs = [

From 1444d7ded617fb7254961253dcb1b5ae4f3f16d5 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:10:50 +0700
Subject: [PATCH 015/172] python3Packages.simber: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index 98aab295b2b3..af22cf04df2a 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   colorama,
   pytestCheckHook,
 }:
@@ -9,7 +10,7 @@
 buildPythonPackage rec {
   pname = "simber";
   version = "0.2.6";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deepjyoti30";
@@ -18,7 +19,9 @@ buildPythonPackage rec {
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
 
-  propagatedBuildInputs = [ colorama ];
+  build-system = [ setuptools ];
+
+  dependencies = [ colorama ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From 7dccb3728a05279bfba8b464b3f4e57e2368be17 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 3 Jul 2026 02:13:19 +0700
Subject: [PATCH 016/172] python3Packages.simber: modernize

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

diff --git a/pkgs/development/python-modules/simber/default.nix b/pkgs/development/python-modules/simber/default.nix
index af22cf04df2a..ce93635e115e 100644
--- a/pkgs/development/python-modules/simber/default.nix
+++ b/pkgs/development/python-modules/simber/default.nix
@@ -7,15 +7,17 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "simber";
   version = "0.2.6";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "deepjyoti30";
     repo = "simber";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-kHoFZD7nhVxJu9MqePLkL7KTG2saPecY9238c/oeEco=";
   };
 
@@ -30,8 +32,8 @@ buildPythonPackage rec {
   meta = {
     description = "Simple, minimal and powerful logger for Python";
     homepage = "https://github.com/deepjyoti30/simber";
-    changelog = "https://github.com/deepjyoti30/simber/releases/tag/${version}";
+    changelog = "https://github.com/deepjyoti30/simber/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ j0hax ];
   };
-}
+})

From 2b686ec2f658005ec5d170efbbe1791563a848c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 00:28:59 +0000
Subject: [PATCH 017/172] webtunnel: 0.0.4 -> 0.0.5

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

diff --git a/pkgs/by-name/we/webtunnel/package.nix b/pkgs/by-name/we/webtunnel/package.nix
index 9c3ea36bebd8..bc8de978ee66 100644
--- a/pkgs/by-name/we/webtunnel/package.nix
+++ b/pkgs/by-name/we/webtunnel/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "webtunnel";
-  version = "0.0.4";
+  version = "0.0.5";
 
   src = fetchFromGitLab {
     domain = "gitlab.torproject.org";
@@ -14,7 +14,7 @@ buildGoModule (finalAttrs: {
     owner = "anti-censorship/pluggable-transports";
     repo = "webtunnel";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-00Wq2/xuDNftXG+r95/HyEcWQSX0GaQao28CG8yIiR4=";
+    hash = "sha256-9dXlkIkCERy/eFsVrAfBkbjU6aEeJLGmlLjLuXTwAs8=";
   };
 
   vendorHash = "sha256-3AAPySLAoMimXUOiy8Ctl+ghG5q+3dWRNGXHpl9nfG0=";

From 236fd52fb4d260cca4d80ed7ab488a94f1a5f6c3 Mon Sep 17 00:00:00 2001
From: Hythera <87016780+Hythera@users.noreply.github.com>
Date: Mon, 29 Jun 2026 21:07:08 +0200
Subject: [PATCH 018/172] accountsservice: 26.13.3 -> 26.27.3

changelog: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/releases/26.27.3

diff: https://gitlab.freedesktop.org/accountsservice/accountsservice/-/compare/26.13.3...26.27.3
---
 pkgs/by-name/ac/accountsservice/fix-paths.patch | 9 ---------
 pkgs/by-name/ac/accountsservice/package.nix     | 7 +++----
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ac/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch
index 19c4744e17d0..c512b35bef89 100644
--- a/pkgs/by-name/ac/accountsservice/fix-paths.patch
+++ b/pkgs/by-name/ac/accountsservice/fix-paths.patch
@@ -78,15 +78,6 @@ index da6428c..682842d 100644
                          argv[1] = "-s";
                          argv[2] = shell;
                          argv[3] = "--";
-@@ -3163,7 +3163,7 @@ user_change_icon_file_classic_authorized_cb (Daemon                *daemon,
-                         return;
-                 }
- 
--                argv[0] = "/bin/cat";
-+                argv[0] = "@coreutils@/bin/cat";
-                 argv[1] = filename;
-                 argv[2] = NULL;
- 
 @@ -3279,7 +3279,7 @@ user_change_locked_authorized_cb (Daemon                *daemon,
                  } else {
                          const gchar *argv[5];
diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix
index b184e5d0299e..ffe6259f2366 100644
--- a/pkgs/by-name/ac/accountsservice/package.nix
+++ b/pkgs/by-name/ac/accountsservice/package.nix
@@ -9,7 +9,6 @@
   gobject-introspection,
   polkit,
   systemdLibs,
-  coreutils,
   meson,
   mesonEmulatorHook,
   dbus,
@@ -23,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "accountsservice";
-  version = "26.13.3";
+  version = "26.27.3";
 
   outputs = [
     "out"
@@ -35,13 +34,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "accountsservice";
     repo = "accountsservice";
     tag = finalAttrs.version;
-    hash = "sha256-ZIfkBlEaITX2rDcV5al4e2IFP238MXOlWeGoh+3+DoQ=";
+    hash = "sha256-/n0YCPZaf1SsTScidFUZcxfJkpv/+Bnb6Z7oKL+clgE=";
   };
 
   patches = [
     # Hardcode dependency paths.
     (replaceVars ./fix-paths.patch {
-      inherit shadow coreutils;
+      inherit shadow;
     })
 
     # Do not try to create directories in /var, that will not work in Nix sandbox.

From ed47b93cb7f325ea07464be9f4b6d047c334975c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 00:07:37 +0000
Subject: [PATCH 019/172] python3Packages.rio-tiler: 9.3.0 -> 9.4.0

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

diff --git a/pkgs/development/python-modules/rio-tiler/default.nix b/pkgs/development/python-modules/rio-tiler/default.nix
index fd2f0bb6e723..bc62ed5afb3c 100644
--- a/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/pkgs/development/python-modules/rio-tiler/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "rio-tiler";
-  version = "9.3.0";
+  version = "9.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cogeotiff";
     repo = "rio-tiler";
     tag = finalAttrs.version;
-    hash = "sha256-Tf3F/XRGdPDZqlXQfRc5cvGvUvu94Y6TO2cFqjFsg5g=";
+    hash = "sha256-A3GBH9IALmjL1TvJ4fzZyIqd+y4F2ggItpzR+cXH5X0=";
   };
 
   build-system = [ hatchling ];

From 97dd352dc415e846fb278b773ff476bb38a80afb Mon Sep 17 00:00:00 2001
From: dmkhitaryan <davtot111@icloud.com>
Date: Tue, 7 Jul 2026 18:11:46 +0400
Subject: [PATCH 020/172] iosevka: use nodejs_latest to fix Darwin build

---
 pkgs/by-name/io/iosevka/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 1312abf903dc..326dc45ad92a 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -6,6 +6,7 @@
   cctools,
   go-toml,
   ttfautohint-nox,
+  nodejs_latest,
   # Custom font set options.
   # See https://typeof.net/Iosevka/customizer
   # Can be a raw TOML string, or a Nix attrset.
@@ -68,6 +69,7 @@ buildNpmPackage rec {
   };
 
   npmDepsHash = "sha256-tlBxO9K0itXO6Mac4jcygZ6+9kj1gTdmu+rtbL2qdcE=";
+  nodejs = nodejs_latest;
 
   nativeBuildInputs = [
     go-toml

From 08c53a9ebc4cf5c7219809b769b5c59ed5b9288b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 13:00:26 +0000
Subject: [PATCH 021/172] fishPlugins.macos: 7.2.0 -> 7.3.0

---
 pkgs/shells/fish/plugins/macos.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/macos.nix b/pkgs/shells/fish/plugins/macos.nix
index ee9c2f2e4c8b..02a68afa3edd 100644
--- a/pkgs/shells/fish/plugins/macos.nix
+++ b/pkgs/shells/fish/plugins/macos.nix
@@ -7,13 +7,13 @@
 
 buildFishPlugin rec {
   pname = "macos";
-  version = "7.2.0";
+  version = "7.3.0";
 
   src = fetchFromGitHub {
     owner = "halostatue";
     repo = "fish-macos";
     tag = "v${version}";
-    hash = "sha256-yTwN2ztdU+vk+AXEfsJUN7J4KqrbLSWHgA0q5rUT5CE=";
+    hash = "sha256-VKJp+7YzqHMNniWs4aGq0gR11mPJU4gPIEgUPhdfA30=";
   };
 
   passthru.updateScript = nix-update-script { };

From 3dc7da509f84a7aaf321c774296583f7f43b6052 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 8 Jul 2026 15:16:05 +0200
Subject: [PATCH 022/172] cc-wrapper: Don't force outPath comparisons during
 metadata evaluation

Operations like `nix eval --file '<nixpkgs>' hello.name` are supposed
to be lazy in the sense that they shouldn't cause any derivations to
be instantiated. However, this was not the case anymore, e.g.

  $ time nix eval --file '<nixpkgs>' hello.name -vvvvvvv 2>&1 | grep -c 'copying.*to the store\|^instantiated'
  1145
  real    0m0.359s

In fact, even evaluating `lib.version` triggers 1145 paths to be
copied to the store. (Why `lib` causes a bunch of derivations to be
evaluated is another issue...)

The reason for this is that cc-wrapper has assertions like

  assert libc_bin == bintools.libc_bin

which which Nix implements by comparing their outPaths. Computing an
outPath calls derivationStrict, causing the .drv closure of the
bootstrap libc to be written to the store. Since these asserts ran
whenever a cc-wrapper derivation was forced to WHNF (which the stdenv
bootstrap stage assertions do on every evaluation of the Nixpkgs top
level), merely evaluating e.g. 'hello.name' wrote over a thousand .drv
files.

Now the asserts are (arbitrarily) moved under `unpackPhase`, which is
only forced when the derivation is actually instantiated, so
evaluating metadata attributes stays free of store writes:

  $ time nix eval --file '<nixpkgs>' hello.name -vvvvvvv 2>&1 | grep -c 'copying.*to the store\|^instantiated'
  0
  real    0m0.113s

Assisted-by: Claude Fable 5 <noreply@anthropic.com>
---
 pkgs/build-support/cc-wrapper/default.nix | 26 +++++++++++++----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index fd857d0c152d..85b0584a9d2d 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -392,14 +392,6 @@ in
 
 assert includeFortifyHeaders' -> fortify-headers != null;
 
-# Ensure bintools matches
-assert libc_bin == bintools.libc_bin;
-assert libc_dev == bintools.libc_dev;
-assert libc_lib == bintools.libc_lib;
-assert nativeTools == bintools.nativeTools;
-assert nativeLibc == bintools.nativeLibc;
-assert nativePrefix == bintools.nativePrefix;
-
 stdenvNoCC.mkDerivation {
   pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper");
   version = optionalString (cc != null) ccVersion;
@@ -469,9 +461,21 @@ stdenvNoCC.mkDerivation {
   # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750.
   dontCheckForBrokenSymlinks = true;
 
-  unpackPhase = ''
-    src=$PWD
-  '';
+  # Ensure bintools matches. This is done here rather than at top level
+  # so that evaluating the derivation's metadata (such as `name`)
+  # doesn't force the comparisons, which cause the outPaths of the
+  # compared derivations to be computed and thus .drv files to be
+  # written to the store.
+  unpackPhase =
+    assert libc_bin == bintools.libc_bin;
+    assert libc_dev == bintools.libc_dev;
+    assert libc_lib == bintools.libc_lib;
+    assert nativeTools == bintools.nativeTools;
+    assert nativeLibc == bintools.nativeLibc;
+    assert nativePrefix == bintools.nativePrefix;
+    ''
+      src=$PWD
+    '';
 
   wrapper = ./cc-wrapper.sh;
 

From 199eb8233a01d76c7a74db229e9f5bb9f6336e75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Jul 2026 22:40:24 +0200
Subject: [PATCH 023/172] sidplayfp: 2.16.2 -> 3.1.0

Co-authored-by: OPNA2608 <opna2608@protonmail.com>
---
 pkgs/by-name/si/sidplayfp/package.nix | 66 ++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 391414fec8b8..a11d90ef8189 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -6,29 +6,75 @@
   runCommand,
   testers,
   alsaSupport ? stdenv.hostPlatform.isLinux,
+  coreaudioSupport ? stdenv.hostPlatform.isDarwin,
+  jackSupport ? stdenv.hostPlatform.isUnix,
+  pulseSupport ? stdenv.hostPlatform.isLinux,
   alsa-lib,
   autoreconfHook,
-  pulseSupport ? stdenv.hostPlatform.isLinux,
+  jack2,
   libpulseaudio,
   libsidplayfp,
   makeWrapper,
-  out123Support ? stdenv.hostPlatform.isDarwin,
-  mpg123,
   perl,
   pkg-config,
 }:
 
+let
+  miniaudioBackends = [
+    "NULL"
+  ]
+  ++ lib.optional alsaSupport "ALSA"
+  ++ lib.optional coreaudioSupport "COREAUDIO"
+  ++ lib.optional jackSupport "JACK"
+  ++ lib.optional pulseSupport "PULSEAUDIO";
+
+  miniaudioPkgconfigs =
+    lib.optional alsaSupport "alsa"
+    ++ lib.optional jackSupport "jack"
+    ++ lib.optional pulseSupport "libpulse";
+
+  miniaudioNeedsPkgconfigs = builtins.length miniaudioPkgconfigs > 0;
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.16.2";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zvV1BIKkJF/UAZnSgHFqNSiioUH5iB8I7SDqnWQnGj0=";
+    hash = "sha256-wkZ/iJzz1QikNEaI00PFHaeewOrP+lYHF/iaws1aSro=";
   };
 
+  postPatch = ''
+    substituteInPlace Makefile.am \
+      --replace-fail \
+        'AM_CPPFLAGS =' \
+        "AM_CPPFLAGS = ${
+          toString (
+            [
+              # Don't use dlopen() for audio-related libraries
+              "-DMA_NO_RUNTIME_LINKING"
+
+              # Only selected backends
+              "-DMA_ENABLE_ONLY_SPECIFIC_BACKENDS"
+            ]
+            ++ map (backend: "-DMA_ENABLE_" + backend) miniaudioBackends
+            ++ lib.optionals miniaudioNeedsPkgconfigs [
+              "$(pkg-config --cflags ${toString miniaudioPkgconfigs})"
+            ]
+          )
+        }" \
+      --replace-fail 'src_sidplayfp_LDADD =' "src_sidplayfp_LDFLAGS = ${
+        toString (
+          lib.optionals miniaudioNeedsPkgconfigs [
+            "$(pkg-config --libs ${toString miniaudioPkgconfigs})"
+          ]
+          ++ lib.optionals coreaudioSupport [ "-framework CoreAudio" ]
+        )
+      }"
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -43,15 +89,11 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals alsaSupport [
     alsa-lib
   ]
+  ++ lib.optionals jackSupport [
+    jack2
+  ]
   ++ lib.optionals pulseSupport [
     libpulseaudio
-  ]
-  ++ lib.optionals out123Support [
-    mpg123
-  ];
-
-  configureFlags = [
-    (lib.strings.withFeature out123Support "out123")
   ];
 
   enableParallelBuilding = true;

From 9a4ee3b3a9299363453f4be93268324a4c6ad11b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 00:27:16 +0000
Subject: [PATCH 024/172] obs-studio-plugins.advanced-scene-switcher: 1.34.2 ->
 1.35.1

---
 .../obs-studio/plugins/advanced-scene-switcher/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index e3ceeb3fbaf6..6c67d1757316 100644
--- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
@@ -36,13 +36,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "advanced-scene-switcher";
-  version = "1.34.2";
+  version = "1.35.1";
 
   src = fetchFromGitHub {
     owner = "WarmUpTill";
     repo = "SceneSwitcher";
     rev = version;
-    hash = "sha256-BZYJ5ZZbla4nnpKdZAQPrqd+g1aeLMcsnAvyXfmm4yU=";
+    hash = "sha256-gfJtkX6OGqy+hUXvLXaOETvfIX+TRNEj0IwZnE9t81E=";
   };
 
   nativeBuildInputs = [

From cfded879f2deed6ff9ba2ebd45d89fba877c405a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 15:04:30 +0000
Subject: [PATCH 025/172] steam-art-manager: 3.16.1 -> 3.17.0

---
 pkgs/by-name/st/steam-art-manager/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-art-manager/package.nix b/pkgs/by-name/st/steam-art-manager/package.nix
index dc9e8eeaf5e4..6d8ffd9a0621 100644
--- a/pkgs/by-name/st/steam-art-manager/package.nix
+++ b/pkgs/by-name/st/steam-art-manager/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "steam-art-manager";
-  version = "3.16.1";
+  version = "3.17.0";
   src = fetchurl {
     url = "https://github.com/Tormak9970/Steam-Art-Manager/releases/download/v${version}/steam-art-manager.AppImage";
-    hash = "sha256-7Lqcj9Q5P29YFt6biFXLlVdWHdlzF/daLIaA2fGY0+A=";
+    hash = "sha256-FJeIe4ZoIdmoVQrAfPQe7Lm3K+I7z7ASj5pn3dUeMqM=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From c4f3e21a95aace157f7fbbd187ab54c8fd68050e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Jul 2026 15:20:03 +0000
Subject: [PATCH 026/172] nextvi: 6.0 -> 6.1

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

diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix
index 5781d5f27504..5611001eac0e 100644
--- a/pkgs/by-name/ne/nextvi/package.nix
+++ b/pkgs/by-name/ne/nextvi/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextvi";
-  version = "6.0";
+  version = "6.1";
 
   src = fetchFromGitHub {
     owner = "kyx0r";
     repo = "nextvi";
     tag = finalAttrs.version;
-    hash = "sha256-xxkV2y3+TErR9GfI1ui9CmFgKCmNm/Sdc7BE881mRx8=";
+    hash = "sha256-SysBH4+Rp1M9HtdGUAHErmc+148/fTAtYrY/QQG2OS4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 8cdacbe386ebd5c6d95fc05d4a7f8096a15aadf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 9 Jul 2026 10:34:56 -0700
Subject: [PATCH 027/172] python3Packages.httplib2: 0.31.1 -> 0.32.0

Diff: https://github.com/httplib2/httplib2/compare/v0.31.1...v0.32.0

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

diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix
index 5d5156adb042..bd7d596cecdc 100644
--- a/pkgs/development/python-modules/httplib2/default.nix
+++ b/pkgs/development/python-modules/httplib2/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "httplib2";
-  version = "0.31.1";
+  version = "0.32.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "httplib2";
     repo = "httplib2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1OO3BNtOGJxV9L34C60CHv95LLH9Ih1lY0zQUD4wrnc=";
+    hash = "sha256-l+E3cADVb81SN3ME8qUqI8dfmT2e7S6p0nWOCu3CQWE=";
   };
 
   build-system = [ setuptools ];

From ddf9e33b85e426e6cd852bde07cb209d3fa6c8e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 00:46:20 +0000
Subject: [PATCH 028/172] python3Packages.async-substrate-interface: 2.2.0 ->
 2.2.1

---
 .../python-modules/async-substrate-interface/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/async-substrate-interface/default.nix b/pkgs/development/python-modules/async-substrate-interface/default.nix
index 26e7ed8e43cf..9a833a6693b1 100644
--- a/pkgs/development/python-modules/async-substrate-interface/default.nix
+++ b/pkgs/development/python-modules/async-substrate-interface/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "async-substrate-interface";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   __structuredAttrs = true;
@@ -23,7 +23,7 @@ buildPythonPackage (finalAttrs: {
     owner = "latent-to";
     repo = "async-substrate-interface";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-39QL0h47ubKI26rIYxniNlchNAFEkPtKw6MyKuu2AXY=";
+    hash = "sha256-JEyB2UyvtTWIszuJ8Hf9S6WzK+Hb4L1L36E/KywfkYw=";
   };
 
   # On darwin the sandbox isolation is not as strict as on linux,

From 510aab0284212d53ea58611697874801ab3270e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 01:24:23 +0000
Subject: [PATCH 029/172] pana: 0.23.13 -> 0.23.14

---
 pkgs/by-name/pa/pana/package.nix       |  4 ++--
 pkgs/by-name/pa/pana/pubspec.lock.json | 24 ++++++++++++------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/pa/pana/package.nix b/pkgs/by-name/pa/pana/package.nix
index 6881bae84334..6b279726dcbf 100644
--- a/pkgs/by-name/pa/pana/package.nix
+++ b/pkgs/by-name/pa/pana/package.nix
@@ -9,13 +9,13 @@
 }:
 buildDartApplication rec {
   pname = "pana";
-  version = "0.23.13";
+  version = "0.23.14";
 
   src = fetchFromGitHub {
     owner = "dart-lang";
     repo = "pana";
     tag = version;
-    hash = "sha256-LPTcmAb0eZKhxzz/LzV4GnHfw/RAKCItoC7Vn9vvOuw=";
+    hash = "sha256-yBheou/u8TjL+MDhxd6AhWPJARLEcQF+ojmDqkv8zi4=";
   };
 
   dartEntryPoints = {
diff --git a/pkgs/by-name/pa/pana/pubspec.lock.json b/pkgs/by-name/pa/pana/pubspec.lock.json
index 2ca72fb00a18..56f6f5b351b8 100644
--- a/pkgs/by-name/pa/pana/pubspec.lock.json
+++ b/pkgs/by-name/pa/pana/pubspec.lock.json
@@ -54,41 +54,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "build",
-        "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10",
+        "sha256": "45d14a0fb23e018d8287c32fc98d726ce466b231928ed9b9200f29bd3ccd39ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "4.0.7"
     },
     "build_config": {
       "dependency": "direct dev",
       "description": {
         "name": "build_config",
-        "sha256": "4070d2a59f8eec34c97c86ceb44403834899075f66e8a9d59706f8e7834f6f71",
+        "sha256": "f2c223156a26eea323e6244b85141d76413a80aeee9fe0b380773789fabaf8ae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.3.1"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957",
+        "sha256": "fd754058c342243718d5171a95f352cfc9fcf0cba8cfa26df67cb13a5836db78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.2"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "1523ce62448ebac2c15a8ba5fbad8acac169788658a7dd2a1c2d9c2a9318b9a6",
+        "sha256": "5367e521935b102bdf1e735d2aab461e36b2edca6517662d088dd04cc39f8d16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.15.0"
+      "version": "2.15.1"
     },
     "build_verify": {
       "dependency": "direct dev",
@@ -224,11 +224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60",
+        "sha256": "b60b8cb28aa514346eb8f6b005c60484ea65190f213b1986f6e391e0292d18f4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.9"
+      "version": "3.1.11"
     },
     "ffi": {
       "dependency": "transitive",
@@ -404,11 +404,11 @@
       "dependency": "direct main",
       "description": {
         "name": "meta",
-        "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d",
+        "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.3"
+      "version": "1.19.0"
     },
     "mime": {
       "dependency": "transitive",

From 453bab7160fa7f81577fe997ef786fee58af42da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 02:18:39 +0000
Subject: [PATCH 030/172] netbird: 0.74.2 -> 0.74.3

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 1f342526688d..5c3638e6d70f 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -73,13 +73,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.74.2";
+  version = "0.74.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+BGWZzw6a8Fp8NlhtbX81OA3hCTcQ9r6nLuXTsbXCZ8=";
+    hash = "sha256-JXmtoHe0CwO1nKOPi82+cxhJ3tf3XZUCpDstk8U6s94=";
   };
 
   overrideModAttrs = final: prev: {

From ebef11dee413fa5ad423307097ab805f5d286b4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 02:20:51 +0000
Subject: [PATCH 031/172] python3Packages.openai-agents: 0.17.6 -> 0.18.1

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

diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index a35a81bdad58..70b3155e7003 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "openai-agents";
-  version = "0.17.6";
+  version = "0.18.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) version;
     pname = "openai_agents";
-    hash = "sha256-/tlPjPDrTFfGOomtSxB5MtdfKgttnolciPo8IX5jyCI=";
+    hash = "sha256-aJrYjI9kQ1QT3ecHykX7QtVSF/9u9jqrPWOMM/eOBL8=";
   };
 
   build-system = [

From 4e8211fa5321cd51af25f12b20c1d225ae55b7dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 12:26:46 +0000
Subject: [PATCH 032/172] octavePackages.datatypes: 1.2.5 -> 1.2.6

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

diff --git a/pkgs/development/octave-modules/datatypes/default.nix b/pkgs/development/octave-modules/datatypes/default.nix
index 1be6a219be3e..cab09eb45a8a 100644
--- a/pkgs/development/octave-modules/datatypes/default.nix
+++ b/pkgs/development/octave-modules/datatypes/default.nix
@@ -7,13 +7,13 @@
 
 buildOctavePackage rec {
   pname = "datatypes";
-  version = "1.2.5";
+  version = "1.2.6";
 
   src = fetchFromGitHub {
     owner = "pr0m1th3as";
     repo = "datatypes";
     tag = "release-${version}";
-    sha256 = "sha256-e7xHit/EvsNCzWWA5tuqVMwoUvJo09gNma7RrDd2ib0=";
+    sha256 = "sha256-8gOBjU9YJbS90iR/dgUzg5DHdb3x5PmEqmaDUbRZAyM=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=release-(.*)" ]; };

From 9ff2dfbc96bb50c73d6b7974e0cb5ab02f1eb613 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:26:42 +0700
Subject: [PATCH 033/172] python3Packages.dateutils: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index 323a4e05ec32..0e19d5c46103 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   python-dateutil,
   pytz,
 }:
@@ -9,14 +10,16 @@
 buildPythonPackage rec {
   pname = "dateutils";
   version = "0.6.12";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     python-dateutil
     pytz
   ];

From d8c2da55d62c555d486575525017c3d6d4d44a01 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:26:59 +0700
Subject: [PATCH 034/172] python3Packages.dawg-python: migrate to pyproject

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

diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index eab79418b8b5..65e5642ec3b9 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -2,12 +2,13 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "dawg-python";
   version = "0.7.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit version;
@@ -15,6 +16,8 @@ buildPythonPackage rec {
     hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "dawg_python" ];
 
   meta = {

From 467e6ca1dffec6529c18447844dd356063fd2ac6 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:27:40 +0700
Subject: [PATCH 035/172] python3Packages.dateutils: modernize

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

diff --git a/pkgs/development/python-modules/dateutils/default.nix b/pkgs/development/python-modules/dateutils/default.nix
index 0e19d5c46103..193cc01e797b 100644
--- a/pkgs/development/python-modules/dateutils/default.nix
+++ b/pkgs/development/python-modules/dateutils/default.nix
@@ -7,13 +7,16 @@
   pytz,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dateutils";
   version = "0.6.12";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit pname version;
+    pname = "dateutils";
+    inherit (finalAttrs) version;
     hash = "sha256-A92QvLIVQb1OtLATY35PG1+USIHEbMbktnpgWeNw4/E=";
   };
 
@@ -32,4 +35,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd0;
     maintainers = [ ];
   };
-}
+})

From 9fe1bcd1a6d565f1966dd105e9b92a98fded3f12 Mon Sep 17 00:00:00 2001
From: Harinn <prinn.dev@pm.me>
Date: Fri, 10 Jul 2026 23:28:13 +0700
Subject: [PATCH 036/172] python3Packages.dawg-python: modernize

---
 pkgs/development/python-modules/dawg-python/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/dawg-python/default.nix b/pkgs/development/python-modules/dawg-python/default.nix
index 65e5642ec3b9..cef1c82cd2ee 100644
--- a/pkgs/development/python-modules/dawg-python/default.nix
+++ b/pkgs/development/python-modules/dawg-python/default.nix
@@ -5,13 +5,15 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "dawg-python";
   version = "0.7.2";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchPypi {
-    inherit version;
+    inherit (finalAttrs) version;
     pname = "DAWG-Python";
     hash = "sha256-Sl4yhuYmHMoC8gXP1VFqerEBkPowxRwo00WAj1leNCE=";
   };
@@ -26,4 +28,4 @@ buildPythonPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From b910f531faae777cdcd63af3b7395612fa91b0db Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 11:59:07 +0200
Subject: [PATCH 037/172] maintainers: add antoineco

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 30952dd7302a..d1ad59414d05 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1997,6 +1997,12 @@
     githubId = 14838767;
     name = "Jacopo Scannella";
   };
+  antoineco = {
+    email = "hello@acotten.com";
+    github = "antoineco";
+    githubId = 3299086;
+    name = "Antoine Cotten";
+  };
   anton-4 = {
     name = "Anton";
     github = "Anton-4";

From 4ccd659f26bebfb21702562f2d6a91a917932714 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 12:54:10 +0200
Subject: [PATCH 038/172] cider-2: add antoineco as maintainer

---
 pkgs/by-name/ci/cider-2/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 1d8db2f568f6..ed47a5ee9d1a 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -95,6 +95,7 @@ stdenv.mkDerivation rec {
     mainProgram = "cider-2";
     maintainers = with lib.maintainers; [
       amadejkastelic
+      antoineco
       l0r3v
     ];
     platforms = [ "x86_64-linux" ];

From 1dfba633c54e2713022a878e8f49eb6a118541f8 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 13:03:20 +0200
Subject: [PATCH 039/172] cider-2: remove deps on widevine and asar

Cider 4 is a Widevine capable build; it does not need WidevineCdm to be
symlinked. Cider fetches it from Google's CDN either way, and playback
works out of the box.

The asar extract/repack is a left over from commit 4d94729 which was
mistakenly left behind in commit 99eafc4; it is now a no-op.
---
 pkgs/by-name/ci/cider-2/package.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index ed47a5ee9d1a..d12bfd4ca490 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -8,13 +8,11 @@
 
   # Required dependencies for autoPatchelfHook
   alsa-lib,
-  asar,
   gtk3,
   libgbm,
   libGL,
   nspr,
   nss,
-  widevine-cdm,
 }:
 stdenv.mkDerivation rec {
   pname = "cider-2";
@@ -26,7 +24,6 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    asar
     dpkg
     autoPatchelfHook
     makeWrapper
@@ -59,16 +56,6 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  postInstall = ''
-    ${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build
-
-    ${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar
-    rm -rf ./cider-build
-
-    # Install Widevine CDM for DRM support
-    ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/
-  '';
-
   postFixup = ''
     makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
       --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \

From ac23ecaa136d38c0b2c8dbb62b98c0a01e07671b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Jul 2026 22:15:08 +0000
Subject: [PATCH 040/172] mpvScripts.twitch-chat: 0-unstable-2026-06-13 ->
 0-unstable-2026-07-02

---
 pkgs/by-name/mp/mpv/scripts/twitch-chat.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
index 33fb7d229737..cef4666be274 100644
--- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
+++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix
@@ -7,13 +7,13 @@
 }:
 buildLua {
   pname = "twitch-chat";
-  version = "0-unstable-2026-06-13";
+  version = "0-unstable-2026-07-02";
 
   src = fetchFromGitHub {
     owner = "CrendKing";
     repo = "mpv-twitch-chat";
-    rev = "1e9d2dfcd8ab9c343cc6a3c55363994dbafe5b58";
-    hash = "sha256-vtv5YZO7qROhUL3TKCKaNfvv1uCjQv9kvfo7sno24BE=";
+    rev = "72d97a02fae1045dedc44979e60403a198bbef1c";
+    hash = "sha256-PaPCAmvARbRrL+NY+CcJGiQRO+Ahjo0o5vz1av3h2Ds=";
 
     postFetch = "rm $out/screenshot.webp";
   };

From 481d8cbe4196b790f5fb78d456908c43b30ad03e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 00:37:30 +0000
Subject: [PATCH 041/172] mapserver: 8.6.4 -> 8.6.5

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

diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix
index b075c21c6e20..1faa71910363 100644
--- a/pkgs/by-name/ma/mapserver/package.nix
+++ b/pkgs/by-name/ma/mapserver/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapserver";
-  version = "8.6.4";
+  version = "8.6.5";
 
   src = fetchFromGitHub {
     owner = "MapServer";
     repo = "MapServer";
     rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-kqCP0QZ8gNqS54B8nL8M9Wr9WyMQnORCs42O1eiMtRw=";
+    hash = "sha256-HEQ+bBb6cXXqR+4Yw5H+3xwQMQvlv0LjlBRT0baFeZQ=";
   };
 
   nativeBuildInputs = [

From 5a9a5ab1b6537f53271ea0f3a596c6c70e6c7973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 10 Jul 2026 19:45:50 -0700
Subject: [PATCH 042/172] python3Packages.flufl-bounce: 4.0 -> 5.0.1

Diff: https://gitlab.com/flufl/flufl.bounce/-/compare/4.0...5.0.1

Changelog: https://gitlab.com/warsaw/flufl.bounce/-/blob/5.0.1/docs/NEWS.rst
---
 .../python-modules/flufl/bounce.nix           | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/flufl/bounce.nix b/pkgs/development/python-modules/flufl/bounce.nix
index c33f898c87d2..1b8c36884f69 100644
--- a/pkgs/development/python-modules/flufl/bounce.nix
+++ b/pkgs/development/python-modules/flufl/bounce.nix
@@ -1,41 +1,35 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fetchpatch2,
-  setuptools,
+  fetchFromGitLab,
+  hatchling,
   atpublic,
-  zope-interface,
   pytestCheckHook,
+  sybil,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "flufl-bounce";
-  version = "4.0";
+  version = "5.0.1";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "flufl.bounce";
-    inherit version;
-    hash = "sha256-JVBK65duwP5aGc1sQTo0EMtRT9zb3Kn5tdjTQ6hgODE=";
+  src = fetchFromGitLab {
+    owner = "flufl";
+    repo = "flufl.bounce";
+    tag = finalAttrs.version;
+    hash = "sha256-NWDh8vqHCAjhQYyOUkURuFhDa2xdtEukppCBCjhxhfg=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Replace deprecated failIf with assertFalse for Python 3.12 compatibility.
-      url = "https://gitlab.com/warsaw/flufl.bounce/-/commit/e0b9fd0f24572e024a8d0484a3c9fb4542337d18.patch";
-      hash = "sha256-HJHEbRVjiiP5Z7W0sQCj6elUMyaWOTqQw6UpYOYCVZM=";
-    })
-  ];
+  build-system = [ hatchling ];
 
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     atpublic
-    zope-interface
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    sybil
+  ];
 
   pythonImportsCheck = [ "flufl.bounce" ];
 
@@ -44,8 +38,8 @@ buildPythonPackage rec {
   meta = {
     description = "Email bounce detectors";
     homepage = "https://gitlab.com/warsaw/flufl.bounce";
-    changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${version}/flufl/bounce/NEWS.rst";
+    changelog = "https://gitlab.com/warsaw/flufl.bounce/-/blob/${finalAttrs.src.tag}/docs/NEWS.rst";
     maintainers = [ ];
     license = lib.licenses.asl20;
   };
-}
+})

From ad01b3e1556656d732a1fc6e5014e22f797df85c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 03:52:59 +0000
Subject: [PATCH 043/172] python3Packages.click-aliases: 1.0.6 -> 1.0.7

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

diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index 118ded806492..125888233166 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "click-aliases";
-  version = "1.0.6";
+  version = "1.0.7";
 
   pyproject = true;
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "click-contrib";
     repo = "click-aliases";
     rev = "v${version}";
-    hash = "sha256-nHUvzUiWc7Fq22PPsodIDOwU1INy2CQfztD0ceguhEo=";
+    hash = "sha256-Km6rVAsdoctECEFxZG/gCnacmhdHQVJcVrOta6xh1XU=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 8c29b7ae2b6e35f9a0b95443972998414767fb31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 04:27:51 +0000
Subject: [PATCH 044/172] temporal-ui-server: 2.49.1 -> 2.52.0

---
 pkgs/by-name/te/temporal-ui-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/temporal-ui-server/package.nix b/pkgs/by-name/te/temporal-ui-server/package.nix
index 4f681cba6af2..f8659de2dc3c 100644
--- a/pkgs/by-name/te/temporal-ui-server/package.nix
+++ b/pkgs/by-name/te/temporal-ui-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-ui-server";
-  version = "2.49.1";
+  version = "2.52.0";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "ui-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cCYBMNkQZBdy1OpofI0THT9qDtYdsfI/rl3MWi0K1CU=";
+    hash = "sha256-5WGE4igWVkWwxy5k8x+X4roDX1glaW+x67UGkoiSWwM=";
   };
 
-  vendorHash = "sha256-nw4OHa13kRvdR6IFop5eZiB+5+cJCry4sgTnercRq9s=";
+  vendorHash = "sha256-E9pg16YJRDahBmiHwQY3r8kA+vBfza7KdFYqdw+qBSY=";
 
   postInstall = ''
     mv $out/bin/server $out/bin/temporal-ui-server

From 917f81954906d83572a6e70b5a79333bdb5e33f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 07:44:32 +0000
Subject: [PATCH 045/172] python3Packages.splunk-sdk: 2.1.1 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/splunk-sdk/default.nix b/pkgs/development/python-modules/splunk-sdk/default.nix
index a34fdcb4299f..d7c8900ad999 100644
--- a/pkgs/development/python-modules/splunk-sdk/default.nix
+++ b/pkgs/development/python-modules/splunk-sdk/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "splunk-sdk";
-  version = "2.1.1";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "splunk";
     repo = "splunk-sdk-python";
     tag = version;
-    hash = "sha256-+ae4/Q7Rx6K35RZuTOc/MDIgnX9hqswgZelnRvFiaRM=";
+    hash = "sha256-8544jRlv//Qkcq4JqrMOBZhFC6K6BI1WGT6PK4AwVvs=";
   };
 
   build-system = [ setuptools ];

From 0d7b51ad6994d57302ad431aede88d9b40a38c19 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Fri, 3 Jul 2026 23:51:32 +0200
Subject: [PATCH 046/172] cider-2: allow reading gsettings

Cider 4 throws a warning on startup:

  (cider-2:915399): GLib-GIO-CRITICAL **:
  g_settings_schema_source_lookup: assertion 'source != NULL' failed

wrapGAppsHook3[1] solves the problem transparently by prepending
- prepending gtk3 + gsettings-desktop-schemas to XDG_DATA_DIRS
- prepending dconf libs to GIO_EXTRA_MODULES
- setting the path to GTK's pixbuf loader cache as GDK_PIXBUF_MODULE_FILE

We emulate its behavior manually here to avoid a double-wrapping of the
cider-2 executable. (strace reveals that all these paths are effectively
opened on startup.)

[1]: https://nixos.org/manual/nixpkgs/stable/#ssec-gnome-hooks
---
 pkgs/by-name/ci/cider-2/package.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index d12bfd4ca490..6ded6b4a5738 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -5,6 +5,8 @@
   dpkg,
   autoPatchelfHook,
   makeWrapper,
+  gsettings-desktop-schemas,
+  dconf,
 
   # Required dependencies for autoPatchelfHook
   alsa-lib,
@@ -53,15 +55,21 @@ stdenv.mkDerivation rec {
 
     chmod +x $out/lib/cider/Cider
 
+    # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3.
+    # We append them manually instead to avoid a double-wrapping.
+    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
+      --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
+      --add-flags "--no-sandbox --disable-gpu-sandbox" \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
+      --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \
+      --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+
     runHook postInstall
   '';
 
   postFixup = ''
-    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
-      --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
-      --add-flags "--no-sandbox --disable-gpu-sandbox" \
-      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}"
-
     mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
     substituteInPlace $out/share/applications/${pname}.desktop \
       --replace-warn 'Exec=cider' 'Exec=${pname}' \
@@ -70,7 +78,7 @@ stdenv.mkDerivation rec {
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png
 
-    rm -r $out/share/pixmaps
+    rm -r $out/share/{pixmaps,lintian}
   '';
 
   passthru.updateScript = ./updater.sh;

From d25d5184a03dc17ce9d3dd42c21ebaffafd7e3ae Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Sat, 4 Jul 2026 11:43:21 +0200
Subject: [PATCH 047/172] cider-2: suppress substituteInPlace replace warning

Suppresses the warning
  pattern Exec=/usr/lib/cider/Cider doesn't match anything in file

Use an absolute path as Exec replacement.
Be strict and fail the build on error.
---
 pkgs/by-name/ci/cider-2/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 6ded6b4a5738..22a038fa3a53 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -72,8 +72,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
     substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-warn 'Exec=cider' 'Exec=${pname}' \
-      --replace-warn 'Exec=/usr/lib/cider/Cider' 'Exec=${pname}'
+      --replace-fail Exec=cider Exec=${pname}
 
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png

From 5d35a9225ddb45b2cf42506214cf810a2aac80b0 Mon Sep 17 00:00:00 2001
From: Antoine Cotten <hello@acotten.com>
Date: Mon, 6 Jul 2026 00:11:37 +0200
Subject: [PATCH 048/172] cider-2: remove superfluous use of pname

NixOS/nixpkgs#277994
---
 pkgs/by-name/ci/cider-2/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix
index 22a038fa3a53..501fd5abebf6 100644
--- a/pkgs/by-name/ci/cider-2/package.nix
+++ b/pkgs/by-name/ci/cider-2/package.nix
@@ -16,12 +16,12 @@
   nspr,
   nss,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cider-2";
   version = "4.0.9.1";
 
   src = fetchurl {
-    url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb";
+    url = "https://repo.cider.sh/apt/pool/main/cider-v${finalAttrs.version}-linux-x64.deb";
     hash = "sha256-MsA6lK3PsyOEx938FgJFx8l9oqwoM3FzIK5goF73lTs=";
   };
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
     # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3.
     # We append them manually instead to avoid a double-wrapping.
-    makeWrapper $out/lib/cider/Cider $out/bin/${pname} \
+    makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \
       --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \
       --add-flags "--no-sandbox --disable-gpu-sandbox" \
       --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \
@@ -70,9 +70,9 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = ''
-    mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --replace-fail Exec=cider Exec=${pname}
+    mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop
+    substituteInPlace $out/share/applications/cider-2.desktop \
+      --replace-fail Exec=cider Exec=cider-2
 
     install -Dm444 $out/share/pixmaps/cider.png \
       $out/share/icons/hicolor/256x256/apps/cider.png
@@ -94,4 +94,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = [ "x86_64-linux" ];
   };
-}
+})

From df554927aa3234c650b1c70a7b85a1f3ba2bfa62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 12:17:34 +0000
Subject: [PATCH 049/172] neo4j: 2026.02.2 -> 2026.06.0

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

diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix
index 4b5da6269d0b..a370884bc3ea 100644
--- a/pkgs/by-name/ne/neo4j/package.nix
+++ b/pkgs/by-name/ne/neo4j/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neo4j";
-  version = "2026.02.2";
+  version = "2026.06.0";
 
   src = fetchurl {
     url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz";
-    hash = "sha256-TpVibiE0ijAQl5mkRjnCFpvCTifhoTcZcv8lg8PYSTw=";
+    hash = "sha256-Hc9i5+gDXnFzK4ZTK5+OMhnOiVa9BpQNWgAkaWcnGSo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 5d9a7fbe7fdb491df2b4c93da813f959773b5d62 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Sat, 11 Jul 2026 15:45:08 +0200
Subject: [PATCH 050/172] nixos/test/systemd-localed:
 services.xserver.xkb.layout should be respected

---
 nixos/tests/all-tests.nix       |  1 +
 nixos/tests/systemd-localed.nix | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 nixos/tests/systemd-localed.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5e7a1a12a29c..c2e373ce0fca 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1684,6 +1684,7 @@ in
   systemd-journal = runTest ./systemd-journal.nix;
   systemd-journal-gateway = runTest ./systemd-journal-gateway.nix;
   systemd-journal-upload = runTest ./systemd-journal-upload.nix;
+  systemd-localed = runTest ./systemd-localed.nix;
   systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix;
   systemd-machinectl = runTest ./systemd-machinectl.nix;
   systemd-misc = runTest ./systemd-misc.nix;
diff --git a/nixos/tests/systemd-localed.nix b/nixos/tests/systemd-localed.nix
new file mode 100644
index 000000000000..308d90122868
--- /dev/null
+++ b/nixos/tests/systemd-localed.nix
@@ -0,0 +1,23 @@
+{ lib, ... }:
+{
+  name = "systemd-localed";
+  meta.maintainers = [ lib.maintainers.haansn08 ];
+
+  nodes.machine = { ... }: {
+    # we don't use services.xserver.enable because some window managers like
+    # niri rely on systemd-localed for the keyboard layout:
+    # https://niri-wm.github.io/niri/Configuration%3A-Input.html#layout
+    services.graphical-desktop.enable = true;
+
+    services.xserver.xkb.layout = "jp";
+  };
+
+  testScript = ''
+    machine.start()
+    machine.wait_for_unit("default.target")
+    machine.wait_for_unit("dbus.socket")
+
+    status, stdout = machine.execute("localectl")
+    t.assertIn("X11 Layout: jp", stdout)
+  '';
+}

From ba673cf63472ec6e3152b3cdaa8331e958f7641b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 11 Jul 2026 11:48:49 +0200
Subject: [PATCH 051/172] python3Packages.click-aliases: modernize

---
 .../python-modules/click-aliases/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/click-aliases/default.nix b/pkgs/development/python-modules/click-aliases/default.nix
index 125888233166..36ab94b8140d 100644
--- a/pkgs/development/python-modules/click-aliases/default.nix
+++ b/pkgs/development/python-modules/click-aliases/default.nix
@@ -7,31 +7,31 @@
   pytestCheckHook,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "click-aliases";
   version = "1.0.7";
-
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "click-contrib";
     repo = "click-aliases";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-Km6rVAsdoctECEFxZG/gCnacmhdHQVJcVrOta6xh1XU=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ click ];
+  dependencies = [ click ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "click_aliases" ];
 
   meta = {
-    homepage = "https://github.com/click-contrib/click-aliases";
     description = "Enable aliases for click";
+    homepage = "https://github.com/click-contrib/click-aliases";
+    changelog = "https://github.com/click-contrib/click-aliases/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ panicgh ];
   };
-}
+})

From 5a9256d210bdad81dc8bd33e39b3aa9818c1ec01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Jul 2026 19:02:40 +0000
Subject: [PATCH 052/172] schemesh: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/by-name/sc/schemesh/package.nix b/pkgs/by-name/sc/schemesh/package.nix
index 6d7b5f8344ba..4e242cfd3b5d 100644
--- a/pkgs/by-name/sc/schemesh/package.nix
+++ b/pkgs/by-name/sc/schemesh/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "schemesh";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "cosmos72";
     repo = "schemesh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tt3pxzti/Vv5JiP0kiplv6gOPiFU75tKoKyvpEPPztw=";
+    hash = "sha256-Sk2AZXd5kBR3Er8GeVm+10BaLwFL9k0v5Uk5CmuWv6o=";
   };
 
   buildInputs = [

From 3e46c77dd8c72ceb5db0fba1db90137b149ed163 Mon Sep 17 00:00:00 2001
From: Stefan Haan <stefan@kikeriki.at>
Date: Sun, 12 Jul 2026 04:23:54 +0200
Subject: [PATCH 053/172] nixos/graphical-desktop: avoid writing empty Option
 values to 00-keyboard.conf

---
 .../services/misc/graphical-desktop.nix       | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix
index e26050c123de..906601d1fc0c 100644
--- a/nixos/modules/services/misc/graphical-desktop.nix
+++ b/nixos/modules/services/misc/graphical-desktop.nix
@@ -22,17 +22,23 @@ in
 
   config = lib.mkIf cfg.enable {
     environment = {
-      # localectl looks into 00-keyboard.conf
-      etc."X11/xorg.conf.d/00-keyboard.conf".text = ''
-        Section "InputClass"
-          Identifier "Keyboard catchall"
-          MatchIsKeyboard "on"
-          Option "XkbModel" "${xcfg.xkb.model}"
-          Option "XkbLayout" "${xcfg.xkb.layout}"
-          Option "XkbOptions" "${xcfg.xkb.options}"
-          Option "XkbVariant" "${xcfg.xkb.variant}"
-        EndSection
-      '';
+      # systemd-localed looks into 00-keyboard.conf
+      # systemd-localed does not like if Option values are ""
+      etc."X11/xorg.conf.d/00-keyboard.conf".text =
+        let
+          optionLine =
+            name: value: lib.optionalString (value != null && value != "") ''Option "${name}" "${value}"'';
+        in
+        ''
+          Section "InputClass"
+            Identifier "Keyboard catchall"
+            MatchIsKeyboard "on"
+            ${optionLine "XkbModel" xcfg.xkb.model}
+            ${optionLine "XkbLayout" xcfg.xkb.layout}
+            ${optionLine "XkbOptions" xcfg.xkb.options}
+            ${optionLine "XkbVariant" xcfg.xkb.variant}
+          EndSection
+        '';
       systemPackages = with pkgs; [
         nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more
         xdg-utils

From e00a69115c61bd6d571d4118aa484fb6fc59d2a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 03:41:12 +0000
Subject: [PATCH 054/172] rdap: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/by-name/rd/rdap/package.nix b/pkgs/by-name/rd/rdap/package.nix
index 4713875f843b..09834e1e63c6 100644
--- a/pkgs/by-name/rd/rdap/package.nix
+++ b/pkgs/by-name/rd/rdap/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rdap";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "openrdap";
     repo = "rdap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FiaUyhiwKXZ3xnFPmdxb8bpbm5eRRFNDL3duOGDnc/A=";
+    hash = "sha256-dlRIKf/NikCxiKub6qFmC+e3J1XllaVodzVZvUyvycE=";
   };
 
-  vendorHash = "sha256-8b1EAnR8PkEAw9yLBqPKFeANJit0OCJG+fssAGR/iTk=";
+  vendorHash = "sha256-F9kwlUwrV6cUT9C/xZx5TyDPoqTt8mt/uh+QYaSCiUw=";
 
   doCheck = false;
 

From 530a50b4bff977b040ffbe4d4a34906c18ed356e Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Sun, 12 Jul 2026 13:18:20 +0200
Subject: [PATCH 055/172] rstudio: fix build with ru-ru-mozilla dict

---
 pkgs/by-name/rs/rstudio/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 712c82014729..853211adfe8b 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -73,7 +73,13 @@ let
   # -large versions in case of clashes
   largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
   otherDicts = lib.filter (
-    d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
+    d:
+    !(
+      lib.hasInfix "ru-ru-libreoffice" d.name # conflits with ru-ru-mozilla
+      || (
+        lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (lib.map (d: d.dictFileName) largeDicts)
+      )
+    )
   ) hunspellDictionaries;
   dictionaries = largeDicts ++ otherDicts;
 

From d632772ad87cd3391b6e0f83c039ba8129aded24 Mon Sep 17 00:00:00 2001
From: Benjamin Levy <7348004+io12@users.noreply.github.com>
Date: Sun, 12 Jul 2026 14:05:00 -0400
Subject: [PATCH 056/172] pdal: 2.9.3 -> 2.10.2

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

diff --git a/pkgs/by-name/pd/pdal/package.nix b/pkgs/by-name/pd/pdal/package.nix
index 88cb48468f45..80ccb9bbba2e 100644
--- a/pkgs/by-name/pd/pdal/package.nix
+++ b/pkgs/by-name/pd/pdal/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdal";
-  version = "2.9.3";
+  version = "2.10.2";
 
   src = fetchFromGitHub {
     owner = "PDAL";
     repo = "PDAL";
     tag = finalAttrs.version;
-    hash = "sha256-htuvNheRwzpdSKc4FbwugBWWaCNC7/20TSKwRpLr+7Y=";
+    hash = "sha256-VxELHAiiFMKjsvgBK4Cm6YJSrs/4QhhF1haZv4/FlZg=";
   };
 
   nativeBuildInputs = [
@@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     "pdal_io_stac_reader_test"
 
     # Require data to be downloaded from Internet
-    "pdal_io_copc_reader_test"
+    "pdal_io_copc_remote_reader_test"
   ];
 
   nativeCheckInputs = [

From 2a424cd798d3420a05981f6df3e7d181f1b5f25f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Jul 2026 19:40:56 +0000
Subject: [PATCH 057/172] dae: 1.1.0 -> 2.0.0

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

diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix
index 6ac073aeb8fb..844bd9eea49a 100644
--- a/pkgs/by-name/da/dae/package.nix
+++ b/pkgs/by-name/da/dae/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "dae";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "daeuniverse";
     repo = "dae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Kc51VQuqObxKXVXGv5CnDm4/3XYqjPvrpAQSVb2vxSM=";
+    hash = "sha256-hzX3b86BHvxXQZotSteiHoyBMF/P4WubeuJ6xpxa8ac=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-juxIsZt1T33epN8CbzDc02MmlW5PtYa4pcGxuX9OpH4=";
+  vendorHash = "sha256-S2dNFvMeZqGhzu+sIBGeaET4bQXfeucao6XR4QSTpog=";
 
   proxyVendor = true;
 

From cce826bedac124fc5de6666e1c49375f6632aad9 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 19:26:49 +0100
Subject: [PATCH 058/172] maintainers/scripts/update.py: fix exclusion of
 commitBody when commitMessage is provided

When manually providing a commit message, the logic to add
a commit body is skipped accidentally.
---
 maintainers/scripts/update.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
index ca35f04d1285..bf52c01bb56f 100644
--- a/maintainers/scripts/update.py
+++ b/maintainers/scripts/update.py
@@ -307,7 +307,7 @@ async def commit_changes(
             commit_message = "{attrPath}: {oldVersion} -> {newVersion}".format(**change)
             if "commitMessage" in change:
                 commit_message = change["commitMessage"]
-            elif "commitBody" in change:
+            if "commitBody" in change:
                 commit_message = commit_message + "\n\n" + change["commitBody"]
             await check_subprocess_output(
                 "git",

From 56cc555fc9be3e27a8a96f79f206e5d6726f164f Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 20:19:46 +0100
Subject: [PATCH 059/172] minecraft-server: support updateScript generated
 commits

---
 .../mi/minecraft-server/derivation.nix        |   6 +-
 pkgs/by-name/mi/minecraft-server/update.py    | 132 +++++++++++++++++-
 2 files changed, 133 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix
index 4192dff1ccf6..e7e31f2a16ce 100644
--- a/pkgs/by-name/mi/minecraft-server/derivation.nix
+++ b/pkgs/by-name/mi/minecraft-server/derivation.nix
@@ -36,7 +36,11 @@ stdenv.mkDerivation {
 
   passthru = {
     tests = { inherit (nixosTests) minecraft-server; };
-    updateScript = ./update.py;
+    updateScript = {
+      command = [ ./update.py ];
+
+      supportedFeatures = [ "commit" ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/mi/minecraft-server/update.py b/pkgs/by-name/mi/minecraft-server/update.py
index f272c8b71a84..de4c9339c576 100755
--- a/pkgs/by-name/mi/minecraft-server/update.py
+++ b/pkgs/by-name/mi/minecraft-server/update.py
@@ -110,6 +110,32 @@ def group_major_releases(releases: List[Version]) -> Dict[str, List[Version]]:
     return groups
 
 
+def slugify(version: str) -> str:
+    return version.replace(".", "-")
+
+
+def get_changelog_url(version: str) -> Optional[str]:
+    """
+    Attempt to resolve the Minecraft changelog article URL.
+    Returns the URL if it exists, otherwise None.
+    """
+    url = f"https://www.minecraft.net/en-us/article/minecraft-java-edition-{slugify(version)}"
+
+    # our request is denied without a human user-agent
+    headers = {
+        "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:140.0) Gecko/20100101 Firefox/140.0"
+    }
+
+    try:
+        response = requests.head(url, headers=headers, timeout=3)
+        if response.status_code == 200:
+            return url
+    except requests.RequestException as e:
+        pass
+
+    return None
+
+
 def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]:
     """
     Return a dictionary containing the latest version for each major release.
@@ -118,8 +144,12 @@ def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]:
     """
     return {
         major_release: max(
-            (release for release in releases if get_major_release(release.id) == major_release),
-            key=lambda x: tuple(map(int, x.id.split('.'))),
+            (
+                release
+                for release in releases
+                if get_major_release(release.id) == major_release
+            ),
+            key=lambda x: tuple(map(int, x.id.split("."))),
         )
         for major_release in group_major_releases(releases)
     }
@@ -153,7 +183,101 @@ def generate() -> Dict[str, Dict[str, str]]:
     return servers
 
 
+def get_latest(servers: Dict[str, Dict[str, str]]) -> str | None:
+    return max(
+        (v.get("version") for v in servers.values()),
+        key=lambda x: tuple(map(int, x.split("."))) if x is not None else (),
+    )
+
+
+def generate_commit(
+    previous_servers: Dict[str, Dict[str, str]],
+    servers: Dict[str, Dict[str, str]],
+    versions_file: Path,
+) -> List[Dict[str, str | list[str]]]:
+    actions = []
+    commit_body_lines = []
+
+    old_latest = get_latest(previous_servers)
+    new_latest = get_latest(servers)
+
+    for major_version, server in servers.items():
+        version = server.get("version")
+        previous_server = previous_servers.get(major_version)
+
+        if version is None:
+            continue
+
+        attribute = f"minecraftServers.vanilla-{slugify(major_version)}"
+
+        if not previous_server:
+            # this version didn't exist before
+            # check if its now the latest version
+            if version == new_latest:
+                action = f"{old_latest} -> {new_latest}"
+                attribute = "minecraft-server"
+            else:
+                action = f"init {version}"
+
+        else:
+            previous_version = previous_server.get("version")
+            if previous_version == version:
+                continue
+
+            action = f"{previous_version} -> {version}"
+
+        actions.append(action)
+
+        commit_body_lines.append(f"{attribute}: {action}")
+
+        changelog_url = get_changelog_url(version)
+        if changelog_url:
+            commit_body_lines.append(f"Release notes: {changelog_url}")
+
+    if not commit_body_lines:
+        return []
+
+    if len(actions) == 1:
+        commit_message = commit_body_lines[0]
+
+        # the body should only be the release notes to avoid repeatition
+        # if the release notes don't exist this will be blank
+        commit_body = "\n".join(commit_body_lines[1:]).strip()
+    else:
+        detailed_message = f"minecraft-server: {', '.join(actions)}"
+
+        commit_message = (
+            detailed_message
+            if len(detailed_message) <= 72
+            else "minecraft-server: update multiple versions"
+        )
+
+        commit_body = "\n".join(commit_body_lines).strip()
+
+    commit_json = {
+        "attrPath": "minecraftServers.vanilla",
+        "files": [str(versions_file)],
+        "commitMessage": commit_message,
+    }
+
+    if commit_body:
+        commit_json["commitBody"] = commit_body
+
+    return [commit_json]
+
+
 if __name__ == "__main__":
-    with open(Path(__file__).parent / "versions.json", "w") as file:
-        json.dump(generate(), file, indent=2)
+    versions_file = Path(__file__).parent / "versions.json"
+
+    with open(versions_file, "r") as file:
+        previous_servers = json.load(file)
+
+    servers = generate()
+
+    commit_json = generate_commit(previous_servers, servers, versions_file)
+
+    with open(versions_file, "w") as file:
+        json.dump(servers, file, indent=2)
         file.write("\n")
+
+    print(json.dumps(commit_json))

From 906c30c7853c524daf6c03424cb3a1942e717c22 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 20:04:10 +0000
Subject: [PATCH 060/172] minecraft-server: 26.1.2 -> 26.2

Release notes: https://www.minecraft.net/en-us/article/minecraft-java-edition-26-2
---
 pkgs/by-name/mi/minecraft-server/versions.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/mi/minecraft-server/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json
index ac403058dc95..192cef5383f4 100644
--- a/pkgs/by-name/mi/minecraft-server/versions.json
+++ b/pkgs/by-name/mi/minecraft-server/versions.json
@@ -1,4 +1,10 @@
 {
+  "26.2": {
+    "sha1": "823e2250d24b3ddac457a60c92a6a941943fcd6a",
+    "url": "https://piston-data.mojang.com/v1/objects/823e2250d24b3ddac457a60c92a6a941943fcd6a/server.jar",
+    "version": "26.2",
+    "javaVersion": 25
+  },
   "26.1": {
     "sha1": "97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51",
     "url": "https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar",

From 2d7b93f85c58384f9691c7986ad605f40b3d2c82 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Sun, 12 Jul 2026 17:59:31 -0400
Subject: [PATCH 061/172] openboard: fix build with poppler 26+

https://github.com/OpenBoard-org/OpenBoard/pull/1474
---
 pkgs/by-name/op/openboard/package.nix         |  4 ++
 .../op/openboard/poppler-26-compat.patch      | 69 +++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/op/openboard/poppler-26-compat.patch

diff --git a/pkgs/by-name/op/openboard/package.nix b/pkgs/by-name/op/openboard/package.nix
index c68a6034eb91..ee2fd8646c40 100644
--- a/pkgs/by-name/op/openboard/package.nix
+++ b/pkgs/by-name/op/openboard/package.nix
@@ -48,6 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MjUbfv+3o3f4qsLPxLDeUn+/h5YupMMhC/SecwmCR8Q=";
   };
 
+  patches = [
+    ./poppler-26-compat.patch # https://github.com/OpenBoard-org/OpenBoard/pull/1474
+  ];
+
   postPatch = ''
     substituteInPlace resources/etc/OpenBoard.config \
       --replace-fail 'EnableAutomaticSoftwareUpdates=true' 'EnableAutomaticSoftwareUpdates=false' \
diff --git a/pkgs/by-name/op/openboard/poppler-26-compat.patch b/pkgs/by-name/op/openboard/poppler-26-compat.patch
new file mode 100644
index 000000000000..1630211ff88f
--- /dev/null
+++ b/pkgs/by-name/op/openboard/poppler-26-compat.patch
@@ -0,0 +1,69 @@
+diff --git a/src/pdf/PDFRenderer.h b/src/pdf/PDFRenderer.h
+index 8f0cb93e03c9fe03414e394a91ec7ec73a542739..a5e872611e2060ee84a7a8382297af1e81dff7da 100644
+--- a/src/pdf/PDFRenderer.h
++++ b/src/pdf/PDFRenderer.h
+@@ -58,8 +58,6 @@ class PDFRenderer : public QObject
+ 
+         virtual QSizeF pointSizeF(int pageNumber) const = 0;
+ 
+-        virtual QString title() const = 0;
+-
+         void attach();
+         void detach();
+ 
+diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp
+index 8e361430c031e21fdde6faa23594ee561aedf21a..bb4bca36cec30f6992181d59f8417b4ffb442594 100644
+--- a/src/pdf/XPDFRenderer.cpp
++++ b/src/pdf/XPDFRenderer.cpp
+@@ -157,39 +157,6 @@ int XPDFRenderer::pageCount() const
+         return 0;
+ }
+ 
+-QString XPDFRenderer::title() const
+-{
+-    if (isValid())
+-    {
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
+-        Object pdfInfo = mDocument->getDocInfo();
+-#else
+-        Object pdfInfo;
+-        mDocument->getDocInfo(&pdfInfo);
+-#endif
+-        if (pdfInfo.isDict())
+-        {
+-            Dict *infoDict = pdfInfo.getDict();
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 55
+-            Object title = infoDict->lookup((char*)"Title");
+-#else
+-            Object title;
+-            infoDict->lookup((char*)"Title", &title);
+-#endif
+-            if (title.isString())
+-            {
+-#if POPPLER_VERSION_MAJOR > 0 || POPPLER_VERSION_MINOR >= 72
+-                return QString(title.getString()->c_str());
+-#else
+-                return QString(title.getString()->getCString());
+-#endif
+-            }
+-        }
+-    }
+-
+-    return QString();
+-}
+-
+ 
+ QSizeF XPDFRenderer::pageSizeF(int pageNumber) const
+ {
+diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h
+index 6264ae1b087fefe82fa7ec8291a52ead657b3697..7a9bdf7777aa6cbc1b823a7a6adf52e837a7fc59 100644
+--- a/src/pdf/XPDFRenderer.h
++++ b/src/pdf/XPDFRenderer.h
+@@ -73,7 +73,6 @@ class XPDFRenderer : public PDFRenderer
+         virtual QSizeF pageSizeF(int pageNumber) const override;
+         virtual int pageRotation(int pageNumber) const override;
+         virtual QSizeF pointSizeF(int pageNumber) const override;
+-        virtual QString title() const override;
+         virtual void render(QPainter *p, int pageNumber, const bool cacheAllowed, const QRectF &bounds = QRectF()) override;
+ 
+     signals:

From 52ad4c068369d880726fa61b29516b6f6ab61356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 12 Jul 2026 15:06:29 -0700
Subject: [PATCH 062/172] dblatex: use default python3

---
 pkgs/by-name/db/dblatex/package.nix | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/db/dblatex/package.nix b/pkgs/by-name/db/dblatex/package.nix
index 3bed1f8cc05f..e3bd013ed712 100644
--- a/pkgs/by-name/db/dblatex/package.nix
+++ b/pkgs/by-name/db/dblatex/package.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
-  python311,
+  python3,
   libxslt,
   texliveBasic,
   enableAllFeatures ? false,
@@ -62,8 +63,26 @@ stdenv.mkDerivation rec {
     sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-replace-imp-by-importlib.patch";
+      hash = "sha256-ND9fS8KkQKnML6EwJFSUFhqiIn4yEvu1KOxTRPjXsd0=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-adjust-submodule-imports.patch";
+      hash = "sha256-0wOn2IvCSCtrE0rM56yw3FcGggTsDk3owQa1UmFsbVo=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-script_path.patch";
+      hash = "sha256-JGN9NxOiqoZ0Yz5ZbYwsis3tujBA2OWX5PZtrc/iTJY=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    (python3.withPackages (ps: [ ps.setuptools_80 ]))
+  ];
+
   buildInputs = [
-    python311
     libxslt
     tex
   ]
@@ -100,7 +119,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose
+    python ./setup.py install --prefix="$out" --use-python-path --verbose
   '';
 
   passthru = { inherit tex; };

From c1997f9e93ef6f61b8abced1796f3a7fbc3f5b51 Mon Sep 17 00:00:00 2001
From: wrench-exile-legacy <user@wrench-exile-legacy.site>
Date: Sun, 12 Jul 2026 23:14:49 +0100
Subject: [PATCH 063/172] minecraft-server: add wrench-exile-legacy as a
 maintainer

---
 pkgs/by-name/mi/minecraft-server/derivation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix
index e7e31f2a16ce..a93d2eb05302 100644
--- a/pkgs/by-name/mi/minecraft-server/derivation.nix
+++ b/pkgs/by-name/mi/minecraft-server/derivation.nix
@@ -52,6 +52,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       thoughtpolice
       tomberek
+      wrench-exile-legacy
       costrouc
     ];
     mainProgram = "minecraft-server";

From 8c3d3148f6308e07124186a8b0d9e5ed575679ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 00:54:40 +0000
Subject: [PATCH 064/172] zsh: 5.9.1 -> 5.9.2

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

diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index d8d86ba0399f..ea7931ffac72 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsh";
-  version = "5.9.1";
+  version = "5.9.2";
   outputs = [
     "out"
     "doc"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-XSC+wD+YHcTpoJ7CRedBU4j/ZB95xcXEFrUELljYKA0=";
+    sha256 = "sha256-NvpzQ3S0R4NYLOwJvNZ4IuL5ksd57BYkq1WW3weNL4E=";
   };
 
   patches = [

From 66bab6662e8d2bef15626012da9ec8ce3d5b7728 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Sun, 12 Jul 2026 18:40:54 -0700
Subject: [PATCH 065/172] gnupatch: move to by-name/

---
 .../gnupatch/default.nix => by-name/gn/gnupatch/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/text/gnupatch/default.nix => by-name/gn/gnupatch/package.nix} (100%)

diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/by-name/gn/gnupatch/package.nix
similarity index 100%
rename from pkgs/tools/text/gnupatch/default.nix
rename to pkgs/by-name/gn/gnupatch/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4ccbaaa5d70..1bd3059b3f97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2099,8 +2099,6 @@ with pkgs;
 
   gnugrep = callPackage ../tools/text/gnugrep { };
 
-  gnupatch = callPackage ../tools/text/gnupatch { };
-
   gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { };
   gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1
 

From 0ab4968115459c3ad208a6014723b9cc3181cbe8 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Mon, 13 Jul 2026 09:00:27 +0200
Subject: [PATCH 066/172] input-remapper: 2.2.0 -> 2.2.1

https://github.com/sezanzeb/input-remapper/releases/tag/2.2.1

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/in/input-remapper/package.nix | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/in/input-remapper/package.nix b/pkgs/by-name/in/input-remapper/package.nix
index 3b7a60156f8e..03c5738a0f08 100644
--- a/pkgs/by-name/in/input-remapper/package.nix
+++ b/pkgs/by-name/in/input-remapper/package.nix
@@ -32,24 +32,25 @@ let
 in
 (python3Packages.buildPythonApplication rec {
   pname = "input-remapper";
-  version = "2.2.0";
-  format = "setuptools";
+  version = "2.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sezanzeb";
     repo = "input-remapper";
     tag = version;
-    hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI=";
+    hash = "sha256-CFg/AvmZseU1f9bWI4CtYp9blvAhCgGzVWE8csVDbyE=";
   };
 
   postPatch = ''
     # fix FHS paths
-    substituteInPlace inputremapper/configs/data.py \
-      --replace-fail "/usr/share"  "$out/usr/share"
+    substituteInPlace inputremapper/installation_info.py \
+      --replace-fail 'DATA_DIR = "/usr/share/input-remapper"' \
+        "DATA_DIR = \"$out/usr/share/input-remapper\""
   ''
   + lib.optionalString withDebugLogLevel ''
     # if debugging
-    substituteInPlace inputremapper/logger.py \
+    substituteInPlace inputremapper/logging/logger.py \
       --replace-fail "logger.setLevel(logging.INFO)"  "logger.setLevel(logging.DEBUG)"
   '';
 
@@ -63,15 +64,17 @@ in
   ]
   ++ maybeXmodmap;
 
+  build-system = with python3Packages; [ setuptools ];
+
   dependencies = with python3Packages; [
-    setuptools # needs pkg_resources
-    pygobject3
+    dasbus
     evdev
-    pkgconfig
-    pydantic
-    pydbus
     gtksourceview4
+    packaging
     psutil
+    pycairo
+    pydantic
+    pygobject3
   ];
 
   # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs.
@@ -98,6 +101,7 @@ in
 
     install -m644 -D -t $out/share/applications/ data/*.desktop
     install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy
+    install -m644 -D data/69-input-remapper-forwarded.rules $out/etc/udev/rules.d/69-input-remapper-forwarded.rules
     install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules
     install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service
     install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy
@@ -179,7 +183,8 @@ in
       # discussion
       postPatch = prev.postPatch or "" + ''
         # set revision for --version output
-        echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py
+        substituteInPlace inputremapper/installation_info.py \
+          --replace-fail 'COMMIT_HASH = "unknown"' 'COMMIT_HASH = "${final.src.rev}"'
       '';
     }
   )

From 37ecda9da3a8ef1a4fcb56aabacafd9507a68e89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 08:23:24 +0000
Subject: [PATCH 067/172] haproxy: 3.4.1 -> 3.4.2

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

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index 77945c05c7d6..ac08bb4307e0 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.4.1";
+  version = "3.4.2";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-LmLEzk/XfTvHzxflhkMWY0VEVqB4t8hGW48BJbW8Ivg=";
+    hash = "sha256-sTMNuw1ua8SnLEcIpqnlhVec0RVt/ldjwmMFEFvBKQc=";
   };
 
   buildInputs = [

From f09afe460a40d3ae60151217f17d9c491019113b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 11:57:19 +0000
Subject: [PATCH 068/172] python3Packages.scrapy: 2.16.0 -> 2.17.0

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

diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix
index cceb55ded458..c03267c6f715 100644
--- a/pkgs/development/python-modules/scrapy/default.nix
+++ b/pkgs/development/python-modules/scrapy/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "scrapy";
-  version = "2.16.0";
+  version = "2.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scrapy";
     repo = "scrapy";
     tag = version;
-    hash = "sha256-s72COXzDuTtRNGenZEZG8QCeq+9LBu6fuT5NOjpVYaY=";
+    hash = "sha256-4FAZJZc8qsMn93XPNYnnbqecA29DWwh5VNNlCsnib7A=";
   };
 
   pythonRelaxDeps = [

From 67e5d3eddee47ad41c7173e400f549ce7272aa8d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 13 Jul 2026 15:10:27 +0300
Subject: [PATCH 069/172] zsh: add doronbehar to maintainers

---
 pkgs/by-name/zs/zsh/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index ea7931ffac72..862f3bae856f 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -145,6 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       pSub
       artturin
+      doronbehar
     ];
     platforms = lib.platforms.unix;
     mainProgram = "zsh";

From aecbb1a2320fbe051783e1c043614ae3d82e6801 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 12:28:10 +0000
Subject: [PATCH 070/172] aliae: 0.26.6 -> 1.1.1

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

diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix
index 42dc084574f5..5a14624dab5b 100644
--- a/pkgs/by-name/al/aliae/package.nix
+++ b/pkgs/by-name/al/aliae/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aliae";
-  version = "0.26.6";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "aliae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY=";
+    hash = "sha256-/n20oNQGcfji2whdl/DaUUf2kgiVZMB73veUfOr9EqU=";
   };
 
-  vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4=";
+  vendorHash = "sha256-qY12bkwa8lyHtS7AdvkKuAmwDRyn5am2aU6wy8GE4Wk=";
 
   sourceRoot = "${finalAttrs.src.name}/src";
 

From ce2d17e9abaf03c177a288754306ff88c8d76781 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 13:10:57 +0000
Subject: [PATCH 071/172] lazyworktree: 1.47.0 -> 1.48.0

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

diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix
index a319756abbe7..0ddaca0b29a9 100644
--- a/pkgs/by-name/la/lazyworktree/package.nix
+++ b/pkgs/by-name/la/lazyworktree/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "lazyworktree";
-  version = "1.47.0";
+  version = "1.48.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "lazyworktree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aiObEOw+osGRzvkSwo/aWbby8eb/jPiruxcGehafUvw=";
+    hash = "sha256-0Ldrul/T7QdmZiIiaCPkcojw75WZqKBLMSmKyLBUd3Y=";
   };
 
-  vendorHash = "sha256-aQ0My2re9rCoU6EZ0VSyHYT1TMZEMAwnhmcqGBd95ks=";
+  vendorHash = "sha256-HCPS084sPctHAXgy0SK0EWVpn6K/UQYCu2LnGT0czAI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 0534b5c8f2a8e8f4c9a8674661f76c843b10ef4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 14:01:56 +0000
Subject: [PATCH 072/172] python3Packages.pygmt: 0.18.0 -> 0.19.0

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

diff --git a/pkgs/development/python-modules/pygmt/default.nix b/pkgs/development/python-modules/pygmt/default.nix
index 23c581d02b50..a45712b74c48 100644
--- a/pkgs/development/python-modules/pygmt/default.nix
+++ b/pkgs/development/python-modules/pygmt/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pygmt";
-  version = "0.18.0";
+  version = "0.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "GenericMappingTools";
     repo = "pygmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yWB/IRu5B6hnu8e1TvpAaLehr1TMqvnDc5sRgyMw2mM=";
+    hash = "sha256-XuJuSma2EVqEYpJlz/rS01gQeI+DgJSifLs2Wj2pdiI=";
   };
 
   postPatch = ''

From 6d11b0dfb87d2b7ce9d9a397ffdc427135b0045a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0lkecan=20Bozdo=C4=9Fan?= <ilkecan@protonmail.com>
Date: Mon, 13 Jul 2026 17:29:59 +0300
Subject: [PATCH 073/172] brewtarget: set __structuredAttrs & strictDeps, add
 changelog

---
 pkgs/by-name/br/brewtarget/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix
index 334d8e2ba912..cffed27593d7 100644
--- a/pkgs/by-name/br/brewtarget/package.nix
+++ b/pkgs/by-name/br/brewtarget/package.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  __structuredAttrs = true;
+  strictDeps = true;
+
   postPatch = ''
     # 3 sed statements from below derived from AUR
     # Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland
@@ -41,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     pkg-config
+    qt6.qttools
     qt6.wrapQtAppsHook
     wrapGAppsHook3
     pandoc
@@ -51,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     qt6.qtbase
     qt6.qtmultimedia
     qt6.qtsvg
-    qt6.qttools
     xercesc
     xalanc
   ];
@@ -66,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Open source beer recipe creation tool";
     mainProgram = "brewtarget";
     homepage = "https://www.brewtarget.beer";
+    changelog = "https://github.com/Brewtarget/brewtarget/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [

From adafca942f37b3150849efd4f823331f525bbff2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 14:31:15 +0000
Subject: [PATCH 074/172] python3Packages.types-openpyxl: 3.1.5.20250919 ->
 3.1.5.20260518

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

diff --git a/pkgs/development/python-modules/types-openpyxl/default.nix b/pkgs/development/python-modules/types-openpyxl/default.nix
index 28c28da71abb..bfcb893c1959 100644
--- a/pkgs/development/python-modules/types-openpyxl/default.nix
+++ b/pkgs/development/python-modules/types-openpyxl/default.nix
@@ -6,14 +6,14 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "types-openpyxl";
-  version = "3.1.5.20250919";
+  version = "3.1.5.20260518";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_openpyxl";
     inherit (finalAttrs) version;
-    hash = "sha256-IytZBnc+66zhUJuJlM2t2gQ/aSz9upv7uGypIdVNMtc=";
+    hash = "sha256-2pzWROToAhWj9gqMLCyOmA6UGptYHP+jh2KFqnkcpa8=";
   };
 
   build-system = [ setuptools ];

From 61af9b9ab1c612fd4e2f1d91db26ca1b3c89ecd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ila=C3=AF=20Deutel?= <root@ilai.dev>
Date: Tue, 26 May 2026 01:48:42 -0400
Subject: [PATCH 075/172] amber-lang: add versionCheckHook, include unstable in
 updateScript

---
 pkgs/by-name/am/amber-lang/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index a704fbd47fa1..40efcab57a60 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -7,6 +7,7 @@
   gnused,
   makeWrapper,
   installShellFiles,
+  versionCheckHook,
   stdenv,
   runCommand,
   amber-lang,
@@ -62,8 +63,13 @@ rustPlatform.buildRustPackage rec {
       --bash <($out/bin/amber completion)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
     tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
       diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World')
       touch $out

From 9d5147209a2c02b9997a6f08b4cd524fed3d3475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ila=C3=AF=20Deutel?= <root@ilai.dev>
Date: Tue, 26 May 2026 01:48:42 -0400
Subject: [PATCH 076/172] amber-lang: 0.5.1-alpha -> 0.6.0-alpha

---
 .../am/amber-lang/fix_word_boundaries.patch   | 38 ------------
 pkgs/by-name/am/amber-lang/package.nix        | 61 ++++++++++++-------
 2 files changed, 39 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/by-name/am/amber-lang/fix_word_boundaries.patch

diff --git a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch b/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch
deleted file mode 100644
index ec73631eccae..000000000000
--- a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From efdbecaf721ccb217ece34a5105eaac68e27aa51 Mon Sep 17 00:00:00 2001
-From: Max Karou <maxkarou@protonmail.com>
-Date: Sun, 4 Jan 2026 01:47:51 +0100
-Subject: [PATCH] sed_version: remove word boundary assertions
-
-Word boundary assertions (\b) are GNU regex extensions that may fail
-on systems using non-glibc C libraries (e.g., musl, macOS).
-
-This was previously fixed in replace_regex() via NixOS/nixpkgs#388412,
-which was subsequently upstreamed in amber-lang/amber#686.
-
-Changes in amber-lang/amber#717 reintroduced the same portability issue.
----
- src/std/text.ab | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/std/text.ab b/src/std/text.ab
-index 5f2d935..a5dac3f 100644
---- a/src/std/text.ab
-+++ b/src/std/text.ab
-@@ -51,12 +51,12 @@ const SED_VERSION_BUSYBOX = 2
- fun sed_version(): Int {
-     // We can't match against a word "GNU" because
-     // alpine's busybox sed returns "This is not GNU sed version"
--    trust $ re='\bCopyright\b.+\bFree Software Foundation\b'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $
-+    trust $ re='Copyright.+Free Software Foundation'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $
-     if status == 0 {
-         return SED_VERSION_GNU
-     }
-     // On BSD single `sed` waits for stdin. We must use `sed --help` to avoid this.
--    trust $ re='\bBusyBox\b'; [[ \$(sed --help 2>&1) =~ \$re ]] $
-+    trust $ re='BusyBox'; [[ \$(sed --help 2>&1) =~ \$re ]] $
-     if status == 0 {
-         return SED_VERSION_BUSYBOX
-     }
--- 
-2.51.2
-
diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 40efcab57a60..f35e9b533e2f 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -4,7 +4,6 @@
   rustPlatform,
   bc,
   util-linux,
-  gnused,
   makeWrapper,
   installShellFiles,
   versionCheckHook,
@@ -12,31 +11,23 @@
   runCommand,
   amber-lang,
   nix-update-script,
+  bash,
+  ksh,
+  zsh,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "amber-lang";
-  version = "0.5.1-alpha";
+  version = "0.6.0-alpha";
 
   src = fetchFromGitHub {
     owner = "amber-lang";
     repo = "amber";
     tag = version;
-    hash = "sha256-v1uJe3vVGKXaZcQzdoYzu/bJKMQnS4IYET4QLPW+J8Y=";
+    hash = "sha256-pyMsxb9XPtseroH2MORhMOg9+iaLyoxmgpUTCej+i+Y=";
   };
 
-  patches = [
-    # Upstreamed in #995, can be removed in >= 0.5.2
-    # github.com/amber-lang/amber/pull/995
-    ./fix_word_boundaries.patch
-  ];
-
-  cargoHash = "sha256-aXcxlmmDYLFbyRJYyGE1gbQMbdysHx4iWXsrUj10Eco=";
-
-  preConfigure = ''
-    substituteInPlace src/compiler.rs \
-      --replace-fail 'Command::new("/usr/bin/env")' 'Command::new("env")'
-  '';
+  cargoHash = "sha256-7TZIRg4NK2uOivUUg09T5mbxrNlRmmVyec2xhmzSNvY=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -44,15 +35,23 @@ rustPlatform.buildRustPackage rec {
   ];
 
   nativeCheckInputs = [
+    bash
     bc
     # 'rev' in generated bash script of test
     # tests::validity::variable_ref_function_invocation
     util-linux
   ];
 
+  preCheck = ''
+    substituteInPlace src/tests/cli.rs \
+      --replace-fail 'Command::new(amber_bin())' "Command::new(\"target/${stdenv.targetPlatform.rust.cargoShortTarget}/$cargoBuildType/amber\")"
+    substituteInPlace src/tests/cli.rs \
+      --replace-fail 'cmd.env("AMBER_SHELL", "/bin/bash")' 'cmd.env("AMBER_SHELL", "bash")'
+  '';
+
   checkFlags = [
     "--skip=tests::extra::download"
-    "--skip=tests::formatter::all_exist"
+    "--skip=tests::stdlib::test_stdlib_src_tests_stdlib_http_fetch_ab"
   ];
 
   postInstall = ''
@@ -70,21 +69,39 @@ rustPlatform.buildRustPackage rec {
 
   passthru = {
     updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
-    tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } ''
-      diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World')
-      touch $out
-    '';
+    tests =
+      let
+        testHelloWorld =
+          type: pkg:
+          runCommand "amber-lang-test-eval-hello-world-${type}"
+            {
+              nativeBuildInputs = [
+                amber-lang
+                pkg
+              ];
+            }
+            ''
+              diff -U3 --color=auto <(amber eval --target ${type} 'echo("Hello, World")') <(echo 'Hello, World')
+              touch $out
+            '';
+      in
+      {
+        eval-hello-world-bash = testHelloWorld "bash" bash;
+        eval-hello-world-bash-3_2 = testHelloWorld "bash-3.2" bash;
+        eval-hello-world-ksh = testHelloWorld "ksh" ksh;
+        eval-hello-world-zsh = testHelloWorld "zsh" zsh;
+      };
   };
 
   meta = {
     description = "Programming language compiled to bash";
     homepage = "https://amber-lang.com";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.lgpl3Only;
     mainProgram = "amber";
     maintainers = with lib.maintainers; [
       cafkafk
       aleksana
+      ilai-deutel
     ];
-    platforms = lib.platforms.unix;
   };
 }

From 3cfda093b161efcd040e2408c5a2a0beb93f69c5 Mon Sep 17 00:00:00 2001
From: Andreas <asamonik@student.tugraz.at>
Date: Mon, 13 Jul 2026 15:19:08 +0200
Subject: [PATCH 077/172] expresslrs-configurator: 1.7.11 -> 1.8.1

Release notes:
https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/tag/v1.8.1

Drop the serialport node_gyp_bins workaround because the path is no
longer present in the 1.8.x bundle. Add the C++ runtime library to the
wrapper for the updated serialport native module.
---
 pkgs/by-name/ex/expresslrs-configurator/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ex/expresslrs-configurator/package.nix b/pkgs/by-name/ex/expresslrs-configurator/package.nix
index 4a63c931b5a8..467ee1798c86 100644
--- a/pkgs/by-name/ex/expresslrs-configurator/package.nix
+++ b/pkgs/by-name/ex/expresslrs-configurator/package.nix
@@ -12,7 +12,7 @@
 
 let
   pname = "expresslrs-configurator";
-  version = "1.7.11";
+  version = "1.8.1";
   installPath = "share/${pname}";
   resourcesPath = "${installPath}/resources";
 in
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   src = fetchzip {
     url = "https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/download/v${version}/${pname}-${version}.zip";
     stripRoot = false;
-    hash = "sha256-BIbJzNWjYFbbwCEWoym3g6XBpQGi2owbf2XsQiXwHmw=";
+    hash = "sha256-3f2/ifXLs/gHZVVDI0EUBP05FEHH8exDvBzALDXq0Wo=";
   };
 
   nativeBuildInputs = [
@@ -52,10 +52,6 @@ stdenv.mkDerivation {
     cp -r $src/locales $src/resources $out/${installPath}/
     chmod -R u+w $out/${resourcesPath}
 
-    # broken symlink
-    rm -f $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
-    touch $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3
-
     # patch asar absolute paths
     asar extract $out/${resourcesPath}/app.asar $TMPDIR/app
     substituteInPlace $TMPDIR/app/dist/main/main.js \
@@ -70,6 +66,7 @@ stdenv.mkDerivation {
     makeWrapper '${lib.getExe electron}' "$out/bin/${pname}" \
       --add-flags "$out/${resourcesPath}/app.asar" \
       --prefix PATH : ${lib.makeBinPath [ git ]} \
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]} \
       --set ELECTRON_OVERRIDE_DIST_PATH "${electron}/lib/electron" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
 

From 97dcf43f5b6805dcc7b067dc05508c4467ea1165 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Jul 2026 23:56:12 +0000
Subject: [PATCH 078/172] subsurface: 6.0.5504 -> 6.0.5576

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

diff --git a/pkgs/by-name/su/subsurface/package.nix b/pkgs/by-name/su/subsurface/package.nix
index fbc41a4b5e54..6eb0faa2e8c6 100644
--- a/pkgs/by-name/su/subsurface/package.nix
+++ b/pkgs/by-name/su/subsurface/package.nix
@@ -23,14 +23,14 @@
 }:
 
 let
-  version = "6.0.5504";
+  version = "6.0.5576";
 
   subsurfaceSrc = (
     fetchFromGitHub {
       owner = "Subsurface";
       repo = "subsurface";
-      rev = "28ad7132d2283a3fc06872de6526bc19c077d203";
-      hash = "sha256-PQwBfm4oPGLU1HRFIcbgTYOYLeVhmEBgN5U8fnUMMlQ=";
+      rev = "87a5ba9fd00712e71b90115b7566d4228a5c0d98";
+      hash = "sha256-ILy5M2m2rKPP77x7cMiqNzpd6NOnQS8UpqZemf/SHf4=";
       fetchSubmodules = true;
     }
   );

From 634bccc9b0b629261dbc74c41d8c6ead8fc260dc Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Sat, 27 Jun 2026 01:29:53 -0400
Subject: [PATCH 079/172] mlt: 7.38.0 -> 7.40.0, add new dep rnnoise

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

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 85216c588e67..4f9f8cb9d754 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -18,6 +18,7 @@
   makeWrapper,
   movit,
   opencv4,
+  rnnoise,
   rtaudio,
   rubberband,
   sox,
@@ -44,13 +45,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mlt";
-  version = "7.38.0";
+  version = "7.40.0";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "mlt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc=";
+    hash = "sha256-rw1jnQJzbtpGsIe/AFMiy7k/3X0vkfkY3rG4E419aVM=";
     # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate.
     # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on
     # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545
@@ -84,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
     libvorbis
     libxml2
     movit
+    rnnoise
     rtaudio
     rubberband
     sox

From f7d66fa955bfa18c43a66fa632d7a7e08e3a0b16 Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Sat, 27 Jun 2026 01:39:21 -0400
Subject: [PATCH 080/172] mlt: Enable missing module support

---
 pkgs/by-name/ml/mlt/package.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index 4f9f8cb9d754..db580fba2944 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -1,4 +1,5 @@
 {
+  alsa-lib,
   config,
   lib,
   stdenv,
@@ -8,16 +9,22 @@
   which,
   ffmpeg,
   fftw,
+  fontconfig,
   frei0r,
   libdv,
+  libebur128,
+  libexif,
   libjack2,
   libsamplerate,
+  libspatialaudio,
   libvorbis,
   libxml2,
   libx11,
+  lilv,
   makeWrapper,
   movit,
   opencv4,
+  pango,
   rnnoise,
   rtaudio,
   rubberband,
@@ -78,19 +85,28 @@ stdenv.mkDerivation (finalAttrs: {
     (opencv4.override { ffmpeg-headless = ffmpeg; })
     ffmpeg
     fftw
+    fontconfig
     frei0r
     libdv
+    libebur128
+    libexif
     libjack2
     libsamplerate
+    libspatialaudio
     libvorbis
     libxml2
+    lilv
     movit
+    pango
     rnnoise
     rtaudio
     rubberband
     sox
     vid-stab
   ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib
+  ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_cudart
   ]

From 079a6f481f4e42e8c3ff670f7582403a8b47e84a Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Sat, 27 Jun 2026 01:46:53 -0400
Subject: [PATCH 081/172] mlt: update --replace and match opencv to PR in
 staging

---
 pkgs/by-name/ml/mlt/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix
index db580fba2944..4d07ef764a36 100644
--- a/pkgs/by-name/ml/mlt/package.nix
+++ b/pkgs/by-name/ml/mlt/package.nix
@@ -152,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \
-      --replace '=''${prefix}//' '=/'
+      --replace-fail '=''${prefix}//' '=/'
   '';
 
   passthru = {

From 1e85b6cba66cf2b96064a86603898258baf91345 Mon Sep 17 00:00:00 2001
From: nick-linux8 <nick.stationengineer@proton.me>
Date: Tue, 14 Jul 2026 00:30:28 -0400
Subject: [PATCH 082/172] xsetroot: 1.1.3 -> 1.1.4

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

diff --git a/pkgs/by-name/xs/xsetroot/package.nix b/pkgs/by-name/xs/xsetroot/package.nix
index 82f9e885c00f..0b78956c354b 100644
--- a/pkgs/by-name/xs/xsetroot/package.nix
+++ b/pkgs/by-name/xs/xsetroot/package.nix
@@ -12,11 +12,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xsetroot";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchurl {
     url = "mirror://xorg/individual/app/xsetroot-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YIG0Wp60Qm4EXSWdHhRLMkF/tjXluWqpBkc2WslmONE=";
+    hash = "sha256-ExWj9+mr4GNXNjuTRh4nJgH2ciXOC8B1xDDM41BzNis=";
   };
 
   strictDeps = true;

From 8e38748dffb2b90169c6e4f7d0d8b5a8f93569d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 04:50:35 +0000
Subject: [PATCH 083/172] python3Packages.pydo: 0.38.0 -> 0.39.0

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

diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index ac60fe63767e..e0bf13efd786 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pydo";
-  version = "0.38.0";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NTQIRyG+ysGgq9TTyLG4yXpx+YvLNkRQz29NwTAdz1o=";
+    hash = "sha256-wo1qg8mromlI+DsYns0IYtCwsYQgLisSSpkHPtnoR/E=";
   };
 
   build-system = [ poetry-core ];

From 783a09be09b998926090b5a4f05d51c27c6519da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 10:56:11 +0000
Subject: [PATCH 084/172] qsv: 20.1.0 -> 21.1.0

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

diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 64be3c4f433a..f449260a4b37 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -33,7 +33,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qsv";
-  version = "20.1.0";
+  version = "21.1.0";
 
   inherit buildFeatures;
 
@@ -41,10 +41,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dathere";
     repo = "qsv";
     rev = finalAttrs.version;
-    hash = "sha256-dYUZ2IwvXTFwpv1cDQjmq+iq2g/vQQovpR0++/ZtSy8=";
+    hash = "sha256-Qfrt0HA9VqHE7RpqOZ1XZ7MZ9xoLaTccAgfxOOezSMs=";
   };
 
-  cargoHash = "sha256-7jZR5u32Hy0XQEeX+tWDbpkj7jM804LBUL93wgnA5bM=";
+  cargoHash = "sha256-yPDfOq8JTDMI0g/ao5SLnCA5hw6SJaA/LekI7uPVdDk=";
 
   buildInputs = [
     file

From 64b51072f1d94b6b8299feec483404f746a5e1b9 Mon Sep 17 00:00:00 2001
From: Yisrael Dov Lebow <lebow@lebowtech.com>
Date: Tue, 14 Jul 2026 14:14:41 +0300
Subject: [PATCH 085/172] tiny-wii-backup-manager: 6.0.7 -> 6.0.8

https://github.com/mq1/TinyWiiBackupManager/blob/v6.0.8/CHANGELOG.md
---
 pkgs/by-name/ti/tiny-wii-backup-manager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix b/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
index eed8d1b1793a..c2f7d76ab0d3 100644
--- a/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
+++ b/pkgs/by-name/ti/tiny-wii-backup-manager/package.nix
@@ -27,16 +27,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tiny-wii-backup-manager";
-  version = "6.0.7";
+  version = "6.0.8";
 
   src = fetchFromGitHub {
     owner = "mq1";
     repo = "TinyWiiBackupManager";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yvmLI8T+ut0QwnHPw+0+XKvd+wWo0cJLcxSkz3oj/vE=";
+    hash = "sha256-zY/vLzsj256uKMkr+uxXj5SLQPKxfkS3IB0mXePlGiA=";
   };
 
-  cargoHash = "sha256-/Q0P3re8w9O4a8MTZXmEiaJNURo1XeZhHk8adcUCNeQ=";
+  cargoHash = "sha256-unv/9LoCpRcfGRq8mo6Y1b5PEf0+5UONi2eked8gfSg=";
 
   cargoBuildFlags = [
     "--bin"

From a46a9f400be3e2e674a410e2fcb8a6d4a453f63f Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Tue, 14 Jul 2026 19:55:07 +0800
Subject: [PATCH 086/172] bilibili-tui: 1.0.9 -> 1.0.12

---
 pkgs/by-name/bi/bilibili-tui/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix
index c582a809336d..258f6f9a9549 100644
--- a/pkgs/by-name/bi/bilibili-tui/package.nix
+++ b/pkgs/by-name/bi/bilibili-tui/package.nix
@@ -5,8 +5,9 @@
   nix-update-script,
   stdenv,
   pkg-config,
-  makeWrapper,
+  makeBinaryWrapper,
   openssl,
+  cacert,
   mpv-unwrapped,
   yt-dlp-light,
 
@@ -14,23 +15,28 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bilibili-tui";
-  version = "1.0.9";
+  version = "1.0.12";
 
   src = fetchFromGitHub {
     owner = "MareDevi";
     repo = "bilibili-tui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LACNDpVhlYEgT3fN+Ff2MVipblUqPlqwOUpTLaXSCbk=";
+    hash = "sha256-G2aoPw8SMu3ytHbxcQrf1iH6i+b9viM+/EYorv6j5bg=";
   };
 
-  cargoHash = "sha256-q3jRjmzQA64sZjVShoEmu1x2CFOAgBGgZYyTq7Lg4is=";
+  cargoHash = "sha256-ojAN98of7vZp/F1n0a/88e6k4nBPG9HPKyTO1xc8o4Q=";
 
-  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config;
 
-  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
+  buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl;
 
   env.OPENSSL_NO_VENDOR = true;
 
+  nativeCheckInputs = [ cacert ];
+
   # Wrap mpv as fallback; users should prefer their system's mpv in PATH
   postInstall = lib.optionalString withMpv ''
     wrapProgram $out/bin/bilibili-tui \

From f115284c614ad770cb9bdc2b46b8eaca2a2b18c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 12:43:10 +0000
Subject: [PATCH 087/172] ggmorse: 0.1.0-unstable-2024-05-31 ->
 0-unstable-2024-05-31

---
 pkgs/by-name/gg/ggmorse/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix
index 51a4ce819e28..e11f6879e877 100644
--- a/pkgs/by-name/gg/ggmorse/package.nix
+++ b/pkgs/by-name/gg/ggmorse/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation {
   pname = "ggmorse";
-  version = "0.1.0-unstable-2024-05-31";
+  version = "0-unstable-2024-05-31";
 
   src = fetchFromGitHub {
     owner = "ggerganov";

From aa433c9d22ab2d7a4fd0160647be0380be48265b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 14:26:13 +0000
Subject: [PATCH 088/172] kotlin: 2.4.0 -> 2.4.10

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 85fe47b09a88..9f7a4d441768 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.4.0";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-uhuebrbdwydQeSJPLp6korAu731Zzi04QE8EsiYTwgo=";
+    sha256 = "sha256-Rz3WbHo+9LGCBls9pnBGbBvydzqduw7Yszo5/p1Ph20=";
   };
 
   propagatedBuildInputs = [ jre ];

From fc253511aa90ccf5fa612b47c3290bf9d84313d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 16:41:31 +0000
Subject: [PATCH 089/172] octavePackages.control: 4.2.1 -> 4.2.2

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

diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index afc3976c2eef..d152f0fb8d81 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -11,14 +11,14 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "4.2.1";
+  version = "4.2.2";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "pkg-control";
     tag = "${pname}-${version}";
     fetchSubmodules = true;
-    sha256 = "sha256-NOZi003brDQ5nVyP7w5n7hxhafbiBwMPErhhTQhn2bw=";
+    sha256 = "sha256-Miv+XFt8yAx890VfwI6lchW5u2wkaeOV3OfYNr9xWxs=";
   };
 
   # Running autoreconfHook inside the src directory fixes a compile issue about

From d0684eabb327795fb543942d1cc6d6b56da1b2a2 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:43:36 +0100
Subject: [PATCH 090/172] qalculate-qt: add maintainer magicquark

---
 pkgs/by-name/qa/qalculate-qt/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 82cb820f2394..7f8d43c348e7 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -47,7 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Ultimate desktop calculator";
     homepage = "http://qalculate.github.io";
-    maintainers = [ ];
+    maintainers = [
+      lib.maintainers.magicquark
+    ];
     license = lib.licenses.gpl2Plus;
     mainProgram = "qalculate-qt";
     platforms = lib.platforms.unix;

From 3c4808eda819a5a4555a721fcbddde388a79d871 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:44:13 +0100
Subject: [PATCH 091/172] qalculate-qt: 5.11.0 -> 5.12.0

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

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 7f8d43c348e7..9ac1ec8f7d12 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.11.0";
+  version = "5.12.0";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5u/YA5/k7JQclIqJUKvzGEenEhndo52m23XlFjkhw78=";
+    hash = "sha256-zeHpTe4DlurFqdsrJBlXSl+vXCOdhJRCjHLDpFf2u1o=";
   };
 
   nativeBuildInputs = with qt6; [

From 52f857a58987e691567a8ae44a335103f46f90b0 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:50:25 +0100
Subject: [PATCH 092/172] qalculate-qt: enable __structuredattrs

---
 pkgs/by-name/qa/qalculate-qt/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 9ac1ec8f7d12..9b0504ddd8c8 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-zeHpTe4DlurFqdsrJBlXSl+vXCOdhJRCjHLDpFf2u1o=";
   };
 
+  __structuredAttrs = true;
+
   nativeBuildInputs = with qt6; [
     qmake
     pkg-config

From 3e897f9978f3e29d5265020f64e90f89ce995391 Mon Sep 17 00:00:00 2001
From: Sapphire <imsapphire0@gmail.com>
Date: Tue, 14 Jul 2026 12:22:04 -0500
Subject: [PATCH 093/172] wivrn: 26.6.1 -> 26.6.2

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

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index dc157a42d4ff..6f6171c1834b 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -56,13 +56,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wivrn";
-  version = "26.6.1";
+  version = "26.6.2";
 
   src = fetchFromGitHub {
     owner = "wivrn";
     repo = "wivrn";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eXU7hYLYchAb6AbCyINfTmOp0NdxK35Kg9tcid2ucg4=";
+    hash = "sha256-5e0XeP5DCdVrSQeDgNuCZP5McRbwybnpKuJw9cxHNPI=";
   };
 
   monado = applyPatches {

From a1a36bfe71225fdc12b6a8d31cae2addcf873571 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 12:03:08 -0400
Subject: [PATCH 094/172] freebsd.libcompiler_rt: init

---
 .../bsd/freebsd/pkgs/libcompiler_rt.nix       | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix
new file mode 100644
index 000000000000..1d6f44e3fd19
--- /dev/null
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcompiler_rt.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  lib,
+  mkDerivation,
+  include,
+}:
+
+mkDerivation {
+  path = "lib/libcompiler_rt";
+  extraPaths = [
+    "contrib/llvm-project/compiler-rt"
+  ];
+
+  buildInputs = [
+    include
+  ];
+
+  # The build system is importing source files from another directory,
+  # then trying to put the objects in lib/libcompiler_rt
+  # It does not create subdirectories in the lib/libcompiler_rt directory.
+  preBuild = ''
+    mkdir cpu_model
+  ''
+  + lib.optionalString stdenv.hostPlatform.isx86_64 ''
+    mkdir i386
+  '';
+
+  noLibc = true;
+
+  alwaysKeepStatic = true;
+}

From 9ab1989aba6b1b1a108e6fa3c342a29aad3f3a14 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 14:41:39 -0400
Subject: [PATCH 095/172] freebsd: Build packages with compiler-rt

---
 .../patches/15.0/bmake-no-compiler-rt.patch   | 11 ----------
 .../15.0/libc-no-force--lcompiler-rt.patch    | 21 -------------------
 .../15.0/rtld-no-force--lcompiler-rt.patch    | 10 ---------
 .../bsd/freebsd/pkgs/libcMinimal.nix          |  2 ++
 pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix  |  2 ++
 .../os-specific/bsd/freebsd/pkgs/rtld-elf.nix |  2 ++
 6 files changed, 6 insertions(+), 42 deletions(-)
 delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
 delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
 delete mode 100644 pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch

diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
deleted file mode 100644
index 20be3503fd17..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/bmake-no-compiler-rt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/share/mk/src.libnames.mk	2023-12-21 23:56:50.767042385 -0800
-+++ b/share/mk/src.libnames.mk	2023-12-21 23:56:39.671089506 -0800
-@@ -392,7 +392,7 @@
- _DP_ztest=	geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp
- # The libc dependencies are not strictly needed but are defined to make the
- # assert happy.
--_DP_c=		compiler_rt sys
-+_DP_c=		sys
- # Use libssp_nonshared only on i386 and power*.  Other archs emit direct calls
- # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared.
- .if ${MK_SSP} != "no" && \
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
deleted file mode 100644
index 3cc8fee77355..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/libc-no-force--lcompiler-rt.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/lib/libc/Makefile
-+++ b/lib/libc/Makefile
-@@ -58,7 +58,6 @@ CFLAGS+=${CANCELPOINTS_CFLAGS}
- # Link with static libcompiler_rt.a.
- #
- LDFLAGS+= -nodefaultlibs
--LIBADD+=	compiler_rt
- LIBADD+=	sys
- 
- .if ${MK_SSP} != "no" && \
---- a/lib/libsys/Makefile
-+++ b/lib/libsys/Makefile
-@@ -46,7 +46,6 @@
- #
- LDFLAGS+= -nodefaultlibs
- LDFLAGS+= -Wl,-Bsymbolic
--LIBADD+=	compiler_rt
-
- .if ${MK_SSP} != "no" && \
-     (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "")
-
diff --git a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch b/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch
deleted file mode 100644
index 45f0d0c51eec..000000000000
--- a/pkgs/os-specific/bsd/freebsd/patches/15.0/rtld-no-force--lcompiler-rt.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libexec/rtld-elf/Makefile
-+++ b/libexec/rtld-elf/Makefile
-@@ -86,7 +86,6 @@ 
- 
- # Some of the required math functions (div & mod) are implemented in
- # libcompiler_rt on some architectures.
--LIBADD+=	compiler_rt
- 
- .include <bsd.prog.mk>
- ${PROG_FULL}:  ${VERSION_MAP}
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
index 6ad205b215ab..515fcc7d82fc 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
@@ -9,6 +9,7 @@
   i18n,
   libsys,
   llvmPackages,
+  libcompiler_rt,
   extraSrc ? [ ],
 }:
 
@@ -52,6 +53,7 @@ mkDerivation {
   buildInputs = [
     include
     libsys
+    libcompiler_rt
   ];
 
   extraNativeBuildInputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
index 67611f7e0ce1..a4360a99021c 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libsys.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation,
   include,
+  libcompiler_rt,
   csu,
 }:
 
@@ -25,6 +26,7 @@ mkDerivation {
   buildInputs = [
     include
     csu
+    libcompiler_rt
   ];
 
   preBuild = ''
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index eef5e067da29..db41b450a168 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -7,6 +7,7 @@
   flex,
   byacc,
   csu,
+  libcompiler_rt,
   extraSrc ? [ ],
 }:
 
@@ -55,6 +56,7 @@ mkDerivation {
   buildInputs = [
     include
     libsys
+    libcompiler_rt
   ];
 
   extraNativeBuildInputs = [

From 25a581579fd75f10e6465b14663a2440ebb9ec12 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 10:40:32 -0400
Subject: [PATCH 096/172] freebsd: fix compile for aarch64-freebsd

---
 pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix |  5 +++++
 pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix      |  6 ++++++
 pkgs/os-specific/bsd/freebsd/pkgs/msun.nix        |  5 +++++
 pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix    |  5 +++++
 pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix | 14 +++++++++-----
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
index 515fcc7d82fc..01473102e061 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libcMinimal.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   rpcgen,
@@ -40,6 +42,9 @@ mkDerivation {
     "include/paths.h"
     "include/gssapi"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
+  ]
   ++ extraSrc;
 
   outputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
index 6bcc4639d15f..22e2f32bf868 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libgcc.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   libcMinimal,
@@ -30,6 +32,10 @@ mkDerivation {
 
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
+  ''
+  # Undefined symbols in the version script related to arm-optimized-routines
+  + lib.optionalString (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS --undefined-version"
   '';
 
   postBuild = ''
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix b/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
index 87e081c6c445..3f9f0414f581 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/msun.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   include,
   libcMinimal,
@@ -10,6 +12,9 @@ mkDerivation {
   path = "lib/msun";
   extraPaths = [
     "lib/libc" # wants arch headers
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
   ];
 
   outputs = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index db41b450a168..5fcb65fcb811 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   mkDerivation,
   fetchpatch,
   include,
@@ -33,6 +35,9 @@ mkDerivation {
     "sys/crypto"
     "include/gssapi"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) [
+    "contrib/arm-optimized-routines"
+  ]
   ++ extraSrc;
 
   patches = [
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index e2a765552add..fa7bba6025e2 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -26,6 +26,7 @@
   kldxref,
   ctfconvert,
   ctfmerge,
+  dtc,
 }:
 let
   baseConfigFile =
@@ -35,7 +36,7 @@ let
       extraConfig
     else
       writeText "extraConfig" extraConfig;
-  hostArchBsd = freebsd-lib.mkBsdArch stdenv;
+  hostMachineBsd = freebsd-lib.mkBsdMachine stdenv;
   filteredSource = filterSource {
     pname = "sys";
     path = "sys";
@@ -57,7 +58,7 @@ let
       done
     ''
     + lib.optionalString (baseConfigFile != null) ''
-      cat ${baseConfigFile} >>sys/${hostArchBsd}/conf/${baseConfig}
+      cat ${baseConfigFile} >>sys/${hostMachineBsd}/conf/${baseConfig}
     '';
   };
 
@@ -93,7 +94,9 @@ mkDerivation rec {
     kldxref
     ctfconvert
     ctfmerge
-  ];
+  ]
+  # Device trees are built in the same sys package
+  ++ lib.optional (stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64) dtc;
 
   # --dynamic-linker /red/herring is used when building the kernel.
   NIX_ENFORCE_PURITY = 0;
@@ -125,7 +128,8 @@ mkDerivation rec {
 
   KODIR = "${placeholder "out"}/kernel";
   KMODDIR = "${placeholder "out"}/kernel";
-  DTBDIR = "${placeholder "out"}/dbt";
+  DTBDIR = "${placeholder "out"}/dtb";
+  DTBODIR = "${placeholder "out"}/dtb/overlays";
 
   KERN_DEBUGDIR = "${placeholder "debug"}/lib/debug";
   KERN_DEBUGDIR_KODIR = "${KERN_DEBUGDIR}/kernel";
@@ -136,7 +140,7 @@ mkDerivation rec {
   configurePhase = ''
     runHook preConfigure
 
-    cd ${hostArchBsd}/conf
+    cd ${hostMachineBsd}/conf
     config ${baseConfig}
 
     runHook postConfigure

From 5e80c33857a25432ff8577abbe25d6059fa74fdc Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 7 Jul 2026 18:35:25 +0200
Subject: [PATCH 097/172] ttl: 0.19.1 -> 0.21.0

---
 pkgs/by-name/tt/ttl/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index 951013b18b87..9414fbbf0929 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -9,21 +9,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ttl";
-  version = "0.19.1";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "lance0";
     repo = "ttl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xY0z5GH6aLL38wOH6B2V9pAv9HnrJfpmQDjDKGSL4qo=";
+    hash = "sha256-bna3zD1RI2eSYX+IyDxi8IB/gys8PDDRThDdcUfcHR0=";
   };
 
-  cargoHash = "sha256-zYO3sY/MdDPfypDeseabTtwMeeUZQ8OiVfch+5fRetI=";
+  cargoHash = "sha256-VLNDcP7LjClYEqew0xDQdevMM0LKJJnUXxh6tBtx6lw=";
 
   nativeBuildInputs = [
     installShellFiles
     versionCheckHook
   ];
+
   doInstallCheck = true;
 
   postInstall = ''

From bc2f01b11a16e294e9fdb4287902fa0f34c89757 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 7 Jul 2026 18:35:25 +0200
Subject: [PATCH 098/172] ttl: disable update check

The update-check of ttl is now a feature. To deselect this
we have to disable all default features.
---
 pkgs/by-name/tt/ttl/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index 9414fbbf0929..a987fc3d23e6 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -27,6 +27,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   doInstallCheck = true;
 
+  # opt ouf of default features to deselect the update-check feature
+  buildNoDefaultFeatures = true;
+
   postInstall = ''
     installShellCompletion --cmd ttl \
       --bash <($out/bin/ttl --completions bash) \

From ed7f4ae3f75a6ab6f5922b3bf3094f7eed1676bd Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Tue, 7 Jul 2026 18:35:25 +0200
Subject: [PATCH 099/172] ttl: add herbetom as maintainer

---
 pkgs/by-name/tt/ttl/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/tt/ttl/package.nix b/pkgs/by-name/tt/ttl/package.nix
index a987fc3d23e6..7dace95ae3cc 100644
--- a/pkgs/by-name/tt/ttl/package.nix
+++ b/pkgs/by-name/tt/ttl/package.nix
@@ -51,7 +51,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "ttl";
     homepage = "https://github.com/lance0/ttl";
     changelog = "https://github.com/lance0/ttl/releases/tag/v${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ vincentbernat ];
+    maintainers = with lib.maintainers; [
+      vincentbernat
+      herbetom
+    ];
     license = with lib.licenses; [
       asl20
       mit

From 5c1083d90ca2a366946e77739fe462ab1fe81d03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 20:18:12 +0000
Subject: [PATCH 100/172] slurm: 26.05.1.1 -> 26-05-2-1

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

diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 05c21505ab71..95b4f3fcdb10 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slurm";
-  version = "26.05.1.1";
+  version = "26-05-2-1";
 
   # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php
   # because the latter does not keep older releases.
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "slurm";
     # The release tags use - instead of .
     tag = "slurm-${builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version}";
-    hash = "sha256-ZH80Ws/9+7pjDe7aZyyDHXFbNvmw8C7OJXiw5+/3jkA=";
+    hash = "sha256-HkBHwN/j0do+CPpouG6qswZEOeY17owmA980wVubiw4=";
   };
 
   outputs = [

From 0d4e839df40466e2020ee321da299ba63c6a0e9b Mon Sep 17 00:00:00 2001
From: Artemis Tosini <artemis.tosini@obsidian.systems>
Date: Tue, 14 Jul 2026 16:47:28 -0400
Subject: [PATCH 101/172] sqlite: Do not run tests on BSD

---
 pkgs/development/libraries/sqlite/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index bc27578cda3d..9ac51240bc0c 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -132,7 +132,8 @@ stdenv.mkDerivation rec {
   '';
 
   # SQLite’s tests are unreliable on Darwin. Sometimes they run successfully, but often they do not.
-  doCheck = !stdenv.hostPlatform.isDarwin;
+  # The tests are only defined for Darwin, Linux, Windows, and OpenBSD, not any other unix-like OS.
+  doCheck = stdenv.hostPlatform.isLinux;
   # When tcl is not available, only run test targets that don't need it.
   checkTarget = lib.optionalString stdenv.hostPlatform.isStatic "fuzztest sourcetest";
 

From 6c181cba9191e191f77946df98182f4f25853c3c Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Tue, 30 Jun 2026 14:35:04 -0700
Subject: [PATCH 102/172] iruby: 0.8.2 -> 0.8.3

---
 pkgs/by-name/ir/iruby/Gemfile      |   2 +-
 pkgs/by-name/ir/iruby/Gemfile.lock |  45 ++++++---
 pkgs/by-name/ir/iruby/gemset.nix   | 148 +++++++++++++++++++++++++----
 3 files changed, 161 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/ir/iruby/Gemfile b/pkgs/by-name/ir/iruby/Gemfile
index 3998b5c6e99a..4a466e235bbb 100644
--- a/pkgs/by-name/ir/iruby/Gemfile
+++ b/pkgs/by-name/ir/iruby/Gemfile
@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-gem 'iruby', "0.8.2"
+gem 'iruby', "0.8.3"
diff --git a/pkgs/by-name/ir/iruby/Gemfile.lock b/pkgs/by-name/ir/iruby/Gemfile.lock
index 972a50ba6bf4..4c8a24f9b13d 100644
--- a/pkgs/by-name/ir/iruby/Gemfile.lock
+++ b/pkgs/by-name/ir/iruby/Gemfile.lock
@@ -1,35 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    cgi (0.5.2)
     data_uri (0.1.0)
-    ffi (1.15.5)
+    date (3.5.1)
+    erb (4.0.4.1)
+      cgi (>= 0.3.3)
+    ffi (1.17.4)
     ffi-rzmq (2.0.7)
       ffi-rzmq-core (>= 1.0.7)
     ffi-rzmq-core (1.0.7)
       ffi
-    io-console (0.6.0)
-    irb (1.7.4)
-      reline (>= 0.3.6)
-    iruby (0.8.2)
+    io-console (0.8.2)
+    irb (1.18.0)
+      pp (>= 0.6.0)
+      prism (>= 1.3.0)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    iruby (0.8.3)
       data_uri (~> 0.1)
       ffi-rzmq
       irb
       logger
       mime-types (>= 3.3.1)
-      multi_json (~> 1.11)
     logger (1.7.0)
-    mime-types (3.5.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
-    multi_json (1.15.0)
-    reline (0.3.8)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2026.0414)
+    pp (0.6.4)
+      prettyprint
+    prettyprint (0.2.0)
+    prism (1.9.0)
+    psych (5.4.0)
+      date
+      stringio
+    rdoc (7.2.0)
+      erb
+      psych (>= 4.0.0)
+      tsort
+    reline (0.6.3)
       io-console (~> 0.5)
+    stringio (3.2.0)
+    tsort (0.2.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  iruby (= 0.8.2)
+  iruby (= 0.8.3)
 
 BUNDLED WITH
-   2.6.9
+   2.3.9
diff --git a/pkgs/by-name/ir/iruby/gemset.nix b/pkgs/by-name/ir/iruby/gemset.nix
index 0b875d6e8a6f..6bc68cee3f16 100644
--- a/pkgs/by-name/ir/iruby/gemset.nix
+++ b/pkgs/by-name/ir/iruby/gemset.nix
@@ -1,4 +1,14 @@
 {
+  cgi = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1fzqwshg1xzbdm97havskfp6wifsgbjii00dzba0y6bih4lk1jk1";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
   data_uri = {
     groups = [ "default" ];
     platforms = [ ];
@@ -9,15 +19,36 @@
     };
     version = "0.1.0";
   };
+  date = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
+  erb = {
+    dependencies = [ "cgi" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "097f4xvjq5k0m0i9mjwpl8vmqrl1wpbllc624f6fqk5s484sgqj7";
+      type = "gem";
+    };
+    version = "4.0.4.1";
+  };
   ffi = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
+      sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw";
       type = "gem";
     };
-    version = "1.15.5";
+    version = "1.17.4";
   };
   ffi-rzmq = {
     dependencies = [ "ffi-rzmq-core" ];
@@ -46,21 +77,26 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff";
+      sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.8.2";
   };
   irb = {
-    dependencies = [ "reline" ];
+    dependencies = [
+      "pp"
+      "prism"
+      "rdoc"
+      "reline"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8";
+      sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y";
       type = "gem";
     };
-    version = "1.7.4";
+    version = "1.18.0";
   };
   iruby = {
     dependencies = [
@@ -69,16 +105,15 @@
       "irb"
       "logger"
       "mime-types"
-      "multi_json"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11lb7flkqpaff303g6lj9vzdw9zc0s2qmz36a6i4x4qj559bz30n";
+      sha256 = "13qdw2ykzn6yjs4biiyvy1dr5j5v3kb1q7r98ds0kvg22rbs1s56";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "0.8.3";
   };
   logger = {
     groups = [ "default" ];
@@ -91,35 +126,88 @@
     version = "1.7.0";
   };
   mime-types = {
-    dependencies = [ "mime-types-data" ];
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5";
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.7.0";
   };
   mime-types-data = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a";
+      sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726";
       type = "gem";
     };
-    version = "3.2023.0808";
+    version = "3.2026.0414";
   };
-  multi_json = {
+  pp = {
+    dependencies = [ "prettyprint" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "0.6.4";
+  };
+  prettyprint = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  prism = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv";
+      type = "gem";
+    };
+    version = "1.9.0";
+  };
+  psych = {
+    dependencies = [
+      "date"
+      "stringio"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql";
+      type = "gem";
+    };
+    version = "5.4.0";
+  };
+  rdoc = {
+    dependencies = [
+      "erb"
+      "psych"
+      "tsort"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46";
+      type = "gem";
+    };
+    version = "7.2.0";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -127,9 +215,29 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb";
+      sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i";
       type = "gem";
     };
-    version = "0.3.8";
+    version = "0.6.3";
+  };
+  stringio = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63";
+      type = "gem";
+    };
+    version = "3.2.0";
+  };
+  tsort = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
   };
 }

From 0e2420ac8d20a992301db957e14c6ac681db8e5f Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Tue, 30 Jun 2026 14:47:11 -0700
Subject: [PATCH 103/172] iruby: expose jupyter kernel definition with the
 others

---
 pkgs/by-name/ir/iruby/package.nix | 2 +-
 pkgs/top-level/all-packages.nix   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ir/iruby/package.nix b/pkgs/by-name/ir/iruby/package.nix
index 9054540ab378..b69da51d9eb8 100644
--- a/pkgs/by-name/ir/iruby/package.nix
+++ b/pkgs/by-name/ir/iruby/package.nix
@@ -7,7 +7,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel iruby.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.iruby = iruby.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.iruby = iruby.definition; }) ]' -c jupyter-notebook
 
 let
   self = bundlerApp {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd203b155387..c7b1da3f770c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2321,6 +2321,7 @@ with pkgs;
       clojure = clojupyter.definition;
       octave = octave-kernel.definition;
       r = r-ark-kernel.definition;
+      ruby = iruby.definition;
       # wolfram = wolfram-for-jupyter-kernel.definition; # unfree
     };
   };

From 40990fc494728e6557ff5817b3b59e776d50e2e8 Mon Sep 17 00:00:00 2001
From: thomasjm <tom@codedown.io>
Date: Tue, 30 Jun 2026 15:19:53 -0700
Subject: [PATCH 104/172] jupyter-kernels: update comments to use working
 commands

---
 .../applications/editors/jupyter-kernels/clojupyter/default.nix | 2 +-
 pkgs/applications/editors/jupyter-kernels/octave/default.nix    | 2 +-
 pkgs/applications/editors/jupyter-kernels/wolfram/default.nix   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index ee081737e355..af56ba9147eb 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -13,7 +13,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel clojupyter.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.clojure = clojupyter.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.clojure = clojupyter.definition; }) ]' -c jupyter-notebook
 
 let
   cljdeps = import ./deps.nix { inherit pkgs; };
diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
index 74ea3d9b60f5..f4b9202b8109 100644
--- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix
@@ -12,7 +12,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel octave-kernel.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.octave = octave-kernel.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.octave = octave-kernel.definition; }) ]' -c jupyter-notebook
 
 let
   kernel = callPackage ./kernel.nix {
diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
index 92ffdcb38e8a..89efbb9d041e 100644
--- a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix
@@ -7,7 +7,7 @@
 # nix run --impure --expr 'with import <nixpkgs> {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition'
 
 # Jupyter notebook:
-# nix run --impure --expr 'with import <nixpkgs> {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }'
+# nix shell --impure --expr 'with import <nixpkgs> {}; [ (jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }) ]' -c jupyter-notebook
 
 let
   kernel = callPackage ./kernel.nix { };

From 80aaddc8090cff83625419c45cebf30b66fe1580 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:43:16 +0200
Subject: [PATCH 105/172] aritim-dark: fix version scheme

---
 pkgs/by-name/ar/aritim-dark/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix
index e57692cddc64..6ff829f7261c 100644
--- a/pkgs/by-name/ar/aritim-dark/package.nix
+++ b/pkgs/by-name/ar/aritim-dark/package.nix
@@ -6,7 +6,7 @@
 
 stdenvNoCC.mkDerivation {
   pname = "aritim-dark";
-  version = "unstable-2021-12-29";
+  version = "0.7-unstable-2021-12-29";
 
   src = fetchFromGitHub {
     owner = "Mrcuve0";

From 520b11fa1c273d2d7c729b416cfb3878c4713c78 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:47:01 +0200
Subject: [PATCH 106/172] arftracksat: fix version scheme

---
 pkgs/by-name/ar/arftracksat/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/arftracksat/package.nix b/pkgs/by-name/ar/arftracksat/package.nix
index 38c1f53cd6c7..a4199fc3f5ad 100644
--- a/pkgs/by-name/ar/arftracksat/package.nix
+++ b/pkgs/by-name/ar/arftracksat/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation {
   pname = "arftracksat";
-  version = "unstable-2025-09-15";
+  version = "1.0-unstable-2025-09-15";
 
   src = fetchFromGitHub {
     owner = "arf20";

From bdc022adc44cda4c4f95986b70a4a47c6108a0db Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Wed, 15 Jul 2026 00:48:54 +0200
Subject: [PATCH 107/172] armitage: fix version scheme

---
 pkgs/by-name/ar/armitage/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix
index 1d384ca08e51..286fc11eacb0 100644
--- a/pkgs/by-name/ar/armitage/package.nix
+++ b/pkgs/by-name/ar/armitage/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "armitage";
-  version = "unstable-2022-12-05";
+  version = "1.0-unstable-2022-12-05";
 
   src = fetchFromGitHub {
     owner = "r00t0v3rr1d3";

From 7d56b8198e9da23494e33b53a7873ed91220542c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 22:53:45 +0000
Subject: [PATCH 108/172] swaylock-plugin: 1.8.6 -> 1.8.7

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

diff --git a/pkgs/by-name/sw/swaylock-plugin/package.nix b/pkgs/by-name/sw/swaylock-plugin/package.nix
index abc2506d0392..367ba39197f5 100644
--- a/pkgs/by-name/sw/swaylock-plugin/package.nix
+++ b/pkgs/by-name/sw/swaylock-plugin/package.nix
@@ -23,12 +23,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "swaylock-plugin";
-  version = "1.8.6";
+  version = "1.8.7";
   src = fetchFromGitHub {
     owner = "mstoeckl";
     repo = "swaylock-plugin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JSFxWpSUt6ekX/owk9I6CdGBTF6F1pOTtFAls7kZrsc=";
+    hash = "sha256-JWZ8aZeS8XXjRPhwyJXptwdMU2y/uFG1KlZh+v92/0c=";
   };
 
   strictDeps = true;

From 6fdc3268f5add4067c2969eaf3bed9d64a4d3457 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Jul 2026 23:01:01 +0000
Subject: [PATCH 109/172] prmt: 0.6.0 -> 0.7.0

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

diff --git a/pkgs/by-name/pr/prmt/package.nix b/pkgs/by-name/pr/prmt/package.nix
index e239a4d931e9..6181c6ab74b3 100644
--- a/pkgs/by-name/pr/prmt/package.nix
+++ b/pkgs/by-name/pr/prmt/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prmt";
-  version = "0.6.0";
+  version = "0.7.0";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
     repo = "prmt";
     owner = "3axap4eHko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pLxWArZzGU1vjS2DOJ6PyrhYC2XbkAD5SfiFjHTaQfI=";
+    hash = "sha256-5UgHnQl/kfeJm3EHATmcWF4V7C/rhaGnpDa6Ym41Ns4=";
   };
 
-  cargoHash = "sha256-hmtKmnSnSGgivY+dmC4WlMuCJGTVM6GI5k0pZcfzYso=";
+  cargoHash = "sha256-TQHe0FJomKZMSrt/VEhsbVNdxhvYmi/1vQxp4vxtH1U=";
 
   # Fail to run in sandbox environment
   checkFlags = map (t: "--skip=${t}") [

From 72cda5d985e5ad32b2a02471122d884c8702c791 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:31:48 +0000
Subject: [PATCH 110/172] qpwgraph: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/by-name/qp/qpwgraph/package.nix b/pkgs/by-name/qp/qpwgraph/package.nix
index c11000e8c3cb..54bb292c8227 100644
--- a/pkgs/by-name/qp/qpwgraph/package.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpwgraph";
-  version = "1.0.2";
+  version = "1.0.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-mCsjNkQw4yalwZvkMzEmK/NVviVZCLxkROtaNrgEAUo=";
+    sha256 = "sha256-xzAnZG9tPeVKgOBIX0PdB6bWlK49nMLZWpfDJpnjP4o=";
   };
 
   nativeBuildInputs = [

From 56f3f2d8129820220578c47601c58ca211735f75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 00:35:44 +0000
Subject: [PATCH 111/172] release-plz: 0.3.159 -> 0.3.160

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

diff --git a/pkgs/by-name/re/release-plz/package.nix b/pkgs/by-name/re/release-plz/package.nix
index dd33a852967a..d9d333fa1e36 100644
--- a/pkgs/by-name/re/release-plz/package.nix
+++ b/pkgs/by-name/re/release-plz/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "release-plz";
-  version = "0.3.159";
+  version = "0.3.160";
 
   src = fetchFromGitHub {
     owner = "MarcoIeni";
     repo = "release-plz";
     rev = "release-plz-v${finalAttrs.version}";
-    hash = "sha256-p0KzeGM1erpdD3akoUHCnIw6lPzjfxBcESTB0bHwWoo=";
+    hash = "sha256-rPYRYAp5grTgASFHKGBdOcO0TvbP7iD+GgL0ZLmHhos=";
   };
 
-  cargoHash = "sha256-tiDDniYO7nXeXMLCT2EJhP6Ii9SUJ3cRJZHZTo0rtak=";
+  cargoHash = "sha256-m6gX/Tu3WCMzkXhWZ19bM9PL7lQ6Xg1R90/ptuswI1s=";
 
   nativeBuildInputs = [
     installShellFiles

From c4161e4e2d9a541f8a160754d2432a5ab61f823b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:38:52 +0000
Subject: [PATCH 112/172] telemt: 3.4.22 -> 3.4.23

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

diff --git a/pkgs/by-name/te/telemt/package.nix b/pkgs/by-name/te/telemt/package.nix
index 25ef48a3b92d..7124583f7dfb 100644
--- a/pkgs/by-name/te/telemt/package.nix
+++ b/pkgs/by-name/te/telemt/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "telemt";
-  version = "3.4.22";
+  version = "3.4.23";
 
   src = fetchFromGitHub {
     owner = "telemt";
     repo = "telemt";
     tag = version;
-    hash = "sha256-LTWdeYLOZpq6bde5LhK9pCcGN+n1MenP8rmpuoHNOM8=";
+    hash = "sha256-8rKEMQPgIrvtLoM+LcSoXiYaMmCtb4OObnDUYagy+Ak=";
   };
 
-  cargoHash = "sha256-QnL0GqFppIS2Q51o7IS/RKho4Fja/fyLX2S4yIn4zaA=";
+  cargoHash = "sha256-wjw+FE1yQ+zc2Ta3h7B3Wtejf6bGobstTKDCjFphU+M=";
 
   checkFlags = [
     # flaky: races between MiddleClientWriterCancelled and TrafficBudgetWaitCancelled observation paths

From 3a2943be0248df7ae5ecdbad1a0221966f2b6218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 01:48:51 +0000
Subject: [PATCH 113/172] python3Packages.pylint-odoo: 10.0.4 -> 10.0.7

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

diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix
index 91c5333074b8..70fb7baf2daa 100644
--- a/pkgs/development/python-modules/pylint-odoo/default.nix
+++ b/pkgs/development/python-modules/pylint-odoo/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "pylint-odoo";
-  version = "10.0.4";
+  version = "10.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OCA";
     repo = "pylint-odoo";
     tag = "v${version}";
-    hash = "sha256-OVltvmSEsL7F46LlTqJ8PH9BO4iYlFWKFTLv5AcmaVU=";
+    hash = "sha256-xwtIaZTQcS/Q96r3nLeIT3e8B5Z4zpipA56GwIIBLLA=";
   };
 
   pythonRelaxDeps = [

From 9beaf3dd7426af2b9b1bb5c2695893dee6b5c749 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 02:33:54 +0000
Subject: [PATCH 114/172] os-agent: 1.9.0 -> 1.10.0

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

diff --git a/pkgs/by-name/os/os-agent/package.nix b/pkgs/by-name/os/os-agent/package.nix
index a776018160ba..be83d942b6d1 100644
--- a/pkgs/by-name/os/os-agent/package.nix
+++ b/pkgs/by-name/os/os-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "os-agent";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "home-assistant";
     repo = "os-agent";
     tag = finalAttrs.version;
-    hash = "sha256-Bc/EXVjq0tTxCslKB9zszu10htq/xPgJ5zaiCZ9CHAw=";
+    hash = "sha256-jO7TE4lBqyxUYcy3ZsZAFO98orGJ6hTM97+G/ueawNg=";
   };
 
-  vendorHash = "sha256-PXl/1CW6hQhGFWZDiRo4DNvnaN3CfEIz/fx0a+UVEpo=";
+  vendorHash = "sha256-WC251fHO3XRICP7q7RdHCTnf8WfqNKnueCp36uEtrIg=";
 
   ldFlags = [
     "-X main.version="

From 7dd3e5ddee3cb7d76fb9f550c2b5989fa4a085b8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 09:47:35 +0000
Subject: [PATCH 115/172] peertube: drop `x86_64-darwin` mention in comment

---
 pkgs/by-name/pe/peertube/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/pe/peertube/package.nix b/pkgs/by-name/pe/peertube/package.nix
index 408dd20c1d2d..326846061102 100644
--- a/pkgs/by-name/pe/peertube/package.nix
+++ b/pkgs/by-name/pe/peertube/package.nix
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
       "aarch64-linux"
       # feasible, looking for maintainer to help out
-      # "x86_64-darwin" "aarch64-darwin"
+      # "aarch64-darwin"
     ];
     maintainers = with lib.maintainers; [
       immae

From da43840e1c29799308fd7bdbc57ec9fff3dcdfc1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:44:28 +0000
Subject: [PATCH 116/172] jackett: drop `x86_64-darwin` mention in comments

---
 pkgs/by-name/ja/jackett/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix
index 1bf8590d5df0..db8409117d56 100644
--- a/pkgs/by-name/ja/jackett/package.nix
+++ b/pkgs/by-name/ja/jackett/package.nix
@@ -39,8 +39,6 @@ buildDotnetModule (finalAttrs: {
 
   runtimeDeps = [ openssl ];
   # mono is not available on aarch64-darwin
-  #x86_64-darwin is failed with
-  #System.Net.Sockets.SocketException (13): Permission denied
   doCheck = !stdenv.hostPlatform.isDarwin;
   nativeCheckInputs = [ mono ];
   testProjectFile = "src/Jackett.Test/Jackett.Test.csproj";

From 856551df45dcb40a3c4f501a1ed0f5c9a894e932 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:55:10 +0000
Subject: [PATCH 117/172] podman-bootc: drop `x86_64-darwin` mention in comment

---
 pkgs/by-name/po/podman-bootc/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/po/podman-bootc/package.nix b/pkgs/by-name/po/podman-bootc/package.nix
index 59c7fa4388c0..cf1d644e0d26 100644
--- a/pkgs/by-name/po/podman-bootc/package.nix
+++ b/pkgs/by-name/po/podman-bootc/package.nix
@@ -66,8 +66,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/bootc-dev/podman-bootc/releases/tag/${finalAttrs.src.tag}";
     maintainers = with lib.maintainers; [ evan-goode ];
     license = lib.licenses.asl20;
-    # x86_64-darwin does not seem to be supported at this time:
-    # https://github.com/containers/podman-bootc/issues/46
     platforms = [
       "aarch64-linux"
       "aarch64-darwin"

From b2b8197317bcf2c34ee8c4f4fcc61f799b92865f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:56:16 +0000
Subject: [PATCH 118/172] howl: drop `x86_64-darwin` mention in comment

---
 pkgs/by-name/ho/howl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix
index 7f04a9497a48..6c4cd032ace6 100644
--- a/pkgs/by-name/ho/howl/package.nix
+++ b/pkgs/by-name/ho/howl/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ euxane ];
     mainProgram = "howl";
 
-    # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively
+    # Howl builds fail for aarch64-linux
     platforms = [
       "i686-linux"
       "x86_64-linux"

From 919042f6e63e1d7841bb6bbb4bc7eb1189a21aee Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:56:34 +0000
Subject: [PATCH 119/172] mesa: drop `x86_64-darwin` mention in comment

---
 pkgs/development/libraries/mesa/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 5e3bbf9d6131..5b9465d50566 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -2,7 +2,7 @@
 # When updating this package, please verify at least these build (assuming x86_64-linux):
 # nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
 # Ideally also verify:
-# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
+# nix build .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
   version = "26.1.4";

From 1eaa3c57cb79198298b7c93a1baed69985e70e4d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 10:59:05 +0000
Subject: [PATCH 120/172] python3: drop `x86_64-darwin` mention in comment

---
 pkgs/development/interpreters/python/cpython/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 02c6e27d11d4..e9440614cf34 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -870,7 +870,7 @@ stdenv.mkDerivation (finalAttrs: {
       lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.windows ++ lib.platforms.freebsd;
     mainProgram = executable;
     teams = [ lib.teams.python ];
-    # static build on x86_64-darwin/aarch64-darwin breaks with:
+    # static build on aarch64-darwin breaks with:
     # configure: error: C compiler cannot create executables
 
     # mingw patches only apply to Python 3.11 currently

From 0bce55e3e5ec216514500350d32b41e24c3d6a31 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 18 Feb 2026 11:00:46 +0000
Subject: [PATCH 121/172] python3Packages.pyannote-audio: drop `x86_64-darwin`
 mention in comment

---
 pkgs/development/python-modules/pyannote-audio/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 8613419900bb..0ccbceceecef 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -124,7 +124,6 @@ buildPythonPackage (finalAttrs: {
     lib.optionals stdenv.hostPlatform.isDarwin [
       # Crashes the interpreter
       # - On aarch64-darwin: Trace/BPT trap: 5
-      # - On x86_64-darwin: Fatal Python error: Illegal instruction
       "tests/inference_test.py"
       "tests/test_train.py"
     ]

From 221afe9df1306643f5a5202e00194d2ff5f133f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:01:53 +0000
Subject: [PATCH 122/172] python3Packages.robot-descriptions: 2.0.0 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/robot-descriptions/default.nix b/pkgs/development/python-modules/robot-descriptions/default.nix
index a4e76e813cab..491cdf114eb0 100644
--- a/pkgs/development/python-modules/robot-descriptions/default.nix
+++ b/pkgs/development/python-modules/robot-descriptions/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "robot-descriptions";
-  version = "2.0.0";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "robot-descriptions";
     repo = "robot_descriptions.py";
     tag = "v${version}";
-    hash = "sha256-PykMzWOwnjvay5zzddqD/07SdZ03GN80tRAa1CzrJzU=";
+    hash = "sha256-THLGQWZVeXwbanBIyYw8ymM+c/x5rXJxD7YWgn8GCWw=";
   };
 
   build-system = [

From 3cdd216f5ad50205ade99a78b05a54ea5b2651c3 Mon Sep 17 00:00:00 2001
From: Ross Nomann <rossnomann@protonmail.com>
Date: Wed, 15 Jul 2026 05:06:51 +0200
Subject: [PATCH 123/172] deadbeef: disable swift in libdispatch build input

---
 pkgs/by-name/de/deadbeef/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix
index bd5af326d7c2..919017ab9d6b 100644
--- a/pkgs/by-name/de/deadbeef/package.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -77,7 +77,7 @@ clangStdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     jansson
-    swift-corelibs-libdispatch
+    (swift-corelibs-libdispatch.override { useSwift = false; })
     gtk3
     gsettings-desktop-schemas
   ]

From 7e81099b51220796fee03c5de6a17d5409131d46 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 14 Jul 2026 23:12:53 -0400
Subject: [PATCH 124/172] vector: skip flakey test

---
 pkgs/by-name/ve/vector/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 2a378fde56ab..727084178694 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -109,6 +109,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=sources::host_metrics::cgroups::tests::generates_cgroups_metrics"
     "--skip=sources::host_metrics::cpu::tests::generates_cpu_metrics"
     "--skip=sources::internal_logs::tests::repeated_logs_are_not_rate_limited"
+    "--skip=topology::test::reload::topology_reload_preserves_enrichment_table_state"
 
     # Requires access to journalctl
     "--skip=sources::journald::tests::emits_cursor"

From 04f40393c068b55b8554b8ae63efca2a90fa65be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 03:27:24 +0000
Subject: [PATCH 125/172] pocketbase: 0.39.5 -> 0.39.6

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

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index c717b2df6932..e31c998bf487 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "pocketbase";
-  version = "0.39.5";
+  version = "0.39.6";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3OsvxKhYd/kQuxDVBjClJrOdFevTeBJmT3gImP/aTcE=";
+    hash = "sha256-EQMgqdxssB4FbVJDoYZTdk9vq+++k52MJe/6ZiGgHjo=";
   };
 
-  vendorHash = "sha256-8ABdBsV7FhXNbKkUUcje8OgtVHB4BfRjWVfFAK4I8As=";
+  vendorHash = "sha256-Xu9jokD5Dkov5kZjO05q60YpM3NZlbwOZs0XJmQ8kC8=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 3f58121755064e4b0844cc13b93d6be2d7960860 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 07:31:51 +0200
Subject: [PATCH 126/172] lttng-tools: 2.14.1 -> 2.15.1

https://github.com/lttng/lttng-tools/releases/tag/v2.15.1

Align with lttng-ust 2.15 and provide Python for the 2.15 test source generator.

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/lt/lttng-tools/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix
index ffe2ed82880b..e91b33e858fb 100644
--- a/pkgs/by-name/lt/lttng-tools/package.nix
+++ b/pkgs/by-name/lt/lttng-tools/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   pkg-config,
+  python3,
   babeltrace2,
   popt,
   libuuid,
@@ -14,14 +15,21 @@
 
 stdenv.mkDerivation rec {
   pname = "lttng-tools";
-  version = "2.14.1";
+  version = "2.15.1";
 
   src = fetchurl {
     url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-DmjrJ5I2IcS8Enz85AQi0oz35HP+32IprmwyulxbfG0=";
+    sha256 = "sha256-i21Lp64sA299r7tOKXF2d0EQePmp2WGy3HwboWJz6ek=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    python3
+  ];
+
+  # Used by the test source generator during the build.
+  makeFlags = [ "PYTHON=${lib.getExe python3}" ];
+
   buildInputs = [
     babeltrace2
     popt

From e066da2f80a56a3f448d68178bf42f16fa660a67 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 15 Jul 2026 07:50:38 +0200
Subject: [PATCH 127/172] claude-code: 2.1.209 -> 2.1.210

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 pkgs/by-name/cl/claude-code/manifest.json | 41 ++++++++++++-----------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json
index f32f16ee3d24..6bd58d1851a3 100644
--- a/pkgs/by-name/cl/claude-code/manifest.json
+++ b/pkgs/by-name/cl/claude-code/manifest.json
@@ -1,47 +1,47 @@
 {
-  "version": "2.1.209",
-  "commit": "0fe048596fd45e79e99353cbe2c3d1b1ac069568",
-  "buildDate": "2026-07-14T03:58:29Z",
+  "version": "2.1.210",
+  "commit": "88e9fbf39bf4efa5bca44549b7fd9461628657e6",
+  "buildDate": "2026-07-14T15:12:31Z",
   "platforms": {
     "darwin-arm64": {
       "binary": "claude",
-      "checksum": "59d2de7f49db2f75d5c33bbb46a6b8f288ad24d40b61e30602a502bb7ddc380c",
-      "size": 240377264
+      "checksum": "1b471d62d1117482689d75447f5e050c640da717a5a3c91e6c13792450f8c662",
+      "size": 241509968
     },
     "darwin-x64": {
       "binary": "claude",
-      "checksum": "4cc3f44b905d45bd27a6db9306ec6de928aea758537205329851ae478f2fa2c6",
-      "size": 249886224
+      "checksum": "892f2c878050d8829e67119328dd9768345fba18a58c169212b70597c9175c40",
+      "size": 251025552
     },
     "linux-arm64": {
       "binary": "claude",
-      "checksum": "278cb68ef7217cfcc5c949d2573bb8e59a8b1305f76689fba88eb722b0d9e2f0",
-      "size": 256817904
+      "checksum": "84feb193c1d91f3b5eba836ed47c0e4dee953195abba950917c3e101eff174e8",
+      "size": 257932016
     },
     "linux-x64": {
       "binary": "claude",
-      "checksum": "b882f4b8b27772f897540df50f24000206f43a9426e8f7d19bd065959b69e9dd",
-      "size": 259951416
+      "checksum": "e7d2ceb53ed4c2ced1fe7fc1c6331c98dc5f7b4c9b2722d9c5fa3dd5dff6f719",
+      "size": 261081912
     },
     "linux-arm64-musl": {
       "binary": "claude",
-      "checksum": "d5785d7c25f86a00ba5d5fe81d98726c89ea7d6f45dca90fcc4cbabef6a9e0b5",
-      "size": 250066104
+      "checksum": "17f617e24a05533cea8a344f44f0a25b6fb20ee467500601c3cd8392064ec528",
+      "size": 251180216
     },
     "linux-x64-musl": {
       "binary": "claude",
-      "checksum": "7ad8e7d428e1ddef18040fe43f54110541ced063a7b5903091aac8f45c57ee21",
-      "size": 254607744
+      "checksum": "03012f856faa1a9409d9add13936794f168e530c9746c8a099dec6ce8415c32b",
+      "size": 255742336
     },
     "win32-x64": {
       "binary": "claude.exe",
-      "checksum": "b9d5e8542338a0918534e55d046a7c960ae4af5ee214c7e4e80a89067b63ea2c",
-      "size": 251303072
+      "checksum": "29aa99c436f0d4125780691123b756176d83b59cc7d492304cd4694292d3f04f",
+      "size": 252385952
     },
     "win32-arm64": {
       "binary": "claude.exe",
-      "checksum": "a29607da80ac0d6f2620553e52026ecc7744b27d49128f143eacd120e5f2ad9d",
-      "size": 245652640
+      "checksum": "4a603da0a33d49478e55938898ddd06c4ec5d1ec7f443d92dd4352665faaef05",
+      "size": 246736544
     }
   },
   "sdkCompat": {
@@ -63,7 +63,8 @@
       "0.3.204",
       "0.3.205",
       "0.3.207",
-      "0.3.208"
+      "0.3.208",
+      "0.3.209"
     ],
     "harnessSchema": 1
   }

From 18881306ce438059d566decfe870d2185ee5765a Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 15 Jul 2026 07:50:43 +0200
Subject: [PATCH 128/172] vscode-extensions.anthropic.claude-code: 2.1.209 ->
 2.1.210

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md

Assisted-by: Claude Code (Claude Opus 4.8)
---
 .../vscode/extensions/anthropic.claude-code/default.nix   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 2382c040f5c6..634ab22464ac 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -21,22 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-YVomTY/KpBcR4dZr0EN4egkuzvQXUCj7RvwgMo88z9Q=";
+          hash = "sha256-uWghjE/Ue+i2kUD4KedN4NDTllgiZPMFFXbT0RQnGrE=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-jbTFmXqtdt6+1SdhfOLcnhOhtSESYM9th8k5EJ4Nex4=";
+          hash = "sha256-pIwEx6+1Wc+MazqJQYA4h9oOqNOOA8MyJcJOd9Bx2ZM=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-YFLVhDckeXIItc+AvHlJ/B45c43Ubi3BKr8gy3Ui68w=";
+          hash = "sha256-Iq5C55YrV5ud74a218pTPIyq1oJisbDRNNefkzjpGs4=";
         };
       };
     in
     {
       name = "claude-code";
       publisher = "anthropic";
-      version = "2.1.209";
+      version = "2.1.210";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 692daeac48bce39026786e7193ae15b8e5f1b2a1 Mon Sep 17 00:00:00 2001
From: Niols <niols@niols.fr>
Date: Tue, 14 Jul 2026 19:06:48 +0200
Subject: [PATCH 129/172] nixos/rtorrent: remove deprecated commands from
 default config

Assisted-by: DeepSeek V4 Flash (via OpenCode Zen)
---
 nixos/modules/services/torrent/rtorrent.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix
index 07825ecbc897..2b672d6a6584 100644
--- a/nixos/modules/services/torrent/rtorrent.nix
+++ b/nixos/modules/services/torrent/rtorrent.nix
@@ -149,13 +149,6 @@ in
 
       protocol.encryption.set = allow_incoming,try_outgoing,enable_retry
 
-      # Limits for file handle resources, this is optimized for
-      # an `ulimit` of 1024 (a common default). You MUST leave
-      # a ceiling of handles reserved for rTorrent's internal needs!
-      network.http.max_open.set = 50
-      network.max_open_files.set = 600
-      network.max_open_sockets.set = 3000
-
       # Memory resource usage (increase if you have a large number of items loaded,
       # and/or the available resources to spend)
       pieces.memory.max.set = 1800M
@@ -169,15 +162,14 @@ in
       execute.nothrow = sh, -c, (cat, "echo >", (session.path), "rtorrent.pid", " ", (system.pid))
 
       # Other operational settings (check & adapt)
-      encoding.add = utf8
       system.umask.set = 0027
       system.cwd.set = (cfg.basedir)
       network.http.dns_cache_timeout.set = 25
-      schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
+      schedule = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
 
       # Watch directories (add more as you like, but use unique schedule names)
-      #schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent")))
-      #schedule2 = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent")))
+      #schedule = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent")))
+      #schedule = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent")))
 
       # Logging:
       #   Levels = critical error warn notice info debug
@@ -218,6 +210,10 @@ in
               RuntimeDirectory = "rtorrent";
               RuntimeDirectoryMode = 750;
 
+              # rtorrent derives socket limits from this value since 0.16.15; see table in
+              # https://github.com/rakshasa/rtorrent/wiki/Socket-Manager-and-Resource-Allocation
+              LimitNOFILE = lib.mkDefault 16384;
+
               CapabilityBoundingSet = [ "" ];
               LockPersonality = true;
               NoNewPrivileges = true;

From 63eb066f5860015c2c4e2648453ce73f03187888 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 06:33:05 +0000
Subject: [PATCH 130/172] cargo-diet: 1.3.0 -> 1.3.2

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

diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index fc5f821f6f60..3c55e294ef75 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-diet";
-  version = "1.3.0";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "the-lean-crate";
     repo = "cargo-diet";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YjUO8UUXWZvZZZ2Y0py5LQdVBpq8jjwvGimVAWC8Gr8=";
+    hash = "sha256-/f5GbNWkx/pOQgsaxg+HeI4Z9joX3pCL8u4Pu7VZg08=";
   };
 
-  cargoHash = "sha256-CnaeS7mh+QDPcQgeKzNV5Vey3zsiD10NdlfdQ1kcDB8=";
+  cargoHash = "sha256-PK5Ru/Slz1MTD9DxVY0zratzAeXAokJZ+Kz/MznaeB0=";
 
   meta = {
     description = "Help computing optimal include directives for your Cargo.toml manifest";

From e768cd917417336eade1513b6a4d0eb5b1a089df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= <lblasc@tvbeat.com>
Date: Wed, 15 Jul 2026 07:20:18 +0000
Subject: [PATCH 131/172] python3Packages.pyemd: 1.0.0 -> 2.0.0

Now a pure-Python wrapper around POT; fixes build on python 3.14.

Changelog: https://github.com/wmayner/pyemd/blob/v2.0.0/CHANGELOG.rst
---
 .../python-modules/pyemd/default.nix          | 35 ++++++++-----------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix
index 4ac6e9155541..11eb9d95d8d3 100644
--- a/pkgs/development/python-modules/pyemd/default.nix
+++ b/pkgs/development/python-modules/pyemd/default.nix
@@ -1,24 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  cython,
   fetchPypi,
   numpy,
-  oldest-supported-numpy,
-  packaging,
+  pot,
   pytestCheckHook,
+  pythonOlder,
   setuptools-scm,
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pyemd";
-  version = "1.0.0";
+  version = "2.0.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
+  disabled = pythonOlder "3.12";
+
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-tCta57LRWx1N7mOBDqeYo5IX6Kdre0nA62OoTg/ZAP4=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-FZaflENcK+mOajakkwfINm49/BpnASrMMG6SyQtQP+U=";
   };
 
   build-system = [
@@ -26,28 +29,18 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  nativeBuildInputs = [
-    cython
+  dependencies = [
     numpy
-    oldest-supported-numpy
-    packaging
+    pot
   ];
 
-  dependencies = [ numpy ];
-
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTests = [
-    # Broken with Numpy 2.x, https://github.com/wmayner/pyemd/issues/68
-    "test_emd_samples_2"
-    "test_emd_samples_3"
-  ];
-
   meta = {
     description = "Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance";
     homepage = "https://github.com/wmayner/pyemd";
-    changelog = "https://github.com/wmayner/pyemd/releases/tag/${version}";
+    changelog = "https://github.com/wmayner/pyemd/blob/v${finalAttrs.version}/CHANGELOG.rst";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
-}
+})

From fcbfba63a629ef883793340c110b6bab5b959bbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luka=20Bla=C5=A1kovi=C4=87?= <lblasc@tvbeat.com>
Date: Wed, 15 Jul 2026 07:20:18 +0000
Subject: [PATCH 132/172] python3Packages.gensim: fix build with python 3.14

Apply piskvorky/gensim#3649 for the forkserver multiprocessing default.
---
 .../python-modules/gensim/default.nix         |  19 ++-
 .../python314-chunkize-forkserver.patch       | 149 ++++++++++++++++++
 2 files changed, 164 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch

diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 4cf38bdb3d0a..9f962fe3ef5d 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -19,18 +19,28 @@
   testfixtures,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "gensim";
   version = "4.4.0";
   pyproject = true;
 
+  __structuredAttrs = true;
+
   src = fetchFromGitHub {
     owner = "piskvorky";
     repo = "gensim";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-TXutcU43ReBj9ss9+zBJFUxb5JqVHpl+B0c7hqcJAJY=";
   };
 
+  patches = [
+    # Fall back to serial chunkize when the multiprocessing start method is not
+    # "fork" (the default changed to "forkserver" on Linux with Python 3.14).
+    # Vendored (filtered to gensim/utils.py) from the not yet merged
+    # https://github.com/piskvorky/gensim/pull/3649
+    ./python314-chunkize-forkserver.patch
+  ];
+
   build-system = [
     cython
     setuptools
@@ -70,7 +80,8 @@ buildPythonPackage rec {
     description = "Topic-modelling library";
     homepage = "https://radimrehurek.com/gensim/";
     downloadPage = "https://github.com/piskvorky/gensim";
-    changelog = "https://github.com/RaRe-Technologies/gensim/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/RaRe-Technologies/gensim/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.lgpl21Only;
+    maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch b/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch
new file mode 100644
index 000000000000..f6ce575b254b
--- /dev/null
+++ b/pkgs/development/python-modules/gensim/python314-chunkize-forkserver.patch
@@ -0,0 +1,149 @@
+diff --git a/gensim/utils.py b/gensim/utils.py
+index 2abd5179e09671de1ea9ef48a9dc3fc4bce9b465..20bad4857bf4e159bc0e244522aa21bd41af8712 100644
+--- a/gensim/utils.py
++++ b/gensim/utils.py
+@@ -1302,90 +1302,68 @@
+             self.q.put(wrapped_chunk.pop(), block=True)
+ 
+ 
+-# Multiprocessing on Windows (and on OSX with python3.8+) uses "spawn" mode, which
+-# causes issues with pickling.
+-# So for these two platforms, use simpler serial processing in `chunkize`.
+-# See https://github.com/RaRe-Technologies/gensim/pull/2800#discussion_r410890171
+-if os.name == 'nt' or (sys.platform == "darwin" and sys.version_info >= (3, 8)):
+-    def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
+-        """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
++def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
++    """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
+ 
+-        Parameters
+-        ----------
+-        corpus : iterable of object
+-            An iterable.
+-        chunksize : int
+-            Split `corpus` into chunks of this size.
+-        maxsize : int, optional
+-            Ignored. For interface compatibility only.
+-        as_numpy : bool, optional
+-            Yield chunks as `np.ndarray` s instead of lists?
+-
+-        Yields
+-        ------
+-        list OR np.ndarray
+-            "chunksize"-ed chunks of elements from `corpus`.
+-
+-        """
+-        if maxsize > 0:
+-            entity = "Windows" if os.name == 'nt' else "OSX with python3.8+"
+-            warnings.warn("detected %s; aliasing chunkize to chunkize_serial" % entity)
+-        for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
+-            yield chunk
+-else:
+-    def chunkize(corpus, chunksize, maxsize=0, as_numpy=False):
+-        """Split `corpus` into fixed-sized chunks, using :func:`~gensim.utils.chunkize_serial`.
+-
+-        Parameters
+-        ----------
+-        corpus : iterable of object
+-            An iterable.
+-        chunksize : int
+-            Split `corpus` into chunks of this size.
+-        maxsize : int, optional
+-            If > 0, prepare chunks in a background process, filling a chunk queue of size at most `maxsize`.
+-        as_numpy : bool, optional
+-            Yield chunks as `np.ndarray` instead of lists?
+-
+-        Yields
+-        ------
+-        list OR np.ndarray
+-            "chunksize"-ed chunks of elements from `corpus`.
++    Parameters
++    ----------
++    corpus : iterable of object
++        An iterable.
++    chunksize : int
++        Split `corpus` into chunks of this size.
++    maxsize : int, optional
++        If > 0, prepare chunks in a background process, filling a chunk queue of size at most `maxsize`.
++    as_numpy : bool, optional
++        Yield chunks as `np.ndarray` instead of lists?
+ 
+-        Notes
+-        -----
+-        Each chunk is of length `chunksize`, except the last one which may be smaller.
+-        A once-only input stream (`corpus` from a generator) is ok, chunking is done efficiently via itertools.
++    Yields
++    ------
++    list OR np.ndarray
++        "chunksize"-ed chunks of elements from `corpus`.
+ 
+-        If `maxsize > 0`, don't wait idly in between successive chunk `yields`, but rather keep filling a short queue
+-        (of size at most `maxsize`) with forthcoming chunks in advance. This is realized by starting a separate process,
+-        and is meant to reduce I/O delays, which can be significant when `corpus` comes from a slow medium
+-        like HDD, database or network.
++    Notes
++    -----
++    Each chunk is of length `chunksize`, except the last one which may be smaller.
++    A once-only input stream (`corpus` from a generator) is ok, chunking is done efficiently via itertools.
+ 
+-        If `maxsize == 0`, don't fool around with parallelism and simply yield the chunksize
+-        via :func:`~gensim.utils.chunkize_serial` (no I/O optimizations).
++    If `maxsize > 0`, don't wait idly in between successive chunk `yields`, but rather keep filling a short queue
++    (of size at most `maxsize`) with forthcoming chunks in advance. This is realized by starting a separate process,
++    and is meant to reduce I/O delays, which can be significant when `corpus` comes from a slow medium
++    like HDD, database or network.
+ 
+-        Yields
+-        ------
+-        list of object OR np.ndarray
+-            Groups based on `iterable`
++    If `maxsize == 0`, don't fool around with parallelism and simply yield the chunksize
++    via :func:`~gensim.utils.chunkize_serial` (no I/O optimizations).
+ 
+-        """
+-        assert chunksize > 0
++    Yields
++    ------
++    list of object OR np.ndarray
++        Groups based on `iterable`
+ 
++    """
++    assert chunksize > 0
++
++    # 1. Evaluate the start method dynamically at runtime
++    # 2. Only attempt multiprocessing if maxsize > 0 AND the method is 'fork'
++    # See https://github.com/RaRe-Technologies/gensim/pull/2800#discussion_r410890171
++    if maxsize > 0 and multiprocessing.get_start_method() == "fork":
++        q = multiprocessing.Queue(maxsize=maxsize)
++        worker = InputQueue(q, corpus, chunksize, maxsize=maxsize, as_numpy=as_numpy)
++        worker.daemon = True
++        worker.start()
++        while True:
++            chunk = [q.get(block=True)]
++            if chunk[0] is None:
++                break
++            yield chunk.pop()
++    else:
++        # Fallback to serial processing
+         if maxsize > 0:
+-            q = multiprocessing.Queue(maxsize=maxsize)
+-            worker = InputQueue(q, corpus, chunksize, maxsize=maxsize, as_numpy=as_numpy)
+-            worker.daemon = True
+-            worker.start()
+-            while True:
+-                chunk = [q.get(block=True)]
+-                if chunk[0] is None:
+-                    break
+-                yield chunk.pop()
+-        else:
+-            for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
+-                yield chunk
++            # We only warn if they asked for multiprocessing but we have to deny it
++            current_method = multiprocessing.get_start_method()
++            warnings.warn(f"start method is '{current_method}', not 'fork'; aliasing chunkize to chunkize_serial")
++
++        for chunk in chunkize_serial(corpus, chunksize, as_numpy=as_numpy):
++            yield chunk
+ 
+ 
+ def smart_extension(fname, ext):

From 1f544d25e9f070e516a4aa94337bf6edc481ce91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 07:41:26 +0000
Subject: [PATCH 133/172] s7: 11.9-unstable-2026-06-27 ->
 11.9-unstable-2026-07-10

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index c480594bd0e0..25f8c5d4242e 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.9-unstable-2026-06-27";
+  version = "11.9-unstable-2026-07-10";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "1416ca232c9154e47235be2378151f9f2beea278";
-    hash = "sha256-lA4nLtJ6+O5Cn7TQRzZCPhk3oB8qHdpewZE5yM8z4iw=";
+    rev = "2a631b545cbe66d9cf3f5343fbaab1449e3d8957";
+    hash = "sha256-gYgwQDcWgugZemM2kNu09hwNtJqT49AmvXPlxj+/Ink=";
   };
 
   buildInputs =

From 3b370d9691fde3a6095e923dfc2f37033287952e Mon Sep 17 00:00:00 2001
From: Tom Vincent <git@tlvince.com>
Date: Wed, 15 Jul 2026 09:05:37 +0100
Subject: [PATCH 134/172] immich-kiosk: 0.39.3 -> 0.41.0

---
 pkgs/by-name/im/immich-kiosk/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix
index 113ce904c923..0ca88bb23802 100644
--- a/pkgs/by-name/im/immich-kiosk/package.nix
+++ b/pkgs/by-name/im/immich-kiosk/package.nix
@@ -10,28 +10,28 @@
 
 buildGoModule rec {
   pname = "immich-kiosk";
-  version = "0.39.3";
+  version = "0.41.0";
 
   src = fetchFromGitHub {
     owner = "damongolding";
     repo = "immich-kiosk";
     tag = "v${version}";
-    hash = "sha256-kdTEvH8MqL3oXe0QZlPTVpeByLpqAdNfPGfu5f2G6g0=";
+    hash = "sha256-mr0cxHdekpzfKfJ2IKpm79vTu5qnSl8q2c8eWose7tg=";
   };
 
   postPatch = ''
     # Delete vendor directory to regenerate it consistently across platforms
     rm -rf vendor
     # immich-kiosk bumps go at a faster cadence than nixpkgs
-    sed 's/^go 1\.26\.\d+$/go 1.26/' go.mod
+    sed -i -E 's/^go 1\.26\.[0-9]+$/go 1.26/' go.mod
   '';
-  vendorHash = "sha256-y6Xl00G+mkhRKVGwMS0WCXZhQqqGGX5qY8PhMxtw7z8=";
+  vendorHash = "sha256-5mMU73/XvHfvT8VaseSymZjDalvHj/KR6cTz1nvXHPQ=";
   proxyVendor = true;
 
   npmDeps = fetchNpmDeps {
     inherit src;
     sourceRoot = "${src.name}/frontend";
-    hash = "sha256-lNON0/lxix2aczC0+m7Er5Te1+4fsSoLkk6Z2pYzQYQ=";
+    hash = "sha256-1m0JvPZDYjd2cNy9atENRS3/GHWzLnPISwGnJbSZwAo=";
   };
   # Frontend is in a subdirectory
   npmRoot = "frontend";

From 9f4d0a83d6f9611bd890933a28222dbecb2bc08b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:34:01 +0000
Subject: [PATCH 135/172] cargo-update: 20.0.3 -> 22.0.0

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

diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix
index 82b09665fd65..3edff871f022 100644
--- a/pkgs/by-name/ca/cargo-update/package.nix
+++ b/pkgs/by-name/ca/cargo-update/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-update";
-  version = "20.0.3";
+  version = "22.0.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-YTUMC9jY3l21uW3W+M0qUQUqmgyC4FN0uM4IYH1kuC0=";
+    hash = "sha256-7SjJ+v+6PzwV8dTXxSVxKrj4/yUlyGVJtt0A+WaWNc8=";
   };
 
-  cargoHash = "sha256-fpcN09e12Am7+UAa9OojyxShvK2QTKeWGm/vkUkk0UU=";
+  cargoHash = "sha256-xRjPnZPewo/5pCDUem8+9Ko0XJ1p5HJtLLmErtZQb8w=";
 
   nativeBuildInputs = [
     cmake

From 7f5031fae865304fdbb65007f371bc2247d1d4de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:42:08 +0000
Subject: [PATCH 136/172] reproxy: 1.6.0 -> 1.7.0

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

diff --git a/pkgs/by-name/re/reproxy/package.nix b/pkgs/by-name/re/reproxy/package.nix
index 23850ea81c48..404a75ea7903 100644
--- a/pkgs/by-name/re/reproxy/package.nix
+++ b/pkgs/by-name/re/reproxy/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "reproxy";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "umputun";
     repo = "reproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eAxksLPCQrmKRKNlFhDb5dfXSaa9o/rexM1n+CiPZvw=";
+    hash = "sha256-dxQWuONVYidNtppLd5S1tBEPXM64JdnAhdFWzOsaG6U=";
   };
 
   vendorHash = null;

From d97b86f1e0cc4f35f6ab90d4cef1780eaf8bd560 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 08:52:06 +0000
Subject: [PATCH 137/172] sqls: 0.2.45 -> 0.2.48

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

diff --git a/pkgs/by-name/sq/sqls/package.nix b/pkgs/by-name/sq/sqls/package.nix
index 8a6a0f2e3924..0b04885b3c60 100644
--- a/pkgs/by-name/sq/sqls/package.nix
+++ b/pkgs/by-name/sq/sqls/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sqls";
-  version = "0.2.45";
+  version = "0.2.48";
 
   src = fetchFromGitHub {
     owner = "sqls-server";
     repo = "sqls";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-r9D3YtUk/hv3ex/PSGPTNIBTW3s3a3KdIBtxDry30Zc=";
+    hash = "sha256-TjGu8QcwYIPoW2v61fXpq/oZKoksOUZ2/dnleJhPjFM=";
   };
 
-  vendorHash = "sha256-eh43G0fR+NRRXRPCfxjlwzzw3yg/ZRb1GpWwHGqyRrE=";
+  vendorHash = "sha256-VVa77h0mgWLEuL2+Q3qre5V71kbBaWaugNN9TcTC8y0=";
 
   ldflags = [
     "-s"

From 58849d22c4d1dba16848f8320005d4b7e1daae13 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 15 Jul 2026 11:31:57 +0200
Subject: [PATCH 138/172] viser: allow rich 15

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

diff --git a/pkgs/development/python-modules/viser/default.nix b/pkgs/development/python-modules/viser/default.nix
index 0313910feef8..e30bdac6d16a 100644
--- a/pkgs/development/python-modules/viser/default.nix
+++ b/pkgs/development/python-modules/viser/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
 
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -171,6 +170,11 @@ buildPythonPackage (finalAttrs: {
     "viser"
   ];
 
+  pythonRelaxDeps = [
+    # rich<15.0.0,>=13.3.3 not satisfied by version 15.0.0
+    "rich"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   meta = {

From 0bbc8ba36dfb854036f13fbc68239ed71d1bf570 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 09:57:54 +0000
Subject: [PATCH 139/172] openspeedrun: 0.3.3 -> 0.4.3

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

diff --git a/pkgs/by-name/op/openspeedrun/package.nix b/pkgs/by-name/op/openspeedrun/package.nix
index 73ea17ef9e3e..34cfdd802cb3 100644
--- a/pkgs/by-name/op/openspeedrun/package.nix
+++ b/pkgs/by-name/op/openspeedrun/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openspeedrun";
-  version = "0.3.3";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "SrWither";
     repo = "OpenSpeedRun";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EZPApXUVhsaOYa6CnpR8IWeEoHEl89KJGGoBOYFqBV0=";
+    hash = "sha256-0gVFnQbbtlQG2H0oD28cbbqvGsAxqC5DPsKvHC1CUw8=";
   };
 
-  cargoHash = "sha256-WzsLEfDZpjpUrbyPOr5QUkTMrlAJoC9Rej5BMOKF7OM=";
+  cargoHash = "sha256-xOz/Ru6NqpI20t+hz/81xaVU6XrsqGx0tI04O6nkRj4=";
 
   nativeBuildInputs = [
     autoPatchelfHook

From 02c2a539f2b99d0ca6e72e0ff2721095d6f5c2a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 10:09:34 +0000
Subject: [PATCH 140/172] kazumi: 2.1.8 -> 2.2.0

---
 pkgs/by-name/ka/kazumi/package.nix       |  4 +-
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 68 +++++++++++++++---------
 2 files changed, 46 insertions(+), 26 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 382a297f1865..dd288a2724bd 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -18,13 +18,13 @@
 }:
 
 let
-  version = "2.1.8";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-g6Z2DTZVhLD9M1jJAyJexi4lYd7Y3XUci2mjvJWxvkU=";
+    hash = "sha256-xAXhESIGk3St2TgqLtUl6je7DlS4j4vD338T5t99OAE=";
   };
 in
 flutter.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 166f9d6a1c28..ccd5c300e2fe 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -146,11 +146,11 @@
       "dependency": "transitive",
       "description": {
         "name": "auto_injector",
-        "sha256": "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8",
+        "sha256": "81815294ad9a512e294d97819bdbeccc7f93f18daeceac321e0c046a6f25eeb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
@@ -524,7 +524,7 @@
       "version": "1.3.3"
     },
     "ffi": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "ffi",
         "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45",
@@ -729,11 +729,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_modular",
-        "sha256": "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586",
+        "sha256": "04b924a79e17ec897aa40886a46f27954ee0194e4601a006bdba3cb2be65e180",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
+      "version": "7.1.0"
     },
     "flutter_native_splash": {
       "dependency": "direct dev",
@@ -1017,6 +1017,16 @@
       "source": "hosted",
       "version": "1.0.5"
     },
+    "iregexp": {
+      "dependency": "transitive",
+      "description": {
+        "name": "iregexp",
+        "sha256": "c79119931b7ae9c0b6327adaa4495811813fcae7e6236ac68c15f45ca857d38b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "isolate_channel": {
       "dependency": "transitive",
       "description": {
@@ -1067,6 +1077,16 @@
       "source": "hosted",
       "version": "4.12.0"
     },
+    "json_path": {
+      "dependency": "direct main",
+      "description": {
+        "name": "json_path",
+        "sha256": "99cef94ca7b604ad85b9442bc8852e55396f559c08c0ab961d10b90b730c326f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.9.0"
+    },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
@@ -1147,6 +1167,16 @@
       "source": "hosted",
       "version": "0.13.0"
     },
+    "maybe_just_nothing": {
+      "dependency": "transitive",
+      "description": {
+        "name": "maybe_just_nothing",
+        "sha256": "57af3cacbbe57d5889a4479983755b76551db3c8862aa6335f57f50657945054",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.0"
+    },
     "media_kit": {
       "dependency": "direct main",
       "description": {
@@ -1296,16 +1326,6 @@
       "source": "hosted",
       "version": "2.7.7"
     },
-    "modular_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "modular_core",
-        "sha256": "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.4.1"
-    },
     "msix": {
       "dependency": "direct dev",
       "description": {
@@ -1477,7 +1497,7 @@
       "version": "2.2.1"
     },
     "path_provider_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "path_provider_platform_interface",
         "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
@@ -1527,7 +1547,7 @@
       "version": "3.1.6"
     },
     "plugin_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct dev",
       "description": {
         "name": "plugin_platform_interface",
         "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
@@ -1557,7 +1577,7 @@
       "version": "6.5.0"
     },
     "provider": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "provider",
         "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
@@ -1606,15 +1626,15 @@
       "source": "hosted",
       "version": "0.6.0"
     },
-    "result_dart": {
+    "rfc_6901": {
       "dependency": "transitive",
       "description": {
-        "name": "result_dart",
-        "sha256": "80096f0928e276c024e53cf1bb2aaffd5a94623dac8fdfa5cb3529e82b51eb3c",
+        "name": "rfc_6901",
+        "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "0.2.1"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -2314,7 +2334,7 @@
       "version": "0.4.0"
     },
     "win32": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "win32",
         "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
@@ -2396,6 +2416,6 @@
   },
   "sdks": {
     "dart": ">=3.11.0 <4.0.0",
-    "flutter": ">=3.44.4"
+    "flutter": ">=3.44.5"
   }
 }

From 0e8ab1170898ea67d0bb8ecbb4e05260cfdc7855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 10:32:53 +0000
Subject: [PATCH 141/172] ruqola: 2.7.2 -> 2.8.1

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

diff --git a/pkgs/by-name/ru/ruqola/package.nix b/pkgs/by-name/ru/ruqola/package.nix
index ca6412a65467..5a29ac99dba5 100644
--- a/pkgs/by-name/ru/ruqola/package.nix
+++ b/pkgs/by-name/ru/ruqola/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ruqola";
-  version = "2.7.2";
+  version = "2.8.1";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = "ruqola";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6ModByNU47fWsUUp7TTqgStFViTZy5ZXPYcrj0Rwrpc=";
+    hash = "sha256-+Ry4Ns+QHhgFJpVkDsbyfLt/aVvp2AZk/1dyrbOIH0A=";
   };
 
   nativeBuildInputs = [

From 9ac72d2b8d5a250ac7be4139d61f278fbf7f8937 Mon Sep 17 00:00:00 2001
From: Emilia Bopp <contact@ebopp.de>
Date: Wed, 15 Jul 2026 12:35:16 +0200
Subject: [PATCH 142/172] =?UTF-8?q?python3Packages.schwifty:=202026.07.0?=
 =?UTF-8?q?=20=E2=86=92=202026.07.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/development/python-modules/schwifty/default.nix b/pkgs/development/python-modules/schwifty/default.nix
index 5c5c30a5e89a..3b1be2fa9372 100644
--- a/pkgs/development/python-modules/schwifty/default.nix
+++ b/pkgs/development/python-modules/schwifty/default.nix
@@ -23,15 +23,15 @@
 
 buildPythonPackage rec {
   pname = "schwifty";
-  version = "2026.07.0";
+  version = "2026.07.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname;
     # The version is different missing leading zeros in the CalVer month.
     # This is due to PyPI's normalization of integers
-    version = "2026.7.0";
-    hash = "sha256-ej/mSjACWqM1nm8zGhgSeOxCFHarll3wCXUA2d2+V8Y=";
+    version = "2026.7.1";
+    hash = "sha256-Rux0m5MQG5aBrEiQAEjalxdbabYWAU33qFSuN+rddEA=";
   };
 
   build-system = [

From be7ac8d1cd49c6503a0fccc18939d6b4d64a6d7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:41:30 +0000
Subject: [PATCH 143/172] spread: 0-unstable-2025-02-06 -> 2026.07.12

---
 pkgs/by-name/sp/spread/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sp/spread/package.nix b/pkgs/by-name/sp/spread/package.nix
index bed3d7d354c7..9b1515cc4953 100644
--- a/pkgs/by-name/sp/spread/package.nix
+++ b/pkgs/by-name/sp/spread/package.nix
@@ -12,7 +12,7 @@
 
 buildGoModule {
   pname = "spread";
-  version = "0-unstable-2025-02-06";
+  version = "2026.07.12";
 
   src = fetchFromGitHub {
     owner = "snapcore";

From 5b3fb02758dea3d89da7afbeadf9d3484fa87ac3 Mon Sep 17 00:00:00 2001
From: Simon Leiner <simon@leiner.me>
Date: Wed, 15 Jul 2026 13:34:20 +0200
Subject: [PATCH 144/172] helm-secrets: Fix CLI compatibility with Helm v4

While introducing support for Helm v4, helm-secrets has split
up into multiple plugins [1], with the the v4-compatible
manifest residing at "plugins/helm-secrets-cli/plugin.yaml"
[2] in the source repo, while the manifest in the root
directory [3] is compatible to Helm v3, not v4.

This patch is minimally invasive and only restores the CLI;
getter and post-renderer do not become available through this.

[1]: https://github.com/jkroepke/helm-secrets/wiki/Installation#helm-4
[2]: https://github.com/jkroepke/helm-secrets/blob/main/plugins/helm-secrets-cli/plugin.yaml
[3]: https://github.com/jkroepke/helm-secrets/blob/main/plugin.yaml

Fixes: https://github.com/NixOS/nixpkgs/issues/536239
---
 .../networking/cluster/helm/plugins/helm-secrets.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
index 6395244fe708..7b23822646e0 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix
@@ -40,8 +40,8 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     install -dm755 $out/helm-secrets $out/helm-secrets/scripts
-    install -m644 -Dt $out/helm-secrets plugin.yaml
-    cp -r scripts/* $out/helm-secrets/scripts
+    install -m644 -Dt $out/helm-secrets plugins/helm-secrets-cli/plugin.yaml
+    cp -r plugins/helm-secrets-cli/scripts/* $out/helm-secrets/scripts
     wrapProgram $out/helm-secrets/scripts/run.sh \
         --prefix PATH : ${
           lib.makeBinPath [

From af9b23694821dcabf121681a98437e76722e0536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 11:58:24 +0000
Subject: [PATCH 145/172] slint-lsp: 1.17.0 -> 1.17.1

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

diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index f477b22e8125..afdab4339a91 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -18,14 +18,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-6TwEB3t0vwDnvGmZU1LSIkYbA02NEyVI4wbEeqYbatM=";
+    hash = "sha256-GAy2D2eEx2NYEXx/x4z+43CbRV7gWwY2Sgd9iAK6T2Y=";
   };
 
-  cargoHash = "sha256-RTWfR/RmijSj5DlS+9tJ6uG534NmG5jy+p1hliEsdiE=";
+  cargoHash = "sha256-4Cs+ezxoBeeGeUcJK0ury63zW0AJADDZk/zhIeJV6Uc=";
 
   rpathLibs = [
     fontconfig

From e8c1d8bffa93c98f4c1d19bb84877140ccfb5295 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 12:05:17 +0000
Subject: [PATCH 146/172] pods: 3.0.0 -> 3.1.0

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

diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 7838c7c3c75c..efe8edd68f3b 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -23,18 +23,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pods";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "marhkb";
     repo = "pods";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-50NOkLffLbs5/qug6xzoSWSMZ3+/Lau9sTPi9za4+LA=";
+    hash = "sha256-GMFrcWFozRR0G0+7g5JJyMkWzPY79cVF4Go1Wd/4HtA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-JbYJQdli3OAxnbGApVe5+KAAcGePTTH59fdXdFx0+hA=";
+    hash = "sha256-P0teC048Z61pMrl5cvlvrGaPcccxTki/AIthyzQusGI=";
   };
 
   nativeBuildInputs = [

From 5ff3683a69af51c0bd206e9591e9875e32c93573 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:03:50 +0200
Subject: [PATCH 147/172] skalibs: 2.15.0.0 -> 2.15.1.0

---
 pkgs/development/skaware-packages/skalibs/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/skalibs/default.nix b/pkgs/development/skaware-packages/skalibs/default.nix
index 9d0c622612dd..1a3ee89624c8 100644
--- a/pkgs/development/skaware-packages/skalibs/default.nix
+++ b/pkgs/development/skaware-packages/skalibs/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "skalibs";
-  version = "2.15.0.0";
-  sha256 = "sha256-f96W6K+0GRWToVMoiD6cdybJaJHPBxIiFGgh6Mh/gAc=";
+  version = "2.15.1.0";
+  sha256 = "sha256-+ckF50k1xv6RHH40Tj6J1fvSAUwaBGULUksVzptWNdE=";
 
   description = "Set of general-purpose C programming libraries";
 
@@ -50,6 +50,8 @@ skawarePackages.buildPackage {
     # child has successfully exec'ed. That happens with old glibcs
     # and some virtual platforms.
     "--with-sysdep-posixspawnearlyreturn=no"
+
+    "--with-sysdep-selectinfinite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
   ];
 
   postInstall = ''

From 6f57884abc37d750c90c2010d0b7edb0a3fdc52f Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:04:04 +0200
Subject: [PATCH 148/172] execline: 2.9.9.1 -> 2.9.9.2

---
 pkgs/development/skaware-packages/execline/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/execline/default.nix b/pkgs/development/skaware-packages/execline/default.nix
index f47dd73b295f..f49e79712c38 100644
--- a/pkgs/development/skaware-packages/execline/default.nix
+++ b/pkgs/development/skaware-packages/execline/default.nix
@@ -7,14 +7,14 @@
 }:
 
 let
-  version = "2.9.9.1";
+  version = "2.9.9.2";
 in
 skawarePackages.buildPackage {
   inherit version;
 
   pname = "execline";
   # ATTN: also check whether there is a new manpages version
-  sha256 = "sha256-vmNTMpepPDb9JnGVEXtOZoaHpSb4NFF6jbR9hbbH7Go=";
+  sha256 = "sha256-kI7U2zprOiOiBdj9TPKnEIkVbyrq4PVGVgRar60t7jI=";
 
   # Maintainer of manpages uses following versioning scheme: for every
   # upstream $version he tags manpages release as ${version}.1, and,

From 911b4c771eb5596e4e5380470f36b5812dd1a59c Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:04:50 +0200
Subject: [PATCH 149/172] s6: 2.15.0.0 -> 2.15.1.0

Closes: https://github.com/NixOS/nixpkgs/issues/529958
---
 pkgs/development/skaware-packages/s6/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6/default.nix b/pkgs/development/skaware-packages/s6/default.nix
index d88a808762db..8fb427878dae 100644
--- a/pkgs/development/skaware-packages/s6/default.nix
+++ b/pkgs/development/skaware-packages/s6/default.nix
@@ -7,8 +7,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6";
-  version = "2.15.0.0";
-  sha256 = "sha256-J9/3PWJihVQBM+B151iHCH9RF/1R3llQPvfSnpb2nkw=";
+  version = "2.15.1.0";
+  sha256 = "sha256-6rnEbiK2axYTX5oF7Gig6ih9kGC4TRDe+qosqtFYq1I=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-man-pages";

From ce53fe45eb3e32a94bd9d5c4bc65b55d21a55c0d Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:12 +0200
Subject: [PATCH 150/172] nsss: 0.2.1.2 -> 0.2.1.3

---
 pkgs/development/skaware-packages/nsss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/nsss/default.nix b/pkgs/development/skaware-packages/nsss/default.nix
index 9432e8293649..f10e1cc4454a 100644
--- a/pkgs/development/skaware-packages/nsss/default.nix
+++ b/pkgs/development/skaware-packages/nsss/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "nsss";
-  version = "0.2.1.2";
-  sha256 = "sha256-zKpz6QUJ8/pbUq+F2QIDumKMFsna7TTFQmea52gfEGc=";
+  version = "0.2.1.3";
+  sha256 = "sha256-FNpESoNtJLaihvrIilAr2qKWpNMo8J1Sl1aK07PgJoU=";
 
   description = "Implementation of a subset of the pwd.h, group.h and shadow.h family of functions";
 

From 81db60c21f8dc06d70ddf8d0c2007b938536b611 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:25 +0200
Subject: [PATCH 151/172] s6-dns: 2.4.1.2 -> 2.4.1.3

Closes: https://github.com/NixOS/nixpkgs/pull/542037
---
 pkgs/development/skaware-packages/s6-dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-dns/default.nix b/pkgs/development/skaware-packages/s6-dns/default.nix
index ee0c7878533e..df5d39f1b5cf 100644
--- a/pkgs/development/skaware-packages/s6-dns/default.nix
+++ b/pkgs/development/skaware-packages/s6-dns/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-dns";
-  version = "2.4.1.2";
-  sha256 = "sha256-BhjYgw/OY+4Xt/VeSUKAachcl6FxCCensjSbZgzTOk4=";
+  version = "2.4.1.3";
+  sha256 = "sha256-+enetGSMVQeoSFVINkvRxW2r2jlLye4tfxy7FqA2zXY=";
 
   description = "Suite of DNS client programs and libraries for Unix systems";
 

From ff375817b423dd9b35e9e74a5ceb88db8540e1bb Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:37 +0200
Subject: [PATCH 152/172] s6-linux-init: 1.2.0.1 -> 1.2.0.2

---
 pkgs/development/skaware-packages/s6-linux-init/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-linux-init/default.nix b/pkgs/development/skaware-packages/s6-linux-init/default.nix
index ff8137aa19ec..03b79d9ad513 100644
--- a/pkgs/development/skaware-packages/s6-linux-init/default.nix
+++ b/pkgs/development/skaware-packages/s6-linux-init/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-linux-init";
-  version = "1.2.0.1";
-  sha256 = "sha256-ctWbE2g9E5D335ooa+Rn5zKTQWAhr5+hAjySk+xcfXw=";
+  version = "1.2.0.2";
+  sha256 = "sha256-b60BTaFiwMgZJBl8V9FuGnXBM7NKIOQjQxobdB6Qex0=";
 
   description = "Set of minimalistic tools used to create a s6-based init system, including a /sbin/init binary, on a Linux kernel";
   platforms = lib.platforms.linux;

From 7bb3b889d1627f47c9e7ff8d610e20c688c1c8d3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:50 +0200
Subject: [PATCH 153/172] s6-networking: 2.8.0.0 -> 2.8.0.1

---
 pkgs/development/skaware-packages/s6-networking/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-networking/default.nix b/pkgs/development/skaware-packages/s6-networking/default.nix
index 79a133fc8886..344ad98aa42b 100644
--- a/pkgs/development/skaware-packages/s6-networking/default.nix
+++ b/pkgs/development/skaware-packages/s6-networking/default.nix
@@ -25,8 +25,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport};
 
 skawarePackages.buildPackage {
   pname = "s6-networking";
-  version = "2.8.0.0";
-  sha256 = "sha256-rE9lhA/OwWJPe/nGMvtAVThRvJApV/+VayofIoGkXNQ=";
+  version = "2.8.0.1";
+  sha256 = "sha256-bwEcM7oFhs5Y/u4M+FSgsIfpCC/b0kq7eGFIRjgw80E=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-networking-man-pages";

From a5662f4e9265bf468e3b6d07091c129359722174 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:05:57 +0200
Subject: [PATCH 154/172] s6-rc: 0.6.1.1 -> 0.7.0.0

---
 pkgs/development/skaware-packages/s6-rc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/s6-rc/default.nix b/pkgs/development/skaware-packages/s6-rc/default.nix
index 63c5cda8cf3d..69f1b2034a04 100644
--- a/pkgs/development/skaware-packages/s6-rc/default.nix
+++ b/pkgs/development/skaware-packages/s6-rc/default.nix
@@ -10,8 +10,8 @@
 
 skawarePackages.buildPackage {
   pname = "s6-rc";
-  version = "0.6.1.1";
-  sha256 = "sha256-tU8iajW+HuVqIovxpMOUN/ByvGTmnb81bnM+YGqGQC0=";
+  version = "0.7.0.0";
+  sha256 = "sha256-v1uM4NpaTucNZCuBi2HZkWp6m2SkV1lfOIET5UoYhog=";
 
   manpages = skawarePackages.buildManPages {
     pname = "s6-rc-man-pages";

From ab2de20c98e8b280ecc8b5fd0a47eec8af55f637 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:06:06 +0200
Subject: [PATCH 155/172] tipidee: 0.0.7.2 -> 0.0.8.0

Closes: https://github.com/NixOS/nixpkgs/pull/542011
---
 pkgs/development/skaware-packages/tipidee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/tipidee/default.nix b/pkgs/development/skaware-packages/tipidee/default.nix
index 6e8d07841ef8..245417379777 100644
--- a/pkgs/development/skaware-packages/tipidee/default.nix
+++ b/pkgs/development/skaware-packages/tipidee/default.nix
@@ -6,8 +6,8 @@
 
 skawarePackages.buildPackage {
   pname = "tipidee";
-  version = "0.0.7.2";
-  sha256 = "sha256-x34St9s/3FbcI9s3ncpmhhbnQmA/6Gf6K9yNTxrKj5s=";
+  version = "0.0.8.0";
+  sha256 = "sha256-GjllM2YqxwvCsKC4xlYW/6f6IBUIhZMA67mtM82mEC0=";
 
   description = "HTTP 1.1 webserver, serving static files and CGI/NPH";
 

From d616968d1b6727df9933e7b7f0c17b6975cd19c3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:06:12 +0200
Subject: [PATCH 156/172] utmps: 0.1.3.3 -> 0.1.3.4

Closes: https://github.com/NixOS/nixpkgs/pull/542010
---
 pkgs/development/skaware-packages/utmps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/skaware-packages/utmps/default.nix b/pkgs/development/skaware-packages/utmps/default.nix
index 37a375380465..70b5e138a0ed 100644
--- a/pkgs/development/skaware-packages/utmps/default.nix
+++ b/pkgs/development/skaware-packages/utmps/default.nix
@@ -2,8 +2,8 @@
 
 skawarePackages.buildPackage {
   pname = "utmps";
-  version = "0.1.3.3";
-  sha256 = "sha256-4iEr0C/hdzBCT39eMKTd5x0IYqUrI9i3Ke7XRCCjSaI=";
+  version = "0.1.3.4";
+  sha256 = "sha256-EtzBAq1qyB+BrsxJUHM9uU81CBlHBUubFHPKxckIELw=";
 
   description = "Secure utmpx and wtmp implementation";
 

From 8f70fa9f591b9195b9c907a08e36f1caeefd723b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Wed, 15 Jul 2026 14:27:11 +0200
Subject: [PATCH 157/172] Reapply "sdnotify-wrapper: drop"

This reverts commit 09384d7270eed91a1eac560ad312b0b599a22b78.
---
 nixos/modules/services/desktops/seatd.nix     |   3 +-
 pkgs/development/skaware-packages/default.nix |  10 +-
 .../sdnotify-wrapper/default.nix              |  47 -----
 .../sdnotify-wrapper/sdnotify-wrapper.c       | 174 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   1 -
 6 files changed, 10 insertions(+), 226 deletions(-)
 delete mode 100644 pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
 delete mode 100644 pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c

diff --git a/nixos/modules/services/desktops/seatd.nix b/nixos/modules/services/desktops/seatd.nix
index bedcc9a43120..939b9f338af9 100644
--- a/nixos/modules/services/desktops/seatd.nix
+++ b/nixos/modules/services/desktops/seatd.nix
@@ -40,7 +40,6 @@ in
   config = lib.mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       seatd
-      sdnotify-wrapper
     ];
     users.groups.seat = lib.mkIf (cfg.group == "seat") { };
 
@@ -55,7 +54,7 @@ in
         Type = "notify";
         NotifyAccess = "all";
         SyslogIdentifier = "seatd";
-        ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
+        ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}";
         RestartSec = 1;
         Restart = "always";
       };
diff --git a/pkgs/development/skaware-packages/default.nix b/pkgs/development/skaware-packages/default.nix
index b0877ada8c36..0ae8c4d43865 100644
--- a/pkgs/development/skaware-packages/default.nix
+++ b/pkgs/development/skaware-packages/default.nix
@@ -1,4 +1,8 @@
-{ lib, pkgs }:
+{
+  lib,
+  pkgs,
+  config,
+}:
 
 lib.makeScope pkgs.newScope (
   self:
@@ -22,7 +26,6 @@ lib.makeScope pkgs.newScope (
     # libs
     skalibs = callPackage ./skalibs { };
     skalibs_2_10 = callPackage ./skalibs/2_10.nix { };
-    sdnotify-wrapper = callPackage ./sdnotify-wrapper { };
 
     # s6 tooling
     s6 = callPackage ./s6 { };
@@ -40,4 +43,7 @@ lib.makeScope pkgs.newScope (
     s6-portable-utils-man-pages = self.s6-portable-utils.passthru.manpages;
     s6-rc-man-pages = self.s6-rc.passthru.manpages;
   }
+  // lib.optionalAttrs config.allowAliases {
+    sdnotify-wrapper = throw "sdnotify-wrapper has been removed in favour of s6-notify-socket-from-fd in the s6 package";
+  }
 )
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix b/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
deleted file mode 100644
index d9fa940a3294..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  lib,
-  runCommandCC,
-  skalibs,
-}:
-
-let
-  # From https://skarnet.org/software/misc/sdnotify-wrapper.c,
-  # which is unversioned.
-  src = ./sdnotify-wrapper.c;
-
-in
-runCommandCC "sdnotify-wrapper"
-  {
-
-    outputs = [
-      "bin"
-      "doc"
-      "out"
-    ];
-
-    meta = {
-      homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c";
-      description = "Use systemd sd_notify without having to link against libsystemd";
-      mainProgram = "sdnotify-wrapper";
-      platforms = lib.platforms.linux;
-      license = lib.licenses.isc;
-      maintainers = with lib.maintainers; [ Profpatsch ];
-    };
-
-  }
-  ''
-    mkdir -p $bin/bin
-    mkdir $out
-
-    # the -lskarnet has to come at the end to support static builds
-    $CC \
-      -o $bin/bin/sdnotify-wrapper \
-      -I${skalibs.dev}/include \
-      -L${skalibs.lib}/lib \
-      ${src} \
-      -lskarnet
-
-    mkdir -p $doc/share/doc/sdnotify-wrapper
-    # copy the documentation comment
-    sed -ne '/Usage:/,/*\//p' ${src} > $doc/share/doc/sdnotify-wrapper/README
-  ''
diff --git a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c b/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
deleted file mode 100644
index 00ede0b2d706..000000000000
--- a/pkgs/development/skaware-packages/sdnotify-wrapper/sdnotify-wrapper.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-   Copyright: (C)2015-2020 Laurent Bercot.  http://skarnet.org/
-   ISC license. See http://opensource.org/licenses/ISC
-
-   Build-time requirements: skalibs.  https://skarnet.org/software/skalibs/
-   Run-time requirements: none, if you link skalibs statically.
-
-   Compilation:
-     gcc -o sdnotify-wrapper -L/usr/lib/skalibs sdnotify-wrapper.c -lskarnet
-   Use /usr/lib/skalibs/libskarnet.a instead of -lskarnet to link statically.
-   Adapt gcc's -I and -L options to your skalibs installation paths.
-
-   Usage: if a daemon would be launched by systemd as "foobard args...",
-   launch it as "sdnotify-wrapper foobard args..." instead, and you can now
-   tell systemd that this daemon supports readiness notification.
-
-   Instead of using sd_notify() and having to link against the systemd
-   library, the daemon notifies readiness by writing whatever it wants
-   to a file descriptor (by default: stdout), then a newline. (Then it
-   should close that file descriptor.) The simplest way is something like
-   int notify_readiness() { write(1, "\n", 1) ; close(1) ; }
-   This mechanism is understandable by any notification readiness framework.
-
-   Readiness notification occurs when the newline is written, not when
-   the descriptor is closed; but since sdnotify-wrapper stops reading
-   after the first newline and will exit, any subsequent writes will
-   fail and it's best to simply close the descriptor right away.
-
-   sdnotify-wrapper sees the notification when it occurs and sends it
-   to systemd using the sd_notify format.
-
-   Options:
-     -d fd: the daemon will write its notification on descriptor fd.
-     Default is 1.
-     -f: do not doublefork. Use if the daemon waits for children it does
-     not know it has (for instance, superservers do this). When in doubt,
-     do not use that option, or you may have a zombie hanging around.
-     -t timeout: if the daemon has not sent a notification after timeout
-     milliseconds, give up and exit; systemd will not be notified.
-     -k: keep the NOTIFY_SOCKET environment variable when execing into the
-     daemon. By default, the variable is unset: the daemon should not need it.
-
-   Notes:
-     sdnotify-wrapper does not change the daemon's pid. It runs as a
-     (grand)child of the daemon.
-     If the NOTIFY_SOCKET environment variable is not set, sdnotify-wrapper
-     does nothing - it only execs into the daemon.
-     sdnotify-wrapper is more liberal than sd_notify(). It will accept
-     a relative path in NOTIFY_SOCKET.
-*/
-
-
-#include <sys/types.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <skalibs/uint64.h>
-#include <skalibs/types.h>
-#include <skalibs/bytestr.h>
-#include <skalibs/sgetopt.h>
-#include <skalibs/strerr.h>
-#include <skalibs/allreadwrite.h>
-#include <skalibs/tai.h>
-#include <skalibs/iopause.h>
-#include <skalibs/djbunix.h>
-#include <skalibs/socket.h>
-#include <skalibs/exec.h>
-
-#define USAGE "sdnotify-wrapper [ -d fd ] [ -f ] [ -t timeout ] [ -k ] prog..."
-#define dieusage() strerr_dieusage(100, USAGE)
-
-#define VAR "NOTIFY_SOCKET"
-
-static inline int ipc_sendto (int fd, char const *s, size_t len, char const *path)
-{
-  struct sockaddr_un sa ;
-  size_t l = strlen(path) ;
-  if (l > IPCPATH_MAX) return (errno = ENAMETOOLONG, 0) ;
-  memset(&sa, 0, sizeof sa) ;
-  sa.sun_family = AF_UNIX ;
-  memcpy(sa.sun_path, path, l+1) ;
-  if (path[0] == '@') sa.sun_path[0] = 0 ;
-  return sendto(fd, s, len, MSG_NOSIGNAL, (struct sockaddr *)&sa, sizeof sa) >= 0 ;
-}
-
-static inline void notify_systemd (pid_t pid, char const *socketpath)
-{
-  size_t n = 16 ;
-  char fmt[16 + PID_FMT] = "READY=1\nMAINPID=" ;
-  int fd = ipc_datagram_b() ;
-  if (fd < 0) strerr_diefu1sys(111, "create socket") ;
-  n += pid_fmt(fmt + n, pid) ;
-  fmt[n++] = '\n' ;
-  if (!ipc_sendto(fd, fmt, n, socketpath))
-    strerr_diefu2sys(111, "send notification message to ", socketpath) ;
-  close(fd) ;
-}
-
-static inline int run_child (int fd, unsigned int timeout, pid_t pid, char const *s)
-{
-  char dummy[4096] ;
-  iopause_fd x = { .fd = fd, .events = IOPAUSE_READ } ;
-  tain deadline ;
-  tain_now_g() ;
-  if (timeout) tain_from_millisecs(&deadline, timeout) ;
-  else deadline = tain_infinite_relative ;
-  tain_add_g(&deadline, &deadline) ;
-  for (;;)
-  {
-    int r = iopause_g(&x, 1, &deadline) ;
-    if (r < 0) strerr_diefu1sys(111, "iopause") ;
-    if (!r) return 99 ;
-    r = sanitize_read(fd_read(fd, dummy, 4096)) ;
-    if (r < 0)
-      if (errno == EPIPE) return 1 ;
-      else strerr_diefu1sys(111, "read from parent") ;
-    else if (r && memchr(dummy, '\n', r)) break ;
-  }
-  close(fd) ;
-  notify_systemd(pid, s) ;
-  return 0 ;
-}
-
-int main (int argc, char const *const *argv)
-{
-  char const *s = getenv(VAR) ;
-  unsigned int fd = 1 ;
-  unsigned int timeout = 0 ;
-  int df = 1, keep = 0 ;
-  PROG = "sdnotify-wrapper" ;
-  {
-    subgetopt l = SUBGETOPT_ZERO ;
-    for (;;)
-    {
-      int opt = subgetopt_r(argc, argv, "d:ft:k", &l) ;
-      if (opt == -1) break ;
-      switch (opt)
-      {
-        case 'd' : if (!uint0_scan(l.arg, &fd)) dieusage() ; break ;
-        case 'f' : df = 0 ; break ;
-        case 't' : if (!uint0_scan(l.arg, &timeout)) dieusage() ; break ;
-        case 'k' : keep = 1 ; break ;
-        default : dieusage() ;
-      }
-    }
-    argc -= l.ind ; argv += l.ind ;
-  }
-  if (!argc) dieusage() ;
-
-  if (!s) xexec(argv) ;
-  else
-  {
-    pid_t parent = getpid() ;
-    pid_t child ;
-    int p[2] ;
-    if (pipe(p) < 0) strerr_diefu1sys(111, "pipe") ;
-    child = df ? doublefork() : fork() ;
-    if (child < 0) strerr_diefu1sys(111, df ? "doublefork" : "fork") ;
-    else if (!child)
-    {
-      PROG = "sdnotify-wrapper (child)" ;
-      close(p[1]) ;
-      return run_child(p[0], timeout, parent, s) ;
-    }
-    close(p[0]) ;
-    if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "move descriptor") ;
-    if (keep) xexec(argv) ;
-    else xmexec_m(argv, VAR, sizeof(VAR)) ;
-  }
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9407085f56a2..c2f58bbf9dbd 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2053,6 +2053,7 @@ mapAliases {
   SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL_compat = sdl12-compat; # Added 2026-05-19
+  sdnotify-wrapper = skawarePackages.sdnotify-wrapper;
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
   securefs = throw "'securefs' has been removed as it depends on fuse2"; # Added 2026-05-05
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 06ef7f62abba..33c26ea4216c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6713,7 +6713,6 @@ with pkgs;
     s6-portable-utils-man-pages
     s6-rc
     s6-rc-man-pages
-    sdnotify-wrapper
     skalibs
     skalibs_2_10
     tipidee

From 50a76acaf9e42c4a6e3c1f6abb9cd05f77128598 Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 14:27:50 +0200
Subject: [PATCH 158/172] tilt: 0.37.3 -> 0.37.5

https://github.com/tilt-dev/tilt/releases/tag/v0.37.4
https://github.com/tilt-dev/tilt/releases/tag/v0.37.5

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/by-name/ti/tilt/assets.nix  | 2 +-
 pkgs/by-name/ti/tilt/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ti/tilt/assets.nix b/pkgs/by-name/ti/tilt/assets.nix
index a167d1a57773..61b5cfccc096 100644
--- a/pkgs/by-name/ti/tilt/assets.nix
+++ b/pkgs/by-name/ti/tilt/assets.nix
@@ -77,7 +77,7 @@ stdenvNoCC.mkDerivation {
     dontInstall = true;
 
     outputHashAlgo = "sha256";
-    outputHash = "sha256-3P42xJ1tBVRpe1hNDy4ax9bUmiaPnSZolTGmsKpzYUA=";
+    outputHash = "sha256-nPbIFUBbbgaFpKBky5FXFBopZd4IxvTGbYXfC3SfaUE=";
     outputHashMode = "recursive";
   };
 
diff --git a/pkgs/by-name/ti/tilt/package.nix b/pkgs/by-name/ti/tilt/package.nix
index 0a2872f88f13..c041b515d910 100644
--- a/pkgs/by-name/ti/tilt/package.nix
+++ b/pkgs/by-name/ti/tilt/package.nix
@@ -9,13 +9,13 @@ let
       running in development environment and try to serve assets from the
       source tree, which is not there once build completes.
     */
-    version = "0.37.3";
+    version = "0.37.5";
 
     src = fetchFromGitHub {
       owner = "tilt-dev";
       repo = "tilt";
       tag = "v${version}";
-      hash = "sha256-gJQ9ECGsJ4VBASxmNewOhA3zLl7YjMm5GRDuAefmFYE=";
+      hash = "sha256-aa5ZPheqRZDgcIuuI/tXRHxMtB2RH0yITwvA2SMN9Ec=";
     };
   };
 

From 31833bb654f2778f8de6b78ebce5c25aed5e4c63 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Wed, 15 Jul 2026 14:38:28 +0200
Subject: [PATCH 159/172] forgejo: 15.0.4 -> 15.0.5

Release notes: https://codeberg.org/forgejo/forgejo/src/branch/forgejo/release-notes-published/15.0.5.md
Security announcement: https://codeberg.org/forgejo/security-announcements/issues/56
Diff: https://codeberg.org/forgejo/forgejo/compare/v15.0.4...v15.0.5
See also: https://codeberg.org/forgejo/forgejo/releases/tag/v15.0.5
---
 pkgs/by-name/fo/forgejo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 29c9b2a22a96..474e72baff85 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "15.0.4";
-  hash = "sha256-8AMq5CT4q7aaF5gj9d5+JINp5rrI5U98juI9BA0wVVo=";
+  version = "15.0.5";
+  hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ=";
   npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg=";
   vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig=";
   lts = true;

From 22e4a068e3901d1ef309272d71886e8cf0b99bc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 12:39:27 +0000
Subject: [PATCH 160/172] kdePackages.ktextaddons: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/kde/misc/ktextaddons/default.nix b/pkgs/kde/misc/ktextaddons/default.nix
index 49691d741bd7..85a88eb4a882 100644
--- a/pkgs/kde/misc/ktextaddons/default.nix
+++ b/pkgs/kde/misc/ktextaddons/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "ktextaddons";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchurl {
     url = "mirror://kde/stable/ktextaddons/ktextaddons-${version}.tar.xz";
-    hash = "sha256-QsdrZiDc6vqYuwKp4lrAWbSIGfmSO1VRfJ4IfYXUE64=";
+    hash = "sha256-fOWWG3qCrVDk/ytDhtdkzSnTCGAOu7X9duJJLTHg9fA=";
   };
 
   extraBuildInputs = [

From b8145bbead06fe509c12bd79f68af8981dae1461 Mon Sep 17 00:00:00 2001
From: Holiu618 <165534185+Holiu618@users.noreply.github.com>
Date: Wed, 15 Jul 2026 20:41:30 +0800
Subject: [PATCH 161/172] dolt: 2.1.10 -> 2.1.11

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

diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix
index 7db759314cc4..6078a0d850cf 100644
--- a/pkgs/by-name/do/dolt/package.nix
+++ b/pkgs/by-name/do/dolt/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "dolt";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchFromGitHub {
     owner = "dolthub";
     repo = "dolt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-svBAmp/gPHSa6HXmqiFFB31sbaQa6s3HIW1tti8G1pA=";
+    hash = "sha256-bHQBnZpghqh01Voq9U5nOWKrvujx6n3xZNtZqUDIpeU=";
   };
 
   modRoot = "./go";
   subPackages = [ "cmd/dolt" ];
-  vendorHash = "sha256-tBvNKDBv86pGBhzPc9tGDVwR1tB/HmUMn2VH42B6QRc=";
+  vendorHash = "sha256-mvoy/ChZVGG9QxRGUG902Eda37SuJGjYLOi87OqjF68=";
   proxyVendor = true;
   doCheck = false;
 

From c9b0c119ecb1c17f4f3a44a6799e3049fa0bb816 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:00:58 +0000
Subject: [PATCH 162/172] museum: 1.3.36 -> 1.3.58

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

diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 9e43e19dbe83..27b5b1a8fcce 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.3.36";
+  version = "1.3.58";
 
   src = fetchFromGitHub {
     owner = "ente";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-9MWmJ3QUgS7BToTnSZzTi4ywGW1RtwrCO+9yQJkvejM=";
+    hash = "sha256-G9T5qsBKzO7bMCf3IexF9YyDeHK+gZI1Unm4pBq69iI=";
   };
 
-  vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ=";
+  vendorHash = "sha256-Ri2hsPkBvAGGbk9vREmkYxY+JX+nv/OfIAkhU2y0xnQ=";
 
   sourceRoot = "${finalAttrs.src.name}/server";
 

From 93ba0ffb052a992525e884dff31056e4a88aa077 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:13:11 +0000
Subject: [PATCH 163/172] python3Packages.verlib2: 0.3.2 -> 26.2

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

diff --git a/pkgs/development/python-modules/verlib2/default.nix b/pkgs/development/python-modules/verlib2/default.nix
index 40b0d0527796..8320625d87fa 100644
--- a/pkgs/development/python-modules/verlib2/default.nix
+++ b/pkgs/development/python-modules/verlib2/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "verlib2";
-  version = "0.3.2";
+  version = "26.2";
   pyproject = true;
 
   # This tarball doesn't include tests unfortunately, and the GitHub tarball
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   # should work for us as well.
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oKavmDjY0mwYIlowyNV/twcURi480p8kUeeYLVpR4h4=";
+    hash = "sha256-B0Cjs1dVqdjruTP/zpifN3YRP+MZq2LfX6IPfBQ0PVg=";
   };
 
   nativeBuildInputs = [

From 54c3d1eda6a5e18ec85b3bda6e078ab527025497 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:29:56 +0000
Subject: [PATCH 164/172] python3Packages.niquests: 3.20.0 -> 3.20.1

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

diff --git a/pkgs/development/python-modules/niquests/default.nix b/pkgs/development/python-modules/niquests/default.nix
index 162539ae98cf..cc20a284f81c 100644
--- a/pkgs/development/python-modules/niquests/default.nix
+++ b/pkgs/development/python-modules/niquests/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "niquests";
-  version = "3.20.0";
+  version = "3.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "niquests";
     tag = "v${version}";
-    hash = "sha256-9zBo59l/zDIMKnYX1jOMOCec+oRnCkqJjjJmjbAzoPM=";
+    hash = "sha256-ux0Nypp3gvf//vNyTt/BygkneEfX2Z3wHaLpbb3TGyI=";
   };
 
   build-system = [ hatchling ];

From b62690e6161b3e823da319591e5301471b219b8c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 13:30:03 +0000
Subject: [PATCH 165/172] waytrogen: 0.9.8 -> 1.0.1

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

diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 6fe2a8531346..396d0742735d 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -32,18 +32,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.9.8";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-Nf1qPIFlhQl5T3RYVK4GMinO2vOJDNoYBrrVY93VF0Q=";
+    hash = "sha256-3whabM2leDPZS276FRCC5q6XSKWCIisQ0HLM8l8T5WE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-EXP6Mt04Z+2ag2BhihzAtjwPGE82Ig6GoD1Vgor7oHc=";
+    hash = "sha256-5XgajiMJpiy7OzsrrsKwxC4dstvSj5JDU3Iw0zOnfMM=";
   };
 
   nativeBuildInputs = [

From 3c8cce3f8ea4faad139d0170aa5146507c597705 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 14:37:38 +0000
Subject: [PATCH 166/172] devin-desktop: 3.4.22 -> 3.4.27

---
 pkgs/by-name/de/devin-desktop/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json
index 38321f0ea022..592f3a25bdb2 100644
--- a/pkgs/by-name/de/devin-desktop/info.json
+++ b/pkgs/by-name/de/devin-desktop/info.json
@@ -1,14 +1,14 @@
 {
   "aarch64-darwin": {
-    "version": "3.4.22",
+    "version": "3.4.27",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-darwin-arm64-3.4.22.zip",
-    "sha256": "ed6f3bd022cbac6cef8757beeaafebf65641724a5e7897e4d62a03b87161627f"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-darwin-arm64-3.4.27.zip",
+    "sha256": "c42b0671c246ef295807e822809cb82dfe65831d4879d68f25334f754babec8d"
   },
   "x86_64-linux": {
-    "version": "3.4.22",
+    "version": "3.4.27",
     "vscodeVersion": "1.110.1",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0c84d3332806347c90e571331f48dd13a957d880/Devin-linux-x64-3.4.22.tar.gz",
-    "sha256": "02bfb58af6d898cc41337a761a34ae69f55f05c8c28e3611a5cf2c431610b072"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-linux-x64-3.4.27.tar.gz",
+    "sha256": "80850124b31331f63c24a201d1317bdacdfb438fb2bcc9b31c9b7a6391391619"
   }
 }

From b519e653e2b331fba9cf17ac89ae3675a518792a Mon Sep 17 00:00:00 2001
From: Gerhard Schwanzer <geri@sdf.org>
Date: Wed, 15 Jul 2026 17:13:15 +0200
Subject: [PATCH 167/172] perlPackages.CryptOpenSSLX509: 1.915 -> 2.1.3

https://github.com/dsully/perl-crypt-openssl-x509/blob/2.1.3/Changes.md

Assisted-by: pi coding agent / Mika (OpenAI gpt-5.6-sol)
---
 pkgs/top-level/perl-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index dfe9e57f7eb5..03b713f20ba9 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7792,10 +7792,10 @@ with self;
 
   CryptOpenSSLX509 = buildPerlPackage {
     pname = "Crypt-OpenSSL-X509";
-    version = "1.915";
+    version = "2.1.3";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-1.915.tar.gz";
-      hash = "sha256-xNvBbE/CloV4I3v8MkWH/9eSSacQFQJlLbnjjUSJUX8=";
+      url = "mirror://cpan/authors/id/J/JO/JONASBN/Crypt-OpenSSL-X509-2.1.3.tar.gz";
+      hash = "sha256-CtllF1dGroRrBRCwOKofltLduMhg/pfOpvvcegVfn54=";
     };
     env.NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";
     env.NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto";

From cb712ce141051760a194ec4f3bf71caf27fc51bb Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Wed, 15 Jul 2026 17:18:40 +0200
Subject: [PATCH 168/172] python314Packages.guidata: enable python 3.14

Python 3.14 is supported since guidata 3.14.1
(https://github.com/PlotPyStack/guidata/issues/97).
---
 pkgs/development/python-modules/guidata/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/guidata/default.nix b/pkgs/development/python-modules/guidata/default.nix
index bb6d80bdd483..bcd80b043b26 100644
--- a/pkgs/development/python-modules/guidata/default.nix
+++ b/pkgs/development/python-modules/guidata/default.nix
@@ -41,9 +41,6 @@ buildPythonPackage rec {
     hash = "sha256-iUfZX51Ef1PY7roy9ER8hG34BAhCLs3Sagoasd5BT3E=";
   };
 
-  # https://github.com/PlotPyStack/guidata/issues/97
-  disabled = pythonAtLeast "3.14";
-
   build-system = [
     setuptools
   ];

From ff05afeac806a96d953bb74d2828c4dcf53933a7 Mon Sep 17 00:00:00 2001
From: 0x-xnum <81901593+0x-xnum@users.noreply.github.com>
Date: Wed, 15 Jul 2026 18:23:00 +0300
Subject: [PATCH 169/172] qtkeychain: fix build by updating cmake flag for Qt6
 default

---
 pkgs/development/libraries/qtkeychain/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix
index 37025c587d20..0388ab1bec8f 100644
--- a/pkgs/development/libraries/qtkeychain/default.nix
+++ b/pkgs/development/libraries/qtkeychain/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   dontWrapQtApps = true;
 
   cmakeFlags = [
-    "-DBUILD_WITH_QT6=${if lib.versions.major qtbase.version == "6" then "ON" else "OFF"}"
+    "-DBUILD_WITH_QT5=${if lib.versions.major qtbase.version == "5" then "ON" else "OFF"}"
     "-DQT_TRANSLATIONS_DIR=share/qt/translations"
   ];
 

From bf9913fbaf1057e76df617f93fe34ae33dd4e484 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 15:39:07 +0000
Subject: [PATCH 170/172] zennotes-desktop: 2.13.2 -> 2.13.3

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

diff --git a/pkgs/by-name/ze/zennotes-desktop/package.nix b/pkgs/by-name/ze/zennotes-desktop/package.nix
index 2ec8888bca27..b153a483b5aa 100644
--- a/pkgs/by-name/ze/zennotes-desktop/package.nix
+++ b/pkgs/by-name/ze/zennotes-desktop/package.nix
@@ -13,14 +13,14 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "zennotes-desktop";
-  version = "2.13.2";
+  version = "2.13.3";
   npmDepsHash = "sha256-7dchbcGAZm+PlVsES76sYD9NOqeCulEKC7S0zLERvvY=";
 
   src = fetchFromGitHub {
     owner = "ZenNotes";
     repo = "zennotes";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wazp3v6fV0gBh4ASlinhmA6SnGDmBvRcWFEXbENQUII=";
+    hash = "sha256-9/fvHSUf0rWwljhN/Vqoui7ZdGL6nvN6svM8iwYQF7A=";
   };
 
   npmWorkspace = "apps/desktop";

From b330fd0cc43f3ffb44d72c20437b0c5927cdd7b2 Mon Sep 17 00:00:00 2001
From: Oleksii Filonenko <github@brightone.cloud>
Date: Wed, 15 Jul 2026 16:43:10 +0100
Subject: [PATCH 171/172] concord-tui: 2.4.0 -> 2.4.1

Diff: https://github.com/chojs23/concord/compare/v2.4.0...v2.4.1
---
 pkgs/by-name/co/concord-tui/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix
index 3ee01635380c..f2ea41311f2e 100644
--- a/pkgs/by-name/co/concord-tui/package.nix
+++ b/pkgs/by-name/co/concord-tui/package.nix
@@ -9,19 +9,20 @@
   stdenv,
   # TODO: Clean up on `staging`
   lld,
+  nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "concord-tui";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "chojs23";
     repo = "concord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/79Hq54qXWXLopPda6xiZ6892UpVoKXQad84QOXCTDM=";
+    hash = "sha256-3c5jxpJrBr6vYnbcJIYD06d932Da94hXUZA5FLa3kkU=";
   };
 
-  cargoHash = "sha256-Ihr4JM0hKEvJ9FMcQ5VPtemJjjPB5mXvAeDa4G0pGSo=";
+  cargoHash = "sha256-6iAyKsS+FoNCKkMvbL70vKSPoAaKQtUDiAQGaEMuxWk=";
 
   buildInputs = [
     opus
@@ -47,6 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}";
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Feature-rich TUI client for Discord, written in Rust";
     homepage = "https://github.com/chojs23/concord";

From 67c199eae839c0a8bb0f45377337e5bb140922e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Jul 2026 15:56:12 +0000
Subject: [PATCH 172/172] linuxKernel.kernels.linux_zen: 7.1.2 -> 7.1.3

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

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 147503fe1c30..6cbfffe22095 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -12,13 +12,13 @@ let
   # override options if they need using lib.mkForce (that has 50 priority)
   mkKernelOverride = lib.mkOverride 90;
 
-  suffix = "zen1";
+  suffix = "zen2";
 in
 
 buildLinux (
   args
   // rec {
-    version = "7.1.2";
+    version = "7.1.3";
     pname = "linux-zen";
     modDirVersion = lib.versions.pad 3 "${version}-${suffix}";
     isZen = true;
@@ -27,7 +27,7 @@ buildLinux (
       owner = "zen-kernel";
       repo = "zen-kernel";
       rev = "v${version}-${suffix}";
-      sha256 = "0d02lgwl0x415xrbznsldd7j1krpzlnbd2ciis3shz8zhmbhfg1f";
+      sha256 = "0af939wq8gfgwrb4s3jjbkqh2pn3zkgk1w48m0hf5fc0qi8ify8x";
     };
 
     # This is based on the following source: