From aa2ccac114986608f365207a587ed122dde5b4e0 Mon Sep 17 00:00:00 2001
From: Riccardo Sacchetto <rsacchetto@nexxontech.it>
Date: Fri, 18 Apr 2025 16:51:40 +0200
Subject: [PATCH 001/166] nixos/immersed: add option to open firewall ports

---
 nixos/modules/programs/immersed.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/programs/immersed.nix b/nixos/modules/programs/immersed.nix
index 0fb217b91d54..53c984c74c9f 100644
--- a/nixos/modules/programs/immersed.nix
+++ b/nixos/modules/programs/immersed.nix
@@ -26,6 +26,12 @@ in
     programs.immersed = {
       enable = lib.mkEnableOption "immersed";
 
+      openPorts = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        description = "Whether to open firewall ports for Immersed";
+      };
+
       package = lib.mkPackageOption pkgs "immersed" { };
     };
   };
@@ -43,6 +49,15 @@ in
     };
 
     environment.systemPackages = [ cfg.package ];
+
+    # https://immersed.helpscoutdocs.com/article/23-connection-troubleshooting-linux
+    networking.firewall = lib.mkIf cfg.openPorts {
+      allowedTCPPorts = [ 21000 ];
+      allowedUDPPorts = [
+        21000
+        21010
+      ];
+    };
   };
 
   meta.maintainers = pkgs.immersed.meta.maintainers;

From 2db0455735ed2f181ae83d551dbc6ac090b209cb Mon Sep 17 00:00:00 2001
From: Riccardo Sacchetto <rsacchetto@nexxontech.it>
Date: Fri, 18 Apr 2025 16:51:52 +0200
Subject: [PATCH 002/166] immersed: add libraries to support Intel hardware
 encoding

---
 pkgs/by-name/im/immersed/linux.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix
index dda4ed55adae..2a0b4a644e12 100644
--- a/pkgs/by-name/im/immersed/linux.nix
+++ b/pkgs/by-name/im/immersed/linux.nix
@@ -25,6 +25,13 @@ appimageTools.wrapAppImage {
 
   extraPkgs =
     pkgs: with pkgs; [
+      libva
+      # VAAPI backends
+      intel-media-driver
+      intel-vaapi-driver
+      nvidia-vaapi-driver
+      mesa
+      # Other dependencies
       libgpg-error
       fontconfig
       libGL

From c79c23b4ab3dccc9048327102214146abd7f984d Mon Sep 17 00:00:00 2001
From: Alessio Caiazza <code.git@caiazza.info>
Date: Wed, 16 Apr 2025 17:08:01 +0200
Subject: [PATCH 003/166] nixos/cloudlog: fix QSL image serving and assets
 management

This change enables Cloudlog to properly manage additional media and asset
files by making these directories writable, persistent, and available from the
web server.
---
 nixos/modules/services/web-apps/cloudlog.nix | 38 ++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix
index bec59aa779e1..c4cc12dbc611 100644
--- a/nixos/modules/services/web-apps/cloudlog.nix
+++ b/nixos/modules/services/web-apps/cloudlog.nix
@@ -62,17 +62,14 @@ let
       ln -s ${configFile} $out/application/config/config.php
       ln -s ${dbFile} $out/application/config/database.php
 
+      # make a copy of the original assets/json to prime the datadir
+      cp -a "$out/assets/json/" "$out/assets/json.original/"
+
       # link writable directories
-      for directory in updates uploads backup logbook; do
+      for directory in updates uploads backup logbook assets/qslcard images/eqsl_card_images assets/sstvimages assets/json; do
         rm -rf $out/$directory
         ln -s ${cfg.dataDir}/$directory $out/$directory
       done
-
-      # link writable asset files
-      for asset in dok sota wwff; do
-        rm -rf $out/assets/json/$asset.txt
-        ln -s ${cfg.dataDir}/assets/json/$asset.txt $out/assets/json/$asset.txt
-      done
     '';
   };
 in
@@ -503,13 +500,26 @@ in
           group = config.services.nginx.group;
         in
         [
-          "d ${cfg.dataDir}                0750 ${cfg.user} ${group} - -"
-          "d ${cfg.dataDir}/updates        0750 ${cfg.user} ${group} - -"
-          "d ${cfg.dataDir}/uploads        0750 ${cfg.user} ${group} - -"
-          "d ${cfg.dataDir}/backup         0750 ${cfg.user} ${group} - -"
-          "d ${cfg.dataDir}/logbook        0750 ${cfg.user} ${group} - -"
-          "d ${cfg.dataDir}/assets/json    0750 ${cfg.user} ${group} - -"
-          "d ${cfg.dataDir}/assets/qslcard 0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}                         0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/updates                 0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/uploads                 0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/backup                  0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/logbook                 0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/assets                  0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/assets/json             0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/assets/qslcard          0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/assets/sstvimages       0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/images                  0750 ${cfg.user} ${group} - -"
+          "d ${cfg.dataDir}/images/eqsl_card_images 0750 ${cfg.user} ${group} - -"
+          "C ${cfg.dataDir}/assets/json/dok.txt                              0640 ${cfg.user} ${group} - ${package}/assets/json.original/dok.txt"
+          "C ${cfg.dataDir}/assets/json/pota.txt                             0640 ${cfg.user} ${group} - ${package}/assets/json.original/pota.txt"
+          "C ${cfg.dataDir}/assets/json/satellite_data.json                  0640 ${cfg.user} ${group} - ${package}/assets/json.original/satellite_data.json"
+          "C ${cfg.dataDir}/assets/json/sota.txt                             0640 ${cfg.user} ${group} - ${package}/assets/json.original/sota.txt"
+          "C ${cfg.dataDir}/assets/json/US_counties.csv                      0640 ${cfg.user} ${group} - ${package}/assets/json.original/US_counties.csv"
+          "C ${cfg.dataDir}/assets/json/us_national_parksontheair.csv        0640 ${cfg.user} ${group} - ${package}/assets/json.original/us_national_parksontheair.csv"
+          "C ${cfg.dataDir}/assets/json/WABSquares.geojson                   0640 ${cfg.user} ${group} - ${package}/assets/json.original/WABSquares.geojson"
+          "C ${cfg.dataDir}/assets/json/wwff.txt                             0640 ${cfg.user} ${group} - ${package}/assets/json.original/wwff.txt"
+          "C+ ${cfg.dataDir}/assets/json/datatables_languages                0750 ${cfg.user} ${group} - ${package}/assets/json.original/datatables_languages"
         ];
     };
 

From d9acd4c9328ffc55776fee469010b5360ef7d7d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 5 May 2026 09:18:25 +0000
Subject: [PATCH 004/166] firezone-gateway: 1.4.18 -> 1.5.2

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

diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 0cd89a809b4c..e8031b677e6a 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "firezone-gateway";
-  version = "1.4.18";
+  version = "1.5.2";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gateway-${finalAttrs.version}";
-    hash = "sha256-vxOFca6yO9AvgIJwizhaNlOjOvV00+ckQfXIJ17ASq4=";
+    hash = "sha256-bfLPOhxv0xfnU3Q1zZWbhqvNe9Hav2RgF/ESMk81F4I=";
   };
 
-  cargoHash = "sha256-8YftVt72JpmxWB/WvOPpduE0/QgYvQhSuFRmsFth2iU=";
+  cargoHash = "sha256-oOJ/UkamQrlWjAz2A4oObdBssHH9iJWN2BHFgMPOxck=";
   sourceRoot = "${finalAttrs.src.name}/rust";
   buildAndTestSubdir = "gateway";
   env.RUSTFLAGS = "--cfg system_certs";

From 99d0d6055bf24306e5f2551ab0dcbde1f7da2156 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Mon, 18 May 2026 19:34:38 -0400
Subject: [PATCH 005/166] taisei: added philocalyst as maintainer

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

diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index cf60561951d0..be4169e16c7b 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -106,6 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       lambda-11235
       Gliczy
+      philocalyst
     ];
     platforms = lib.platforms.all;
   };

From d81d1a7fd6a6a6fa90184835badc7fd5d1dd25a2 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 9 Jun 2026 08:57:49 +0200
Subject: [PATCH 006/166] syncthing: set meta.donationPage

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

diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix
index de32f29866a9..10a7cdad4b3a 100644
--- a/pkgs/by-name/sy/syncthing/package.nix
+++ b/pkgs/by-name/sy/syncthing/package.nix
@@ -114,6 +114,7 @@ buildGoModule (finalAttrs: {
   meta = {
     homepage = "https://syncthing.net/";
     description = "Open Source Continuous File Synchronization";
+    donationPage = "https://syncthing.net/donations/";
     changelog = "https://github.com/syncthing/syncthing/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [

From 439e1a48e981691121c07b15602349f796a41df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Mon, 18 May 2026 19:34:46 -0400
Subject: [PATCH 007/166] taisei: added changelog

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

diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index be4169e16c7b..c873c6be0235 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -109,5 +109,6 @@ stdenv.mkDerivation (finalAttrs: {
       philocalyst
     ];
     platforms = lib.platforms.all;
+    changelog = "https://github.com/taisei-project/taisei/releases/tag/${finalAttrs.src.tag}";
   };
 })

From ac6d3384c55f78c45d819ada9f5e92c84ef89601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9D=91=B7=F0=9D=92=89=F0=9D=92=8A=F0=9D=92=8D?=
 =?UTF-8?q?=F0=9D=92=90=F0=9D=92=84=F0=9D=92=82=F0=9D=92=8D=F0=9D=92=9A?=
 =?UTF-8?q?=F0=9D=92=94=F0=9D=92=95?= <regime_skylark.0y@icloud.com>
Date: Mon, 18 May 2026 19:34:55 -0400
Subject: [PATCH 008/166] taisei: fix darwin build

---
 pkgs/by-name/ta/taisei/package.nix | 57 +++++++++++++++++++++---------
 1 file changed, 40 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ta/taisei/package.nix b/pkgs/by-name/ta/taisei/package.nix
index c873c6be0235..76230234dad5 100644
--- a/pkgs/by-name/ta/taisei/package.nix
+++ b/pkgs/by-name/ta/taisei/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+
   # Build depends
   docutils,
   meson,
@@ -13,10 +14,14 @@
   gamemode,
   shaderc,
   makeWrapper,
+  cmake,
+  mimalloc,
+  glslang,
+  libogg,
+  makeBinaryWrapper,
+
   # Runtime depends
-  glfw,
   sdl3,
-  SDL2_mixer,
   cglm,
   freetype,
   libpng,
@@ -24,10 +29,10 @@
   zlib,
   zstd,
   spirv-cross,
-  mimalloc,
 
   gamemodeSupport ? stdenv.hostPlatform.isLinux,
 }:
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "taisei";
   version = "1.4.4";
@@ -49,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.zstandard
     shaderc
     makeWrapper
+    makeBinaryWrapper
+    cmake
   ];
 
   buildInputs = [
-    glfw
     sdl3
-    SDL2_mixer
     cglm
     freetype
     libpng
@@ -63,30 +68,48 @@ stdenv.mkDerivation (finalAttrs: {
     zstd
     opusfile
     openssl
-    spirv-cross
     mimalloc
+    libogg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    glslang
+    spirv-cross
   ]
   ++ lib.optional gamemodeSupport gamemode;
 
+  # Forced to use builtin-sincos because the symbol isn't available otherwise
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin " -Dsincos=__builtin_sincos";
+
   mesonFlags = [
-    (lib.mesonBool "b_lto" false)
-    (lib.mesonEnable "install_macos_bundle" false)
-    (lib.mesonEnable "install_relocatable" false)
-    (lib.mesonEnable "shader_transpiler" false)
-    (lib.mesonEnable "shader_transpiler_dxbc" false)
-    (lib.mesonEnable "gamemode" gamemodeSupport)
-    (lib.mesonEnable "package_data" false)
     (lib.mesonEnable "vfs_zip" false)
+    (lib.mesonEnable "shader_transpiler_dxbc" false)
+    (lib.mesonEnable "package_data" false)
+    (lib.mesonBool "b_lto" false)
+    (lib.mesonEnable "gamemode" gamemodeSupport)
+    (lib.mesonEnable "install_freedesktop" stdenv.hostPlatform.isLinux)
+    (lib.mesonEnable "install_macos_bundle" stdenv.hostPlatform.isDarwin)
+    (lib.mesonEnable "install_relocatable" stdenv.hostPlatform.isDarwin)
+    (lib.mesonEnable "shader_transpiler" stdenv.hostPlatform.isDarwin)
   ];
 
   preConfigure = ''
     patchShebangs .
   '';
 
-  postInstall = lib.optionalString gamemodeSupport ''
-    wrapProgram $out/bin/taisei \
-      --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ gamemode ]}
-  '';
+  postInstall =
+    lib.optionalString (stdenv.hostPlatform.isLinux && gamemodeSupport) ''
+      wrapProgram $out/bin/taisei \
+        --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gamemode ]}"
+    ''
+    +
+
+      lib.optionalString stdenv.hostPlatform.isDarwin ''
+        mkdir -p $out/Applications $out/bin
+
+        mv $out/Taisei.app $out/Applications/
+        # regular symlink will fail here due to resources being missed
+        makeBinaryWrapper $out/Applications/Taisei.app/Contents/MacOS/Taisei $out/bin/taisei
+      '';
 
   strictDeps = true;
 

From d528156e993c28b0c24d5079628e2d0ea2d9b5ed Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 21 Jun 2026 18:09:01 +0200
Subject: [PATCH 009/166] mysql84: 8.4.9 -> 8.4.10

https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-10.html

Fixes CVE-2026-46863.
---
 pkgs/by-name/my/mysql84/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index 5eed4c7b57f0..b5c7391048a7 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.4.9";
+  version = "8.4.10";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5KqLOeQtH+B48zu9c2lfrCtU28e7E38L2+Y/e+GgLWs=";
+    hash = "sha256-1XpnMLrvFK4Rj39KbgKEW1tQkzdY32H7BuEE8nzMj5Y=";
   };
 
   nativeBuildInputs = [

From 7b8af507305fc4665d8244b2d1521261eabe1c3d Mon Sep 17 00:00:00 2001
From: "ken.huang1" <ken.huang1@ecoflow.com>
Date: Wed, 24 Jun 2026 16:12:25 +0800
Subject: [PATCH 010/166] snipaste: 2.10.8 -> 2.11.3

https://www.snipaste.com/linux_version
---
 pkgs/by-name/sn/snipaste/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix
index d263602fad1e..ef3f7c16cd09 100644
--- a/pkgs/by-name/sn/snipaste/package.nix
+++ b/pkgs/by-name/sn/snipaste/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "snipaste";
-  version = "2.10.8";
+  version = "2.11.3";
   src = fetchurl {
     url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage";
-    hash = "sha256-Ieitxc1HPjqBpf7/rREKca+U0srE+q/s8mz+9Vhczk0=";
+    hash = "sha256-6ARv8gRbZoul+sbXc9g3MTE6TwC6FxFHxvoaE4UkAzQ=";
   };
   contents = appimageTools.extract { inherit pname version src; };
 in

From a39323f036800d4f40fb6b78e388716b6bb1fbc2 Mon Sep 17 00:00:00 2001
From: kenis <1836362346@qq.com>
Date: Wed, 24 Jun 2026 16:38:45 +0800
Subject: [PATCH 011/166] snipaste: add macOS support

---
 pkgs/by-name/sn/snipaste/package.nix | 88 +++++++++++++++++++++-------
 pkgs/by-name/sn/snipaste/sources.nix | 23 ++++++++
 pkgs/by-name/sn/snipaste/update.sh   | 59 +++++++++++++++----
 3 files changed, 139 insertions(+), 31 deletions(-)
 create mode 100644 pkgs/by-name/sn/snipaste/sources.nix

diff --git a/pkgs/by-name/sn/snipaste/package.nix b/pkgs/by-name/sn/snipaste/package.nix
index ef3f7c16cd09..cd2a8efd0ecf 100644
--- a/pkgs/by-name/sn/snipaste/package.nix
+++ b/pkgs/by-name/sn/snipaste/package.nix
@@ -2,26 +2,23 @@
   appimageTools,
   lib,
   fetchurl,
+  stdenv,
+  stdenvNoCC,
+  undmg,
+  makeWrapper,
 }:
-let
-  pname = "snipaste";
-  version = "2.11.3";
-  src = fetchurl {
-    url = "https://download.snipaste.com/archives/Snipaste-${version}-x86_64.AppImage";
-    hash = "sha256-6ARv8gRbZoul+sbXc9g3MTE6TwC6FxFHxvoaE4UkAzQ=";
-  };
-  contents = appimageTools.extract { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-  passthru.updateScript = ./update.sh;
 
-  extraInstallCommands = ''
-    install -d $out/share/{applications,icons}
-    cp ${contents}/usr/share/applications/*.desktop -t $out/share/applications/
-    cp -r ${contents}/usr/share/icons/* -t $out/share/icons/
-    substituteInPlace $out/share/applications/*.desktop --replace-warn 'Exec=Snipaste' 'Exec=${pname}'
-  '';
+let
+  sources = import ./sources.nix { inherit fetchurl; };
+  source =
+    sources.${stdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  pname = "snipaste";
+  inherit (source) version src;
+
+  passthru = {
+    updateScript = ./update.sh;
+  };
 
   meta = {
     description = "Screenshot tools";
@@ -32,7 +29,58 @@ appimageTools.wrapType2 {
       ltrump
     ];
     mainProgram = "snipaste";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+      "x86_64-linux"
+    ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+in
+if stdenv.hostPlatform.isDarwin then
+  stdenvNoCC.mkDerivation {
+    inherit
+      pname
+      version
+      src
+      passthru
+      meta
+      ;
+
+    nativeBuildInputs = [
+      undmg
+      makeWrapper
+    ];
+
+    sourceRoot = ".";
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications $out/bin
+      cp -R Snipaste.app $out/Applications
+      makeWrapper $out/Applications/Snipaste.app/Contents/MacOS/Snipaste $out/bin/snipaste
+
+      runHook postInstall
+    '';
+  }
+else
+  let
+    contents = appimageTools.extract { inherit pname version src; };
+  in
+  appimageTools.wrapType2 {
+    inherit
+      pname
+      version
+      src
+      passthru
+      meta
+      ;
+
+    extraInstallCommands = ''
+      install -d $out/share/{applications,icons}
+      install -m 444 ${contents}/Snipaste.desktop $out/share/applications/${pname}.desktop
+      cp -r ${contents}/usr/share/icons/* -t $out/share/icons/
+      substituteInPlace $out/share/applications/${pname}.desktop --replace-warn 'Exec=Snipaste' 'Exec=${pname}'
+    '';
+  }
diff --git a/pkgs/by-name/sn/snipaste/sources.nix b/pkgs/by-name/sn/snipaste/sources.nix
new file mode 100644
index 000000000000..fd43d746efdc
--- /dev/null
+++ b/pkgs/by-name/sn/snipaste/sources.nix
@@ -0,0 +1,23 @@
+# Generated by ./update.sh - do not update manually!
+# Last updated: 2026-06-20
+{ fetchurl }:
+let
+  any-darwin = {
+    version = "2.11.3";
+    src = fetchurl {
+      url = "https://download.snipaste.com/archives/Snipaste-2.11.3.dmg";
+      hash = "sha256-oih4OIieexc0pl2VK65e9/R5vcFj0MMb6RhZvKEg/T4=";
+    };
+  };
+in
+{
+  aarch64-darwin = any-darwin;
+  x86_64-darwin = any-darwin;
+  x86_64-linux = {
+    version = "2.11.3";
+    src = fetchurl {
+      url = "https://download.snipaste.com/archives/Snipaste-2.11.3-x86_64.AppImage";
+      hash = "sha256-6ARv8gRbZoul+sbXc9g3MTE6TwC6FxFHxvoaE4UkAzQ=";
+    };
+  };
+}
diff --git a/pkgs/by-name/sn/snipaste/update.sh b/pkgs/by-name/sn/snipaste/update.sh
index 1c6843fe6839..114574e3732d 100755
--- a/pkgs/by-name/sn/snipaste/update.sh
+++ b/pkgs/by-name/sn/snipaste/update.sh
@@ -1,15 +1,52 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p bash curl coreutils jq common-updater-scripts
+#!nix-shell -i bash -p bash curl coreutils jq nix
 
-latestTag=$(curl -sSfL https://www.snipaste.com/linux_version | jq -r ".subject")
-latestVersion="$(expr "$latestTag" : 'v\(.*\)')"
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; snipaste.version" | tr -d '"')
+set -euo pipefail
 
-if [[ "$latestVersion" == "$currentVersion" ]]; then
-    echo "package is up-to-date"
-    exit 0
-fi
+cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
 
-prefetch=$(nix-prefetch-url "https://download.snipaste.com/archives/Snipaste-$latestVersion-x86_64.AppImage")
-hash=$(nix-hash --type sha256 --to-sri "$prefetch")
-update-source-version snipaste "$latestVersion" "$hash" --ignore-same-version
+linux_version=$(
+  curl -sSfL https://www.snipaste.com/linux_version \
+    | jq -r '.subject' \
+    | sed 's/^v//'
+)
+mac_version=$(
+  curl -sSfL https://www.snipaste.com/mac_version \
+    | jq -r '.subject' \
+    | sed 's/^v//'
+)
+
+linux_url="https://download.snipaste.com/archives/Snipaste-${linux_version}-x86_64.AppImage"
+mac_url="https://download.snipaste.com/archives/Snipaste-${mac_version}.dmg"
+
+linux_hash=$(nix-prefetch-url "$linux_url")
+mac_hash=$(nix-prefetch-url "$mac_url")
+
+linux_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$linux_hash")
+mac_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$mac_hash")
+
+cat >sources.nix <<EOF
+# Generated by ./update.sh - do not update manually!
+# Last updated: $(date +%F)
+{ fetchurl }:
+let
+  any-darwin = {
+    version = "$mac_version";
+    src = fetchurl {
+      url = "$mac_url";
+      hash = "$mac_hash";
+    };
+  };
+in
+{
+  aarch64-darwin = any-darwin;
+  x86_64-darwin = any-darwin;
+  x86_64-linux = {
+    version = "$linux_version";
+    src = fetchurl {
+      url = "$linux_url";
+      hash = "$linux_hash";
+    };
+  };
+}
+EOF

From 4a9210e1ec3ec2a8d2eab06c7d5e38b1a060a536 Mon Sep 17 00:00:00 2001
From: cinereal <cinereal@riseup.net>
Date: Thu, 18 Jun 2026 16:38:49 +0200
Subject: [PATCH 012/166] nixos/tests: add nspawn-daemon-reexec-dbus repro

Loops `systemctl daemon-reexec` inside a systemd-nspawn test container and
asserts the in-container D-Bus stays usable afterwards. On affected systemd
under nspawn, one of the re-execs wedges PID 1 (it never finishes
re-initialising after the re-exec), and every later `systemctl` call hangs or
returns 'Transport endpoint is not connected'. The identical loop on a QEMU
node survives indefinitely, so the test is nspawn-specific.

Assisted-by: Claude:claude-opus-4-8
---
 nixos/tests/all-tests.nix                 |  1 +
 nixos/tests/nspawn-daemon-reexec-dbus.nix | 79 +++++++++++++++++++++++
 2 files changed, 80 insertions(+)
 create mode 100644 nixos/tests/nspawn-daemon-reexec-dbus.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 5b17b838e343..650dd7205eec 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -152,6 +152,7 @@ in
     ssh-backdoor = runTestOn [ "x86_64-linux" ] ./nixos-test-driver/ssh-backdoor.nix;
     console-log = runTest ./nixos-test-driver/console-log.nix;
     containers = runTest ./nixos-test-driver/containers.nix;
+    nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix;
     skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix;
     options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; };
     driver-timeout =
diff --git a/nixos/tests/nspawn-daemon-reexec-dbus.nix b/nixos/tests/nspawn-daemon-reexec-dbus.nix
new file mode 100644
index 000000000000..115deb778bb5
--- /dev/null
+++ b/nixos/tests/nspawn-daemon-reexec-dbus.nix
@@ -0,0 +1,79 @@
+# Regression test for an nspawn-only systemd re-exec failure that broke D-Bus.
+#
+# Demonstrates `systemctl show` keeps working on `daemon-reexec`.
+#
+# Trigger: `systemctl daemon-reexec` issues a D-Bus `Manager.Reexecute`, like
+# `switch-to-configuration-ng` on a systemd package change.
+#
+# Root cause: inside nspawn test containers PID 1 re-send `READY=1` on the
+# `NOTIFY_SOCKET` on re-exec. The test driver stopped draining that socket
+# after boot, so until drained its receive buffer filled and `systemctl` hung /
+# errored `Failed to connect to bus: Transport endpoint is not connected`.
+{ ... }:
+{
+  name = "nspawn-daemon-reexec-dbus";
+
+  # `containers.<name>` => systemd-nspawn machine (vs `nodes.<name>` => QEMU).
+  # An empty container boots full systemd + D-Bus, which is all we need.
+  containers.machine = { };
+
+  testScript = # python
+    ''
+      import re
+
+      BUS_BROKEN = re.compile(
+          r"Transport endpoint is not connected|Failed to connect to bus"
+      )
+
+      # Without the fix the notify socket's receive buffer fills after 10
+      # undrained `READY=1` resends, so PID 1 blocks then.
+      REEXECS = 10
+
+
+      def bus_broken():
+          """Whether the in-container D-Bus is unusable. A broken bus prints a
+          transport error or hangs until `timeout` kills it (status 124); both
+          count as broken."""
+          status, out = machine.execute(
+              "timeout 10 systemctl show -p ActiveState --value "
+              "multi-user.target 2>&1",
+              check_return=False,
+              timeout=20,
+          )
+          return status != 0 or bool(BUS_BROKEN.search(out)), status, out
+
+
+      machine.start()
+      machine.wait_for_unit("multi-user.target", timeout=120)
+
+      # Pre-reexec sanity: the bus works and shows no break.
+      broken, status, out = bus_broken()
+      assert not broken, (
+          f"bus already broken before any reexec: status={status} out={out!r}"
+      )
+      machine.log(f"pre-reexec sanity OK: {out.strip()!r}")
+
+      broke_at = None
+      for i in range(1, REEXECS + 1):
+          # The same D-Bus Manager.Reexecute that switch-to-configuration issues
+          # on a systemd change.
+          machine.execute(
+              "timeout 30 systemctl daemon-reexec",
+              check_return=False,
+              timeout=45,
+          )
+          broken, status, out = bus_broken()
+          machine.log(f"[reexec {i}] status={status} out={out.strip()!r}")
+          if broken:
+              broke_at = i
+              break
+
+      assert broke_at is None, (
+          f"nspawn D-Bus broke after daemon-reexec #{broke_at} of {REEXECS} "
+          "(systemctl hung or returned a bus transport error). The re-exec'd "
+          "PID 1 never finished re-initialising -- the test driver stopped "
+          "draining the notify socket, so PID 1's READY=1 resend blocked. "
+          "Never observed on QEMU."
+      )
+    '';
+}

From be55bcfa502f48488fe865b7be10c63921f9c7a4 Mon Sep 17 00:00:00 2001
From: cinereal <cinereal@riseup.net>
Date: Thu, 18 Jun 2026 17:13:38 +0200
Subject: [PATCH 013/166] nixos/test-driver: keep nspawn notify socket drained
 after boot

The nspawn test machine passes a driver-owned AF_UNIX SOCK_DGRAM socket as the
container's NOTIFY_SOCKET (systemd-nspawn --notify-ready=yes). The driver only
drained it while waiting for the initial READY=1 during boot.

A container's PID 1 re-sends READY=1 on every `systemctl daemon-reexec` (the
same Manager.Reexecute that switch-to-configuration issues whenever the systemd
package changed). With nothing draining the socket after boot, its receive
buffer fills and PID 1 blocks in sendmsg() to NOTIFY_SOCKET (wchan
unix_wait_for_peer) while re-executing, so it never finishes re-initializing.
From then on every in-container `systemctl` call hangs or fails with
'Transport endpoint is not connected', which hangs wait_for_unit /
switch-to-configuration for the full timeout. QEMU nodes have no such notify
socket and are unaffected.

Drain the notify socket in a dedicated daemon thread for the container's whole
lifetime so PID 1 never blocks on the re-exec READY=1 send. Readiness and the
leader PID are now read from that thread's state instead of polling the socket
inline during boot.

Assisted-by: Claude:claude-opus-4-8
---
 .../src/test_driver/machine/__init__.py       | 98 +++++++++++++------
 1 file changed, 67 insertions(+), 31 deletions(-)

diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
index db96445af912..60410ea405e6 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
@@ -1446,6 +1446,7 @@ class NspawnMachine(BaseMachine):
 
     machine_sock_path: Path
     machine_sock: socket.socket | None
+    notify_thread: threading.Thread | None
 
     @staticmethod
     def machine_name_from_start_command(start_command: str) -> str:
@@ -1476,6 +1477,12 @@ class NspawnMachine(BaseMachine):
 
         self.start_command = start_command
         self.process = None
+        self.notify_thread = None
+        # State maintained by the notify-socket drainer thread (see
+        # `_drain_notify_socket`). Guarded by `_notify_lock`.
+        self._notify_lock = threading.Lock()
+        self._notify_ready = False
+        self._notify_leader_pid: int | None = None
 
         self.machine_sock_path = self.tmp_dir / f"{self.name}-nspawn.sock"
 
@@ -1510,43 +1517,76 @@ class NspawnMachine(BaseMachine):
     def is_up(self) -> bool:
         return self.process is not None
 
-    def _poll_socket(self) -> tuple[bool, int | None]:
-        """Non-blocking check of container status via socket.
-        Returns (is_ready, leader_pid).
+    def _drain_notify_socket(self) -> None:
+        """Continuously drain the container's `sd_notify` socket (NOTIFY_SOCKET)
+        for the whole lifetime of the container, recording readiness and the
+        leader PID as they arrive.
+
+        Draining must not stop after boot: the container's PID 1 re-sends
+        `READY=1` on every `systemctl daemon-reexec` (the same Manager.Reexecute
+        that switch-to-configuration issues on a systemd change). If nothing
+        reads the socket, its receive buffer fills and PID 1 blocks in
+        `sendmsg()` to NOTIFY_SOCKET while re-executing -- it never finishes
+        re-initializing, and every later `systemctl` call inside the container
+        hangs or fails with `Transport endpoint is not connected`.
         """
         assert self.machine_sock is not None
-        ready = False
-        leader_pid = None
-        try:
-            data, _ = self.machine_sock.recvfrom(4096)
-            msg = data.decode()
-            for line in msg.splitlines():
+        sock = self.machine_sock
+        proc = self.process
+        assert proc is not None
+        # Bound the thread to the container's lifetime: on
+        # `wait_for_shutdown()` only non-None `proc.poll()` ends the loop.
+        # On exit of PID 1, any datagrams still queued are stale, so drop them.
+        while proc.poll() is None:
+            try:
+                # Block (with a timeout so we notice the container exiting)
+                # rather than busy-poll; we just need to keep the buffer empty.
+                sock.settimeout(0.5)
+                data, _ = sock.recvfrom(4096)
+            except (TimeoutError, BlockingIOError):
+                continue
+            except OSError:
+                break
+            ready = False
+            leader_pid = None
+            for line in data.decode(errors="replace").splitlines():
                 if line == "READY=1":
                     ready = True
                 if line.startswith("X_NSPAWN_LEADER_PID="):
                     leader_pid = int(line.split("=")[1])
-        except OSError:
-            pass
-        return ready, leader_pid
+            if ready or leader_pid is not None:
+                with self._notify_lock:
+                    if ready:
+                        self._notify_ready = True
+                    if leader_pid is not None:
+                        self._notify_leader_pid = leader_pid
 
     @cached_property
     def get_systemd_process(self) -> int:
-        """Block until startup is complete and return the PID of the container's systemd process."""
-        assert self.process is not None
+        """Block until startup is complete and return the PID of the container's systemd process.
 
-        container_pid: int | None = None
-        is_ready = False
+        Readiness and the leader PID are reported over NOTIFY_SOCKET, which is
+        drained by `_drain_notify_socket` (started in `start()`); we just wait
+        for that thread to record both.
+        """
+        assert self.process is not None
 
         start_time = time.monotonic()
         last_warning = start_time
         delay = 0.01
         max_delay = 0.5
 
-        while not is_ready or container_pid is None:
-            # Poll the socket until we have the container leader PID
+        # Poll the socket until we have the container leader PID
+        while True:
             if self.process.poll() is not None:
                 raise MachineError("systemd-nspawn process exited unexpectedly")
 
+            with self._notify_lock:
+                is_ready = self._notify_ready
+                container_pid = self._notify_leader_pid
+            if is_ready and container_pid is not None:
+                return container_pid
+
             # Print periodic warnings every 10s so the user knows we aren't deadlocked
             now = time.monotonic()
             if now - last_warning > 10.0:
@@ -1555,18 +1595,8 @@ class NspawnMachine(BaseMachine):
                 )
                 last_warning = now
 
-            # Poll and update our local tracking variables
-            ready_now, pid_now = self._poll_socket()
-            if ready_now:
-                is_ready = True
-            if pid_now:
-                container_pid = pid_now
-
-            if not (is_ready and container_pid):
-                time.sleep(delay)
-                delay = min(delay * 2, max_delay)
-
-        return container_pid
+            time.sleep(delay)
+            delay = min(delay * 2, max_delay)
 
     def _execute(
         self,
@@ -1680,7 +1710,6 @@ class NspawnMachine(BaseMachine):
 
         self.machine_sock = socket.socket(family=socket.AF_UNIX, type=socket.SOCK_DGRAM)
         self.machine_sock.bind(str(self.machine_sock_path))
-        self.machine_sock.setblocking(False)
 
         self.process = subprocess.Popen(
             [self.start_command],
@@ -1695,6 +1724,13 @@ class NspawnMachine(BaseMachine):
 
         self.log(f"systemd-nspawn running (pid {self.process.pid})")
 
+        # Keep the notify socket drained for the container's whole lifetime, so
+        # PID 1 never blocks re-sending `READY=1` on `daemon-reexec`.
+        self.notify_thread = threading.Thread(
+            target=self._drain_notify_socket, daemon=True
+        )
+        self.notify_thread.start()
+
         journal_thread = threading.Thread(target=self._stream_journal, daemon=True)
         journal_thread.start()
 

From fb6701387038bae58d90d02cfb3238413f66f758 Mon Sep 17 00:00:00 2001
From: Markus Wamser <github-dev@mail2013.wamser.eu>
Date: Fri, 26 Jun 2026 09:09:22 +0200
Subject: [PATCH 014/166] rmapi: add wamserma to maintainers

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

diff --git a/pkgs/by-name/rm/rmapi/package.nix b/pkgs/by-name/rm/rmapi/package.nix
index 3aeeab18f490..27d86cea7ae8 100644
--- a/pkgs/by-name/rm/rmapi/package.nix
+++ b/pkgs/by-name/rm/rmapi/package.nix
@@ -27,6 +27,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       nickhu
       boltzmannrain
+      wamserma
     ];
     mainProgram = "rmapi";
   };

From b9706678acce74193a751fd54b5b30dfe23048a1 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 24 Jun 2026 23:59:16 +0200
Subject: [PATCH 015/166] nixos/test-driver: deprecate shell_interact()

Reviewing #512771 got me thinking and I'm not sure I see a good reason
to keep this method given the SSH backdoor functionality has a much
better UX.

I'd propose we deprecate it, await 26.11 to see if people complain and
remove it alltogether after that.
---
 .../development/running-nixos-tests-interactively.section.md | 5 +++++
 nixos/doc/manual/release-notes/rl-2611.section.md            | 2 ++
 nixos/lib/test-driver/src/test_driver/machine/__init__.py    | 1 +
 3 files changed, 8 insertions(+)

diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
index 121abd51c804..78df8d3d77c7 100644
--- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
+++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md
@@ -43,6 +43,11 @@ test script).
 
 ## Shell access to VMs in interactive mode {#sec-nixos-test-shell-access}
 
+::: {.warning}
+Using `shell_interact()` is deprecated. Use the
+[interactive SSH backdoor](#sec-nixos-test-ssh-access) instead.
+:::
+
 The function `<yourmachine>.shell_interact()` grants access to a shell running
 inside a virtual machine. To use it, replace `<yourmachine>` with the name of a
 virtual machine defined in the test, for example: `machine.shell_interact()`.
diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index b06f3e9cdfaf..e74dd9ca6f69 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -56,6 +56,8 @@
 
 - `komodo` has been updated to the v2 release line (2.x). See the [upstream v1 → v2 upgrade guide](https://github.com/moghtech/komodo/releases/tag/v2.0.0).
 
+- The `shell_interact()` function on interactive runs of NixOS VM tests has been deprecated. Use the SSH backdoor instead.
+
 - `security.run0.enableSudoAlias` now uses the `run0-sudo-shim` instead of a shell-script to improve compatibility.
 
 - `security.run0.persistentAuth` options have been added to support persistent Authentication of session. Timeout configurable via `security.polkit.settings.Polkitd.ExpirationSeconds`.
diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
index 00876b0e7d1b..84eee2abb0f4 100644
--- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py
@@ -908,6 +908,7 @@ class QemuMachine(BaseMachine):
 
         return (rc, output.decode(errors="replace"))
 
+    @warnings.deprecated("Use the SSH backdoor instead")
     def shell_interact(self, address: str | None = None) -> None:
         """
         Allows you to directly interact with the guest shell. This should

From 59249b1624ac872f2dc3ffa05e9f48728747f3fc Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 25 Jun 2026 00:23:32 +0200
Subject: [PATCH 016/166] nixos/test-driver: show deprecation warnings in the
 REPL

Apparently this wasn't the case before, but now it is

    In [3]: machine.shell_interact()
    ??? Warning (DeprecationWarning): Use the SSH backdoor instead
        File "<ipython-input-3-4e72ea6a987e>", line 1
---
 nixos/lib/test-driver/src/test_driver/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py
index 62c2a6073e6c..774f3afdf49e 100644
--- a/nixos/lib/test-driver/src/test_driver/__init__.py
+++ b/nixos/lib/test-driver/src/test_driver/__init__.py
@@ -6,6 +6,7 @@ import warnings
 from pathlib import Path
 
 import ptpython.ipython
+import ptpython.repl
 from colorama import Fore, Style
 
 from test_driver.debug import Debug, DebugAbstract, DebugNop
@@ -174,6 +175,7 @@ def main() -> None:
         if args.interactive:
             history_dir = os.getcwd()
             history_path = os.path.join(history_dir, ".nixos-test-history")
+            ptpython.repl.enable_deprecation_warnings()
             ptpython.ipython.embed(
                 user_ns=driver.test_symbols(),
                 history_filename=history_path,

From b11d66d8379d054a0681c2ca77ebecc8d0cb7efc Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sat, 27 Jun 2026 19:24:05 +0200
Subject: [PATCH 017/166] ty: 0.0.54 -> 0.0.55

Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.55
Diff: https://github.com/astral-sh/ty/compare/0.0.54...0.0.55
---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 187daf164c61..6d4be58be411 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -17,7 +17,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.54";
+  version = "0.0.55";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-hbVH0dCUHkWKD9IG/CYhYI4TfLgpk++tPOkCD36eVSg=";
+    hash = "sha256-0SHjKIoswdpE3UmW9JeufrMptGfqnOJoxjMZp9VUCKo=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-Bf6nsUnNMYapP0YN0SBkTPoP1czmj35tPwN1awyKhUw=";
+  cargoHash = "sha256-lnrfdfPJe2itf8OO1AmoZj3i6UoZMFvJKIqeD6xWhzU=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];

From 2594192c4c3ca52408c53cf6a04e8188b7b955b5 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 28 Jun 2026 09:20:45 +1000
Subject: [PATCH 018/166] linux_7_0: remove

EOL
---
 pkgs/os-specific/linux/kernel/kernels-org.json |  5 -----
 pkgs/top-level/linux-kernels.nix               | 11 ++---------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 1850e03a312b..1de49c6be741 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -34,11 +34,6 @@
         "hash": "sha256:0maj2ap1m09bxl6a3g9wc65h9sdr6y8rwc5qcqlbavb4wq0d4g58",
         "lts": true
     },
-    "7.0": {
-        "version": "7.0.14",
-        "hash": "sha256:160ggaq9rh50a39gz02fpia8maq85bwxhqlwsc03yafjhjvrk6fy",
-        "lts": false
-    },
     "7.1": {
         "version": "7.1.2",
         "hash": "sha256:0gw8nnq6nix9xk2dhb1jwmhnqjayrn3bn2akzg4lgqkvfa9qq69p",
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index ccd896e616ee..e6ca68d1640b 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -92,14 +92,6 @@ in
           ];
         };
 
-        linux_7_0 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "7.0";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_7_1 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "7.1";
           kernelPatches = [
@@ -175,6 +167,7 @@ in
         linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream";
         linux_6_17 = throw "linux 6.17 was removed because it has reached its end of life upstream";
         linux_6_19 = throw "linux 6.19 was removed because it has reached its end of life upstream";
+        linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream";
 
         linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
         linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
@@ -674,7 +667,6 @@ in
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
     linux_6_18 = recurseIntoAttrs (packagesFor kernels.linux_6_18);
-    linux_7_0 = recurseIntoAttrs (packagesFor kernels.linux_7_0);
     linux_7_1 = recurseIntoAttrs (packagesFor kernels.linux_7_1);
   }
   // lib.optionalAttrs config.allowAliases {
@@ -689,6 +681,7 @@ in
     linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22
     linux_6_17 = throw "linux 6.17 was removed because it reached its end of life upstream"; # Added 2025-12-22
     linux_6_19 = throw "linux 6.19 was removed because it reached its end of life upstream"; # Added 2026-04-23
+    linux_7_0 = throw "linux 7.0 was removed because it has reached its end of life upstream"; # Added 2026-06-27
   };
 
   rpiPackages = {

From 2a663a3c3a403299de66c77c4d2b87fbef7b0f5e Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Mon, 29 Jun 2026 22:10:23 +1200
Subject: [PATCH 019/166] wrangler: fix build on darwin

---
 pkgs/by-name/wr/wrangler/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/wr/wrangler/package.nix b/pkgs/by-name/wr/wrangler/package.nix
index 484794806ed1..131cc4fcc2b0 100644
--- a/pkgs/by-name/wr/wrangler/package.nix
+++ b/pkgs/by-name/wr/wrangler/package.nix
@@ -16,6 +16,7 @@
   moreutils,
   nix-update-script,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wrangler";
@@ -119,7 +120,9 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [
     versionCheckHook
+    writableTmpDirAsHomeHook
   ];
+  versionCheckKeepEnvironment = [ "HOME" ];
 
   preFixup = ''
     # fixupPhase spends a lot of time trying to strip text files, which is especially slow on Darwin

From f88c48642903be5a959de1584c13ba49cf3cf3e7 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 30 Jun 2026 09:41:59 -0500
Subject: [PATCH 020/166] tree-sitter: make tree-sitter-grammars an overridable
 scope
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pkgs.tree-sitter-grammars was a flat recurseIntoAttrs of builtGrammars. Point it at the existing grammarsScope so it carries .overrideScope, and add grammar-only views to that scope — derivations (attrset), allGrammars (non-broken list), and withPlugins — so it stays iterable alongside the package-set helpers. builtGrammars remains the stock, non-overridden set.
---
 pkgs/by-name/tr/tree-sitter/package.nix | 58 +++++++++++++++----------
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/tr/tree-sitter/package.nix b/pkgs/by-name/tr/tree-sitter/package.nix
index cc4522b35f21..7ed95889f5d2 100644
--- a/pkgs/by-name/tr/tree-sitter/package.nix
+++ b/pkgs/by-name/tr/tree-sitter/package.nix
@@ -75,26 +75,12 @@ let
   */
   builtGrammars = lib.mapAttrs (_: lib.makeOverridable buildGrammar) grammars;
 
-  /**
-    # Extensible package set for tree-sitter grammars.
-    # Provides .override and .extend for customization.
-    # Note: Use builtGrammars (not this) when iterating over grammars,
-    # as this includes package set functions alongside derivations
-  */
-  grammarsScope = lib.makeScope newScope (self: builtGrammars);
+  grammarDerivationsFrom = lib.filterAttrs (
+    name: value: lib.hasPrefix "tree-sitter-" name && lib.isDerivation value
+  );
 
-  # Usage:
-  # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ])
-  #
-  # or for all grammars:
-  # pkgs.tree-sitter.withPlugins (_: pkgs.tree-sitter.allGrammars)
-  # which is equivalent to
-  # pkgs.tree-sitter.withPlugins (p: builtins.attrValues p)
-  withPlugins =
-    grammarFn:
-    let
-      grammars = grammarFn builtGrammars;
-    in
+  mkGrammarLinkFarm =
+    grammars:
     linkFarm "grammars" (
       map (
         drv:
@@ -112,7 +98,32 @@ let
       ) grammars
     );
 
-  allGrammars = lib.filter (p: !(p.meta.broken or false)) (lib.attrValues builtGrammars);
+  /**
+    Extensible package set of compiled tree-sitter grammars.
+
+    Exposed as `pkgs.tree-sitter-grammars` and `pkgs.tree-sitter.grammarsScope`.
+    Customize with `.overrideScope`; overrides propagate to every consumer that
+    reads the scope, including the grammar-only views below (which the
+    `pkgs.tree-sitter` passthru re-exports so there is a single source of truth):
+
+      `.derivations`  attrset of every grammar derivation
+      `.allGrammars`  list of non-broken grammar derivations
+      `.withPlugins`  build a grammar link farm
+
+    The scope also carries package-set helpers (`callPackage`, `overrideScope`,
+    …) alongside the grammars, so prefer one of the views above when iterating.
+  */
+  grammarsScope = lib.makeScope newScope (
+    self:
+    builtGrammars
+    // {
+      derivations = grammarDerivationsFrom self;
+      allGrammars = lib.filter (p: !(p.meta.broken or false)) (
+        lib.attrValues (grammarDerivationsFrom self)
+      );
+      withPlugins = grammarFn: mkGrammarLinkFarm (grammarFn (grammarDerivationsFrom self));
+    }
+  );
 
   isWasi = stdenv.hostPlatform.isWasi;
 
@@ -237,14 +248,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     inherit
-      grammars
       buildGrammar
       builtGrammars
+      grammars
       grammarsScope
-      withPlugins
-      allGrammars
       ;
 
+    # Keep legacy `pkgs.tree-sitter` views wired to the overridable scope.
+    inherit (grammarsScope) allGrammars withPlugins;
+
     updateScript = nix-update-script { };
 
     tests = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86aaa2256976..c945dd809bbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5450,7 +5450,7 @@ with pkgs;
 
   tflint-plugins = recurseIntoAttrs (callPackage ../development/tools/analysis/tflint-plugins { });
 
-  tree-sitter-grammars = recurseIntoAttrs tree-sitter.builtGrammars;
+  tree-sitter-grammars = recurseIntoAttrs tree-sitter.grammarsScope;
 
   uhdMinimal = uhd.override {
     enableUtils = false;

From f8a16a306851039b0623d3354681e5ea51f17814 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 30 Jun 2026 09:41:59 -0500
Subject: [PATCH 021/166] tree-sitter-grammars: consume scoped package set

Read grammars from the public tree-sitter-grammars scope, via its derivations and allGrammars views, in emacs treesit-grammars, diffsitter, the python bindings, and nvim-treesitter, instead of tree-sitter.builtGrammars. An overrideScope override of the set now propagates to these packages.
---
 .../treesit-grammars/package.nix              |  4 +--
 .../vim/plugins/nvim-treesitter/overrides.nix |  3 ++-
 pkgs/by-name/di/diffsitter/package.nix        | 25 +++++--------------
 pkgs/top-level/python-packages.nix            |  2 +-
 4 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix
index aa1931869d6b..ed8e4eaa3521 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix
@@ -15,9 +15,9 @@ let
 
   # Usage:
   # treesit-grammars.with-grammars (p: [ p.tree-sitter-bash p.tree-sitter-c ... ])
-  with-grammars = fn: grammarPackage (fn pkgs.tree-sitter.builtGrammars);
+  with-grammars = fn: grammarPackage (fn pkgs.tree-sitter-grammars.derivations);
 
-  with-all-grammars = grammarPackage pkgs.tree-sitter.allGrammars;
+  with-all-grammars = grammarPackage pkgs.tree-sitter-grammars.allGrammars;
 in
 {
   inherit with-grammars with-all-grammars;
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index 84051feecadc..9eb050654f91 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -4,6 +4,7 @@
   symlinkJoin,
   vimUtils,
   tree-sitter,
+  tree-sitter-grammars,
   neovim,
   neovimUtils,
   runCommand,
@@ -127,7 +128,7 @@ let
   withPlugins =
     f:
     let
-      selectedGrammars = f (tree-sitter.builtGrammars // builtGrammars);
+      selectedGrammars = f (tree-sitter-grammars.derivations // builtGrammars);
 
       grammarPlugins = map grammarToPlugin selectedGrammars;
 
diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix
index 5397cd711ed1..30b802e3149f 100644
--- a/pkgs/by-name/di/diffsitter/package.nix
+++ b/pkgs/by-name/di/diffsitter/package.nix
@@ -4,32 +4,19 @@
   linkFarm,
   makeWrapper,
   rustPlatform,
-  tree-sitter,
+  tree-sitter-grammars,
   gitUpdater,
   versionCheckHook,
 }:
 
 let
   # based on https://github.com/NixOS/nixpkgs/blob/aa07b78b9606daf1145a37f6299c6066939df075/pkgs/development/tools/parsing/tree-sitter/default.nix#L85-L104
-  withPlugins =
-    grammarFn:
-    let
-      grammars = grammarFn tree-sitter.builtGrammars;
-    in
-    linkFarm "grammars" (
-      map (
-        drv:
-        let
-          name = lib.strings.getName drv;
-        in
-        {
-          name = "lib" + (lib.strings.removeSuffix "-grammar" name) + ".so";
-          path = "${drv}/parser";
-        }
-      ) grammars
-    );
+  grammarToAttrSet = drv: {
+    name = "lib" + (lib.strings.removeSuffix "-grammar" (lib.strings.getName drv)) + ".so";
+    path = "${drv}/parser";
+  };
 
-  libPath = withPlugins (_: tree-sitter.allGrammars);
+  libPath = linkFarm "grammars" (map grammarToAttrSet tree-sitter-grammars.allGrammars);
 in
 rustPlatform.buildRustPackage rec {
   pname = "diffsitter";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81b1bd4dac5a..ee00178ee9c7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20302,7 +20302,7 @@ self: super: with self; {
             "tree-sitter-sshclientconfig"
             "tree-sitter-templ"
           ])
-        ) pkgs.tree-sitter.builtGrammars
+        ) pkgs.tree-sitter-grammars.derivations
       )
   );
 

From a8fad7e641f10ca1c565c651378ea5158c06808f Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 30 Jun 2026 09:41:59 -0500
Subject: [PATCH 022/166] helix: use top-level tree-sitter grammars

Apply Helix's locked grammar overlay to pkgs.tree-sitter-grammars so global grammar-scope overrides compose through the public extension point.
---
 pkgs/by-name/he/helix/package.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix
index fe7aca303770..e301693489f6 100644
--- a/pkgs/by-name/he/helix/package.nix
+++ b/pkgs/by-name/he/helix/package.nix
@@ -6,7 +6,7 @@
   helix-unwrapped,
   removeReferencesTo,
   pkgs,
-  tree-sitter,
+  tree-sitter-grammars,
   lockedGrammars ? lib.importJSON ./grammars.json,
   grammarsOverlay ? (
     final: prev: {
@@ -66,13 +66,9 @@ let
         }
     ) prev;
 
-  tree-sitter-grammars =
+  helixTreeSitterGrammars =
     lib.filterAttrs (drvName: _: lib.hasAttr (lib.removePrefix "tree-sitter-" drvName) lockedGrammars)
-      (
-        tree-sitter.grammarsScope.overrideScope (
-          lib.composeExtensions lockedVersionsOverlay grammarsOverlay
-        )
-      );
+      (tree-sitter-grammars.overrideScope (lib.composeExtensions lockedVersionsOverlay grammarsOverlay));
 
   # Dynamic libraries for the grammars always use the `.so` extension, also on Darwin (should use `.dylib`)
   # See here: https://github.com/helix-editor/helix/pull/14982
@@ -82,7 +78,7 @@ let
     lib.concatMapAttrsStringSep "\n" (_: grammar: ''
       install -D ${grammar}/parser $out/${grammar.language}.so
       ${lib.getExe removeReferencesTo} -t ${grammar} $out/${grammar.language}.so
-    '') (lib.filterAttrs (_: lib.isDerivation) tree-sitter-grammars)
+    '') helixTreeSitterGrammars
   );
 
   lockedGrammarsCount = lib.length (lib.attrNames lockedGrammars);
@@ -113,7 +109,7 @@ symlinkJoin {
   passthru = {
     updateScript = ./update.sh;
     runtime = runtimeDir;
-    inherit tree-sitter-grammars;
+    tree-sitter-grammars = helixTreeSitterGrammars;
   };
 
   meta = {

From 0a53614dbbd241a3f99ddb0eadaa7655092a8bd9 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 30 Jun 2026 09:41:59 -0500
Subject: [PATCH 023/166] tree-sitter: document grammar scope overrides

Document overrideScope as the supported extension point and the scoped grammar-only views (derivations, allGrammars, withPlugins) that consumers should iterate.
---
 .../by-name/tr/tree-sitter/grammars/README.md | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/pkgs/by-name/tr/tree-sitter/grammars/README.md b/pkgs/by-name/tr/tree-sitter/grammars/README.md
index 9445f68494cb..c829bf6aaa2e 100644
--- a/pkgs/by-name/tr/tree-sitter/grammars/README.md
+++ b/pkgs/by-name/tr/tree-sitter/grammars/README.md
@@ -109,6 +109,59 @@ This includes build-related flags and metadata.
 }
 ```
 
+## Overriding the Grammar Set
+
+Use `pkgs.tree-sitter-grammars.overrideScope` when adding a grammar or replacing a grammar that another package should consume.
+`pkgs.tree-sitter-grammars` is the scoped package set used for grammar overrides and scoped helpers such as `derivations`, `allGrammars`, and `withPlugins`.
+
+```nix
+let
+  grammars = pkgs.tree-sitter-grammars.overrideScope (
+    final: prev: {
+      tree-sitter-foolang = pkgs.tree-sitter.buildGrammar {
+        language = "foolang";
+        version = "0.42.0";
+        src = pkgs.fetchFromGitHub {
+          owner = "example";
+          repo = "tree-sitter-foolang";
+          rev = "v0.42.0";
+          hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+        };
+      };
+
+      tree-sitter-rust = prev.tree-sitter-rust.overrideAttrs (_: {
+        version = "custom";
+        src = pkgs.fetchFromGitHub {
+          owner = "example";
+          repo = "tree-sitter-rust";
+          rev = "custom";
+          hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+        };
+      });
+    }
+  );
+in
+grammars.withPlugins (p: [
+  p.tree-sitter-foolang
+  p.tree-sitter-rust
+])
+```
+
+The scoped `withPlugins` helper receives derivations from the same overridden scope, so added or replaced grammars are visible.
+
+The set also carries package-set helpers (`callPackage`, `newScope`, `overrideScope`, …) alongside the grammars, so do not iterate it directly.
+Use one of its grammar-only views instead; each reflects any `overrideScope`:
+
+- `pkgs.tree-sitter-grammars.derivations` — attrset of every grammar derivation, including grammars marked broken.
+- `pkgs.tree-sitter-grammars.allGrammars` — list of the non-broken grammar derivations.
+- `pkgs.tree-sitter-grammars.withPlugins` — build a grammar link farm.
+
+```nix
+builtins.attrValues pkgs.tree-sitter-grammars.derivations
+```
+
+`pkgs.tree-sitter.builtGrammars` remains the plain attribute set generated directly from [grammar-sources.nix](grammar-sources.nix); use it when you specifically want the stock grammars without any scope overrides.
+
 ## Building WebAssembly Parsers
 
 `buildGrammar` builds a native `$out/parser`.

From 96f486ba9769a1fa6e0ec2a501b01684d8f81c36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Jul 2026 20:29:48 +0000
Subject: [PATCH 024/166] interval-tree: 3.1.1 -> 3.1.2

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

diff --git a/pkgs/by-name/in/interval-tree/package.nix b/pkgs/by-name/in/interval-tree/package.nix
index 71ce2ea68ead..f43b8f9dc640 100644
--- a/pkgs/by-name/in/interval-tree/package.nix
+++ b/pkgs/by-name/in/interval-tree/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "interval-tree";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "5cript";
     repo = "interval-tree";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bSZ56EzzNy6gHgs8OptT/iBlf56RJz+09BE4WGGJpog=";
+    hash = "sha256-t1/oTr+sYkpTiDzaM4SxUcWzO3r24EkUJO04TYNLcQQ=";
   };
 
   # interval-tree is a header only library

From a48a99c881a96f160f4286adb5667675ecd2c0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 1 Jul 2026 23:18:06 +0200
Subject: [PATCH 025/166] headplane: 0.6.2 -> 0.6.3

Diff: https://github.com/tale/headplane/compare/v0.6.2...v0.6.3

Changelog: https://github.com/tale/headplane/releases/tag/0.6.3
---
 pkgs/by-name/he/headplane/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix
index 2d71367644ea..61201296d950 100644
--- a/pkgs/by-name/he/headplane/package.nix
+++ b/pkgs/by-name/he/headplane/package.nix
@@ -15,13 +15,13 @@
 let
   pname = "headplane";
   # Note, if you are upgrading this, you should upgrade headplane-agent at the same time
-  version = "0.6.2";
+  version = "0.6.3";
   pnpmDepsHash = "sha256-CsmffCo9Se/4oiOqbcuhjPMuGmR2GL+YfcyWgzBTAh8=";
   src = fetchFromGitHub {
     owner = "tale";
     repo = "headplane";
     tag = "v${version}";
-    hash = "sha256-2C/Pn2M2aHADtoljSFg9hz6xOaZp6IRI77jjy+LDAgw=";
+    hash = "sha256-zvJUTKRIlHyPMq80teVXBSb7K9Zz44Kuuj2PPi6qIOw=";
   };
 
   headplaneSshWasm = buildGoModule {

From b484df87605e76c26c571dd8b6ce61c362f359ea Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <me@jfly.fyi>
Date: Tue, 30 Jun 2026 12:39:42 -0700
Subject: [PATCH 026/166] nixos-rebuild-ng: fix too long TMPDIR detection

This code tried to compute a `TMPDIR` short enough to guarantee OpenSSH
could create a unix socket underneath it. However, that computation was
flawed, as the logic predates our recent change from `%n` to `%C`:
https://github.com/NixOS/nixpkgs/commit/f23bab46664a3a511fa10d3dcdfb8a9322b14502

I ended up refactoring things here to put the ssh logic close to the
tmpdir logic. I think that's appropriate as they really need to stay in
sync, and this will hopefully help future developers keep them in sync.
(I briefly explored trying to write the code in a way that forces them
to stay in sync, but I abandoned that, as it made the code too obtuse.)

I've documented all the implementation details we depend on. I also
removed our assumptions on the behavior of Python's `tempfile` module:
we now just ask it for a tempdir and check the resulting length. Now nothing
will have to change in the future if Python starts using 9 characters
instead of 8 for avoiding name conflicts.

For the record, we ran into this over in ngipkgs:
https://github.com/ngi-nix/ngipkgs/issues/2300, which is what triggered
this investigation.
---
 .../src/nixos_rebuild/process.py              |  2 +-
 .../src/nixos_rebuild/tmpdir.py               | 90 ++++++++++++++-----
 .../nixos-rebuild-ng/src/tests/test_tmpdir.py | 56 ++++++++++++
 3 files changed, 126 insertions(+), 22 deletions(-)
 create mode 100644 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
index d848709ef8f1..7ba809d4cb9c 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py
@@ -25,7 +25,7 @@ SSH_DEFAULT_OPTS: Final = [
     "-o",
     "ControlMaster=auto",
     "-o",
-    f"ControlPath={tmpdir.TMPDIR_PATH / 'ssh-%C'}",
+    f"ControlPath={tmpdir.SSH_CONTROL_PATH}",
     "-o",
     "ControlPersist=60",
 ]
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py
index 9db6e310a4d2..1df30dcad7eb 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py
@@ -1,38 +1,86 @@
 import logging
+import os
 from pathlib import Path
-from tempfile import TemporaryDirectory, gettempdir
+from tempfile import TemporaryDirectory
 from typing import Final
 
 logger: Final = logging.getLogger(__name__)
 
+# The Linux kernel hardcodes a limit of 108 bytes for Unix sockets [0],
+# but that includes one NULL byte at the very end, so the logical max
+# length is 107 bytes.
+# [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/include/uapi/linux/un.h?h=v6.18.37#n7
+LINUX_MAX_SOCKET_LENGTH: Final = 107
 
-# Very long tmp dirs lead to "too long for Unix domain socket"
-# SSH ControlPath errors. Especially macOS sets long TMPDIR paths.
-# This is also required for Linux, if the user tries to build
-# from inside a shell using `--target-host`, which will cause
-# ssh to fail with "ControlPath too long"
+# OpenSSH expands %C to `conn_hash_hex` [0],
+# which is the result of calling `ssh_connection_hash` [1],
+# which computes a sha1 digest [2],
+# which is 20 bytes long [3].
+# which gets hex encoded [4] to double that length [5].
 #
-# The constant is based on a worst case example FQDN, e.g.:
-# `ec2-123-123-123-123.ap-southeast-2.compute.amazonaws.com` (56 bytes).
-# The `ControlPath` can maximum be 108 bytes. Given the prefix
-# that is used for the tempdir, ie. `nixos-rebuild.47i6dz8c` (22 bytes),
-# we have 30 bytes left to work with.
-# This should be fine for the usual temp folders:
-# /tmp/tmp.7hBqN2Fm5H (19)
-# /var/tmp/tmp.7hBqN2Fm5H (23)
-# /run/user/1000/tmp.7hBqN2Fm5H (29)
+# [0]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/sshconnect.h#L70
+# [1]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/ssh.c#L1464-L1465
+# [2]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/readconf.c#L345
+# [3]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/openbsd-compat/sha1.h#L15
+# [4]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/readconf.c#L360
+# [5]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/misc.c#L1627
+OPENSSH_PERCENT_C_LENGTH: Final = 40
+
+# OpenSSH adds a suffix to the given control path [0].
+# There's 1 character for a `.` separator, followed by 16 random characters [1].
+# [0]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/mux.c#L1348
+# [1]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/mux.c#L1324
+OPENSSH_CONTROL_PATH_SUFFIX_LENGTH: Final = 1 + 16
+
+# Carefully compute a maximum allowed length for a tmpdir, otherwise ssh crashes with errors like this:
+# > unix_listener: path "/home/runner/work/_temp/nixos-rebuild.aw8hzmq7/ssh-ea7c10de83787b1dec3f06ef20ee26b38c6bb0a5.x9MDykk4gmASsl3R"
+# > too long for Unix domain socket
+#
+# The full path to our tmpdir must be short enough for the resulting Unix domain
+# sockets that OpenSSH creates to fit within `LINUX_MAX_SOCKET_LENGTH`.
+# It's common for system configured temp dirs to be more
+# than a few characters:
+# - macOS sets long TMPDIR paths.
+# - Nix dev shells set a longer TMPDIR
+# - GitHub actions set TMPDIR to something like `/home/runner/work/_temp`.
+#
+# Breaking down the socket path into its component pieces:
+#
+# /home/runner/work/_temp/nixos-rebuild.aw8hzmq7/ssh-ea7c10de83787b1dec3f06ef20ee26b38c6bb0a5.x9MDykk4gmASsl3R
+# |-------------- TMPDIR ----------------------|^|----------------- ssh-%C -----------------||---------------|
+#                                               |                                                   |
+#                                Note the path separator character.                   OPENSSH_CONTROL_PATH_SUFFIX_LENGTH
+#
+MAX_TMPDIR_LENGTH: Final = (
+    LINUX_MAX_SOCKET_LENGTH
+    - 1  # Path separator between tmpdir and the socket name.
+    # Keep the following in sync with `SSH_CONTROL_PATH`.
+    - len("ssh-")
+    - OPENSSH_PERCENT_C_LENGTH
+    - OPENSSH_CONTROL_PATH_SUFFIX_LENGTH
+)
+
+
 def make_tmpdir() -> TemporaryDirectory[str]:
-    tmp = gettempdir()
-    if len(tmp) >= 30:
+    prefix = "nixos-rebuild."
+    tmpdir = TemporaryDirectory(prefix=prefix)
+    if len(os.fsencode(tmpdir.name)) > MAX_TMPDIR_LENGTH:
+        short_tmpdir = TemporaryDirectory(prefix=prefix, dir="/tmp")
         logger.debug(
-            "tempdir '%s' exceeds 30 bytes limit, defaulting to /tmp instead",
-            tmp,
+            "tempdir '%s' exceeds %s bytes limit, defaulting to '%s' instead",
+            tmpdir,
+            MAX_TMPDIR_LENGTH,
+            short_tmpdir,
         )
 
-        return TemporaryDirectory(prefix="nixos-rebuild.", dir="/tmp")
+        tmpdir.cleanup()
+        return short_tmpdir
 
-    return TemporaryDirectory(prefix="nixos-rebuild.")
+    return tmpdir
 
 
 TMPDIR: Final = make_tmpdir()
 TMPDIR_PATH: Final = Path(TMPDIR.name)
+
+# Keep this in sync with `MAX_TMPDIR_LENGTH`!
+SSH_CONTROL_PATH: Final = str(TMPDIR_PATH / "ssh-%C")
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py
new file mode 100644
index 000000000000..5735e7b979f3
--- /dev/null
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py
@@ -0,0 +1,56 @@
+import contextlib
+import os
+import tempfile
+import typing
+from pathlib import Path
+
+from nixos_rebuild.tmpdir import MAX_TMPDIR_LENGTH, make_tmpdir
+
+
+@contextlib.contextmanager
+def system_tempdir(path: Path) -> typing.Generator[None]:
+    path.mkdir(exist_ok=True)
+
+    # `tempfile` caches the tempdir, you must clear it for it to recompute.
+    tempfile.tempdir = None
+
+    og_tmpdir = os.environ.get("TMPDIR")
+
+    try:
+        os.environ["TMPDIR"] = str(path)
+        assert Path(tempfile.gettempdir()) == path
+        yield
+    finally:
+        if og_tmpdir is None:
+            del os.environ["TMPDIR"]
+        else:
+            os.environ["TMPDIR"] = og_tmpdir
+
+
+def test_make_tmpdir() -> None:
+    # Basic test: whatever the default system temp dir happens to be.
+    tmpdir = make_tmpdir()
+    tmp = Path(tmpdir.name)
+    assert tmp.exists()
+    assert tmp.is_dir()
+    assert len(os.fsencode(str(tmp))) <= MAX_TMPDIR_LENGTH
+
+    # Test with a short system temp dir. We should use it unmodified.
+    with system_tempdir(Path("/tmp/not-too-long")):
+        tmpdir = make_tmpdir()
+        tmp = Path(tmpdir.name)
+
+        assert tmp.exists()
+        assert tmp.is_dir()
+        assert len(os.fsencode(str(tmp))) <= MAX_TMPDIR_LENGTH
+
+    # Test with a long system temp dir. We should ignore
+    # it and fall back to something short enough for OpenSSH to
+    # create sockets in.
+    with system_tempdir(Path("/tmp/long" + ("g" * MAX_TMPDIR_LENGTH))):
+        tmpdir = make_tmpdir()
+        tmp = Path(tmpdir.name)
+
+        assert tmp.exists()
+        assert tmp.is_dir()
+        assert len(os.fsencode(str(tmp))) <= MAX_TMPDIR_LENGTH

From 779b8dda775b5510eeb67e88dc9430229930fdc9 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 2 Jul 2026 03:56:22 +0200
Subject: [PATCH 027/166] ty: 0.0.55 -> 0.0.56

Changelog: https://github.com/astral-sh/ty/releases/tag/0.0.56
Diff: https://github.com/astral-sh/ty/compare/0.0.55...0.0.56
---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 6d4be58be411..b8a81fe0f97a 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -17,7 +17,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.55";
+  version = "0.0.56";
   __structuredAttrs = true;
 
   src = fetchFromGitHub {
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-0SHjKIoswdpE3UmW9JeufrMptGfqnOJoxjMZp9VUCKo=";
+    hash = "sha256-H5Tin3+OFSmlC2b86gPISE0ZK6+vR+ijYtJBzeyBgL4=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-lnrfdfPJe2itf8OO1AmoZj3i6UoZMFvJKIqeD6xWhzU=";
+  cargoHash = "sha256-suXPAZAQ4dddcHBwmdrpC4cUEs7CgTmW9Bn/v9Roe0U=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = [ rust-jemalloc-sys ];

From 0bf1a1df6780eb9b893014ff49c92298a06250a9 Mon Sep 17 00:00:00 2001
From: Viacheslav Lotsmanov <lotsmanov89@gmail.com>
Date: Thu, 2 Jul 2026 05:16:03 +0300
Subject: [PATCH 028/166] =?UTF-8?q?nimlsp:=200.4.6=20=E2=86=92=200.4.7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/ni/nimlsp/package.nix b/pkgs/by-name/ni/nimlsp/package.nix
index 1e01f33bb859..a24a0ab7f15f 100644
--- a/pkgs/by-name/ni/nimlsp/package.nix
+++ b/pkgs/by-name/ni/nimlsp/package.nix
@@ -15,13 +15,13 @@ let
 in
 buildNimPackage' (finalAttrs: {
   pname = "nimlsp";
-  version = "0.4.6";
+  version = "0.4.7";
 
   src = fetchFromGitHub {
     owner = "PMunch";
     repo = "nimlsp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MCtpCx8jMQp0VXuMowh69d1DQreU5cDftBf0lww7PUM=";
+    hash = "sha256-jUNW+tukZXv41HTWP2F2BdEn7nesFXVg2TffKPWfSss=";
   };
 
   lockFile = ./lock.json;

From 81daafea8c7240b74073c467cc0baf80d08f22ee Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Sat, 15 Nov 2025 10:16:28 +1100
Subject: [PATCH 029/166] nim: remove 1_0, 2_0 and 2_2 versions and aliases;
 nim: 2.2.4 -> 2.2.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

writers/writeNim: migrate package to nim
nim: remove nativeStacktraces and gnuReadline args
nim: use pname instead

It's time that we remove nim1, nim1 has been a package for a while and
nim has moved on during that time to the v2 versions.
It's also time that nim had some attention in nixpkgs and upgrade the
nim 2 versions.

Also fixes an issue with nim-unwrapped missing the pname and version.
See #485742 for more info.

Co-authored-by: éclairevoyant
<848000+eclairevoyant@users.noreply.github.com>
---
 doc/release-notes/rl-2611.section.md          |  2 +
 pkgs/build-support/build-nim-package.nix      | 14 ++---
 pkgs/build-support/writers/scripts.nix        |  4 +-
 pkgs/by-name/ni/nim-1_0/nim.cfg.patch         | 31 -----------
 pkgs/by-name/ni/nim-1_0/package.nix           |  9 ----
 pkgs/by-name/ni/nim-2_0/package.nix           |  9 ----
 .../ni/nim-unwrapped-1_0/extra-mangling.patch | 52 -------------------
 pkgs/by-name/ni/nim-unwrapped-1_0/package.nix | 30 -----------
 .../ni/nim-unwrapped-1_0/toLocation.patch     | 16 ------
 pkgs/by-name/ni/nim-unwrapped-2_0/package.nix | 27 ----------
 .../nim-unwrapped-2_2/extra-mangling-2.patch  | 52 -------------------
 .../NIM_CONFIG_DIR.patch                      |  0
 .../ni/nim-unwrapped/extra-mangling.patch     | 17 ++++++
 .../nixbuild.patch                            |  0
 .../openssl.patch                             |  0
 .../package.nix                               | 10 ++--
 .../ni/{nim-2_2 => nim}/nim2.cfg.patch        |  0
 pkgs/by-name/ni/{nim-2_2 => nim}/package.nix  |  6 +--
 pkgs/top-level/aliases.nix                    | 10 ++++
 pkgs/top-level/all-packages.nix               |  7 ---
 20 files changed, 42 insertions(+), 254 deletions(-)
 delete mode 100644 pkgs/by-name/ni/nim-1_0/nim.cfg.patch
 delete mode 100644 pkgs/by-name/ni/nim-1_0/package.nix
 delete mode 100644 pkgs/by-name/ni/nim-2_0/package.nix
 delete mode 100644 pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch
 delete mode 100644 pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
 delete mode 100644 pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch
 delete mode 100644 pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
 delete mode 100644 pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch
 rename pkgs/by-name/ni/{nim-unwrapped-2_2 => nim-unwrapped}/NIM_CONFIG_DIR.patch (100%)
 create mode 100644 pkgs/by-name/ni/nim-unwrapped/extra-mangling.patch
 rename pkgs/by-name/ni/{nim-unwrapped-2_2 => nim-unwrapped}/nixbuild.patch (100%)
 rename pkgs/by-name/ni/{nim-unwrapped-2_2 => nim-unwrapped}/openssl.patch (100%)
 rename pkgs/by-name/ni/{nim-unwrapped-2_2 => nim-unwrapped}/package.nix (91%)
 rename pkgs/by-name/ni/{nim-2_2 => nim}/nim2.cfg.patch (100%)
 rename pkgs/by-name/ni/{nim-2_2 => nim}/package.nix (96%)

diff --git a/doc/release-notes/rl-2611.section.md b/doc/release-notes/rl-2611.section.md
index 1d2ebf599f7d..936f58ebacf7 100644
--- a/doc/release-notes/rl-2611.section.md
+++ b/doc/release-notes/rl-2611.section.md
@@ -70,6 +70,8 @@
 - `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0)
 
 - Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds.
+- `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2).
+- `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10).
 
 ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes}
 
diff --git a/pkgs/build-support/build-nim-package.nix b/pkgs/build-support/build-nim-package.nix
index ade88ea9d3db..f5e093019935 100644
--- a/pkgs/build-support/build-nim-package.nix
+++ b/pkgs/build-support/build-nim-package.nix
@@ -3,8 +3,7 @@
   buildPackages,
   callPackage,
   stdenv,
-  nim1,
-  nim2,
+  nim,
   nim_builder,
   defaultNimVersion ? 2,
   nimOverrides,
@@ -38,7 +37,7 @@ let
       nim_builder --phase:install
       runHook postInstall
     '';
-    meta = { inherit (nim2.meta) maintainers platforms; };
+    meta = { inherit (nim.meta) maintainers platforms; };
   };
 
   fodFromLockEntry =
@@ -116,15 +115,10 @@ let
           ...
         }:
         (
-          if requiredNimVersion == 1 then
+          if requiredNimVersion == 2 then
             {
               depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
-              nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs;
-            }
-          else if requiredNimVersion == 2 then
-            {
-              depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
-              nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs;
+              nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
             }
           else
             throw "requiredNimVersion ${toString requiredNimVersion} is not valid"
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index eabffa1117cb..9026c7ea42ca 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -799,7 +799,7 @@ rec {
     ## `pkgs.writers.writeNim` usage example
 
     ```nix
-      writeNim "hello-nim" { nim = pkgs.nim2; } ''
+      writeNim "hello-nim" { nim = pkgs.nim; } ''
         echo "hello nim"
       '';
     ```
@@ -809,7 +809,7 @@ rec {
     name:
     {
       makeWrapperArgs ? [ ],
-      nim ? pkgs.nim2,
+      nim ? pkgs.nim,
       nimCompileOptions ? { },
       strip ? true,
     }:
diff --git a/pkgs/by-name/ni/nim-1_0/nim.cfg.patch b/pkgs/by-name/ni/nim-1_0/nim.cfg.patch
deleted file mode 100644
index 7195132e52f6..000000000000
--- a/pkgs/by-name/ni/nim-1_0/nim.cfg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/config/nim.cfg b/config/nim.cfg
-index 3b964d124..850ed0ed9 100644
---- a/config/nim.cfg
-+++ b/config/nim.cfg
-@@ -8,26 +8,12 @@
- # Environment variables can be accessed like so:
- #  gcc.path %= "$CC_PATH"
- 
--cc = gcc
--
- # additional options always passed to the compiler:
- --parallel_build: "0" # 0 to auto-detect number of processors
- 
- hint[LineTooLong]=off
- #hint[XDeclaredButNotUsed]=off
- 
--# Examples of how to setup a cross-compiler:
--
--# Cross-compiling for Raspberry Pi.
--# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu)
--arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc"
--arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc"
--
--# For OpenWRT, you will also need to adjust PATH to point to your toolchain.
--mips.linux.gcc.exe = "mips-openwrt-linux-gcc"
--mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc"
--
--
- path="$lib/deprecated/core"
- path="$lib/deprecated/pure"
- path="$lib/pure/collections"
diff --git a/pkgs/by-name/ni/nim-1_0/package.nix b/pkgs/by-name/ni/nim-1_0/package.nix
deleted file mode 100644
index 63df8623109e..000000000000
--- a/pkgs/by-name/ni/nim-1_0/package.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  nim-unwrapped-1,
-  nim,
-}:
-
-nim.passthru.wrapNim {
-  nimUnwrapped = nim-unwrapped-1;
-  patches = [ ./nim.cfg.patch ];
-}
diff --git a/pkgs/by-name/ni/nim-2_0/package.nix b/pkgs/by-name/ni/nim-2_0/package.nix
deleted file mode 100644
index 841bd71ec3e9..000000000000
--- a/pkgs/by-name/ni/nim-2_0/package.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  nim-unwrapped-2_0,
-  nim-2_2,
-}:
-
-nim-2_2.passthru.wrapNim {
-  nimUnwrapped = nim-unwrapped-2_0;
-  inherit (nim-2_2) patches;
-}
diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch b/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch
deleted file mode 100644
index dc6bcebfaba1..000000000000
--- a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
-index fa8fab08a..63b0cb44d 100644
---- a/compiler/modulepaths.nim
-+++ b/compiler/modulepaths.nim
-@@ -73,6 +73,17 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex =
-   else:
-     result = fileInfoIdx(conf, fullPath)
- 
-+proc rot13(result: var string) =
-+  # don't mangle .nim
-+  let finalIdx =
-+    if result.endsWith(".nim"): result.len - 4
-+    else: result.len
-+  for i, c in result[0..<finalIdx]:
-+    case c
-+    of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13)
-+    of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13)
-+    else: discard
-+
- proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
-   ## Mangle a relative module path to avoid path and symbol collisions.
-   ##
-@@ -81,9 +92,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
-   ##
-   ## Example:
-   ## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar`
--  "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
-+  result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
-     {$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"})
-+  rot13(result)
- 
- proc demangleModuleName*(path: string): string =
-   ## Demangle a relative module path.
-   result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"})
-+  rot13(result)
-diff --git a/compiler/msgs.nim b/compiler/msgs.nim
-index ae4bcfcb8..1ad7e5c08 100644
---- a/compiler/msgs.nim
-+++ b/compiler/msgs.nim
-@@ -661,8 +661,10 @@ proc uniqueModuleName*(conf: ConfigRef; fid: FileIndex): string =
-   for i in 0..<trunc:
-     let c = rel[i]
-     case c
--    of 'a'..'z':
--      result.add c
-+    of 'a'..'m':
-+      result.add char(c.uint8 + 13)
-+    of 'n'..'z':
-+      result.add char(c.uint8 - 13)
-     of {os.DirSep, os.AltSep}:
-       result.add 'Z' # because it looks a bit like '/'
-     of '.':
diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
deleted file mode 100644
index a210f22844c6..000000000000
--- a/pkgs/by-name/ni/nim-unwrapped-1_0/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  nim-unwrapped-2,
-}:
-
-nim-unwrapped-2.overrideAttrs (
-  finalAttrs: prevAttrs: {
-    version = "1.6.20";
-    src = fetchurl {
-      url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
-      hash = "sha256-/+0EdQTR/K9hDw3Xzz4Ce+kaKSsMnFEWFQTC87mE/7k=";
-    };
-
-    patches =
-      builtins.filter (
-        p:
-        builtins.elem (baseNameOf p) [
-          "NIM_CONFIG_DIR.patch"
-          "nixbuild.patch"
-        ]
-      ) nim-unwrapped-2.patches
-      ++ [
-        ./extra-mangling.patch
-        # Mangle store paths of modules to prevent runtime dependence.
-      ]
-      ++ lib.optional (!stdenv.hostPlatform.isWindows) ./toLocation.patch;
-  }
-)
diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch b/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch
deleted file mode 100644
index a3db46044049..000000000000
--- a/pkgs/by-name/ni/nim-unwrapped-1_0/toLocation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/lib/std/private/miscdollars.nim b/lib/std/private/miscdollars.nim
-index 840fedf54..6c3436308 100644
---- a/lib/std/private/miscdollars.nim
-+++ b/lib/std/private/miscdollars.nim
-@@ -6,9 +6,8 @@ template toLocation*(result: var string, file: string | cstring, line: int, col:
-   # it can be done in a single place.
-   result.add file
-   if line > 0:
--    result.add "("
-+    result.add ":"
-     addInt(result, line)
-     if col > 0:
--      result.add ", "
-+      result.add ":"
-       addInt(result, col)
--    result.add ")"
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
deleted file mode 100644
index e459351c676d..000000000000
--- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  fetchurl,
-  nim-unwrapped-1,
-  nim-unwrapped-2_2,
-}:
-
-nim-unwrapped-2_2.overrideAttrs (
-  finalAttrs: previousAttrs: {
-    version = "2.0.16";
-    src = fetchurl {
-      url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
-      hash = "sha256-sucMbAEbVQcJMJCoiH+iUncyCP0EfuOPhWLiVp5cN4o=";
-    };
-    patches = lib.lists.unique (
-      builtins.filter (
-        p:
-        builtins.elem (baseNameOf p) [
-          "NIM_CONFIG_DIR.patch"
-          "nixbuild.patch"
-          "extra-mangling.patch"
-          "openssl.patch"
-        ]
-      ) (nim-unwrapped-1.patches ++ nim-unwrapped-2_2.patches)
-    );
-  }
-)
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch
deleted file mode 100644
index cf384c95d5f6..000000000000
--- a/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim
-index 77762d23a..59dd8903a 100644
---- a/compiler/modulegraphs.nim
-+++ b/compiler/modulegraphs.nim
-@@ -503,7 +503,11 @@ proc uniqueModuleName*(conf: ConfigRef; m: PSym): string =
-   for i in 0..<trunc:
-     let c = rel[i]
-     case c
--    of 'a'..'z', '0'..'9':
-+    of 'a'..'m':
-+      result.add char(c.uint8 + 13)
-+    of 'n'..'z':
-+      result.add char(c.uint8 - 13)
-+    of '0'..'9':
-       result.add c
-     of {os.DirSep, os.AltSep}:
-       result.add 'Z' # because it looks a bit like '/'
-diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim
-index c9e6060e5..2b349f27c 100644
---- a/compiler/modulepaths.nim
-+++ b/compiler/modulepaths.nim
-@@ -79,6 +79,17 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex =
-   else:
-     result = fileInfoIdx(conf, fullPath)
- 
-+proc rot13(result: var string) =
-+  # don't mangle .nim
-+  let finalIdx =
-+    if result.endsWith(".nim"): result.len - 4
-+    else: result.len
-+  for i, c in result[0..<finalIdx]:
-+    case c
-+    of 'a'..'m', 'A'..'M': result[i] = char(c.uint8 + 13)
-+    of 'n'..'z', 'N'..'Z': result[i] = char(c.uint8 - 13)
-+    else: discard
-+
- proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
-   ## Mangle a relative module path to avoid path and symbol collisions.
-   ##
-@@ -87,9 +98,11 @@ proc mangleModuleName*(conf: ConfigRef; path: AbsoluteFile): string =
-   ##
-   ## Example:
-   ## `foo-#head/../bar` becomes `@foo-@hhead@s..@sbar`
--  "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
-+  result = "@m" & relativeTo(path, conf.projectPath).string.multiReplace(
-     {$os.DirSep: "@s", $os.AltSep: "@s", "#": "@h", "@": "@@", ":": "@c"})
-+  rot13(result)
- 
- proc demangleModuleName*(path: string): string =
-   ## Demangle a relative module path.
-   result = path.multiReplace({"@@": "@", "@h": "#", "@s": "/", "@m": "", "@c": ":"})
-+  rot13(result)
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/NIM_CONFIG_DIR.patch b/pkgs/by-name/ni/nim-unwrapped/NIM_CONFIG_DIR.patch
similarity index 100%
rename from pkgs/by-name/ni/nim-unwrapped-2_2/NIM_CONFIG_DIR.patch
rename to pkgs/by-name/ni/nim-unwrapped/NIM_CONFIG_DIR.patch
diff --git a/pkgs/by-name/ni/nim-unwrapped/extra-mangling.patch b/pkgs/by-name/ni/nim-unwrapped/extra-mangling.patch
new file mode 100644
index 000000000000..8461cd406890
--- /dev/null
+++ b/pkgs/by-name/ni/nim-unwrapped/extra-mangling.patch
@@ -0,0 +1,17 @@
+diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim
+index 55f751cda..b0b3e3f40 100644
+--- a/compiler/modulegraphs.nim
++++ b/compiler/modulegraphs.nim
+@@ -466,7 +466,11 @@ proc uniqueModuleName*(conf: ConfigRef; m: PSym): string =
+   for i in 0..<trunc:
+     let c = rel[i]
+     case c
+-    of 'a'..'z', '0'..'9':
++    of 'a'..'m':
++      result.add char(c.uint8 + 13)
++    of 'n'..'z':
++      result.add char(c.uint8 - 13)
++    of '0'..'9':
+       result.add c
+     of {os.DirSep, os.AltSep}:
+       result.add 'Z' # because it looks a bit like '/'
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/nixbuild.patch b/pkgs/by-name/ni/nim-unwrapped/nixbuild.patch
similarity index 100%
rename from pkgs/by-name/ni/nim-unwrapped-2_2/nixbuild.patch
rename to pkgs/by-name/ni/nim-unwrapped/nixbuild.patch
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/openssl.patch b/pkgs/by-name/ni/nim-unwrapped/openssl.patch
similarity index 100%
rename from pkgs/by-name/ni/nim-unwrapped-2_2/openssl.patch
rename to pkgs/by-name/ni/nim-unwrapped/openssl.patch
diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped/package.nix
similarity index 91%
rename from pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
rename to pkgs/by-name/ni/nim-unwrapped/package.nix
index 6a3c02fe4485..08389b6d9a7c 100644
--- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix
+++ b/pkgs/by-name/ni/nim-unwrapped/package.nix
@@ -13,12 +13,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "nim-unwrapped";
-  version = "2.2.4";
+  version = "2.2.10";
   strictDeps = true;
 
   src = fetchurl {
     url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+CtBl1D8zlYfP4l6BIaxgBhoRddvtdmfJIzhZhCBicc=";
+    hash = "sha256-eVe37QBCBrzxC8xPO0dEFTh45i8kMVUqmo6dP0Do1dU=";
   };
 
   buildInputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
     ./nixbuild.patch
     # Load libraries at runtime by absolute path
 
-    ./extra-mangling-2.patch
+    ./extra-mangling.patch
     # Mangle store paths of modules to prevent runtime dependence.
 
     ./openssl.patch
@@ -67,9 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--cpu:${stdenv.hostPlatform.nim.cpu}"
     "--os:${stdenv.hostPlatform.nim.os}"
     "-d:release"
-    "-d:useGnuReadline"
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace";
+  ];
 
   preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
     substituteInPlace makefile \
diff --git a/pkgs/by-name/ni/nim-2_2/nim2.cfg.patch b/pkgs/by-name/ni/nim/nim2.cfg.patch
similarity index 100%
rename from pkgs/by-name/ni/nim-2_2/nim2.cfg.patch
rename to pkgs/by-name/ni/nim/nim2.cfg.patch
diff --git a/pkgs/by-name/ni/nim-2_2/package.nix b/pkgs/by-name/ni/nim/package.nix
similarity index 96%
rename from pkgs/by-name/ni/nim-2_2/package.nix
rename to pkgs/by-name/ni/nim/package.nix
index 350d235887b9..4cafcafd2318 100644
--- a/pkgs/by-name/ni/nim-2_2/package.nix
+++ b/pkgs/by-name/ni/nim/package.nix
@@ -8,7 +8,7 @@
   makeWrapper,
   openssl,
   pcre,
-  nim-unwrapped-2_2 ? buildPackages.nim-unwrapped-2_2,
+  nim-unwrapped ? buildPackages.nim-unwrapped,
 }:
 
 let
@@ -18,7 +18,7 @@ let
       targetPlatformConfig = stdenv.targetPlatform.config;
     in
     stdenv.mkDerivation (finalAttrs: {
-      name = "${targetPlatformConfig}-nim-wrapper-${nimUnwrapped.version}";
+      pname = "${targetPlatformConfig}-nim-wrapper";
       inherit (nimUnwrapped) version;
       preferLocalBuild = true;
       strictDeps = true;
@@ -148,6 +148,6 @@ let
     });
 in
 wrapNim {
-  nimUnwrapped = nim-unwrapped-2_2;
+  nimUnwrapped = nim-unwrapped;
   patches = [ ./nim2.cfg.patch ];
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2437fab8052a..7f65cdfb6416 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1621,6 +1621,16 @@ mapAliases {
   nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
   nginxQuic = throw "'nginxQuic' has been removed. QUIC support is now available in the default nginx builds.";
   ngrid = throw "'ngrid' has been removed as it has been unmaintained upstream and broken"; # Added 2025-11-15
+  nim1 = throw "'nim1' has reached EOL, please use 'nim'"; # Added 2026-03-06
+  nim-unwrapped-1 = throw "'nim-unwrapped-1' has reached EOL, please use 'nim-unwrapped'"; # Added 2026-03-06
+  nim-unwrapped-2 = throw "'nim-unwrapped-2' has been upgraded and removed, please use 'nim-unwrapped'"; # Added 2026-03-06
+  nim-unwrapped-2_0 = throw "'nim-unwrapped-2_0' has been upgraded and removed, please use 'nim-unwrapped'"; # Added 2026-03-06
+  nim-unwrapped-2_2 = throw "'nim-unwrapped-2_2' has been upgraded and removed, please use 'nim-unwrapped'"; # Added 2026-03-06
+  nim-unwrapped_1_0 = throw "'nim-unwrapped_1_0' has reached EOL, please use 'nim-unwrapped'"; # Added 2026-03-06
+  nim_1_0 = throw "'nim_1_0' has reached EOL, please use 'nim'"; # Added 2026-03-06
+  nim_2 = throw "'nim_2' has been upgraded and removed, please use 'nim'"; # Added 2026-03-06
+  nim_2_0 = throw "'nim_2_0' has been upgraded and removed, please use 'nim'"; # Added 2026-03-06
+  nim_2_2 = throw "'nim_2_2' has been upgraded and removed, please use 'nim'"; # Added 2026-03-06
   nimbo = throw "'nimbo' has been removed due to being archived upstream."; # Added 2026-01-18
   nitrokey-fido2-firmware = throw "'nitrokey-fido2-firmware' has been removed as it was broken and unmaintained upstream since 2022"; # Added 2026-03-23
   nix-direnv-flakes = throw "'nix-direnv-flakes' has been renamed to/replaced by 'nix-direnv'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f4e48cfb7c1c..b1894c6bc3bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4024,13 +4024,6 @@ with pkgs;
 
   mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
 
-  nim = nim2;
-  nim1 = nim-1_0;
-  nim2 = nim-2_2;
-  nim-unwrapped = nim-unwrapped-2_2;
-  nim-unwrapped-1 = nim-unwrapped-1_0;
-  nim-unwrapped-2 = nim-unwrapped-2_2;
-
   buildNimPackage = callPackage ../build-support/build-nim-package.nix { };
   buildNimSbom = callPackage ../build-support/build-nim-sbom.nix { };
   nimOverrides = callPackage ./nim-overrides.nix { };

From d5f38069017327e671372912d2e79ef1c8d7bb48 Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Sat, 7 Mar 2026 07:10:19 +1100
Subject: [PATCH 030/166] buildNimPackage: warn of removal of
 requiredNimVersion
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the rise of the nim refractor this removes the need to specify
versions.

Co-authored-by: éclairevoyant
<848000+eclairevoyant@users.noreply.github.com>
---
 pkgs/build-support/build-nim-package.nix | 31 +++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/build-nim-package.nix b/pkgs/build-support/build-nim-package.nix
index f5e093019935..f953c108fd85 100644
--- a/pkgs/build-support/build-nim-package.nix
+++ b/pkgs/build-support/build-nim-package.nix
@@ -5,7 +5,6 @@
   stdenv,
   nim,
   nim_builder,
-  defaultNimVersion ? 2,
   nimOverrides,
   buildNimPackage,
 }:
@@ -16,6 +15,7 @@ let
     enableParallelBuilding = true;
     __structuredAttrs = true;
     doCheck = true;
+
     configurePhase = ''
       runHook preConfigure
       export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS
@@ -107,25 +107,34 @@ let
 
       finalOverride =
         {
-          depsBuildBuild ? [ ],
-          nativeBuildInputs ? [ ],
           nimFlags ? [ ],
-          requiredNimVersion ? defaultNimVersion,
           passthru ? { },
+          nativeBuildInputs ? [ ],
+          depsBuildBuild ? [ ],
           ...
-        }:
+        }@args:
         (
-          if requiredNimVersion == 2 then
-            {
-              depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
-              nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
-            }
+          #TODO: Remove at 26.11
+          if args ? requiredNimVersion then
+            if args.requiredNimVersion == 2 then
+              lib.warn ''
+                `requiredNimVersion' is deprecated and will be removed in nixpkgs 26.11.
+                Please update your package to remove this.
+              ''
+            else
+              throw ''
+                `requiredNimVersion' ${toString args.requiredNimVersion} is not supported.
+                Ensure your package supports nim 2, and remove `requiredNimVersion'.
+              ''
           else
-            throw "requiredNimVersion ${toString requiredNimVersion} is not valid"
+            { }
         )
         // {
+          nativeBuildInputs = [ nim ] ++ nativeBuildInputs;
+          depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;
           nimFlags = lockFileNimFlags ++ nimFlags;
           passthru = passthru // {
+
             # allow overriding the result of buildNimPackageArgs before this composition is applied
             # this allows overriding the lockFile for packages built using buildNimPackage
             # this is adapted from mkDerivationExtensible in stdenv.mkDerivation

From eec3e392d1862d49969beb75dd07a729002b6800 Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Wed, 18 Mar 2026 21:23:34 +1100
Subject: [PATCH 031/166] nim-unwrapped: switch to actually bootstrapped
 compiler

This makes nim use a boostrappped compiler.
---
 pkgs/by-name/ni/nim-unwrapped/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/nim-unwrapped/package.nix b/pkgs/by-name/ni/nim-unwrapped/package.nix
index 08389b6d9a7c..d22fa8a7e090 100644
--- a/pkgs/by-name/ni/nim-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nim-unwrapped/package.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation (finalAttrs: {
         pname = "nim-bootstrap";
         inherit (finalAttrs) version src preBuild;
         enableParallelBuilding = true;
+        buildPhase = ''
+          runHook preBuild
+          ./build.sh
+          runHook postBuild
+        '';
         installPhase = ''
           runHook preInstall
           install -Dt $out/bin bin/nim

From c996582058ca8a76d5ceb03db333d5c7853b650a Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Thu, 19 Mar 2026 22:12:43 +1100
Subject: [PATCH 032/166] nim-unwrapped: remove invalid `gimportc` from openssl
 patch

This fixes an issue with openssl patch in nim where gimportc was invalid
Co-authored-by: Jake Leahy <jake@leahy.dev>
---
 pkgs/by-name/ni/nim-unwrapped/openssl.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ni/nim-unwrapped/openssl.patch b/pkgs/by-name/ni/nim-unwrapped/openssl.patch
index 8cbc2a4cf26e..95dbcab1c52b 100644
--- a/pkgs/by-name/ni/nim-unwrapped/openssl.patch
+++ b/pkgs/by-name/ni/nim-unwrapped/openssl.patch
@@ -48,21 +48,21 @@ index e659746ee..dfb2d3cf2 100644
        SSLeay()
  
 -    proc ERR_load_BIO_strings*() {.cdecl, dynlib: DLLUtilName, importc.}
-+    proc ERR_load_BIO_strings*() {.cdecl, gimportc.}
++    proc ERR_load_BIO_strings*() {.cdecl, importc.}
    else:
 -    proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, dynlib: DLLSSLName, importc, discardable.}
-+    proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, gimportc, discardable.}
++    proc OPENSSL_init_ssl*(opts: uint64, settings: uint8): cint {.cdecl, importc, discardable.}
      proc SSL_library_init*(): cint {.discardable.} =
        ## Initialize SSL using OPENSSL_init_ssl for OpenSSL >= 1.1.0
        return OPENSSL_init_ssl(0.uint64, 0.uint8)
  
 -    proc TLS_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.}
-+    proc TLS_method*(): PSSL_METHOD {.cdecl, gimportc.}
++    proc TLS_method*(): PSSL_METHOD {.cdecl, importc.}
      proc SSLv23_method*(): PSSL_METHOD =
        TLS_method()
  
 -    proc OpenSSL_version_num(): culong {.cdecl, dynlib: DLLUtilName, importc.}
-+    proc OpenSSL_version_num(): culong {.cdecl, gimportc.}
++    proc OpenSSL_version_num(): culong {.cdecl, importc.}
  
      proc getOpenSSLVersion*(): culong =
        ## Return OpenSSL version as unsigned long
@@ -71,13 +71,13 @@ index e659746ee..dfb2d3cf2 100644
  
    when defined(libressl) or defined(openssl10):
 -    proc SSL_state(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.}
-+    proc SSL_state(ssl: SslPtr): cint {.cdecl, gimportc.}
++    proc SSL_state(ssl: SslPtr): cint {.cdecl, importc.}
      proc SSL_in_init*(ssl: SslPtr): cint {.inline.} =
        SSL_state(ssl) and SSL_ST_INIT
    else:
 -    proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.}
 -    proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.}
-+    proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, gimportc.}
++    proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, importc.}
 +    proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, importc.}
  
    template OpenSSL_add_all_algorithms*() = discard
@@ -89,7 +89,7 @@ index e659746ee..dfb2d3cf2 100644
 +  proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, importc.}
 +  proc SSLv2_method*(): PSSL_METHOD {.cdecl, importc.}
 +  proc SSLv3_method*(): PSSL_METHOD {.cdecl, importc.}
-+  proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, gimportc.}
++  proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, importc.}
  
  else:
    # Here we're trying to stay compatible between openssl versions. Some

From 53dc2ea05ada19c15fdd3ae88b20de19ce38fa17 Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Thu, 2 Apr 2026 01:54:27 +1100
Subject: [PATCH 033/166] nim: enable wrapper args for arm darwin

This fixes an issue where nim-gdb does find gdb in path
---
 pkgs/by-name/ni/nim/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nim/package.nix b/pkgs/by-name/ni/nim/package.nix
index 4cafcafd2318..38e8dcc47f20 100644
--- a/pkgs/by-name/ni/nim/package.nix
+++ b/pkgs/by-name/ni/nim/package.nix
@@ -86,7 +86,7 @@ let
           runHook postBuild
         '';
 
-      wrapperArgs = lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [
+      wrapperArgs = [
         "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${placeholder "out"}/bin"
         # Used by nim-gdb
 

From 80f829b69a5cfbc23e85117a4f0e5d721bc9f24a Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Sat, 15 Nov 2025 10:16:03 +1100
Subject: [PATCH 034/166] {mosdepth, nimlsp}: upgrade to nim

nim_lk: fix compatiblity with 2.2.8
---
 pkgs/by-name/mo/mosdepth/package.nix |  2 --
 pkgs/by-name/ni/nim_lk/nil.patch     | 13 +++++++++++++
 pkgs/by-name/ni/nim_lk/package.nix   |  4 ++++
 pkgs/by-name/ni/nimlsp/package.nix   | 14 +++-----------
 4 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/ni/nim_lk/nil.patch

diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix
index b7064c65e635..2750e21a8a04 100644
--- a/pkgs/by-name/mo/mosdepth/package.nix
+++ b/pkgs/by-name/mo/mosdepth/package.nix
@@ -9,8 +9,6 @@ buildNimPackage (finalAttrs: {
   pname = "mosdepth";
   version = "0.3.13";
 
-  requiredNimVersion = 1;
-
   src = fetchFromGitHub {
     owner = "brentp";
     repo = "mosdepth";
diff --git a/pkgs/by-name/ni/nim_lk/nil.patch b/pkgs/by-name/ni/nim_lk/nil.patch
new file mode 100644
index 000000000000..3f50a480c44b
--- /dev/null
+++ b/pkgs/by-name/ni/nim_lk/nil.patch
@@ -0,0 +1,13 @@
+diff --git a/src/nim_lk.nim b/src/nim_lk.nim
+index 09ced9d..45c5ddc 100644
+--- a/src/nim_lk.nim
++++ b/src/nim_lk.nim
+@@ -573,7 +573,7 @@ proc update(bom: JsonNode; bomRef: string; byName: bool): bool =
+   let comp = bom.getComponent(bomRef, byName)
+   assert not comp.isNil
+   var bomRef = comp{"bom-ref"}.getStr
+-  assert not bomRef.isNil
++  assert bomRef != ""
+   var suitableRefFound = false
+   let extRefs = comp{"externalReferences"}
+   for extRef in extRefs.elems:
diff --git a/pkgs/by-name/ni/nim_lk/package.nix b/pkgs/by-name/ni/nim_lk/package.nix
index 99e921819f17..e08ad1d06ad9 100644
--- a/pkgs/by-name/ni/nim_lk/package.nix
+++ b/pkgs/by-name/ni/nim_lk/package.nix
@@ -23,6 +23,10 @@ buildNimSbom (finalAttrs: {
   buildInputs = [ openssl ];
   nativeBuildInputs = [ makeWrapper ];
 
+  patches = [
+    ./nil.patch
+  ];
+
   postFixup = ''
     wrapProgram $out/bin/nim_lk \
       --suffix PATH : ${
diff --git a/pkgs/by-name/ni/nimlsp/package.nix b/pkgs/by-name/ni/nimlsp/package.nix
index 1e01f33bb859..cd97ed0c8fa5 100644
--- a/pkgs/by-name/ni/nimlsp/package.nix
+++ b/pkgs/by-name/ni/nimlsp/package.nix
@@ -3,17 +3,9 @@
   buildNimPackage,
   fetchFromGitHub,
   srcOnly,
-  nim-2_0,
-  nim-unwrapped-2_0,
+  nim-unwrapped,
 }:
-
-let
-  buildNimPackage' = buildNimPackage.override {
-    # Do not build with Nim-2.2.x.
-    nim2 = nim-2_0;
-  };
-in
-buildNimPackage' (finalAttrs: {
+buildNimPackage (finalAttrs: {
   pname = "nimlsp";
   version = "0.4.6";
 
@@ -40,7 +32,7 @@ buildNimPackage' (finalAttrs: {
 
   nimFlags = [
     "--threads:on"
-    "-d:explicitSourcePath=${srcOnly nim-unwrapped-2_0}"
+    "-d:explicitSourcePath=${srcOnly nim-unwrapped}"
     "-d:tempDir=/tmp"
   ];
 

From 5e8d032903b60422e3739ecac02851e21674be02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 12:18:24 +0000
Subject: [PATCH 035/166] wayscriber: 0.9.20 -> 0.9.21

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

diff --git a/pkgs/by-name/wa/wayscriber/package.nix b/pkgs/by-name/wa/wayscriber/package.nix
index 497089435293..2d80a59dfb81 100644
--- a/pkgs/by-name/wa/wayscriber/package.nix
+++ b/pkgs/by-name/wa/wayscriber/package.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wayscriber";
-  version = "0.9.20";
+  version = "0.9.21";
 
   src = fetchFromGitHub {
     owner = "devmobasa";
     repo = "wayscriber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nVV/0czewESSbl/OobATBjO+e1iUeJCYSqvEaiNaSfI=";
+    hash = "sha256-g9LFceW05miR6PyHb6p3RvB1mnhAI/V/AeAYtmGplSA=";
   };
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     pango
     libxkbcommon
   ];
-  cargoHash = "sha256-ugzxGYaH8olBZ4Pq1+Tlm16AbGt8GFF2/KLB+NdnFUA=";
+  cargoHash = "sha256-QNzUjY3k8OLsOLzMuEKFy1xcAHVsUOQMipL0c3T7tsY=";
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 82fba501b8a8e576ec1f86d433f89c39497283cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Jul 2026 16:16:55 +0000
Subject: [PATCH 036/166] algia: 0.0.125 -> 0.0.130

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

diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix
index 6c0264b62da1..4b2551e5a6b0 100644
--- a/pkgs/by-name/al/algia/package.nix
+++ b/pkgs/by-name/al/algia/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "algia";
-  version = "0.0.125";
+  version = "0.0.130";
 
   src = fetchFromGitHub {
     owner = "mattn";
     repo = "algia";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MPCCu34bJoj0QctG4Xe6B1BIUyLaTQ7N8IG15jMZCTE=";
+    hash = "sha256-QuusIoZfNhETaVJJ8sUy3Zo3VnRUp7cfudDP562ZNLU=";
   };
 
   vendorHash = "sha256-mim8EImPFHF2vf1vCi9jgECbVAOB32oXxsPMgUwYDBA=";

From f10c7fb55204355b09027765249b9b816e3f8107 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Fri, 3 Jul 2026 01:21:33 +0330
Subject: [PATCH 037/166] ariang: Pin nodejs to version 22

---
 pkgs/by-name/ar/ariang/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix
index 45ec0b597869..1aeb512c61ce 100644
--- a/pkgs/by-name/ar/ariang/package.nix
+++ b/pkgs/by-name/ar/ariang/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  nodejs_22,
   buildNpmPackage,
   copyDesktopItems,
   imagemagick,
@@ -19,6 +20,8 @@ buildNpmPackage rec {
     hash = "sha256-u4MnjGMvnnb9EGHwK2QYpW7cuX1e1+6z2/1X1baR8iA=";
   };
 
+  nodejs = nodejs_22;
+
   npmDepsHash = "sha256-kxoSEdM8H7M9s6U2dtCdfuvqVROEk35jAkO7MgyVVRg=";
 
   makeCacheWritable = true;

From bd6fb4b88d2dce44e9b6086779b864d14614c62b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 3 Jul 2026 00:56:58 +0200
Subject: [PATCH 038/166] treewide: remove redundant
 SETUPTOOLS_SCM_PRETEND_VERSION setters

The setuptools-scm setup script sets the env var to the derivation
version already.
---
 pkgs/by-name/dt/dtc/package.nix                             | 2 --
 pkgs/by-name/sa/savepagenow/package.nix                     | 2 --
 pkgs/by-name/sk/skypilot/package.nix                        | 2 --
 pkgs/development/python-modules/amd-aiter/default.nix       | 1 -
 pkgs/development/python-modules/cvxopt/default.nix          | 1 -
 pkgs/development/python-modules/fastjet/default.nix         | 2 --
 pkgs/development/python-modules/flash-attn-4/default.nix    | 2 --
 pkgs/development/python-modules/formulaic/default.nix       | 1 +
 pkgs/development/python-modules/geoarrow-c/default.nix      | 2 --
 pkgs/development/python-modules/geoarrow-pandas/default.nix | 2 --
 .../development/python-modules/geoarrow-pyarrow/default.nix | 2 --
 pkgs/development/python-modules/geoarrow-types/default.nix  | 2 --
 .../python-modules/icalendar-compatibility/default.nix      | 2 --
 pkgs/development/python-modules/linearmodels/default.nix    | 6 ++++--
 .../development/python-modules/nipreps-versions/default.nix | 2 --
 pkgs/development/python-modules/niworkflows/default.nix     | 5 +++--
 pkgs/development/python-modules/pandera/default.nix         | 2 --
 pkgs/development/python-modules/pillow-jpls/default.nix     | 2 --
 pkgs/development/python-modules/pyfatfs/default.nix         | 2 --
 pkgs/development/python-modules/riscv-model/default.nix     | 2 --
 pkgs/development/python-modules/trsfile/default.nix         | 2 --
 21 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix
index ae581df6a81c..17fe8f5653e3 100644
--- a/pkgs/by-name/dt/dtc/package.nix
+++ b/pkgs/by-name/dt/dtc/package.nix
@@ -49,8 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
         }
       );
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/by-name/sa/savepagenow/package.nix b/pkgs/by-name/sa/savepagenow/package.nix
index 230db6ed68d7..4a7f20ade31e 100644
--- a/pkgs/by-name/sa/savepagenow/package.nix
+++ b/pkgs/by-name/sa/savepagenow/package.nix
@@ -16,8 +16,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     sha256 = "sha256-ztM1g71g8SN1LTyFF7sxaLhC3+nVsC9fJwfYPjkUsdE=";
   };
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   build-system = with python3Packages; [ setuptools-scm ];
 
   dependencies = with python3Packages; [
diff --git a/pkgs/by-name/sk/skypilot/package.nix b/pkgs/by-name/sk/skypilot/package.nix
index 71df3b03526f..7dca34a57abf 100644
--- a/pkgs/by-name/sk/skypilot/package.nix
+++ b/pkgs/by-name/sk/skypilot/package.nix
@@ -46,8 +46,6 @@ python3Packages.buildPythonApplication (finalAttrs: {
     writableTmpDirAsHomeHook
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   postPatch = ''
     substituteInPlace sky/setup_files/dependencies.py --replace-fail 'casbin' 'pycasbin'
     substituteInPlace pyproject.toml --replace-fail 'buildkite-test-collector' ""
diff --git a/pkgs/development/python-modules/amd-aiter/default.nix b/pkgs/development/python-modules/amd-aiter/default.nix
index 021d39ae5836..fdd23f47e654 100644
--- a/pkgs/development/python-modules/amd-aiter/default.nix
+++ b/pkgs/development/python-modules/amd-aiter/default.nix
@@ -90,7 +90,6 @@ buildPythonPackage (finalAttrs: {
     BUILD_TARGET = "rocm";
     PREBUILD_KERNELS = "0";
     ROCM_PATH = "${rocmPackages.clr}";
-    SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix
index 6e1fd821ef09..9d9b77eb7da9 100644
--- a/pkgs/development/python-modules/cvxopt/default.nix
+++ b/pkgs/development/python-modules/cvxopt/default.nix
@@ -45,7 +45,6 @@ buildPythonPackage rec {
     CVXOPT_BUILD_DSDP = "0";
     CVXOPT_SUITESPARSE_LIB_DIR = "${lib.getLib suitesparse}/lib";
     CVXOPT_SUITESPARSE_INC_DIR = "${lib.getDev suitesparse}/include";
-    SETUPTOOLS_SCM_PRETEND_VERSION = version;
   }
   // lib.optionalAttrs withGsl {
     CVXOPT_BUILD_GSL = "1";
diff --git a/pkgs/development/python-modules/fastjet/default.nix b/pkgs/development/python-modules/fastjet/default.nix
index 943823bc22f2..da7a6cb1a206 100644
--- a/pkgs/development/python-modules/fastjet/default.nix
+++ b/pkgs/development/python-modules/fastjet/default.nix
@@ -76,8 +76,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   meta = {
     description = "Jet-finding in the Scikit-HEP ecosystem";
     homepage = "https://github.com/scikit-hep/fastjet";
diff --git a/pkgs/development/python-modules/flash-attn-4/default.nix b/pkgs/development/python-modules/flash-attn-4/default.nix
index d17f7bd27c80..aa38a657141a 100644
--- a/pkgs/development/python-modules/flash-attn-4/default.nix
+++ b/pkgs/development/python-modules/flash-attn-4/default.nix
@@ -36,8 +36,6 @@ buildPythonPackage (finalAttrs: {
   # The top-level setup.py builds the classic compiled flash-attn and excludes flash_attn.cute.
   sourceRoot = "${finalAttrs.src.name}/flash_attn/cute";
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/formulaic/default.nix b/pkgs/development/python-modules/formulaic/default.nix
index d0c49c3c3e0c..eabc06ccbe82 100644
--- a/pkgs/development/python-modules/formulaic/default.nix
+++ b/pkgs/development/python-modules/formulaic/default.nix
@@ -29,6 +29,7 @@ buildPythonPackage rec {
     hash = "sha256-C4IUuyxBbW2DUxF4at8/736ZMmVZrFRRp+RxrJfmLkY=";
   };
 
+  # project uses a version-file that is not present in tagged releases
   env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   build-system = [
diff --git a/pkgs/development/python-modules/geoarrow-c/default.nix b/pkgs/development/python-modules/geoarrow-c/default.nix
index 8537e250bbe9..98d374798857 100644
--- a/pkgs/development/python-modules/geoarrow-c/default.nix
+++ b/pkgs/development/python-modules/geoarrow-c/default.nix
@@ -41,8 +41,6 @@ buildPythonPackage rec {
     rm -v ./bootstrap.py
   '';
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   nativeCheckInputs = [
     pytestCheckHook
     pyarrow
diff --git a/pkgs/development/python-modules/geoarrow-pandas/default.nix b/pkgs/development/python-modules/geoarrow-pandas/default.nix
index 057522cc5437..e0753524a633 100644
--- a/pkgs/development/python-modules/geoarrow-pandas/default.nix
+++ b/pkgs/development/python-modules/geoarrow-pandas/default.nix
@@ -25,8 +25,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   dependencies = [
     geoarrow-pyarrow
     geoarrow-types
diff --git a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix
index 75cf29cddb3d..e3017464cafe 100644
--- a/pkgs/development/python-modules/geoarrow-pyarrow/default.nix
+++ b/pkgs/development/python-modules/geoarrow-pyarrow/default.nix
@@ -51,8 +51,6 @@ buildPythonPackage rec {
     pyarrow-hotfix
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   nativeCheckInputs = [
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/geoarrow-types/default.nix b/pkgs/development/python-modules/geoarrow-types/default.nix
index a9ff0259fe30..75bb2a0ed51e 100644
--- a/pkgs/development/python-modules/geoarrow-types/default.nix
+++ b/pkgs/development/python-modules/geoarrow-types/default.nix
@@ -22,8 +22,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools-scm ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   nativeCheckInputs = [
     pytestCheckHook
   ];
diff --git a/pkgs/development/python-modules/icalendar-compatibility/default.nix b/pkgs/development/python-modules/icalendar-compatibility/default.nix
index 0bd535a1d91f..fdbfe2ad54a4 100644
--- a/pkgs/development/python-modules/icalendar-compatibility/default.nix
+++ b/pkgs/development/python-modules/icalendar-compatibility/default.nix
@@ -46,8 +46,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "icalendar_compatibility" ];
 
-  # env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   meta = {
     homepage = "https://icalendar-compatibility.readthedocs.io/en/latest/";
     changelog = "https://icalendar-compatibility.readthedocs.io/en/latest/changes.html";
diff --git a/pkgs/development/python-modules/linearmodels/default.nix b/pkgs/development/python-modules/linearmodels/default.nix
index d67690e48774..5245dd64f9a3 100644
--- a/pkgs/development/python-modules/linearmodels/default.nix
+++ b/pkgs/development/python-modules/linearmodels/default.nix
@@ -34,6 +34,10 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-/unFszNGaEPsoXDtaS3tsLnsX4A6e7Y88O8pDrf4nKc=";
   };
 
+  # tries to execute linearmodels/_build/git_version.py at build time
+  # which would require keeping the .git tree
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail "setuptools_scm>=9.2.0,<10" "setuptools_scm"
@@ -46,8 +50,6 @@ buildPythonPackage (finalAttrs: {
     setuptools-scm
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   dependencies = [
     formulaic
     mypy-extensions
diff --git a/pkgs/development/python-modules/nipreps-versions/default.nix b/pkgs/development/python-modules/nipreps-versions/default.nix
index b746e0026ecb..163acc5cbfb2 100644
--- a/pkgs/development/python-modules/nipreps-versions/default.nix
+++ b/pkgs/development/python-modules/nipreps-versions/default.nix
@@ -20,8 +20,6 @@ buildPythonPackage rec {
     hash = "sha256-B2wtLurzgk59kTooH51a2dewK7aEyA0dAm64Wp+tqhM=";
   };
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   nativeBuildInputs = [
     flit-scm
     setuptools-scm
diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix
index ef715c969fb3..102570ee3581 100644
--- a/pkgs/development/python-modules/niworkflows/default.nix
+++ b/pkgs/development/python-modules/niworkflows/default.nix
@@ -52,6 +52,9 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-AMUOiIL33kcJtlKT+L5QwcUh8mBBkf80uzOQZFKDauo=";
   };
 
+  # fails to determine the version automatically
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
+
   pythonRelaxDeps = [ "traits" ];
 
   build-system = [
@@ -84,8 +87,6 @@ buildPythonPackage (finalAttrs: {
     transforms3d
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   nativeCheckInputs = [
     pytest-cov-stub
     pytest-env
diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix
index 711093d7e89a..94d0c990ca52 100644
--- a/pkgs/development/python-modules/pandera/default.nix
+++ b/pkgs/development/python-modules/pandera/default.nix
@@ -59,8 +59,6 @@ buildPythonPackage (finalAttrs: {
     setuptools-scm
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   dependencies = [
     packaging
     pydantic
diff --git a/pkgs/development/python-modules/pillow-jpls/default.nix b/pkgs/development/python-modules/pillow-jpls/default.nix
index c7553ab64007..94d490ff54e2 100644
--- a/pkgs/development/python-modules/pillow-jpls/default.nix
+++ b/pkgs/development/python-modules/pillow-jpls/default.nix
@@ -30,8 +30,6 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-Rc4/S8BrYoLdn7eHDBaoUt1Qy+h0TMAN5ixCAuRmfPU=";
   };
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   dontUseCmakeConfigure = true;
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pyfatfs/default.nix b/pkgs/development/python-modules/pyfatfs/default.nix
index 0d1914c58efa..4b66ee31a406 100644
--- a/pkgs/development/python-modules/pyfatfs/default.nix
+++ b/pkgs/development/python-modules/pyfatfs/default.nix
@@ -40,8 +40,6 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = {
diff --git a/pkgs/development/python-modules/riscv-model/default.nix b/pkgs/development/python-modules/riscv-model/default.nix
index 459d9f670303..7794af60b127 100644
--- a/pkgs/development/python-modules/riscv-model/default.nix
+++ b/pkgs/development/python-modules/riscv-model/default.nix
@@ -20,8 +20,6 @@ buildPythonPackage (finalAttrs: {
     hash = "sha256-H4N9Z8aK/xV5gCCdsL+oiR+XQfYtCfBRBGLqvuztX+o=";
   };
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/trsfile/default.nix b/pkgs/development/python-modules/trsfile/default.nix
index c33bbb3e1050..83ae9c24b837 100644
--- a/pkgs/development/python-modules/trsfile/default.nix
+++ b/pkgs/development/python-modules/trsfile/default.nix
@@ -20,8 +20,6 @@ buildPythonPackage (finalAttrs: {
 
   pyproject = true;
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version;
-
   build-system = [
     setuptools
     setuptools-scm

From 3062c171a48ec954472f9ba6dbe30ac9e407eb75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 05:46:44 +0000
Subject: [PATCH 039/166] unifont: 17.0.04 -> 17.0.05

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

diff --git a/pkgs/by-name/un/unifont/package.nix b/pkgs/by-name/un/unifont/package.nix
index 30b81d2741be..804f326281cf 100644
--- a/pkgs/by-name/un/unifont/package.nix
+++ b/pkgs/by-name/un/unifont/package.nix
@@ -9,21 +9,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unifont";
-  version = "17.0.04";
+  version = "17.0.05";
 
   otf = fetchurl {
     url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.otf";
-    hash = "sha256-0fZkqXU7nGt/81cSh0njK10+7pDHwDYYNj+r1Do5tbc=";
+    hash = "sha256-hXAaubHiUe4W9N8AsT8i6sMR1yt9q0J6fZdf5/UGRwI=";
   };
 
   pcf = fetchurl {
     url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.pcf.gz";
-    hash = "sha256-21hNQMglGdfPrx8VWP3lMT+/Guga7uoKbm72MqXjxJY=";
+    hash = "sha256-kld9gZ/QPhsu7IcqtFghB4qed4B6+Gp9IbbaOP72HNw=";
   };
 
   bdf = fetchurl {
     url = "mirror://gnu/unifont/unifont-${finalAttrs.version}/unifont-${finalAttrs.version}.bdf.gz";
-    hash = "sha256-mi3kgmOIJCdxEhx/4A5BJSPDGDGLjuOOa+bNRU5+yAI=";
+    hash = "sha256-2wERwGbt/nWD8Nd62+y7pGPwBkOjfcO5ZRrpNJVDSH8=";
   };
 
   nativeBuildInputs = [

From 1254819b0d54f53394e98c4bfaf58b3039e561ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 06:06:15 +0000
Subject: [PATCH 040/166] seafile-shared: 9.0.15 -> 9.0.20

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

diff --git a/pkgs/by-name/se/seafile-shared/package.nix b/pkgs/by-name/se/seafile-shared/package.nix
index 64b3ccfe34f4..d6cc528cab50 100644
--- a/pkgs/by-name/se/seafile-shared/package.nix
+++ b/pkgs/by-name/se/seafile-shared/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "seafile-shared";
-  version = "9.0.15";
+  version = "9.0.20";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mWIOk8O3vlg7Sm/5ZQUB5nOgi8/pEczCGQ94p0km/GI=";
+    hash = "sha256-PBoZDhY7GN8UuYUSXBCPZyBHBtlNcYK+0yS/rl66v9I=";
   };
 
   postPatch = ''

From 7d4a2692f6392d6a71a022447c5bcbeca8058ac1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 09:34:56 +0000
Subject: [PATCH 041/166] ctranslate2: 4.8.0 -> 4.8.1

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

diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix
index 812a6d88286f..dbc3c7b237a2 100644
--- a/pkgs/by-name/ct/ctranslate2/package.nix
+++ b/pkgs/by-name/ct/ctranslate2/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "ctranslate2";
-  version = "4.8.0";
+  version = "4.8.1";
 
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-Z7Gq+kXIfMdZs48WeptRGXhXnLfehegAwTtQpTbPM4U=";
+    hash = "sha256-+82u+w08wGX0oh1wBaH/epI2IH7lxbvMThJEoGt0Kvk=";
   };
 
   # Fix CMake 4 compatibility

From 2e1c087b6167978c8cdb4a50b1fc7dea43451e1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 11:59:30 +0000
Subject: [PATCH 042/166] docker: 29.6.0 -> 29.6.1

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

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 54505dafcac0..c953bf906617 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -420,18 +420,18 @@ in
 
   docker_29 =
     let
-      version = "29.6.0";
+      version = "29.6.1";
     in
     callPackage dockerGen {
       inherit version;
       cliRev = "v${version}";
-      cliHash = "sha256-2JTiqvrIYhpwbEgU+5DnmlHpaf8Re1vYPkySs93sKZU=";
+      cliHash = "sha256-cpK2UMRP/WXHsehG9Sq5UJAjhMesmXTrhe00y4RMRZc=";
       mobyRev = "docker-v${version}";
-      mobyHash = "sha256-xr3+RZANLP4IkLv26/7znXnTCOm/5Gm7k6WBaOlZfQk=";
+      mobyHash = "sha256-gv+mea9X5TYDWN3IBRpmw0+R2waGxCiubdatNTeUQZI=";
       runcRev = "v1.3.6";
       runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc=";
-      containerdRev = "v2.2.4";
-      containerdHash = "sha256-F0lw7zh4V9JlFQGkE4RNT1VLX8WWLgZAAvbP12jnRMw=";
+      containerdRev = "v2.2.5";
+      containerdHash = "sha256-3ui+0AjEU6H4VHYwF3G85ggVMUdONCLJ5KfciFasmkk=";
       tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828";
       tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw=";
     };

From 97ed749796d9e3fbba376a1b3488193657ab356b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 12:26:02 +0000
Subject: [PATCH 043/166] django-upgrade: 1.30.0 -> 1.31.1

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

diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix
index c37e6c385585..de9163300556 100644
--- a/pkgs/by-name/dj/django-upgrade/package.nix
+++ b/pkgs/by-name/dj/django-upgrade/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "django-upgrade";
-  version = "1.30.0";
+  version = "1.31.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "django-upgrade";
     tag = finalAttrs.version;
-    hash = "sha256-IiGwYq6TTNiNIx1jrzQlLiULWNZlam7onJJGFFJ/hVM=";
+    hash = "sha256-6x1542ieT+G/r3IiCw4aLePY3HLzpycI7FOBqHm1fmE=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 86018282df44832f098480e9de972f699bfe7250 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 3 Jul 2026 20:52:05 +0300
Subject: [PATCH 044/166] lasuite-meet: 1.21.0 -> 1.22.0

---
 pkgs/by-name/la/lasuite-meet/frontend.nix | 24 +++++++++++++++++++++--
 pkgs/by-name/la/lasuite-meet/mail.nix     |  2 +-
 pkgs/by-name/la/lasuite-meet/package.nix  |  5 +++--
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-meet/frontend.nix b/pkgs/by-name/la/lasuite-meet/frontend.nix
index a6ff5debfd6e..4afde016f643 100644
--- a/pkgs/by-name/la/lasuite-meet/frontend.nix
+++ b/pkgs/by-name/la/lasuite-meet/frontend.nix
@@ -3,17 +3,37 @@
   version,
   meta,
   fetchNpmDeps,
+  fetchpatch,
   buildNpmPackage,
 }:
 buildNpmPackage (finalAttrs: {
   pname = "lasuite-meet-frontend";
   inherit src version;
 
+  patches = [
+    # backport build fix
+    # FIXME: remove in next release
+    (fetchpatch {
+      url = "https://github.com/suitenumerique/meet/commit/df1495c97bc913866169ee8875a9a3169fcfc87e.diff";
+      stripLen = 2;
+      includes = [
+        "package.json"
+        "package-lock.json"
+      ];
+      hash = "sha256-1A26T6LtFlOiJNVGD/fZs562feoQXY37A2ecUfvDGpk=";
+    })
+  ];
+
   sourceRoot = "${finalAttrs.src.name}/src/frontend";
 
   npmDeps = fetchNpmDeps {
-    inherit (finalAttrs) version src sourceRoot;
-    hash = "sha256-YnHjuwDp293KVNTYTd4KcZqMamZNeccOdpSGgJ9a3G8=";
+    inherit (finalAttrs)
+      version
+      src
+      patches
+      sourceRoot
+      ;
+    hash = "sha256-uiD5pcpmka43uraMFo7lRuQFx/4aq1BEhQvyCAzo8fg=";
   };
   npmBuildScript = "build";
 
diff --git a/pkgs/by-name/la/lasuite-meet/mail.nix b/pkgs/by-name/la/lasuite-meet/mail.nix
index 128b5f6e8dee..9cdc0bbc74e3 100644
--- a/pkgs/by-name/la/lasuite-meet/mail.nix
+++ b/pkgs/by-name/la/lasuite-meet/mail.nix
@@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
     pname = "${finalAttrs.pname}-npm-deps";
     inherit version src;
     inherit (finalAttrs) sourceRoot;
-    hash = "sha256-yq88kbrKn9HMwvxcWNXm7zonAqTs8T2i7iQAsD0TtnU=";
+    hash = "sha256-EPVkSzhecDZpvz+uOW0GZnmWl9KfE3UpkTCnhVnJ7dg=";
   };
   npmBuildScript = "build";
 
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index ee61defe5c5e..efb0ab1e6b5e 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -6,13 +6,13 @@
   python3,
 }:
 let
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-pUCSdnTBj/qwc0cya3P96r89r2K1GNSGg4DeIhxUKwI=";
+    hash = "sha256-w2Lw5K62Iaqzqa/ckxK36o5ZHFLXUpHnGGGl5PYGjaI=";
   };
 
   meta = {
@@ -86,6 +86,7 @@ python.pkgs.buildPythonApplication (finalAttrs: {
       mozilla-django-oidc
       nested-multipart-parser
       phonenumbers
+      posthog
       psycopg
       pydantic
       pyjwt

From 355d67a12faf6edf8d5c49c698f36160fc6cbb8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 21:22:50 +0000
Subject: [PATCH 045/166] thunderbird-esr-bin-unwrapped: 140.12.0esr ->
 140.12.1esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index bae1f9680f24..633d5c6bb451 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.12.0esr";
+  version = "140.12.1esr";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/af/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/af/thunderbird-140.12.1esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "050378311049a737822518c8b027796cdb39e9adc6dc0c0fd3928ff13e516ec6";
+      sha256 = "be9018fd65fea36f04564f34277e82700dd6f6ea1a08a2141d7e8b1fd18d7aaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ar/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ar/thunderbird-140.12.1esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "c2db9059a6b4176a1f06d055b14dc1464f6c50c5c6ec27f7caf0b52e2edd51a5";
+      sha256 = "79deb45cd4b928e501498a0367882a9b05ef986f636f6d4decaad3dbf4b89880";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ast/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ast/thunderbird-140.12.1esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "60a4c588e1d23b66c27824cee5621744d3bca001ace5bc5a8d0bcdf57fb26865";
+      sha256 = "ecf4361deb934a3a81434b58c6835eeaf226a7265a58b198572a03641858675e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/be/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/be/thunderbird-140.12.1esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "9bb62803d7ce319c380981443f569400707f199e04908f519dbe9b402ff58ed0";
+      sha256 = "be21c4c898d1454573db61e7ee4b8428bb7656d5b9de839f43cc06bf18fc596c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/bg/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/bg/thunderbird-140.12.1esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "bcecc7405a81da15cb9b3ac4fc8cb0ee2eda216c396f2b1cfc98a169733231a3";
+      sha256 = "c14361f950b6fdacb576dcd1cfe751db826ff433cc7df7faa6463b654410a479";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/br/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/br/thunderbird-140.12.1esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "499a036fbf8f9155381f745094c8769ded4e6eda2a08f2157fdfe73b4ca5bf65";
+      sha256 = "e049cefec62df1fa31eeb9cfb0959d07ca6a2ed61fbc1e4b19b392d974900769";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ca/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ca/thunderbird-140.12.1esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "986a178bb234d17112b0852284b0e075a78294d7bddad14df8df0fae1715b2c9";
+      sha256 = "6f4a3318fec4a757750e586a4a97370c8db4320cb3033aa251a8eed21d18aa48";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/cak/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cak/thunderbird-140.12.1esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "2cf04dc47f0491a5d6d7859502875c674a14dfc3ab8be159cf7695f8960f052b";
+      sha256 = "f42fa814fe765c1f99acb1747708f0f485847020de43a82c62e72e5834e2c3d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/cs/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cs/thunderbird-140.12.1esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "373b52333287733e1d9db7692597cf8586a3c1c4b6e65f62f91f5cddd9ab2154";
+      sha256 = "57f774c07dfe8145b3cb0dbd95f65c7f8e97aef3123774f43a2608b5159b03f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/cy/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cy/thunderbird-140.12.1esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "5f52003da7979bdf7f67eb3b7b3cc56eed131ec3ae6ace959effc807e5de0572";
+      sha256 = "9cd18105b3ec4b7026e6eeb09610ebdc7e16e3f7d2f6af91b216a2356c97d6e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/da/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/da/thunderbird-140.12.1esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "2d3ac1aca92ae22e8333e6fe9553756b11eee8206540c2734587210d49816a0c";
+      sha256 = "765ceeec2296798053febab1a1e32dbe142738db72b88945e619aa238713682f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/de/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/de/thunderbird-140.12.1esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "da09fd775e48505951d8d043f1cd82fb30247b69b854e16f1aea6bde5d01f12c";
+      sha256 = "15ba511fb57c09b50b061b4bb164e21391b70a875dd5d0ee3a26fba414326f07";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/dsb/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/dsb/thunderbird-140.12.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "f05b4fa188a0a7fb9f9c7a064033c23c02f7e4d5707381e3e33d7c2c333e55e8";
+      sha256 = "dbf0bf70808da40282e32e1a75e0ed6f21af8fe47faf59888fcdd6be60a5f8b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/el/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/el/thunderbird-140.12.1esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "a0cd68365bcfadccddad5986681113516084d77caf2c8759bd3241efbc000040";
+      sha256 = "4a9c787562473045724653302b2de0bca5626571633246a373ae1b06e57ba904";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/en-CA/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-CA/thunderbird-140.12.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "3a7cc40f7fe3ae92baa11a42921d4bcb1356b7c4f9265544a49b448d463fa0f8";
+      sha256 = "4514da1947cc1733e29b19c4130283415caf6271df1e670779001d2544fbaf35";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/en-GB/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-GB/thunderbird-140.12.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "a46a9d7c2dd95e5beaa381ade1ff77eddfc5086859d4f63dc9603b6988d2f378";
+      sha256 = "31a404d71ff2d3e6c6e0dfea7201cc5bb926fe22d0f57f2e6577384846c699ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/en-US/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-US/thunderbird-140.12.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c5d06b256cab51dd885b566e41cd89092b235ad76c121aae31faea752203f862";
+      sha256 = "9219a4dce3e4fa5b70678df7841151264d27ebbfdd0da8fa3dcb1c42f39afc9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/es-AR/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-AR/thunderbird-140.12.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "f10b84ebde078189d78b3f09b16deb83bfa804c5260c5d0f39f320951df8b687";
+      sha256 = "4f2e575099db2aae498212b1cff6ec9f400f13e620d36a708b7dae0b4d26d19d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/es-ES/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-ES/thunderbird-140.12.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "500dfbd3895d0f286bbfe9e0571364d720fe423963529ac3eddea3995a378b2a";
+      sha256 = "4c1c55cba2a2a9bd0bac06e3de6c53bbbdf83ca762d3dc2df7b8d5e7fcafb44f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/es-MX/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-MX/thunderbird-140.12.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "15b8284199e810afbe5fc8a7c0b0bf3bb1c398d825287247ab36e9f8c4d141ed";
+      sha256 = "33db312a8bcf41d818db437b322c10a93742457440ac89766fc54e2990185785";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/et/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/et/thunderbird-140.12.1esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "738eabe162536ef4cb9ce4410254d87570c54565d114c9b348c5c2951dfb7720";
+      sha256 = "890b21ffe3bc46cc16cbd568bd3c7c773688466b86508972c4bcf9ebd147c943";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/eu/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/eu/thunderbird-140.12.1esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "0b80fcbe4ecdf5243880f9098562762dc7c24453d04bc574cff10948ad2b17a1";
+      sha256 = "5219c5671612d0d2a0caf687769a1f44509ccece02a160804d89c1dc462a3602";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/fi/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fi/thunderbird-140.12.1esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "8d584823c27f78fbc0fcb4f17ff40bb44060a9883926efae679bd6348f014902";
+      sha256 = "e95521bd64512ada8c370e3fe90c79bbf0b05e2b496dd199e1b041d6300ed657";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/fr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fr/thunderbird-140.12.1esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "c553516dee6c8239104914c4e2cb2398c4481a20ce244a3cd62932eb1580f85f";
+      sha256 = "2aa93022829facf005b19544247f5c12ff7cecc5f0794ec9526a95eeddf822ab";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/fy-NL/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fy-NL/thunderbird-140.12.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "0cb8d5f80f59f73e2e126b9095903b88db27955ac3e572eac8469d2033a8673a";
+      sha256 = "5be868b0a147da456afcd3ddf77a298fb70772f7bc63440e4861e470e91a64d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ga-IE/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ga-IE/thunderbird-140.12.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "708f6c7fb1aa1ae282ae78edd85b961c6806aa499c1323359dec030b2497a03f";
+      sha256 = "aa5c6b581f29e3075dfb648928c15a5adcecbf20933ebdff70e0849206e581c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/gd/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/gd/thunderbird-140.12.1esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "6fb584fc114014c87bbc7e7706edf2dfc61edf0dda460c2c065f688450319a7a";
+      sha256 = "16664961711bd9b9538747e107d429b1934ac1fe8310fd643febe7698324de93";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/gl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/gl/thunderbird-140.12.1esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "4450251a717c392df2a94d495450b9a52166fedd49a05145f1a1213736dcb97d";
+      sha256 = "6ff317dde8a319983a01f2b46466eebb8f2225eb2c88d5950f437616ebe84507";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/he/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/he/thunderbird-140.12.1esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "3a167e20ab4ad7c12e239a7446e782dfe1bb9a966bfb2dd58d68f37f8a3b6f98";
+      sha256 = "e0bea2a1252ea3ea6529ea51059e732b03d45095ef3adc7ea7fdde36d83ad398";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/hr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hr/thunderbird-140.12.1esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "d01c579f7863bf3623afa4c4d115a262490f4b2a90eb120087e30a62b8b6c949";
+      sha256 = "1d298936666fac71a516acb54278ffe7e8ac1b5d37139d275624c48a793f2ebe";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/hsb/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hsb/thunderbird-140.12.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "96f389ecc12af0113fda7fa177432bc7e79414af48df33f5742c822ba1bea59a";
+      sha256 = "a46bda6771c5d83aaec24439de21c33a97f01cfbb712dd7d111a4baf589209dd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/hu/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hu/thunderbird-140.12.1esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "4c614d831b74b7570024cdee4b981dfd0b00b24ebccaf1b7b59e0762cdd20754";
+      sha256 = "ebc0c1b12e90a53ae35652ccbe9181773a382fa02ecc29a74f29fca684f41362";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/hy-AM/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hy-AM/thunderbird-140.12.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "375d7cc6f60a1c26a9674e6eeb3f78dfb02b2e1fda02b9bea08c6615bc0b8b50";
+      sha256 = "0b54dc71db19e9d7e28402bee8b98c8d244fb8eac708621f0b5e168ec9662883";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/id/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/id/thunderbird-140.12.1esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "3c9f80e7c7650e01ef750877eac782f1617fba7a39e6772d2a8a6d611c1bc687";
+      sha256 = "94e241fbd784980ae83d8d7238e8e30602d405827be3609b89a0a67d031cc99e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/is/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/is/thunderbird-140.12.1esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "75acc6a313daeaf329c2a575b6f88ae6564b1d7b7fff97e47419306f5d60f4bc";
+      sha256 = "7c9fbe81d96274b8657a966ae7b093bc3e2a8f7e35ef256d175a6c2fc06d4d90";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/it/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/it/thunderbird-140.12.1esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ef896c6db4b5ac846271350915ae4ff51b4d623265d3b6d781665f1be1f2ab20";
+      sha256 = "17c912a8dbca2be4abfd29af189137e72b64213a2eaa2848a19fd5a1493f1635";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ja/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ja/thunderbird-140.12.1esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "6c2049c0c117ecb204fb13062bab60a1e35a6523746b5975359caddde38e1dea";
+      sha256 = "dab5b64a874c14f6f9b07224e93ac2cc35f4f787e7faf57eb6e04030d1041cbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ka/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ka/thunderbird-140.12.1esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "06752896f2e67994628fcdac734b0139912af4831e7c67e25342b20bdb02d6a4";
+      sha256 = "115d44e3d91e5018d426c2dbd204cefa019bd671c65a7bac125bb27614e6a5db";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/kab/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/kab/thunderbird-140.12.1esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "4f60b77216c5e3d7ccb22457d42f741bfe5deb439e4325241bbd21be4b68fec3";
+      sha256 = "dd5168e203131682bf80b0e7dfbaa7e212dbd375cf886861412eca7a1d0db7bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/kk/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/kk/thunderbird-140.12.1esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "806749e4ed884f6cab1d598131e33960299e111e6d30f1889ae4fba37bdb7768";
+      sha256 = "755d97a8987dd5bd8fdc5612ce687e162713670483b3c55e7b44c7dd042a91ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ko/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ko/thunderbird-140.12.1esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "dfada3e9e5e47a65305bebbbf119fd818318d2f29ae4311d85589b894102fd19";
+      sha256 = "30687136cfa82e455667604e42f495e83a21ef90b19c865de4f7099013ff3cbf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/lt/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/lt/thunderbird-140.12.1esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "dbd680651d996ac06e2b6eeaa627b956c27a1f30da7e5e9f6a23f148d2d93abd";
+      sha256 = "f087ff1203bc99e78ebd04ac80527f547ca13da3c63fecf379ab30e130c2a526";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/lv/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/lv/thunderbird-140.12.1esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "7a3595b074dadd6f3fa05a9f923150b32ffc5c4df33ee012e3392ddc2383b81f";
+      sha256 = "9fa7035fd9e39c727486d52ce5dc56bd17bf753758d5a5a693f7b33ee5736087";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ms/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ms/thunderbird-140.12.1esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "dbf7ff229cd76fbbdf8ad82e2ea10080e9ee7c9a89d87f48b81d8bbdac645e46";
+      sha256 = "7983e316aa18d324ba9fbca057d96ec0028575d126c32ae045176ddef811dbe4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/nb-NO/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nb-NO/thunderbird-140.12.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "787e6d7ab5be70c6cc3ea7ff5289c085a10e702e1bca050fd88df7da71a0b837";
+      sha256 = "d7921d8bf450eaa33646d3ae66c7645ccb88eb6486edee48134efec9759bd229";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/nl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nl/thunderbird-140.12.1esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "b8c8ea2e4b31cdbe3e6ee79f693a24a2e3231514e182591d50b98fba410d147f";
+      sha256 = "5a55d46fb87a2737986c6cb28c35140063040dfa9a734025504c5e818d896840";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/nn-NO/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nn-NO/thunderbird-140.12.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "02c3eb86d19c56bbc8f22a6975f9545bed929e1d76bd0e34815268c7d9cf9d9e";
+      sha256 = "fe501181a77c26d9653dea39ad93fc1d822ad1759ce4d39942eea10b2b85366c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/pa-IN/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pa-IN/thunderbird-140.12.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c5689b110edee033d0af26e49321f8bac2ddad122a34a65006e7e66758b3cc62";
+      sha256 = "c8a3393940e824e07c3754be6a923d94fe18520eeeeb687234ce5dca7150c0e7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/pl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pl/thunderbird-140.12.1esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "13ff125aff920248de22064a41653daa94ffd5b3be8603bb184a64d1bf6ae1b6";
+      sha256 = "a9491c647a326d167c4d48cd6ed12ae6dbeda56d74a327f52200c2a4be1160d3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/pt-BR/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pt-BR/thunderbird-140.12.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "36313bb55ad5a173c016baa48eaeb21e724f34245ee506335946be88341fcd19";
+      sha256 = "1136d4946243d708dbc1c9da8e049d19c4e36c66f0c985820e37d78738ac7f6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/pt-PT/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pt-PT/thunderbird-140.12.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "639ebcf46b3e8758cc6d0913dfef1ab879e5bc1b88918378f04c88c82cf7319a";
+      sha256 = "e23622710ac085886fd024e3190de0970aa51f9997ee58867f502f43b3cf631b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/rm/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/rm/thunderbird-140.12.1esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "5768f3989cd9760453f755f4079d943993b4a066ab7a67ed205ee01f98a00bef";
+      sha256 = "5d151b3715a3dd26bb38a2c5d8c10214c9f23bce42018009a9add87b8ed69e17";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ro/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ro/thunderbird-140.12.1esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "6ec560d39690ade92c3240fbef80ca6e7dfd60d05318c4c5f380e83e82ab8d30";
+      sha256 = "0b113061d80cbaf5cb535634ce373167d6a64cb1f3237d33633d2fea125f8e4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/ru/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ru/thunderbird-140.12.1esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "57771e5eb3fe249beabc14406d5cfb4fa441e34e499ae33182bcd16329f7f006";
+      sha256 = "7a39a7d6b459e27f321fdd38f39a95958c5032d3ecfcc051ac2ac44949d527c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/sk/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sk/thunderbird-140.12.1esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "26e886f4a2d592b63bdf2d7134732bf6dd723f96b35b3c7401557bad1f69ff7a";
+      sha256 = "63d73b38596f78719f3223e9bb2943e1e984f415d82ce6a2c33587c8e1c49e43";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/sl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sl/thunderbird-140.12.1esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "ff6fc182474650b0a06df3eaa17fb8a25d1c6c6439593dad15dbb2dfec6054d0";
+      sha256 = "aceafcf6797834e8b4718b57124c0a1c4ef4457bf3e70e23ad5140c40ce2cf2d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/sq/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sq/thunderbird-140.12.1esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "397558e6d682b2ab113caa37b2f9d92a18060c4186765652ed2c5b25a099f522";
+      sha256 = "2ee339035fe6d9507a8e52879ed56982ed534f7cae580fd7ae46656607626042";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/sr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sr/thunderbird-140.12.1esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d8b38efc58ea52d26de81fa6d102111ba2fbd4223f0d249df50da454dd938a00";
+      sha256 = "69bd23d5426be0eff640aa012a27375c1af0810dcdeeeab04760112bdad0a798";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/sv-SE/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sv-SE/thunderbird-140.12.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "45e221d41072469de109f44e96f14e08805386c204916dafc5c4e0d3c19c8488";
+      sha256 = "3860304e7c2690ce4596022744f2a4108f4e0850eea9c35fc5e5f3030119b403";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/th/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/th/thunderbird-140.12.1esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "a1db6cf962d3a37d2d0377af2344e9096023f312411960423f194aaa4d463440";
+      sha256 = "165ac84909adc334bc47b8c9df7cd5450fee5c4d645da893b1f337d4c36dc0ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/tr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/tr/thunderbird-140.12.1esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "942b512f3a97855af979f169aa13efc2c81e40a57cae9eef847a8002c32a2edc";
+      sha256 = "03ec5cda6b9e65b5a0763e354d39ff96586a8d1013f217354b8c0b44634aac28";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/uk/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/uk/thunderbird-140.12.1esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "419954a7b515eda3cc4b05b0264794e5cdd30e7990ef22bda5853e2d2cfb66ed";
+      sha256 = "1fcfc649b3313e17d0a74a1ffef8ca05935632d7ae0efdd2c546555cd099cabc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/uz/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/uz/thunderbird-140.12.1esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "0fae72eaff57e94da55986fcb780c7f78a3d49d6e88579a8f27b0458c7e795a0";
+      sha256 = "7385491cd07d147b598f8c95c0522b9d9eece19a3bb02b21112deeb419f78ede";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/vi/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/vi/thunderbird-140.12.1esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "b2d34a336a99bb62653fb67cea88556e9e5257b3f274886bdb487b3d2cb8afe0";
+      sha256 = "bddfaa6a2c41872e4b3a739163d1090e8173f08538dba53a5779087a58cde745";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/zh-CN/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/zh-CN/thunderbird-140.12.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "f1fe732f4ea7b201aaa45f8465a355a427c6e8cd3735d6d0439d62bc70d2235f";
+      sha256 = "d6a5a5ede7339f087c4ef4c246895be9e09200bbc7b4940d3d103c4c636d6aed";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-x86_64/zh-TW/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/zh-TW/thunderbird-140.12.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "d110e9903ce4638f62640565b7891c1526489a0a3ad1056db62da30ea410ec18";
+      sha256 = "7bffdbc3af3158652c2a1ae7fc824d26b7d57daa5bb8d65ef2137eb33bd3a2eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/af/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/af/thunderbird-140.12.1esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "322ae7ed2d53f00984c8bf0b18b2c716dfd35a2e7674b7841b9d3d2855fe2350";
+      sha256 = "b520b52478ceab0508b3ba28b4ba22b2c2ee3e7e6d683bd30591191af35ebe48";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ar/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ar/thunderbird-140.12.1esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "8aef945b037a93c5e3ac7b87dc249d61a4b2ef9dfada4cb9f5cac39fc7025d9d";
+      sha256 = "3251114ee3d1d01a51ab60d486c0251020986f87acec3e83ff19102c3d530b8b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ast/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ast/thunderbird-140.12.1esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "ea429dc3e7ba910a88a9a49a83569379dc5cf17b9e85c212cb9ffd4cefbd8af8";
+      sha256 = "eabc7ae14de3b38dc7897b12214ac9a2564deaa3d98ef0893a704c6f5884478d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/be/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/be/thunderbird-140.12.1esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "c3baf19133f41517dc8d71c84028065e32b17d6dae6358868041030ca7352120";
+      sha256 = "0be307dc8bedbedae132ca4a3c72e0437f7b625badf607ab6509eb0cd32129c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/bg/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/bg/thunderbird-140.12.1esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "751b14bf9465813c0409a22a0cd8b04d959d0a01fbbde790dc15d3d5324352b1";
+      sha256 = "5b9adf440bd069833843b02c00204971397b8a1e39a87b94da28e327d981fce7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/br/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/br/thunderbird-140.12.1esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "05d8a35a456493e2e4d33bf137bec2c95118ef5022a3f96fede59522fa35d1d3";
+      sha256 = "01b47cbc9deb1d16b89b0965bcad20d51c60cc4cf26821264b080d410bca51a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ca/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ca/thunderbird-140.12.1esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "8fff2a6eb652eb5be5d094d5df0b2519c9ed46f31f2518d6c253fb782348ba4b";
+      sha256 = "5badc5fbddda73bfbe828ee095d27cd1c5f49d8787a9e4821fd09c26fd9f8885";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/cak/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cak/thunderbird-140.12.1esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "f06825ad3cfb733d28a19fce718b0dedbd902e3ed0477e3561c52e788863b9c2";
+      sha256 = "4dccbba36bcd3f06e477e6d543e772e69a0635845d26d64f01a06010f858babc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/cs/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cs/thunderbird-140.12.1esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "0564af5f85093fbba2785a444dd6c1eb3c7f36e9743810ab2f15960a4f8e4dbf";
+      sha256 = "150838ded74553e561087eca0444ae6e9e46896540d91687431b5089ca83c37d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/cy/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cy/thunderbird-140.12.1esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "a9fdbbfe0c87235040f8e53a8b8a89e8a2d9e170a5915d0ff09b5bff3c8cbdf2";
+      sha256 = "f3e0a6c27e254772ca18c6937391186ce9126c57bec71dc71cd46e9dd9b17687";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/da/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/da/thunderbird-140.12.1esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "8a83c0b74d92f8dc1c7364e86b5b57c99d7beae778000a18f6408aef1e027675";
+      sha256 = "f835517b095eb3e64f1cb84f7adce45a1af69d865ad26c563d926e97de3a2b44";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/de/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/de/thunderbird-140.12.1esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "4fff877677ea3473e5a2112577d5496778e49d2f1875dde617a4d5d2f9ce54b4";
+      sha256 = "14c624a29ee80726352dca7101d6395e971a10ca9397d5a2b1c20cf106c61e64";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/dsb/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/dsb/thunderbird-140.12.1esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "a95cb3ee5df7373048c671833923cf10eceb94518d7b134f0ae5ebb19fb5451e";
+      sha256 = "f9b99a02515378fcac4ce2cd2b65cfb647ef845750362a6d6a3ac61e98eba687";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/el/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/el/thunderbird-140.12.1esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "926849efb07f19937e7b1bb88c97f963569e840bb580d405a62c91a941dbd84a";
+      sha256 = "3ed79ad13c821ad87c66376ce4f9283c19300added87a88d4d8735331ac44c7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/en-CA/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-CA/thunderbird-140.12.1esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "402e06a6c83824fd0eb2c39289662d623a66d572172a90b599a4754756934036";
+      sha256 = "698015ad0c3ef52a9abf38d20c5f4ab8f434f2450926a06a5c0840115121b4d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/en-GB/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-GB/thunderbird-140.12.1esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "c5f0e1761fd16624d9d1830a980581d8069df4b7c86beb9c2c53b384224b8e38";
+      sha256 = "1ac015e0f4bd8848bb95b6c2201b8167abbfc45421d800348a488ba0f3119edf";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/en-US/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-US/thunderbird-140.12.1esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "c72fea4b5500105d1656600f2c06b42740d1189e08062099cdb69829d34768fd";
+      sha256 = "a21ca02982f3d88b03039b699bba90a77e0a7cbdeddfd51bed5e6a7ac29876e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/es-AR/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-AR/thunderbird-140.12.1esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "c8f5bf4dfe5defab943d7ae9c16f6c97ae029c182f177d04a5d3426c0f5f56cf";
+      sha256 = "9781223342677c21b3b806df269a911e18954bab50df3829c67bf8d542f38953";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/es-ES/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-ES/thunderbird-140.12.1esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "1980b65149a256ec28b0d9e308d0bbaf24ea94810e1c64ef2139867b0e212458";
+      sha256 = "5aa5a3540b03a3ab3a7b7394467ce1985563ba8f51e92c449d5c82a14c3fa3f6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/es-MX/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-MX/thunderbird-140.12.1esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "5fcf85ed117a6707ad6bcf8a0f4c77466c99c532389849c985b58364180adc0e";
+      sha256 = "92b2b8bd6cd999376709cdaf196a76041cd5a26e789fb9b2ffe3e712183555c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/et/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/et/thunderbird-140.12.1esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "a0de80f954cc1840563dfa0e0ae217df920370107be9f79fe484c9a22bb1b261";
+      sha256 = "7886929abd458a1d1b734a205bed81d94993409ced11f031a5a53d546ec8765c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/eu/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/eu/thunderbird-140.12.1esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "e0722e189bde39ff9b06983ad6bda18e7b8be6b348027e0012e649f364b1fe4c";
+      sha256 = "cca8aff9c6273d4145ec746d4b1cbfbca78bde4b663d0afc35ad8fa1b8576b4d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/fi/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fi/thunderbird-140.12.1esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "f0ce1ee9a0c6ddbd11b72834a6e9b15688847890d9cf852e035d4576f2800bd6";
+      sha256 = "7c1f5997171892e340f92c4de01f3f609b2f6a7c0a5189350823f39e6e7948f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/fr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fr/thunderbird-140.12.1esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "9342e4650e9fe94baa229fb008390a391e1530e75dc31ecfc2ba93230cac47d9";
+      sha256 = "5cbcd9928838c44896a903d4a42fb06be0ad12175da8c972a40cdaf14ea2a3a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/fy-NL/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fy-NL/thunderbird-140.12.1esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "46018dbd147365a3b7df8e154aecdcfa4daca1c97f4b951cb7843bf3c8ad60ef";
+      sha256 = "7b3e22f7974d1a802e2445a04b1138b32560cf84425ae1c4d728dbfe333680d5";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ga-IE/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ga-IE/thunderbird-140.12.1esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "42bd37c9a1fe3447c73d03f2f9de98c9436660ebb38e196d0116575f87c85e57";
+      sha256 = "87d459dd414167e12f97caa0d927b71e2a234d0ed12707978e1969b5aec03c3d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/gd/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/gd/thunderbird-140.12.1esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "240db796b1226de3b49e2b69b77c7c5c8eb06ad154f636c0e1b0df668a5b7bfc";
+      sha256 = "83c6e9c09917d70484b86dc4b318449f5e92677e93266792ad72a4681fe4e206";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/gl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/gl/thunderbird-140.12.1esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "7ce6f8b93e71d253986bfcb1689bc855e28b2e2760c619f0f281ff184a3feee5";
+      sha256 = "f64dd91c64096cc6e06a455f952e41577511522caa939f08cce80d206a15508f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/he/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/he/thunderbird-140.12.1esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "36e7a54adc1d45ceda5031605c84c1e37df7a8c46af5a6875366af6a572b84d0";
+      sha256 = "146089027ae517144c2f51576b1802f6a13f6fd9a58f451d61d09c70ec63429c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/hr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hr/thunderbird-140.12.1esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "19357676e620fbb28eda02aceaa05ae92ec1c664dc981c37ea22700d18d2afb6";
+      sha256 = "a4ebb133d33be440bbafc4f3b87e0c5bc30c53834b8e990edcdf49766bfeb99a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/hsb/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hsb/thunderbird-140.12.1esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "d1b0ecc410560a47a6065b8b398dbaabc158f816186d3f63e57232a7c4f9dcaf";
+      sha256 = "ad15e52932683f5408eea7749abd3745787b1d603afd283c8b380bcf5a313e4e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/hu/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hu/thunderbird-140.12.1esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "07194833837fc6dfdfd039e99aebe73c134c10c0ea132b43ea0136682207545a";
+      sha256 = "562f1b5e58b7912b2c72a9dc72e14d4bf13f702a3aadae3a72cf697e9ee2eb19";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/hy-AM/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hy-AM/thunderbird-140.12.1esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "45fe4943bc42dfce2a43bb2e42d86d868f55c13ff65903333c921c16f053677c";
+      sha256 = "0dc244101322a521e28598fad1cbd93ebdd0d2165a1d7fe126fc293b9c95ad92";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/id/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/id/thunderbird-140.12.1esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "9f353589846f36e4e8e38730ddb794f5b2ccea43218f3b688ca15ba56bdd4384";
+      sha256 = "f6494040521b1aff5aa3be06167856a0d8ce699e6cb37a892cdfaa0070da4419";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/is/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/is/thunderbird-140.12.1esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "795bb109b2947922fa37fc4481f7ee7f8ac5e84214e1730935d0b5fa76eea513";
+      sha256 = "e1597ef6a1313ee50f09f6fdd049c6f360d029c08ef23ce8b29925d82402365a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/it/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/it/thunderbird-140.12.1esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "002b3b4b26c48b4a20c126eb297362e60559e54b427c5dc986b95943701fb7cf";
+      sha256 = "8e98a32d07b24259d51b3bf3752f3b85848403b1f59c57f51536330d0567471f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ja/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ja/thunderbird-140.12.1esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "89fc3f44eae88fe84c6b05614c5bab705ee77e335989d1f06f5805c27165d7cb";
+      sha256 = "ef83364088cee448f1a4e3b24661a78f615f51e8dad920b483e3234d4cd8f1b4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ka/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ka/thunderbird-140.12.1esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "90fc0418b806c7d7a9e486f314dc4d6c0cf27fb3e6a728bdc8a2157fa3f67229";
+      sha256 = "3be9730bf6abe81eccb7d830b535ec5148b53cf2c1263aa400a2d2ecabcf7b38";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/kab/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/kab/thunderbird-140.12.1esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "a5deee3473991f6b1aed7eff55daedd636968a8823448540eb30194c359c5622";
+      sha256 = "84c9602022538c9dd109b70ef61041fe7418b772c35639f0bfb0fba8467c17b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/kk/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/kk/thunderbird-140.12.1esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "a3f66fc880a81d570c3ebc25a54a4dfcebe3ca135daae2f6afd0c27695ed8fd7";
+      sha256 = "888ed5bbe5e873bdd12b0688d5c3be8f4121dc4fdd8021e91e18512fd6ae597c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ko/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ko/thunderbird-140.12.1esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "191349bd6b473e9dd9710b61d5677b81da41573037f8c7f73f600697e9175df7";
+      sha256 = "11016f84ca55fdf8ba66895ec43c5c7c4ce45d36c1c8d877cf36a579c2a94e73";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/lt/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/lt/thunderbird-140.12.1esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6c06b42407a868e29041ab2759c0a100d110fb035178dd06c6b899718c8ebaa9";
+      sha256 = "95a570c146e17c523d30194740f94a08cda05ba63d653865269af90bc953b89d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/lv/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/lv/thunderbird-140.12.1esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "39bf7d6a2ff69515fcf30be853961a6e51e95f4982c20d7eaad3b732abfb53e0";
+      sha256 = "629ae06a9940b3bab1163ade2329adc3126ea41f4bfa1312e1e36786ce87e0a2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ms/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ms/thunderbird-140.12.1esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "2aa551301599b7432c46c3d30cfceb250b2a856a337f31280b0cb181df01ad9b";
+      sha256 = "1f692dbe750aaf4f05f95632352bc67c6da69488b632ef89641f74829af1c173";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/nb-NO/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nb-NO/thunderbird-140.12.1esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "6d8e7173170bbbd507b0c7f06398a4099af05901d3257581adf69932b6db341a";
+      sha256 = "a481cbbc9888681e9b49c121b2ca94300fd427665b976b0ae124b6dbbb4d8987";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/nl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nl/thunderbird-140.12.1esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "db1bac4729c7bbdf937de9fdf844a273b538891a8731b8dec5219fcfa719018c";
+      sha256 = "a04d5ee21a69490b5ec0529704ec4f4f7db301f4a66bd15083ac945cbd549dfd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/nn-NO/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nn-NO/thunderbird-140.12.1esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "55d0018db9450fd5ac2973eca00d142803b0ec2646b1922d1ac158ae1dafc0de";
+      sha256 = "df72af0af915afb82253c85de7984ef29574b44cd179cd23f54ac59558768542";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/pa-IN/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pa-IN/thunderbird-140.12.1esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "2948ec961b64c313d2c19f2f999e451f8581f7dc28577093060475180f69a201";
+      sha256 = "5a15e3a2362e53f3e9e1bf1ac9383e3bc120d5348894f8c6383af684345e2da1";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/pl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pl/thunderbird-140.12.1esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "84231f7da445e4ab8b830947e78f600a00575ef57a64f9c298801a074fdc990f";
+      sha256 = "e4bda61c36cf9427f8086c6c84199c0599bac72008982a4ac2da89a26cffe8c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/pt-BR/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pt-BR/thunderbird-140.12.1esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "04716af585200d122e2986de4b7c807f306cff73ea4a84751ccfb9fc281a37a6";
+      sha256 = "55ae0e5c95927befdf768469648dd1e60cbabc6fee17b19726e249a491dd43db";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/pt-PT/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pt-PT/thunderbird-140.12.1esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "15e1beb30097d402370c175e877ee3592702f2d72f54a6972c94634824d348c1";
+      sha256 = "e7c26ade8ecc4b3e6917cb795f68945066feaa0079d5ccf0d50ce1edb770b5a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/rm/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/rm/thunderbird-140.12.1esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "a7b4b228ea205ca30d659cb55363b5d4f52a13110858a5e9eec8ad6b94a4a28c";
+      sha256 = "c77e809f87f7d13a3567952673f2d0b4c37dbac7cb95212500c693847cd6b41a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ro/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ro/thunderbird-140.12.1esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "d126beb669b499d379030b73e15f47c8a5efa6f5f5884db7a21eb3272127403b";
+      sha256 = "c6062ca4e6626dc448e47362a5ed29de48e1d2ebb439d77d28d9478a2c0b4949";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/ru/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ru/thunderbird-140.12.1esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "0842b0fd1c55fd47ab364e1f73be15eba7dafd810d34a56d45f36fce5bd1ac4d";
+      sha256 = "91c801faf58e6fc5794ca084b70bda15fa504d7b23b8a2b7a8db7bf75275ce65";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/sk/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sk/thunderbird-140.12.1esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "1b980e36a94b36efa7c60257480af9610f0db13dbaaff5272f82b9d8eae6b5c3";
+      sha256 = "72b93a682e47e2e246890ea6971ddc46ee586153549d70cc66b7f603a82c3227";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/sl/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sl/thunderbird-140.12.1esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "6b1e6d6ccf704ca02f65d30162bdbc527cb27b3097cec2cf5274291f9ae20411";
+      sha256 = "4f442bd3a070de0a640527aa077ce480c1b18f16353425baf7efd179d19425c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/sq/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sq/thunderbird-140.12.1esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "d0aac1d9c39aeab1767e629e82104797421961070905eaa7f46e049201547fa6";
+      sha256 = "23fde29af4fbba7e20a01923b1abe259d296a74871a4ef370c0624a4a28f3a0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/sr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sr/thunderbird-140.12.1esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "7ea70111184ca1a4e039221b33fc886fdef72115219b40f174e94b0cb23a215f";
+      sha256 = "445c0654200decad0fdaf7612d9d24c20de827e19054bc619cb5cb65a28b06b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/sv-SE/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sv-SE/thunderbird-140.12.1esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "483e0aa0aff479a47f8d9f910c3f783c6503d3968197c95c483a21cb128b95ba";
+      sha256 = "04c8955cbd2cf75e2ec0d95abcd594e5a4de5a43f5387e4f37079254c3f61335";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/th/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/th/thunderbird-140.12.1esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "52325f7f5f2e1a8d21dcb4ab5f5bc48ebe86fd96bc2ef4234e695e1d3f36b7e1";
+      sha256 = "c63fda92f76c6c4c921adfbf06822297665c981cd501b29ec332eb5794816942";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/tr/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/tr/thunderbird-140.12.1esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "ed291cf3f52fc625995fca6a986e4a621440210ccbffce8401bbbb9166d538a0";
+      sha256 = "d4adaf76dfd82ce79ce77fff7b039471f5d308228efa7bddcc13b37f9b680060";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/uk/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/uk/thunderbird-140.12.1esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "ebe8eb38bc75d62824bff5ac6f6915cbc29a6847514b18ea377051a8c63f71ef";
+      sha256 = "280cd0d5a55af237fab2f2682a006b7f1e988fdaf02b9a44cda96f55658b6229";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/uz/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/uz/thunderbird-140.12.1esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "95d33ec046461a940c5edd4170edd5b00311c7591f24720209200df2c8092875";
+      sha256 = "492146aa92ced6882a6a55a4780c28f88bae944fa074a3aa1a5859cfd9fa58ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/vi/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/vi/thunderbird-140.12.1esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "b037ea5128e005efe164553db0156cf3d63255598b21a6701e05f6cf72b38827";
+      sha256 = "9236344e5284f7fa5b04daef9d2dc0ba09ce21498aa4f2b8ecf35957f23d068f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/zh-CN/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/zh-CN/thunderbird-140.12.1esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "83093ace3f6fbb2bdbf93d35315fef2b78ddf79b1f0adbba78a0084d22c8a120";
+      sha256 = "9cb9de006d389c13fd00fb0cf9df69139ff18c0b4ece994a2d4b0072f29ea770";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/linux-i686/zh-TW/thunderbird-140.12.0esr.tar.xz";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/zh-TW/thunderbird-140.12.1esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "0ee17bc1a388c022de88307d86d06b8dae855317d754cd9c16d061879764ae24";
+      sha256 = "92456256948e38efdde5ea801d0c373f0592707d1bb1178b2f1adbb60ae64213";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/af/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/af/Thunderbird%20140.12.1esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "2e0fdeefd7f7379cad024983d99f1a279e32734194f3abc1e9be07d76ffdb221";
+      sha256 = "0fef87105a73ba05dfdf6be92d472d4d5c982481506697a7d2a0add172842a8d";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ar/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ar/Thunderbird%20140.12.1esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "919530d0d7949d2183b8de0ddfd1fcd901c4987a74a2632ea61ebc35cf7e15ca";
+      sha256 = "28f6c9eab299bc3694d2ef7ae6138889fdae6ed7b7de78c6a9aada87fe4f38a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ast/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ast/Thunderbird%20140.12.1esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "fdddc5614c36f543070271edc6f88a5ec06c99423549f3bc453117bfa59931a9";
+      sha256 = "63869bd4c720fd47ef289b217c5db2bce68518efe0f8345d1e3a44df51e8bc17";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/be/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/be/Thunderbird%20140.12.1esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "a13cea6ea1147fc1899f08f69c1290efa5ba2c8a8432fa8b35de70c429f7602e";
+      sha256 = "a5bcf4f3fee19b0b6c841669a83476759b75c0c7084fd01c0f2c45f84310a566";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/bg/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/bg/Thunderbird%20140.12.1esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "6d2a156b30b65525536ceb4170dd0e4ac711ec5fb487345a05454e3d7143eac1";
+      sha256 = "4b211c162a1ec29de5ad8d106c0a629600113c778491126c5897aad5228b0eff";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/br/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/br/Thunderbird%20140.12.1esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "edae45cfb19a182656111b5ce01120624d21e47812fe919038cfdeaebb14a0a4";
+      sha256 = "65985864e75f7d8d994070c8708d4ef8dfd3a00cd6dbd977a4fa30cad7e1cb57";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ca/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ca/Thunderbird%20140.12.1esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "161ba0d71513b5ed6284ee33bd1925f4f95a917d17a1bc5c3d932852e92f0877";
+      sha256 = "bebe335a26e384ee788885bb8b737b68b4fb8d6edad0c165425d9609079bca41";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/cak/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cak/Thunderbird%20140.12.1esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "11241d8886db8933ee37011947e39edc16b253cb860adcd428b00bf5836352af";
+      sha256 = "e94d4fe036361140e747c46ce55166603356f5d46bac4746e14a9363c1519f2f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/cs/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cs/Thunderbird%20140.12.1esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "9251cbd0342609dac36b7b4af04adc39389c43355652eb66b4aabf390ef888b6";
+      sha256 = "248cdafa7e62f4b49f914bdc6b5ee69643b754f68d86cd88018d7618e47d70b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/cy/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cy/Thunderbird%20140.12.1esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "d0d3846ebdfd104479ea919531c1f58e5b6d762b884f49a8016c398c88c93dcb";
+      sha256 = "dea95b3c3658ca476f48add5c9bcf89cee784d8076bfd951364168c519b8a7a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/da/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/da/Thunderbird%20140.12.1esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "02db45f5ebcf68dea3175ff963ba74ab0997f1413728a4d991a5fe04efd4512b";
+      sha256 = "976a52ff8776cd75a90a8e3b3ac00026c96ba041f4e76a5de889d010851d4261";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/de/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/de/Thunderbird%20140.12.1esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "33e4ce4054784fed1e51f6fb3303781ffa98da413394c5554573dbf71e3b63e2";
+      sha256 = "6fcb167da688ba52bce4477c62c8fe07c67f14718fadcd3719fd49bff63f8c80";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/dsb/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/dsb/Thunderbird%20140.12.1esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "964c730b7beea89ba59a628eb1c16c9e8f12a2292e7834e049bc2eafc98df266";
+      sha256 = "f3ac9ff7d9d24ffd6b267adda98af7944ad259a40600c4bd02d77097c551373e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/el/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/el/Thunderbird%20140.12.1esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "c254141f904fb8be38903fe7ea02d7799580a485afa4906655752ea749ce4db2";
+      sha256 = "481796c07b5d469746f9833e0cd5e8e3bfe1cf91216d6e4809b3e3d976f6a942";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/en-CA/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-CA/Thunderbird%20140.12.1esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "5c4cf089440e80cb3a6e2b2c3523dc158da83ab31becc885f079345b5aa29ca7";
+      sha256 = "6f004764e0139d8ff51ac098d572c5a68351d144d203fa68b797490daa72c9cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/en-GB/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-GB/Thunderbird%20140.12.1esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "ebc9759d712f3474e9b4124d827837757a2f7e96e2bba33d032d42304bfb9bf8";
+      sha256 = "a814bbb9e61deeb5395b11c1dba1f7202dfd4813319f5011d8f99bcd203c941e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/en-US/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-US/Thunderbird%20140.12.1esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "4bec2d760c561c9f0c47e0449c79859577d99f814cdd2439dee8af4423b89cb7";
+      sha256 = "a7545590281d0d75bfcf107c5b281e45b5a09d64229ebfce33592c423b581006";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/es-AR/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-AR/Thunderbird%20140.12.1esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "1292d70d777876d94e5444b9620e899f64a18f648d8000b67293b2bc5beef2e2";
+      sha256 = "0c36eeff28151332752f6144bba01d9dc5955fa31776824080b920cf474880d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/es-ES/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-ES/Thunderbird%20140.12.1esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "857bc067881d719f49d2e9a22635dc5d1b2277de7ab15bee44d7b6eb4ac0d0a4";
+      sha256 = "f4d7bde33c2502435d4e9ab95fc82ce9b1a46f17697bb14b7fd64f51d1fd3d11";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/es-MX/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-MX/Thunderbird%20140.12.1esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "83a493497bccf3ce8b11a0be250f1ed4721140200b8e787f7c4eae39fe5f669e";
+      sha256 = "8b7d7252754f16e811e9ef1fc9aae774eb37ef1442dd9676ec8b4e70abd3f39f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/et/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/et/Thunderbird%20140.12.1esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "925c19faf90e80aae4768e1f42eacb4ddce6388200bea8faaee3d46f85df33c5";
+      sha256 = "b330eb3fe10cd519f80676baa6936697efb9b9d095f7a166180cc36e6d7ee949";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/eu/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/eu/Thunderbird%20140.12.1esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "3bbd84bf2f5ecad3d7f49671f2d056db2bfc129b6384054140eeb359575ada10";
+      sha256 = "cfb69e8ebce5203178f0bb3a900849dff0f0444d72a16458b68c2e465f7c1217";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/fi/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fi/Thunderbird%20140.12.1esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "38107d8059b94ae9b3693a849cc59ef80e64286069f02bd21e653c05004ed4c1";
+      sha256 = "2dacdc3c560f643d7fc967f306f53a872a7cc7558f2a3073ca85ff19a71bd347";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/fr/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fr/Thunderbird%20140.12.1esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "7482b9769bc8bd8307372a44177287ffff08be4a1c26ccd0e40b8b77cadfa983";
+      sha256 = "3d5369d321de23abeb62ad1993342d6d6d71f2da56d0d2ab98011c46ac884876";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/fy-NL/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fy-NL/Thunderbird%20140.12.1esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "6a50829984026c3f30a8d5da0533eab13e0dc015ea6e19a329e26723afe48e16";
+      sha256 = "020f9670a519155d05e772a20eaf35ef4aca8075cacd19873f1be23c84d49eaa";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ga-IE/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ga-IE/Thunderbird%20140.12.1esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "2ffa979b1d0fa1bb4ea0e025cdc6238d389d2c57f284c410763a9b74facbfc6e";
+      sha256 = "d7724a80711c879d559c167088fe41aa1e6531ea38757d1aaae4fe3d043b2796";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/gd/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/gd/Thunderbird%20140.12.1esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "b2ace43f1ba130cb04d68becdf8c0f2e8340d21e8050ac525b7b70dc68f4bd67";
+      sha256 = "b6022adc6fc36979a66f8d74bd6e0476673882d6ac60ef0b22d2e59cefffefb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/gl/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/gl/Thunderbird%20140.12.1esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "4a88092f150764d394551efef019cf175844e231c88ec2270ca7242e329f9366";
+      sha256 = "9b9878870596d85f78d511e37d4df4cf504bc61f1dcd5cf184989401b525f9a6";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/he/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/he/Thunderbird%20140.12.1esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "6f49b7f4d4c21822d14ec73e4293f15e301725f43d6a815d80bf811fed7446ac";
+      sha256 = "f83d4794e193d00d14bc41b27e955372b9a2af3d6172520ea34433a0a0d20372";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/hr/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hr/Thunderbird%20140.12.1esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "de1f296a66addcee616022c1dd552a4a040591dec9363730be2f79469dfa283f";
+      sha256 = "8ccaffcfe95a610c00760bb4998be5ad8024bf2805f06d4bcd029ddfccaac0f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/hsb/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hsb/Thunderbird%20140.12.1esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "ce9dbd7b9c26e330639d2802a9e76ced183a1e0be11b7c99daf4a684d27ac137";
+      sha256 = "69bd5f6eaa17c39817680fd9813043a383b564715bcbfdf85342f27d684de10e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/hu/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hu/Thunderbird%20140.12.1esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "dba387610be4ff84367744705cf3311d31d417efb2fab4398c93d28c1e78e865";
+      sha256 = "406c258b687c966f1c9bf0d28ff5a47f7cf2716fb20d99a88b512da12b6fc2a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/hy-AM/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hy-AM/Thunderbird%20140.12.1esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "97ecff4bcf7cabb182bfe0575ef1f67d655307c2559296e3c4c75c58e59ae7e3";
+      sha256 = "182d1415b28855c5524aa6cab0fbd59d5bcb29f0464f5f06b70fff042e0256bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/id/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/id/Thunderbird%20140.12.1esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "aa2510109c6c5c8e14120aa9b3fbc98e352ba1de8355e86437d831023a59c4bb";
+      sha256 = "94f5a03cffe7cb69d998fac6a24a448ea60b1fd22e75cd085eebb6abcf674916";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/is/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/is/Thunderbird%20140.12.1esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "3b92dbab9ae2f9bede01dc84fa744cc51b9185e0b5b3c62cc3e4334dcc8d2e40";
+      sha256 = "a6d3624410ac4186f669f7b7115b180ae547fd4c94b508e2cf78b655167fd4dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/it/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/it/Thunderbird%20140.12.1esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "e5168dc2fe6762fdcf20dc1ccb7e863a0c555bad49faf87725bb71a77e7d2e41";
+      sha256 = "592e9b1bf6ccaf7aa7c380e494910b95dd3975c06b9c069e41b319d744fb5184";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ja-JP-mac/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ja-JP-mac/Thunderbird%20140.12.1esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "a08cfce46e7f1fbb6b223acdb094325b6de30b1a162b696b183713810a8b2bfa";
+      sha256 = "fbe32356a00e8d5feb31387bce6e8345d9cfbf4e598646496fa84e0616717e4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ka/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ka/Thunderbird%20140.12.1esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "945029e3b61dca49426bcc839a9b03c5c20fcb837c0ba9c63672cb11b34ae266";
+      sha256 = "260e84ba60f95110adef65b12e8e4f3af0b119e3d56c4610fea9f5015158e5d7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/kab/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/kab/Thunderbird%20140.12.1esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "a4077c9aad04635490e02dd48e332c222d06bc8a105230fdb366ecd8525b5c95";
+      sha256 = "fb4fd0e9652a1417b415d4df450e670753f915a05b32de6418e64e61cfd9a84f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/kk/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/kk/Thunderbird%20140.12.1esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "93d37e9d5d2d57389932b405cb26b45cced1cd8cdef3fe77001f103072d38230";
+      sha256 = "41f4d663cc28831c7f33d364e18bc50ea4895dd1edbb4e71750ca42c5554f546";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ko/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ko/Thunderbird%20140.12.1esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "1ed911f9f676b795da6c3cd5ed9dd264c0f9e9bc29d88cf10bb8695c4a407eeb";
+      sha256 = "8788bf49e1d6b94dfd582510fabfb6db11f3d7b1d70a41f3116600f6f7244fe4";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/lt/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/lt/Thunderbird%20140.12.1esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "8c274dbd53b8e55030a99a67ad2e632488377b640e2b998f5d49f01f65d3d441";
+      sha256 = "d3202d63ae54f07a911d8d96bdb3a6cca4c798b31e6478a4d7be39246a614fee";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/lv/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/lv/Thunderbird%20140.12.1esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "8ee5f2bf9dd9fe4a1332f3ac5105e8adfa14150145342dc94d7092ad44568961";
+      sha256 = "89947413ee7e30f81d794aedd4f553fc84d25ed52556b48daa93b959cd2d4d80";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ms/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ms/Thunderbird%20140.12.1esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "ba433bcf9440bda7713cbe75aa2488f5c998522e9797748c669024f5d3586a96";
+      sha256 = "d9fb626dd801eb542717767276fa8ab50615134d3c8fa6a6249a97a8b0a4d530";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/nb-NO/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nb-NO/Thunderbird%20140.12.1esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "6cf11acb2f0dbe170131c843890bbc4002876fb86564b893e938f190c9505d72";
+      sha256 = "361a10aeb578c2d00b4af934890b9d19fa6673308a3d8373d567944849980a27";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/nl/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nl/Thunderbird%20140.12.1esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "2c29c2ed59ff87b40e18f686529a569ff107002572e41ccaeb0fb5dcf77e8bc8";
+      sha256 = "bae2ec71f7164d27bf51895026f61c5bfc5726e841df2407164b96ac6aa9d6ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/nn-NO/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nn-NO/Thunderbird%20140.12.1esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "9adab55768e444a8de8d8cd0ef2551f0df218724781f1995c12f23ebde283f78";
+      sha256 = "ad720bc0279ebe05dae45b4504fe3b59a5cb26cade9fb0552e7563b92424c9ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/pa-IN/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pa-IN/Thunderbird%20140.12.1esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "c617dfc2d9c0df00e687492a8f21c4fe8643a82742bfb804f957b721a904f064";
+      sha256 = "4864c13e90c6002412f52a4ad4edf68f34ea595bfbdf73ae58d84445d243805e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/pl/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pl/Thunderbird%20140.12.1esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "08accf38faf4c6d4b3d6197f038ce628cfab8506a9e3ccda3c4865b198f6b81f";
+      sha256 = "5132c04421c86392a2b20f92a25c0f40760b106cededa99a32779b1376b2f3aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/pt-BR/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pt-BR/Thunderbird%20140.12.1esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "e3d2baab5763d393d70e0dfec48307894db8d14bd62954b912d5d659dfd93a62";
+      sha256 = "044b80f53e19945a95905cb14397038cb9031c8e87cd0c821f289cd72d94c6c7";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/pt-PT/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pt-PT/Thunderbird%20140.12.1esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "0dd0e195fd9f445cc426120a001b0777441953af3ede4bdb2ab0a7665d0a416d";
+      sha256 = "98898d9bef060de7f1d015ba41cb6d18970c621c6164ac2eae2fed5a1f5d0339";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/rm/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/rm/Thunderbird%20140.12.1esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "5d3e5500b1be9de217f38e0b16327ff9c98938f4b25371f724d84b949ae5e42e";
+      sha256 = "3f36fee7c1133c5b0e88c9653a1a1e4c6885dbd3e08656571ab11522092b443f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ro/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ro/Thunderbird%20140.12.1esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "cdaee775ac4c6376ea9cbc4297be14f9dc470fcc46453bb54eee31e31896ff71";
+      sha256 = "7a92082eea4fd402b6268f9afd0edd1e628538a934c0043128622282ad4e2acd";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/ru/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ru/Thunderbird%20140.12.1esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "faa160c7361c3429a046a85c69f5b14708f57599f6458b443aab32db0a333d14";
+      sha256 = "23e1ca559b2b38d001704b5e4a412186a09f822c1f6da7e05f6c809ca79f908f";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/sk/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sk/Thunderbird%20140.12.1esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "d7c87822ee32fe5265114c38591234c78138a42bb521e8127a84d383f3ab1c2e";
+      sha256 = "e22c2f92dd219666bb93279cd99b3c488e6a5ccc090b6c5f9a5d5dc53d0e8d7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/sl/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sl/Thunderbird%20140.12.1esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "bdcdab4d795dfaa82a9e95f85dc8556088fd75b5e617ca6b625f51b0d5bba121";
+      sha256 = "7229fdbe391154c0a5d2282f61c3e11d7fc226230a13552b4d4df1cb25cbc0e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/sq/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sq/Thunderbird%20140.12.1esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "58ab147078ba465a1e140f200859b84d2db9ba64b41c4f5b267f9726e59e231e";
+      sha256 = "4fd15f38178e96fad7192587e557165bcafbe6b303ee0a5b46c48357e92348f3";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/sr/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sr/Thunderbird%20140.12.1esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "aa5d4ac91710f11dad6582ee15a0872c700f3d19a2d4d92bd02a8c7bb6d6e846";
+      sha256 = "c7ae5528e9dc77069eccf1194273c1e47f784884a0c463e10b20c2bec4f2d614";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/sv-SE/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sv-SE/Thunderbird%20140.12.1esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "41a5eee8d58eeacc65304c4cee5a15c5f2323ea472cbc80b80a2593388f008ad";
+      sha256 = "deb300d744da7c1ab6a64993b1f468ff6b9be32e8911569631b623a037208420";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/th/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/th/Thunderbird%20140.12.1esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "e5b9ce0a7505b2020770526b8eca12c828cee60001133dfcb16aec8b69212c7c";
+      sha256 = "7554039b6255191f1c270dd5c3d9582cc9d0c2c4d904adf1260da99b6d6e413e";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/tr/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/tr/Thunderbird%20140.12.1esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "253af75f50478888326b9743700a9fa24490be489a5b2b578922d956db81f9b1";
+      sha256 = "18fa954a199e7b6d4520741f09e7549f33a0cd96111f8cc4228eb79a634af116";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/uk/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/uk/Thunderbird%20140.12.1esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "bdce24c7597a7aca79d195a1ec3cae38ad8d659f3912733513422bc74414b8d5";
+      sha256 = "ce9fe5b139dc104f300e834eca6d091832af90152537ff11729353e1314d05fb";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/uz/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/uz/Thunderbird%20140.12.1esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "f91de21e432f5102a2ad9c701056a7ee75af98abd390a3a5d9c7dd855dd46774";
+      sha256 = "1417676c77fff78b411e532eddb17fc22f7c2eb92fa3a996de9135bdca4cd30b";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/vi/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/vi/Thunderbird%20140.12.1esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "43e0863fe63a6fa41a069179a66e83e9f354ea9791c74ed8562ae973b7b955e3";
+      sha256 = "b2711b07f3db0980744c4576e95d5ad10846710e95dd1b75352eafc2b1052491";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/zh-CN/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/zh-CN/Thunderbird%20140.12.1esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "16042334de8c07a138c726d6a6c3d6cfc6ce18d95cc24f3c8f50583ed4cbfb8c";
+      sha256 = "a29458425d6fc8bd85307629ebcb841fa38d8e47a8dc419c38db1ad047663493";
     }
     {
-      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.0esr/mac/zh-TW/Thunderbird%20140.12.0esr.dmg";
+      url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/zh-TW/Thunderbird%20140.12.1esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "c0accf5e3e3e6bc20d9f6a745f9812530d2d61e685c469bb24c01db277b03f3a";
+      sha256 = "10154c8457e2e1fb74355485b8d9afd251d134a7c189fca2886564b223683a1b";
     }
   ];
 }

From d953ceaefcb47f30b41e51389259146316cd5b21 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Fri, 3 Jul 2026 23:30:27 +0200
Subject: [PATCH 046/166] seafile-client: add update script

---
 pkgs/by-name/se/seafile-client/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/se/seafile-client/package.nix b/pkgs/by-name/se/seafile-client/package.nix
index 07a6bf03666e..9e7cfd2a124b 100644
--- a/pkgs/by-name/se/seafile-client/package.nix
+++ b/pkgs/by-name/se/seafile-client/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchpatch,
   fetchFromGitHub,
+  nix-update-script,
   pkg-config,
   cmake,
   qt6,
@@ -72,4 +73,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "seafile-applet";
   };
+  passthru.updateScript = nix-update-script { };
 })

From f6c80b64e4cbbfdf8f2dfb2ddbfd43c0e788d3b4 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Fri, 3 Jul 2026 23:31:45 +0200
Subject: [PATCH 047/166] seafile-client: 9.0.15 -> 9.0.20

Changelog:
https://manual.seafile.com/latest/changelog/client-changelog/#9019-20260625

Contains a fix for an SQL injection vulnerability.
---
 pkgs/by-name/se/seafile-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/seafile-client/package.nix b/pkgs/by-name/se/seafile-client/package.nix
index 9e7cfd2a124b..b4f1ea6534e7 100644
--- a/pkgs/by-name/se/seafile-client/package.nix
+++ b/pkgs/by-name/se/seafile-client/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "seafile-client";
-  version = "9.0.15";
+  version = "9.0.20";
 
   src = fetchFromGitHub {
     owner = "haiwen";
     repo = "seafile-client";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BV1+9/+ryZB1BQyRJ5JaIU6bbOi4h8vt+V+FQIfUJp8=";
+    hash = "sha256-0idZCoTsuC32DolSLFDknQjvGWHGd4DQPCUyqocuuKA=";
   };
 
   patches = [

From 4040ad932c07a2ade0c5ba85e5f4946f5deb74b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 21:43:34 +0000
Subject: [PATCH 048/166] stevenblack-blocklist: 3.16.91 -> 3.16.94

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

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 6da4571b4574..88e5948799ab 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.91";
+  version = "3.16.94";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-ZW1sbLqlGv7DlbJ1BnkyGbPtCKtlmZWvxNS9NWxmle8=";
+    hash = "sha256-vVEf9FAXT4QgwM2BZF593JVD7NpTlwXdy9JXrnufhAo=";
   };
 
   outputs = [

From ab9d32678470cd853e91ba92a2bbed6d165a25ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 22:05:57 +0000
Subject: [PATCH 049/166] shotcut: 26.4.30 -> 26.6.25

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

diff --git a/pkgs/by-name/sh/shotcut/package.nix b/pkgs/by-name/sh/shotcut/package.nix
index 9c6d5d96d8e9..43f5886217cf 100644
--- a/pkgs/by-name/sh/shotcut/package.nix
+++ b/pkgs/by-name/sh/shotcut/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shotcut";
-  version = "26.4.30";
+  version = "26.6.25";
 
   src = fetchFromGitHub {
     owner = "mltframework";
     repo = "shotcut";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qDW7d0pWYd8ZofXKCEfXl4/XQ9tfEjhJf8avf4tM0q8=";
+    hash = "sha256-iFaN3WB0CYdENXM4XLoi2RxCOG7kHmvfLRItvxCKYLA=";
   };
 
   nativeBuildInputs = [

From a1c0d90abcb54fdf42fb5e8adb5063b7f5bbda3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Jul 2026 22:29:54 +0000
Subject: [PATCH 050/166] skills: 1.5.13 -> 1.5.14

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

diff --git a/pkgs/by-name/sk/skills/package.nix b/pkgs/by-name/sk/skills/package.nix
index b95b16b079dd..ab66664bd318 100644
--- a/pkgs/by-name/sk/skills/package.nix
+++ b/pkgs/by-name/sk/skills/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "skills";
-  version = "1.5.13";
+  version = "1.5.14";
 
   src = fetchFromGitHub {
     owner = "vercel-labs";
     repo = "skills";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NfjEt37jfA/d0v6gXRjlvsUj0xf8h+NquVUZEKaMFL4=";
+    hash = "sha256-176EeM1VhNSBH1cYUUy3oLST21PbV0v+tCNglfM9+6Y=";
   };
 
   pnpmDeps = fetchPnpmDeps {

From bd17e6c54464e2b87340f2259f700f93e15d5bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 4 Jul 2026 01:12:18 +0200
Subject: [PATCH 051/166] python314Packages.notebook: quier lerna progress bar

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

diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix
index e71a21eeb12b..2d756476dc10 100644
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -81,6 +81,7 @@ buildPythonPackage rec {
   ];
 
   env = {
+    CI = 1; # quiet lerna progress bar
     JUPYTER_PLATFORM_DIRS = 1;
   };
 

From cbbc4fc273d68650bf5da2f482b042f56c2dcb85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 00:46:25 +0200
Subject: [PATCH 052/166] python3Packages.aliyun-python-sdk-*: remove separate
 packages

---
 .../aliyun-python-sdk-alimt/default.nix       | 37 -------------------
 .../aliyun-python-sdk-cdn/default.nix         | 32 ----------------
 .../aliyun-python-sdk-config/default.nix      | 32 ----------------
 .../aliyun-python-sdk-dbfs/default.nix        | 32 ----------------
 .../aliyun-python-sdk-iot/default.nix         | 32 ----------------
 .../aliyun-python-sdk-kms/default.nix         | 35 ------------------
 .../aliyun-python-sdk-sts/default.nix         | 32 ----------------
 7 files changed, 232 deletions(-)
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix
 delete mode 100644 pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix

diff --git a/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix
deleted file mode 100644
index ccb5ac809695..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-alimt/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-alimt";
-  version = "3.2.0";
-  pyproject = true;
-
-  # Upstream doesn't tag releases on Github
-  # https://github.com/aliyun/aliyun-openapi-python-sdk/issues/551
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-oz8PNY/j6xE7pY91F8O5ed2j02q8tFl1A/u9Q5fYbuA=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdkalimt" ];
-
-  meta = {
-    description = "ALIMT module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-sts/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ erictapen ];
-  };
-}
diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
deleted file mode 100644
index e31774ecaf9e..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-cdn";
-  version = "3.8.8";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-LMCNvjV85TvdSM0OXean4dPzAiV8apVdRLTvUISOKec=";
-  };
-
-  propagatedBuildInputs = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdkcdn" ];
-
-  meta = {
-    description = "CDN module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
deleted file mode 100644
index 393b73fb862d..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-config/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-config";
-  version = "2.2.14";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-drmk41/k/JJ6Zs6MrnMQa7xwpkO7MZEaSeyfm2QimKo=";
-  };
-
-  propagatedBuildInputs = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdkconfig" ];
-
-  meta = {
-    description = "Configuration module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-config/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix
deleted file mode 100644
index 9d1eaa867d42..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-dbfs/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-dbfs";
-  version = "2.0.7";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Kj6DfnXZq5ilE+vnZrAoZEhPDoNrMIs5p2OcBc24qXM=";
-  };
-
-  propagatedBuildInputs = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdkdbfs" ];
-
-  meta = {
-    description = "DBFS module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-dbfs/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
deleted file mode 100644
index 2af3b7e26e20..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-iot/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-iot";
-  version = "8.59.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-v0jTMKtYrbEBVjHQokpWSlcJBALZFsuoYHq8wCP8w1E=";
-  };
-
-  propagatedBuildInputs = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdkiot" ];
-
-  meta = {
-    description = "IoT module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-iot/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix
deleted file mode 100644
index 8ef1e5b1d064..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-kms/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-kms";
-  version = "2.16.5";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-8yiooZ2D7LuWX/zg7B6ZMHVSFtEEY4zZXs02J1O4E7M=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdkkms" ];
-
-  meta = {
-    description = "KMS module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-kms/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix
deleted file mode 100644
index 6c28edbcdc3b..000000000000
--- a/pkgs/development/python-modules/aliyun-python-sdk-sts/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  aliyun-python-sdk-core,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "aliyun-python-sdk-sts";
-  version = "3.1.3";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Iv7bi60T+WbnEaH0Zi7te52zNEG8BapLD5GKoB4JuWc=";
-  };
-
-  propagatedBuildInputs = [ aliyun-python-sdk-core ];
-
-  # All components are stored in a mono repo
-  doCheck = false;
-
-  pythonImportsCheck = [ "aliyunsdksts" ];
-
-  meta = {
-    description = "STS module of Aliyun Python SDK";
-    homepage = "https://github.com/aliyun/aliyun-openapi-python-sdk";
-    changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-sts/ChangeLog.txt";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}

From 5c5b842f2d56732576206a423802bd0090d347be Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 00:53:19 +0200
Subject: [PATCH 053/166] python3Packages.aliyun-python-sdk-core: migrate to
 finalAttrs

---
 .../python-modules/aliyun-python-sdk-core/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix
index 14bfbcabacaf..ad296b3084f9 100644
--- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix
+++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix
@@ -7,13 +7,13 @@
   setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "aliyun-python-sdk-core";
   version = "2.16.0";
   pyproject = true;
 
   src = fetchPypi {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-ZRyq1ZfrOdT61s+FEz3/6Sg31TvfYtudjzfatlCLuPk=";
   };
 
@@ -38,4 +38,4 @@ buildPythonPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From 47584421cd9a53030d02cf224b5700177ba60548 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 4 Jul 2026 00:35:28 -0400
Subject: [PATCH 054/166] xclock: 1.1.1 -> 1.2.0

Diff: https://gitlab.freedesktop.org/xorg/app/xclock/-/compare/xclock-1.1.1...xclock-1.2.0

Among other changes, it fixes darwin with this patch:

https://gitlab.freedesktop.org/xorg/app/xclock/-/commit/fd4b44ea3b122cb15181242c4aa9ffc6b2674ca7
---
 pkgs/by-name/xc/xclock/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix
index ed01c2ba7cf6..cf6ec840de32 100644
--- a/pkgs/by-name/xc/xclock/package.nix
+++ b/pkgs/by-name/xc/xclock/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -19,7 +18,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xclock";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
@@ -27,17 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "app";
     repo = "xclock";
     tag = "xclock-${finalAttrs.version}";
-    hash = "sha256-ZgUb+iVO45Az/C+2YJ1TXxcTLk3zQjM1GGv2E69WNfo=";
+    hash = "sha256-sytAl9vXBdxjTM0NnAgRNK34yqn/6zJeCQ/9bH3xaOc=";
   };
 
-  patches = [
-    # meson build system patch
-    (fetchpatch {
-      url = "https://gitlab.freedesktop.org/xorg/app/xclock/-/commit/28e10bd26ac7e02fe8a4fb8016bb115f8d664032.patch";
-      hash = "sha256-KdrS7VneJqwVPB+TRJoMmtR03Ju3PvvUMYfXz5tII6k=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [

From 5b1f2ce84a8d3bc846be011ebb89d2cdbf858948 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 4 Jul 2026 01:17:22 -0400
Subject: [PATCH 055/166] xclock: add version check

---
 pkgs/by-name/xc/xclock/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix
index cf6ec840de32..a6f15830cdb6 100644
--- a/pkgs/by-name/xc/xclock/package.nix
+++ b/pkgs/by-name/xc/xclock/package.nix
@@ -5,6 +5,7 @@
   meson,
   ninja,
   pkg-config,
+  versionCheckHook,
   wrapWithXFileSearchPathHook,
   libx11,
   libxaw,
@@ -53,6 +54,10 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "appdefaultdir" "${placeholder "out"}/share/X11/app-defaults")
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+  doInstallCheck = true;
+
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=xclock-(.*)" ]; };
 
   meta = {

From 186834db39ea905e5ff7a0bbad96ff2031a34174 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sat, 4 Jul 2026 01:17:52 -0400
Subject: [PATCH 056/166] xclock: add booxter as maintainer

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

diff --git a/pkgs/by-name/xc/xclock/package.nix b/pkgs/by-name/xc/xclock/package.nix
index a6f15830cdb6..965ed0f2d398 100644
--- a/pkgs/by-name/xc/xclock/package.nix
+++ b/pkgs/by-name/xc/xclock/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
       mit
     ];
     mainProgram = "xclock";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ booxter ];
     platforms = lib.platforms.unix;
   };
 })

From 7399f6b846966a8c663110fdfa30f424e4b39006 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 00:56:55 +0200
Subject: [PATCH 057/166] python3Packages.aliyun-python-sdk: add update script

---
 .../aliyun-python-sdk/update.sh               | 290 ++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100755 pkgs/development/python-modules/aliyun-python-sdk/update.sh

diff --git a/pkgs/development/python-modules/aliyun-python-sdk/update.sh b/pkgs/development/python-modules/aliyun-python-sdk/update.sh
new file mode 100755
index 000000000000..524df9ef8847
--- /dev/null
+++ b/pkgs/development/python-modules/aliyun-python-sdk/update.sh
@@ -0,0 +1,290 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq nixfmt-tree nix-update xmlstarlet
+
+set -eu -o pipefail
+
+nix-update python3Packages.aliyun-python-sdk-core --commit --build
+
+source_file=pkgs/development/python-modules/aliyun-python-sdk/default.nix
+
+packages=(
+  aliyun-python-sdk-actiontrail
+  aliyun-python-sdk-adb
+  aliyun-python-sdk-adcp
+  aliyun-python-sdk-address-purification
+  aliyun-python-sdk-aicontent
+  aliyun-python-sdk-aigen
+  aliyun-python-sdk-aimath
+  aliyun-python-sdk-aimiaobi
+  aliyun-python-sdk-aipodcast
+  aliyun-python-sdk-airec
+  aliyun-python-sdk-airticketopen
+  aliyun-python-sdk-alb
+  aliyun-python-sdk-alidns
+  aliyun-python-sdk-alikafka
+  aliyun-python-sdk-alimt
+  aliyun-python-sdk-alinlp
+  aliyun-python-sdk-amqp-open
+  aliyun-python-sdk-antiddos-public
+  aliyun-python-sdk-anytrans
+  aliyun-python-sdk-apds
+  aliyun-python-sdk-appstream-center
+  aliyun-python-sdk-aps
+  aliyun-python-sdk-arms
+  aliyun-python-sdk-avatar
+  aliyun-python-sdk-bailianchatbot
+  aliyun-python-sdk-beian
+  aliyun-python-sdk-bpstudio
+  aliyun-python-sdk-brain-industrial
+  aliyun-python-sdk-brinekingdom
+  aliyun-python-sdk-bssopenapi
+  aliyun-python-sdk-btripopen
+  aliyun-python-sdk-buss
+  aliyun-python-sdk-cams
+  aliyun-python-sdk-captcha
+  # aliyun-python-sdk-cas, not maintained anymore
+  aliyun-python-sdk-cassandra
+  aliyun-python-sdk-cbn
+  aliyun-python-sdk-cc5g
+  aliyun-python-sdk-ccc
+  aliyun-python-sdk-cciotgw
+  aliyun-python-sdk-cdn
+  aliyun-python-sdk-cdrs
+  aliyun-python-sdk-ciomarketpop
+  aliyun-python-sdk-clickhouse
+  aliyun-python-sdk-cloudapi
+  aliyun-python-sdk-cloudauth
+  aliyun-python-sdk-cloudauth-console
+  aliyun-python-sdk-cloudesl
+  aliyun-python-sdk-cloudphone
+  aliyun-python-sdk-cloud-siem
+  aliyun-python-sdk-cms
+  aliyun-python-sdk-codeup
+  aliyun-python-sdk-companyreg
+  aliyun-python-sdk-computenest
+  aliyun-python-sdk-computenestsupplier
+  aliyun-python-sdk-config
+  aliyun-python-sdk-csas
+  aliyun-python-sdk-das
+  aliyun-python-sdk-dashdeviceconsole
+  aliyun-python-sdk-dataphin-public
+  aliyun-python-sdk-dataworks-public
+  aliyun-python-sdk-dbfs
+  aliyun-python-sdk-dbs
+  aliyun-python-sdk-dcdn
+  aliyun-python-sdk-ddosbgp
+  aliyun-python-sdk-ddoscoo
+  aliyun-python-sdk-ddosdiversion
+  aliyun-python-sdk-dds
+  aliyun-python-sdk-devops-rdc
+  aliyun-python-sdk-dfs
+  aliyun-python-sdk-dg
+  aliyun-python-sdk-dms
+  aliyun-python-sdk-dms-dg
+  aliyun-python-sdk-dms-enterprise
+  aliyun-python-sdk-documentautoml
+  aliyun-python-sdk-domain
+  aliyun-python-sdk-drds
+  aliyun-python-sdk-dt-oc-info
+  aliyun-python-sdk-dts
+  aliyun-python-sdk-dybaseapi
+  aliyun-python-sdk-dyplsapi
+  aliyun-python-sdk-dypnsapi
+  aliyun-python-sdk-dypnsapi-intl
+  aliyun-python-sdk-dysmsapi
+  aliyun-python-sdk-dytnsapi
+  aliyun-python-sdk-dyvmsapi
+  aliyun-python-sdk-eais
+  aliyun-python-sdk-eas
+  aliyun-python-sdk-ebs
+  aliyun-python-sdk-ecd
+  aliyun-python-sdk-eci
+  aliyun-python-sdk-ecs
+  aliyun-python-sdk-ecs-workbench
+  aliyun-python-sdk-edas
+  aliyun-python-sdk-eds-user
+  aliyun-python-sdk-eduinterpreting
+  aliyun-python-sdk-eflo
+  aliyun-python-sdk-eflo-controller
+  aliyun-python-sdk-ehpc
+  aliyun-python-sdk-ehpcinstant
+  aliyun-python-sdk-eiam
+  aliyun-python-sdk-eipanycast
+  aliyun-python-sdk-elasticsearch
+  aliyun-python-sdk-emas-appmonitor
+  aliyun-python-sdk-emr
+  aliyun-python-sdk-emrstudio
+  aliyun-python-sdk-ens
+  aliyun-python-sdk-esa
+  aliyun-python-sdk-ess
+  aliyun-python-sdk-es-serverless
+  aliyun-python-sdk-et-industry-openapi
+  aliyun-python-sdk-eventbridge
+  aliyun-python-sdk-facebody
+  aliyun-python-sdk-fnf
+  aliyun-python-sdk-foas
+  aliyun-python-sdk-ft
+  aliyun-python-sdk-ga
+  aliyun-python-sdk-gdb
+  aliyun-python-sdk-geoip
+  aliyun-python-sdk-governance
+  aliyun-python-sdk-gpdb
+  aliyun-python-sdk-grace
+  aliyun-python-sdk-green
+  aliyun-python-sdk-gwlb
+  aliyun-python-sdk-hbase
+  aliyun-python-sdk-hbr
+  aliyun-python-sdk-hcs-mgw
+  aliyun-python-sdk-hitsdb
+  aliyun-python-sdk-ice
+  aliyun-python-sdk-idaas-doraemon
+  aliyun-python-sdk-imageaudit
+  aliyun-python-sdk-imageenhan
+  aliyun-python-sdk-imageprocess
+  aliyun-python-sdk-imagerecog
+  aliyun-python-sdk-imageseg
+  aliyun-python-sdk-imarketing
+  aliyun-python-sdk-imgsearch
+  aliyun-python-sdk-imm
+  aliyun-python-sdk-intlmarket
+  aliyun-python-sdk-iot
+  aliyun-python-sdk-iotcc
+  aliyun-python-sdk-iqs
+  aliyun-python-sdk-itag
+  aliyun-python-sdk-ivision
+  aliyun-python-sdk-kms
+  aliyun-python-sdk-lingmou
+  aliyun-python-sdk-linkvisual
+  aliyun-python-sdk-linkwan
+  aliyun-python-sdk-live
+  aliyun-python-sdk-ltl
+  aliyun-python-sdk-lto
+  aliyun-python-sdk-market
+  aliyun-python-sdk-marketplaceintl
+  aliyun-python-sdk-maxcompute
+  aliyun-python-sdk-mns-open
+  aliyun-python-sdk-moguan-sdk
+  aliyun-python-sdk-msccommonquery
+  aliyun-python-sdk-mse
+  aliyun-python-sdk-mseap
+  aliyun-python-sdk-mts
+  aliyun-python-sdk-nas
+  aliyun-python-sdk-nis
+  aliyun-python-sdk-nlb
+  aliyun-python-sdk-nlp-automl
+  aliyun-python-sdk-objectdet
+  aliyun-python-sdk-oceanbasepro
+  aliyun-python-sdk-ocr
+  aliyun-python-sdk-oms
+  aliyun-python-sdk-ons
+  aliyun-python-sdk-onsmqtt
+  aliyun-python-sdk-oos
+  aliyun-python-sdk-openanalytics-open
+  aliyun-python-sdk-openitag
+  aliyun-python-sdk-opensearch
+  aliyun-python-sdk-osssddp
+  aliyun-python-sdk-outboundbot
+  aliyun-python-sdk-pai-dsw
+  aliyun-python-sdk-paielasticdatasetaccelerator
+  aliyun-python-sdk-paifeaturestore
+  aliyun-python-sdk-pairecservice
+  aliyun-python-sdk-polardb
+  aliyun-python-sdk-polardbx
+  aliyun-python-sdk-privatelink
+  aliyun-python-sdk-push
+  aliyun-python-sdk-pvtz
+  aliyun-python-sdk-qianzhou
+  aliyun-python-sdk-qualitycheck
+  aliyun-python-sdk-quickbi-public
+  aliyun-python-sdk-quotas
+  aliyun-python-sdk-ram
+  aliyun-python-sdk-rds
+  aliyun-python-sdk-rds-data
+  aliyun-python-sdk-reid-cloud
+  aliyun-python-sdk-resourcecenter
+  aliyun-python-sdk-resourcemanager
+  aliyun-python-sdk-resourcesharing
+  aliyun-python-sdk-retailcloud
+  aliyun-python-sdk-r-kvstore
+  aliyun-python-sdk-ros
+  aliyun-python-sdk-rsimganalys
+  aliyun-python-sdk-rtc
+  aliyun-python-sdk-sae
+  aliyun-python-sdk-safconsole
+  aliyun-python-sdk-sas
+  aliyun-python-sdk-sasti
+  aliyun-python-sdk-scdn
+  aliyun-python-sdk-schedulerx2
+  aliyun-python-sdk-schedulerx3
+  aliyun-python-sdk-scsp
+  aliyun-python-sdk-sddp
+  aliyun-python-sdk-selectdb
+  aliyun-python-sdk-sgw
+  aliyun-python-sdk-slb
+  aliyun-python-sdk-sls
+  aliyun-python-sdk-smartag
+  aliyun-python-sdk-smartsales
+  aliyun-python-sdk-smc
+  aliyun-python-sdk-snsuapi
+  aliyun-python-sdk-sophonsoar
+  aliyun-python-sdk-sts
+  aliyun-python-sdk-swas-open
+  aliyun-python-sdk-tag
+  aliyun-python-sdk-threedvision
+  aliyun-python-sdk-tingwu
+  aliyun-python-sdk-unimkt
+  aliyun-python-sdk-ververica
+  aliyun-python-sdk-viapi
+  aliyun-python-sdk-viapi-oxs-cross
+  aliyun-python-sdk-viapi-regen
+  aliyun-python-sdk-videoenhan
+  aliyun-python-sdk-videorecog
+  aliyun-python-sdk-videoseg
+  aliyun-python-sdk-vod
+  aliyun-python-sdk-voicenavigator
+  aliyun-python-sdk-vpc
+  aliyun-python-sdk-vpcpeer
+  aliyun-python-sdk-vs
+  aliyun-python-sdk-waf-openapi
+  aliyun-python-sdk-websitebuild
+  aliyun-python-sdk-wfts
+  aliyun-python-sdk-workbench-ide
+  aliyun-python-sdk-workorder
+  aliyun-python-sdk-wss
+  aliyun-python-sdk-xtrace
+)
+
+for package in "${packages[@]}"; do
+  package_short_name="${package#aliyun-python-sdk-}"
+  old_version=$(awk -v pkg="\"$package_short_name\"" -F'"' '$0 ~ pkg {printf $4}' ${source_file})
+  version=$(curl -s https://pypi.org/pypi/${package}/json | jq -r '.info.version')
+
+  echo "Updating ${package} from ${old_version} to ${version}"
+
+  if [ "${version}" != "${old_version}" ]; then
+    url=$(curl -s "https://pypi.org/pypi/${package}/${version}/json" | jq -r '.urls[] | select(.packagetype == "sdist") | .url' | head -1)
+    if [ -z "$url" ]; then
+      url=$(curl -s "https://pypi.org/pypi/${package}/${version}/json" | jq -r '.urls[0].url')
+    fi
+    hash=$(nix-prefetch-url --type sha256 $url)
+    sri_hash="$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash)"
+
+    awk -i inplace -v pkg="\"$package_short_name\"" -v new_version="$version" -v new_sha256="$sri_hash" '
+      # Match the line containing the package name
+      $0 ~ pkg && $0 ~ /buildAliyunSdkPackage/ {
+        # Update the version
+        sub(/"[^"]+"/, "\"" new_version "\"", $3);
+        print;
+        # Update the next line with the new sha256
+        getline;
+        sub(/"[^"]+"/, "\"" new_sha256 "\"");
+      }
+      { print }
+    ' ${source_file}
+
+    treefmt ${source_file}
+
+    git commit ${source_file} -m "python3Packages.${package}: ${old_version} -> ${version}"
+  fi
+
+done

From f4085e39b364e312210826d302da58d30f48b15b Mon Sep 17 00:00:00 2001
From: bloominstrong <github@mail.bloominstrong.net>
Date: Sat, 4 Jul 2026 21:53:43 +1000
Subject: [PATCH 058/166] openvpn: 2.6.19 -> 2.6.21

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

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index bee9e1744aba..a61d981d53f0 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -23,11 +23,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "openvpn";
-  version = "2.6.19";
+  version = "2.6.21";
 
   src = fetchurl {
     url = "https://swupdate.openvpn.net/community/releases/openvpn-${finalAttrs.version}.tar.gz";
-    hash = "sha256-E3AlJvaHwYslQMGj8uGJGHuqplIR7c9/9ncvpp8FNs8=";
+    hash = "sha256-JMthheVEpHMj1nmLA9OfI2fZbyJ77pzRVD6O1Sgxmxc=";
   };
 
   nativeBuildInputs = [

From f2d0b08c73f0fa5d7d46eb87d628bcb97159be98 Mon Sep 17 00:00:00 2001
From: Nivayu <nivalux@web.de>
Date: Sat, 4 Jul 2026 15:25:41 +0200
Subject: [PATCH 059/166] syncthing: 2.1.0 -> 2.1.1

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

diff --git a/pkgs/by-name/sy/syncthing/package.nix b/pkgs/by-name/sy/syncthing/package.nix
index 7b963e50ca41..d6f857ab86c8 100644
--- a/pkgs/by-name/sy/syncthing/package.nix
+++ b/pkgs/by-name/sy/syncthing/package.nix
@@ -22,16 +22,16 @@ assert builtins.elem target [
 
 buildGoModule (finalAttrs: {
   pname = "syncthing";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "syncthing";
     repo = "syncthing";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sTtFmZBPJIHMksaFFLmA3Abt9EhAC8Nz/ibdzg2LMd4=";
+    hash = "sha256-OwR1OiwtlJSRnFXFEyyHcL3q6NdDUQd4JEy0YSQ18fg=";
   };
 
-  vendorHash = "sha256-rOsdg98WVAKqjV7AxH+m4oSf8Z4FPru4NSbgGFtUMVE=";
+  vendorHash = "sha256-gfGuXBvGdQr+o8zV4MM1FYnOy2fpytIIEdQ9waGNSW4=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     # Recent versions of macOS seem to require binaries to be signed when

From f72d6ad3cd44386e0e66f32797eef3173513122c Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Sat, 4 Jul 2026 15:31:27 +0100
Subject: [PATCH 060/166] bazarr: 1.5.6 -> 1.6.0

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

diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix
index f029fa8f1453..fcb85a166a8b 100644
--- a/pkgs/by-name/ba/bazarr/package.nix
+++ b/pkgs/by-name/ba/bazarr/package.nix
@@ -17,11 +17,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bazarr";
-  version = "1.5.6";
+  version = "1.6.0";
 
   src = fetchzip {
     url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip";
-    hash = "sha256-S3idNH9Wm9f6aNj69dERmeks1rLvUeQJYFebXa5cWQo=";
+    hash = "sha256-LRcc2wg5u260yl3A7rRwBfldl6WOyvF2T9NKGTKabfw=";
     stripRoot = false;
   };
 

From d5a8df3efe529b6ebb32ed18ec48488988b3f1ce Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 01:05:22 +0200
Subject: [PATCH 061/166] python3Packages.aliyun-python-sdk-*: init

Alibaba Cloud V1.0 SDK

https://github.com/aliyun/aliyun-openapi-python-sdk
---
 .../aliyun-python-sdk/default.nix             | 1047 +++++++++++++++++
 pkgs/top-level/python-packages.nix            |  259 +++-
 2 files changed, 1293 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/development/python-modules/aliyun-python-sdk/default.nix

diff --git a/pkgs/development/python-modules/aliyun-python-sdk/default.nix b/pkgs/development/python-modules/aliyun-python-sdk/default.nix
new file mode 100644
index 000000000000..51e499096dce
--- /dev/null
+++ b/pkgs/development/python-modules/aliyun-python-sdk/default.nix
@@ -0,0 +1,1047 @@
+{
+  lib,
+  aliyun-python-sdk-core,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+}:
+
+let
+  toUnderscore = str: builtins.replaceStrings [ "-" ] [ "_" ] str;
+  buildAliyunSdkPackage =
+    serviceName: version: hash:
+    buildPythonPackage (finalAttrs: {
+      pname = "aliyun-python-sdk-${serviceName}";
+      inherit version;
+      pyproject = true;
+
+      src = fetchPypi {
+        pname = "aliyun-python-sdk-${serviceName}";
+        inherit version hash;
+      };
+
+      build-system = [ setuptools ];
+
+      dependencies = [ aliyun-python-sdk-core ];
+
+      # All components are stored in a mono repo
+      doCheck = false;
+
+      pythonImportsCheck = [ "aliyunsdk${toUnderscore serviceName}" ];
+
+      meta = {
+        description = "Module of Aliyun Python SDK (${serviceName})";
+        homepage = "https://github.com/aliyun/aliyun-python-sdk";
+        changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-${serviceName}/ChangeLog.txt";
+        license = lib.licenses.asl20;
+        maintainers = with lib.maintainers; [ fab ];
+      };
+    });
+
+  # For packages where PyPI only provides a wheel (no sdist).
+  buildAliyunSdkWheelPackage =
+    serviceName: version: hash:
+    buildPythonPackage (finalAttrs: {
+      pname = "aliyun-python-sdk-${serviceName}";
+      inherit version;
+      format = "wheel";
+
+      src = fetchPypi {
+        pname = "aliyun_python_sdk_${toUnderscore serviceName}";
+        inherit version hash;
+        format = "wheel";
+      };
+
+      dependencies = [ aliyun-python-sdk-core ];
+
+      doCheck = false;
+
+      pythonImportsCheck = [ "aliyunsdk${toUnderscore serviceName}" ];
+
+      meta = {
+        description = "Module of Aliyun Python SDK (${serviceName})";
+        homepage = "https://github.com/aliyun/aliyun-python-sdk";
+        changelog = "https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-${serviceName}/ChangeLog.txt";
+        license = lib.licenses.asl20;
+        maintainers = with lib.maintainers; [ fab ];
+      };
+    });
+in
+{
+  aliyun-python-sdk-actiontrail =
+    buildAliyunSdkPackage "actiontrail" "2.2.0"
+      "sha256-Vy4wSVKf1sIZdP0uT8mLBX0shcodkMojQlwiKI0mWjc=";
+
+  aliyun-python-sdk-adb =
+    buildAliyunSdkPackage "adb" "1.1.10"
+      "sha256-kA1pYyBC0xQ4kAzAe2z43S2ADKyRmPFrhlXkLLaFqsc=";
+
+  aliyun-python-sdk-adcp =
+    buildAliyunSdkPackage "adcp" "1.0.0"
+      "sha256-pG1G6sWiFWzz1HFW3pXkwopriSIrf3tDrRyLU48qGpM=";
+
+  aliyun-python-sdk-address-purification =
+    buildAliyunSdkPackage "address-purification" "1.0.1"
+      "sha256-XD06C5i+OnoAAtJ4kYbHurPYhqAbtaf/iBmTOlEY4j0=";
+
+  aliyun-python-sdk-aicontent =
+    buildAliyunSdkPackage "aicontent" "1.0.1"
+      "sha256-F0mrbd93CQMHxE7ZtmIZsvI2+7u2oc1YC6KajRdDyDg=";
+
+  aliyun-python-sdk-aigen =
+    buildAliyunSdkPackage "aigen" "1.0.0"
+      "sha256-mF27O7EuNF28O0wUNT5x5IDhATZwAbwhDUF6BQy4zVs=";
+
+  aliyun-python-sdk-aimath =
+    buildAliyunSdkPackage "aimath" "1.0.1"
+      "sha256-56R8dkl93Rqq3lzgYnvJ4w/5fEz6z7v1xL0IhoOfGXE=";
+
+  aliyun-python-sdk-aimiaobi =
+    buildAliyunSdkPackage "aimiaobi" "1.0.0"
+      "sha256-2Fug1f5NztU6NNXfXaPpUnsOW+ZTQj9pMSwpdKh6eRY=";
+
+  aliyun-python-sdk-aipodcast =
+    buildAliyunSdkPackage "aipodcast" "1.0.2"
+      "sha256-7RwUx8TQGzQbJo1HUA0j4yX2QibQqyS24JffOBxnypk=";
+
+  aliyun-python-sdk-airec =
+    buildAliyunSdkPackage "airec" "2.1.0"
+      "sha256-yuCxxAi28yHQj+dNodzVHfhxC1JzUNll+qArZmbsbjM=";
+
+  aliyun-python-sdk-airticketopen =
+    buildAliyunSdkPackage "airticketopen" "3.0.3"
+      "sha256-j1YvQSD91LSs4IpgDBrIfhSbJrG5iwH1f9e/sep+nV4=";
+
+  aliyun-python-sdk-alb =
+    buildAliyunSdkPackage "alb" "1.0.22"
+      "sha256-1bvfyq8Xp4A0qikF32zKX/97pMdiVdqLkG5IxXBi1Xk=";
+
+  aliyun-python-sdk-alidns =
+    buildAliyunSdkPackage "alidns" "3.0.7"
+      "sha256-HTALp6D84G+/jvYU02SlqLfv5LAM2Ju7fXm0JvpY4qs=";
+
+  aliyun-python-sdk-alikafka =
+    buildAliyunSdkPackage "alikafka" "1.0.6"
+      "sha256-tNwf1vEuqiXFtIojr2k0wcJY5om7PHJalIPf3spFA6E=";
+
+  aliyun-python-sdk-alimt =
+    buildAliyunSdkPackage "alimt" "3.2.0"
+      "sha256-oz8PNY/j6xE7pY91F8O5ed2j02q8tFl1A/u9Q5fYbuA=";
+
+  aliyun-python-sdk-alinlp =
+    buildAliyunSdkPackage "alinlp" "1.0.24"
+      "sha256-7heBFMWyy5APuQW+Ao3XHChdsyQJtn29PxKmB83t8JI=";
+
+  aliyun-python-sdk-amqp-open =
+    buildAliyunSdkPackage "amqp-open" "1.1.4"
+      "sha256-lcRVAP67FDxkCnw64eAj+kGPunx5uOP6PaKtoxCfO8Q=";
+
+  aliyun-python-sdk-antiddos-public =
+    buildAliyunSdkPackage "antiddos-public" "2.0.4"
+      "sha256-+njm+bW/QRmH9+aaWaR4rRQDvhJ6WAnNb5nsfXgj9aw=";
+
+  aliyun-python-sdk-anytrans =
+    buildAliyunSdkWheelPackage "anytrans" "1.0.2"
+      "sha256-hH2JzmOk63BqT9cKYyZObEZumKukNO3gnCQ+IjVU0wY=";
+
+  aliyun-python-sdk-apds =
+    buildAliyunSdkPackage "apds" "1.0.0"
+      "sha256-tGVgh0IwA6zZ9wS+YLXLOCn4lSz2YzhPY8ImqsAQVbs=";
+
+  aliyun-python-sdk-appstream-center =
+    buildAliyunSdkPackage "appstream-center" "1.0.1"
+      "sha256-7CH8NgQWf2yLZViCe0JTT/J7CwtDnN2LpXnbelQa1sg=";
+
+  aliyun-python-sdk-aps =
+    buildAliyunSdkPackage "aps" "1.0.0"
+      "sha256-HPpvtr1/5C9ZgS7MvoTyoSyT/EqmmIvFfDZIA8LbOiA=";
+
+  aliyun-python-sdk-arms =
+    buildAliyunSdkPackage "arms" "2.7.32"
+      "sha256-cLeR+eiIxH4bNQkTIyd+ZfXsNdPPpgqhi/2ViNSzKPw=";
+
+  aliyun-python-sdk-avatar =
+    buildAliyunSdkPackage "avatar" "2.0.8"
+      "sha256-ctlhWz6yhHBfcwREjlw6QTieZyCd1KsBbxWP/Uw3aOU=";
+
+  aliyun-python-sdk-bailianchatbot =
+    buildAliyunSdkPackage "bailianchatbot" "1.0.1"
+      "sha256-hdJZ8MYVKcc1JKnJT/uoO+L0MgVs19IUagboKmsv5QE=";
+
+  aliyun-python-sdk-beian =
+    buildAliyunSdkPackage "beian" "1.0.1"
+      "sha256-9eKfNuQkRqY01/2MIr6OxqfGF/a+FqCnn2PW0n4/H90=";
+
+  aliyun-python-sdk-bpstudio =
+    buildAliyunSdkPackage "bpstudio" "1.0.18"
+      "sha256-YnW4m0pYqBLjhmD7RI+SLccnkAmt0RlnqwcuwCcIxcI=";
+
+  aliyun-python-sdk-brain-industrial =
+    buildAliyunSdkPackage "brain-industrial" "1.0.4"
+      "sha256-h1vShnxQSLOCsOyaNCtZsrCXC4Ft5zazF8EcqIlpqhc=";
+
+  aliyun-python-sdk-brinekingdom =
+    buildAliyunSdkPackage "brinekingdom" "1.0.7"
+      "sha256-EhMCE7ogBsdY7RBlfn5OLg5UeFCdZ2sTbNRSzpnEna0=";
+
+  aliyun-python-sdk-bssopenapi =
+    buildAliyunSdkPackage "bssopenapi" "2.0.3"
+      "sha256-DNMKpSGtcU3BxIunLLnb8if9gA+s1n5goX0VrFhOrx8=";
+
+  aliyun-python-sdk-btripopen =
+    buildAliyunSdkPackage "btripopen" "1.0.0"
+      "sha256-ILmibOB6dERwn9t6M/xu49wt0FFdlR2Y9/u/Jrd+/Pg=";
+
+  aliyun-python-sdk-buss =
+    buildAliyunSdkPackage "buss" "1.0.0"
+      "sha256-lj2u4ftBUrCUCklBOBM57MJ9XnMt/1ALAhcHE4nUdko=";
+
+  aliyun-python-sdk-cams =
+    buildAliyunSdkPackage "cams" "1.0.13"
+      "sha256-LPnaGIssJ5nfQFYsne68V3Ltn9Su6LRyWxp4tRjyRmM=";
+
+  aliyun-python-sdk-captcha =
+    buildAliyunSdkPackage "captcha" "1.0.0"
+      "sha256-5LlmBHJIPoXrbcZCzWBFWBVEu1AoU6oUuStQADvljIc=";
+
+  aliyun-python-sdk-cassandra =
+    buildAliyunSdkPackage "cassandra" "1.0.7"
+      "sha256-3g74hm2rVr7dDCrSllHrwL/HLQnScfiJ8kzXCeYuEtg=";
+
+  aliyun-python-sdk-cbn =
+    buildAliyunSdkWheelPackage "cbn" "1.0.42"
+      "sha256-HfgV8PmKNtL8nVYbCgtMjZMwfT4txRgy5n90i7zSW0c=";
+
+  aliyun-python-sdk-cc5g =
+    buildAliyunSdkPackage "cc5g" "1.0.7"
+      "sha256-aFlUYAsBmsqsI+NtXenk/SKI97sih5JzwSfI365hKFM=";
+
+  aliyun-python-sdk-ccc =
+    buildAliyunSdkPackage "ccc" "2.10.3"
+      "sha256-JrsR3q3bLXxBOf4qGmd+Yuk+ZEgQMJqj3VKuN672WUE=";
+
+  aliyun-python-sdk-cciotgw =
+    buildAliyunSdkPackage "cciotgw" "1.0.1"
+      "sha256-koDpm9ziNfBmb2ur01HkrOtyeHzqQjvnXclUZQHvz0E=";
+
+  aliyun-python-sdk-cdn =
+    buildAliyunSdkPackage "cdn" "3.8.8"
+      "sha256-LMCNvjV85TvdSM0OXean4dPzAiV8apVdRLTvUISOKec=";
+
+  aliyun-python-sdk-cdrs =
+    buildAliyunSdkPackage "cdrs" "1.0.9"
+      "sha256-ccPl0gfTjYbHfFQ+Mdn5VXiFSwWj+thc0uvAPAi96P4=";
+
+  aliyun-python-sdk-ciomarketpop =
+    buildAliyunSdkPackage "ciomarketpop" "1.0.0"
+      "sha256-vg04ZrV8LK7Om+uO0al9Ttm4aF81n2y5RtZXOQ4BUY0=";
+
+  aliyun-python-sdk-clickhouse =
+    buildAliyunSdkPackage "clickhouse" "3.1.6"
+      "sha256-GjYzErL/18ND5KRz0PQ/dihSm2ekAoxy2ZrXymHKGxI=";
+
+  aliyun-python-sdk-cloudapi =
+    buildAliyunSdkPackage "cloudapi" "4.9.2"
+      "sha256-+K9dZP7gpF9bB7jBoBsZ1xbPix6S06ly47ttZl3RX4w=";
+
+  aliyun-python-sdk-cloudauth =
+    buildAliyunSdkPackage "cloudauth" "2.0.36"
+      "sha256-L8pem641eJ9N4WkL580RkwTYtOgbXYP2L6h8yh2uUwU=";
+
+  aliyun-python-sdk-cloudauth-console =
+    buildAliyunSdkPackage "cloudauth-console" "2.0.0"
+      "sha256-+t/O2SXtc4/Yeowu3kGF0U/hv2HT3AYRwGwjE2KmjyM=";
+
+  aliyun-python-sdk-cloudesl =
+    buildAliyunSdkPackage "cloudesl" "2.1.1"
+      "sha256-txrtPxFUd8QJ3S3EKd2BlDwKu2Bx98gWIomCqzo64lk=";
+
+  aliyun-python-sdk-cloudphone =
+    buildAliyunSdkPackage "cloudphone" "1.0.1"
+      "sha256-hBkCsR4/aLE1wy+GlpwfzforIBtDG/UaI78lJZkU7Zg=";
+
+  aliyun-python-sdk-cloud-siem =
+    buildAliyunSdkWheelPackage "cloud-siem" "1.0.5"
+      "sha256-dSkIuxH+PVqpdp5lp5BQQYdG/UPxBGd4yL1xfjFCkKU=";
+
+  aliyun-python-sdk-cms =
+    buildAliyunSdkPackage "cms" "7.0.33"
+      "sha256-QWZbqyVT16xHHmv8QIpUJE8FARQToVYO+X3e1hXhDdQ=";
+
+  aliyun-python-sdk-codeup =
+    buildAliyunSdkPackage "codeup" "0.1.3"
+      "sha256-oB8r6NwyhW9hjNV5HmMWQnXfICikjRVLm2/Zo/tuGeU=";
+
+  aliyun-python-sdk-companyreg =
+    buildAliyunSdkPackage "companyreg" "2.2.5"
+      "sha256-7qSl9rHX4yonSeMhBS4qImCYBnlcSVqNlM6tPWiOOUk=";
+
+  aliyun-python-sdk-computenest =
+    buildAliyunSdkPackage "computenest" "1.0.3"
+      "sha256-ogHH0oyU+tAimj6kQULwxjPo++WgAiW7gK7jE5kgPAk=";
+
+  aliyun-python-sdk-computenestsupplier =
+    buildAliyunSdkPackage "computenestsupplier" "1.0.6"
+      "sha256-iKLLrwUinchFuHmUwbKkyXUWasIxL2s/GnSJrjAJsqc=";
+
+  aliyun-python-sdk-config =
+    buildAliyunSdkPackage "config" "2.2.14"
+      "sha256-drmk41/k/JJ6Zs6MrnMQa7xwpkO7MZEaSeyfm2QimKo=";
+
+  aliyun-python-sdk-csas =
+    buildAliyunSdkPackage "csas" "1.0.11"
+      "sha256-wcJLPRWbteUQqiANGUxUAJL8szPB+9IcN/0HGvZ0PKo=";
+
+  aliyun-python-sdk-das =
+    buildAliyunSdkPackage "das" "2.0.36"
+      "sha256-iFt41fwlZWpvT4DcKQs+xVmKNFNEmPyO9OHgLmIc5mg=";
+
+  aliyun-python-sdk-dashdeviceconsole =
+    buildAliyunSdkPackage "dashdeviceconsole" "1.0.1"
+      "sha256-VBKkH3YOi1Cph02099Ogeoy9JVU7eaWtPCRXkiBCXZc=";
+
+  aliyun-python-sdk-dataphin-public =
+    buildAliyunSdkWheelPackage "dataphin-public" "1.0.14"
+      "sha256-GUAhGLGtwELUfuTGMuobCzzoRZJRbn9K7lzCAn4IYWE=";
+
+  aliyun-python-sdk-dataworks-public =
+    buildAliyunSdkPackage "dataworks-public" "6.1.12"
+      "sha256-FSA3ICoJZCoRvHnM3wlgzgk7Zshaq1SxYdVib8avl1Q=";
+
+  aliyun-python-sdk-dbfs =
+    buildAliyunSdkPackage "dbfs" "2.0.7"
+      "sha256-Kj6DfnXZq5ilE+vnZrAoZEhPDoNrMIs5p2OcBc24qXM=";
+
+  aliyun-python-sdk-dbs =
+    buildAliyunSdkPackage "dbs" "1.0.36"
+      "sha256-Mx556g1xcHFMag69A48ChN1FLTj7SphaygNbWIpqPhw=";
+
+  aliyun-python-sdk-dcdn =
+    buildAliyunSdkPackage "dcdn" "2.2.19"
+      "sha256-FsqccoBXdmN+utqxQJ9ujteCBoYT14kM+jJVZTeAJaA=";
+
+  aliyun-python-sdk-ddosbgp =
+    buildAliyunSdkPackage "ddosbgp" "1.0.1"
+      "sha256-nuATkn0Ci4tLaslkBMDKZuaiBCvL6uz3V9lOw46Z4VY=";
+
+  aliyun-python-sdk-ddoscoo =
+    buildAliyunSdkPackage "ddoscoo" "1.0.6"
+      "sha256-ySKys/ninfFq4bBOhXsfg/WhRxS57CWPu0a15apd9xo=";
+
+  aliyun-python-sdk-ddosdiversion =
+    buildAliyunSdkPackage "ddosdiversion" "1.0.0"
+      "sha256-L2D2bOk2p2ldr31PCeHw0h6Dx8Ns/GZ8AXJmCfPARdg=";
+
+  aliyun-python-sdk-dds =
+    buildAliyunSdkWheelPackage "dds" "3.7.25"
+      "sha256-XIMps9Tpi63zbJ6jViDHXF9zGmbtU1zI2ecOYJ58agk=";
+
+  aliyun-python-sdk-devops-rdc =
+    buildAliyunSdkPackage "devops-rdc" "2.0.2"
+      "sha256-B0WSi04u1FnHeCrckrdiqan9+kJGV0Q+D96ql8IuTyw=";
+
+  aliyun-python-sdk-dfs =
+    buildAliyunSdkPackage "dfs" "0.0.2"
+      "sha256-S8H0Qvr6NL6CarPrV5tac6cOQYoLyJMcrWaJ8X88KSQ=";
+
+  aliyun-python-sdk-dg =
+    buildAliyunSdkPackage "dg" "1.0.10"
+      "sha256-n1Wl3vkKvoC4PCc791T/eOGDGF3DBduzATix3FH+D7s=";
+
+  aliyun-python-sdk-dms =
+    buildAliyunSdkPackage "dms" "1.0.0"
+      "sha256-4hKNUwOQlxlTo0/mZUc0nCgY/AHhRZ5Iulw+lDz0i7Y=";
+
+  aliyun-python-sdk-dms-dg =
+    buildAliyunSdkPackage "dms-dg" "1.0.0"
+      "sha256-KfifVG8I4kHfkzlkMpGkSaxo+pFyLnYKtl6p6oNMiHU=";
+
+  aliyun-python-sdk-dms-enterprise =
+    buildAliyunSdkPackage "dms-enterprise" "1.53.12"
+      "sha256-3SPn/q/ghN1X1OUFIkNyrXQjg240wn9EhJjo4eHW+0g=";
+
+  aliyun-python-sdk-documentautoml =
+    buildAliyunSdkPackage "documentautoml" "1.0.0"
+      "sha256-Ug07itDQtsOqDwM8eL+5HI04YY3GBIndAEL1ZCVwCrI=";
+
+  aliyun-python-sdk-domain =
+    buildAliyunSdkPackage "domain" "3.14.11"
+      "sha256-wCzqn0OHukreS4EDdNPD36ogTy9+kzauHf5kl9jX02Q=";
+
+  aliyun-python-sdk-drds =
+    buildAliyunSdkPackage "drds" "20210523.0.2"
+      "sha256-ASkvIPCzUi7pflSqfD79+WSG4ZtcFjodoSCZAXdZKrU=";
+
+  aliyun-python-sdk-dt-oc-info =
+    buildAliyunSdkPackage "dt-oc-info" "1.0.0"
+      "sha256-NlLiCId3vMKn6oO1qh3IBN2CSVK/GTkkF71qtxgCdHw=";
+
+  aliyun-python-sdk-dts =
+    buildAliyunSdkPackage "dts" "5.1.29"
+      "sha256-3D8azWnZ4B0grFNA5uJlQyh/GhVkxrBXr7hhnIGjDOw=";
+
+  aliyun-python-sdk-dybaseapi =
+    buildAliyunSdkPackage "dybaseapi" "1.0.8"
+      "sha256-HbFMIRi3xnPy/lEw6l67r6AEQAjNbwZ8I10zieFfVIo=";
+
+  aliyun-python-sdk-dyplsapi =
+    buildAliyunSdkPackage "dyplsapi" "1.3.5"
+      "sha256-Cw+LluwjTjwLdNieN4HYm4f6nAG+VGFwHtPrga+IjkM=";
+
+  aliyun-python-sdk-dypnsapi =
+    buildAliyunSdkPackage "dypnsapi" "1.1.13"
+      "sha256-DmOGKDqG0n7pCjJU+G3NpQtSdW4gOMQytSg8Oyn/e8c=";
+
+  aliyun-python-sdk-dypnsapi-intl =
+    buildAliyunSdkPackage "dypnsapi-intl" "1.0.0"
+      "sha256-kPHOb3uq1AcaXSvue6C92Pco3ef2aofEXzrgGBm3NpQ=";
+
+  aliyun-python-sdk-dysmsapi =
+    buildAliyunSdkPackage "dysmsapi" "2.1.2"
+      "sha256-yZsEFwuhLcGLKVI1RxQKR1Hpr8FiW2aE5Prne7SuLFo=";
+
+  aliyun-python-sdk-dytnsapi =
+    buildAliyunSdkPackage "dytnsapi" "1.1.8"
+      "sha256-VvvxHG2GFO5kl3EdfC8jIcPXuEcTjoY/3VL597duybQ=";
+
+  aliyun-python-sdk-dyvmsapi =
+    buildAliyunSdkPackage "dyvmsapi" "3.2.0"
+      "sha256-U7uCrmD/dlbymSiEsGLwQslgO93+vUKdWBTZsNRcfy8=";
+
+  aliyun-python-sdk-eais =
+    buildAliyunSdkPackage "eais" "2.1.7"
+      "sha256-BgRAs+AVPRi3HVWQCSpy62P3wzlVJliyvTA3o4/N6vY=";
+
+  aliyun-python-sdk-eas =
+    buildAliyunSdkPackage "eas" "0.0.9"
+      "sha256-NX/FqXMgqpYwWer42MLKopHum6StHiXS/6XHYVJ0wec=";
+
+  aliyun-python-sdk-ebs =
+    buildAliyunSdkPackage "ebs" "1.3.7"
+      "sha256-vrie1h9SHxC1QU/aIyvXS7UVDnOEiDjcArOrtTFu3kY=";
+
+  aliyun-python-sdk-ecd =
+    buildAliyunSdkPackage "ecd" "1.0.2"
+      "sha256-VCEQSWdglWzjUsGOFIwpok4AzzQwKc/ld5lCDNcDaOw=";
+
+  aliyun-python-sdk-eci =
+    buildAliyunSdkPackage "eci" "1.3.3"
+      "sha256-eV/bRJt1pOrfQvfFUQ6zwLgDZF33JK6KwE+/r9eH0JE=";
+
+  aliyun-python-sdk-ecs =
+    buildAliyunSdkWheelPackage "ecs" "4.24.83"
+      "sha256-6ey1zhxJqq1IJd4hPjRwpPTRDQ2mVqpMvyiDZHi+yTo=";
+
+  aliyun-python-sdk-ecs-workbench =
+    buildAliyunSdkPackage "ecs-workbench" "1.0.4"
+      "sha256-uPjwDavAcgBpBpiwpMB9arEVBoZv4PhZfTwP9BK+jXA=";
+
+  aliyun-python-sdk-edas =
+    buildAliyunSdkPackage "edas" "3.26.9"
+      "sha256-oyudHqnZ67WBUGgDM2qtO4Q5r1kf6uiV1VOhKEVCCeQ=";
+
+  aliyun-python-sdk-eds-user =
+    buildAliyunSdkWheelPackage "eds-user" "1.0.4"
+      "sha256-1j3WewECT811IK9+TY4XuTf+4PWV4Z+BSDrNy4AS8vA=";
+
+  aliyun-python-sdk-eduinterpreting =
+    buildAliyunSdkPackage "eduinterpreting" "1.0.2"
+      "sha256-YXtaJmYsoans3DsszLWlIHA73UO9a/U3ce9RlHyNIW4=";
+
+  aliyun-python-sdk-eflo =
+    buildAliyunSdkWheelPackage "eflo" "1.0.19"
+      "sha256-jMIaOMz1wQZf020Ziz2kKlPF3Hpq6aPfPPdwj+dxcB8=";
+
+  aliyun-python-sdk-eflo-controller =
+    buildAliyunSdkPackage "eflo-controller" "1.0.3"
+      "sha256-YYeAwrk0XUJ1zzQSlYxv89HqG4EaeCxkIAyk/3NwzKQ=";
+
+  aliyun-python-sdk-ehpc =
+    buildAliyunSdkPackage "ehpc" "1.14.21"
+      "sha256-KoARcIUKfnxqcwewesEc+GWn/Iu07jQ3dYULlQDwr+M=";
+
+  aliyun-python-sdk-ehpcinstant =
+    buildAliyunSdkPackage "ehpcinstant" "1.0.0"
+      "sha256-fX05EMee3Vqg+nyJVZntd+QceEqAy0Jlm64SX/sQaUM=";
+
+  aliyun-python-sdk-eiam =
+    buildAliyunSdkWheelPackage "eiam" "1.0.5"
+      "sha256-OvmC9PaYC7sKFoQ+JO1Ud5Y6hx9YVHerWZ9QLKvyb+M=";
+
+  aliyun-python-sdk-eipanycast =
+    buildAliyunSdkPackage "eipanycast" "1.0.5"
+      "sha256-nMALy2b2TryKdEMN9nVls1G8CVFoGTeB3F4aXup9aVQ=";
+
+  aliyun-python-sdk-elasticsearch =
+    buildAliyunSdkPackage "elasticsearch" "3.1.2"
+      "sha256-qIRwhElBpICkWH+QqOxaFwRyPOIINgPnDsXIxz1epes=";
+
+  aliyun-python-sdk-emas-appmonitor =
+    buildAliyunSdkPackage "emas-appmonitor" "1.2.0"
+      "sha256-jNpDdapL65IUFlC2kHFlZjaEZ7pQjX+eCx3BCj2ffzw=";
+
+  aliyun-python-sdk-emr =
+    buildAliyunSdkPackage "emr" "3.3.10"
+      "sha256-zCn0oYZB/Mav7CAmiezokeuylkDdm2tSVbek26hAqGA=";
+
+  aliyun-python-sdk-emrstudio =
+    buildAliyunSdkPackage "emrstudio" "1.0.0"
+      "sha256-zxoAVxI7fhFJnItUKG8NGM96nHZxEJijTQ187RtFvBA=";
+
+  aliyun-python-sdk-ens =
+    buildAliyunSdkPackage "ens" "3.0.23"
+      "sha256-s9qNHbsOITb8/tEsKtHpmuIRBCUk2v77Gj1lhSaqep8=";
+
+  aliyun-python-sdk-esa =
+    buildAliyunSdkPackage "esa" "1.0.0"
+      "sha256-zkonVNChsFg2XWYt8AHFj6rRNwd019IGaex759OwBDo=";
+
+  aliyun-python-sdk-ess =
+    buildAliyunSdkPackage "ess" "2.3.32"
+      "sha256-5MC/wnt2w7cgV+7WSzGOEWL77V4VrAcRnKi5Qn6VRnE=";
+
+  aliyun-python-sdk-es-serverless =
+    buildAliyunSdkPackage "es-serverless" "1.0.0"
+      "sha256-GTwMtgqElNgmhN5n/2rGsWgvCZ/8oEoYD0TLTYtgRLI=";
+
+  aliyun-python-sdk-et-industry-openapi =
+    buildAliyunSdkPackage "et-industry-openapi" "3.6"
+      "sha256-XIG+IsoPmGaFNQMDasgUcwjzcoPq767WEzk05BpnQAI=";
+
+  aliyun-python-sdk-eventbridge =
+    buildAliyunSdkPackage "eventbridge" "1.0.14"
+      "sha256-Fz8RJv8dxTvXuweUtbYzq7ywjccLoR/07JHMX0C+xtg=";
+
+  aliyun-python-sdk-facebody =
+    buildAliyunSdkPackage "facebody" "2.0.14"
+      "sha256-HMwao+oLdhd6RwdtTmG185WWSSJEtqEg1mwN2RLIcJ8=";
+
+  aliyun-python-sdk-fnf =
+    buildAliyunSdkPackage "fnf" "1.8.3"
+      "sha256-hVzDwcUB3BHFc7k2d6/9rXbFT3c1vWy6ZZTcwBj6mHg=";
+
+  aliyun-python-sdk-foas =
+    buildAliyunSdkPackage "foas" "2.11.1"
+      "sha256-k/ZWGk/EKT+nlO1K0TQN2SjDltrsbCJowdksIDafIoc=";
+
+  aliyun-python-sdk-ft =
+    buildAliyunSdkPackage "ft" "5.6.7"
+      "sha256-XSAOP0UajrrBhcmkDo7OV07W2NPEQ9LqIrBVDgdhMyc=";
+
+  aliyun-python-sdk-ga =
+    buildAliyunSdkPackage "ga" "1.0.19"
+      "sha256-QK3AsyglEY8SqAusVAAB+qXZNStjdn0gLl4T8WyFyNo=";
+
+  aliyun-python-sdk-gdb =
+    buildAliyunSdkPackage "gdb" "1.0.0"
+      "sha256-jOw0DMRy8DEZHttvTmwDDgFot9hVDZu1cpbOS41fi4E=";
+
+  aliyun-python-sdk-geoip =
+    buildAliyunSdkPackage "geoip" "1.0.4"
+      "sha256-CZTdvxa1NnFpmVizMJQVFaBD4ME1G1RNPHTkr48YeIw=";
+
+  aliyun-python-sdk-governance =
+    buildAliyunSdkPackage "governance" "1.0.0"
+      "sha256-5u2+wauojKwLhWdcpsdqVN8pVXj04nJrt+/YZf1/cEM=";
+
+  aliyun-python-sdk-gpdb =
+    buildAliyunSdkPackage "gpdb" "1.1.7"
+      "sha256-u8Er3yXaDsMyH0qz1dZhipX42knFJSqQiA7SiOG3LOI=";
+
+  aliyun-python-sdk-grace =
+    buildAliyunSdkPackage "grace" "1.0.0"
+      "sha256-+ysYLgYcyFzVVXNLZaP+9UsjiofQZXGu/lN/vRsbwGE=";
+
+  aliyun-python-sdk-green =
+    buildAliyunSdkPackage "green" "3.6.6"
+      "sha256-TifdOzViJiAvLA8Yd3HVEt8mhz76MZSegWUgtEg5Ris=";
+
+  aliyun-python-sdk-gwlb =
+    buildAliyunSdkPackage "gwlb" "1.0.2"
+      "sha256-7xFUZWmmEIt+EodCom3OZUY1o9GkkG7gBKXHlGN7rDE=";
+
+  aliyun-python-sdk-hbase =
+    buildAliyunSdkPackage "hbase" "2.9.9"
+      "sha256-nyiFzNP452MfNSbRnh7PDA5xo5d/npg2YEptb8iBP3E=";
+
+  aliyun-python-sdk-hbr =
+    buildAliyunSdkPackage "hbr" "1.2.10"
+      "sha256-kQ4RXmX0AwjjoCjZKaJYwg+88D1bb9t90ayujmFFeow=";
+
+  aliyun-python-sdk-hcs-mgw =
+    buildAliyunSdkPackage "hcs-mgw" "1.0.0"
+      "sha256-sBCozcE0FANK7Fjj8bm5sLa6bJwCXl0RO8NJQQivY3g=";
+
+  aliyun-python-sdk-hitsdb =
+    buildAliyunSdkPackage "hitsdb" "3.1.15"
+      "sha256-D4j688DbjtsZA4PqINl19RCHEdY+oZivBBkAhnP6aqY=";
+
+  aliyun-python-sdk-ice =
+    buildAliyunSdkPackage "ice" "1.0.2"
+      "sha256-HhKAKeWCcfBWdRgFXGzEkALNXV7BONEcTd5+2qHGVRU=";
+
+  aliyun-python-sdk-idaas-doraemon =
+    buildAliyunSdkPackage "idaas-doraemon" "1.0.1"
+      "sha256-8RSnGSlRumFS3QXcWNZZaKzB69DKfiVPimrJrPoTnfY=";
+
+  aliyun-python-sdk-imageaudit =
+    buildAliyunSdkPackage "imageaudit" "1.0.9"
+      "sha256-3GWmj/9ncPMdtF3KzsThJsnQ2aOp4IX6Y3iJ5u+uMho=";
+
+  aliyun-python-sdk-imageenhan =
+    buildAliyunSdkPackage "imageenhan" "1.1.12"
+      "sha256-bJ58qSpDpKxGbrzGgD7plZBBTLitRfNBUrJ9562/DLo=";
+
+  aliyun-python-sdk-imageprocess =
+    buildAliyunSdkPackage "imageprocess" "2.0.7"
+      "sha256-jtf2xu6C1hSBFobOVj+KYxLj6NlbPnE6yg1E8tRiS7U=";
+
+  aliyun-python-sdk-imagerecog =
+    buildAliyunSdkPackage "imagerecog" "1.0.19"
+      "sha256-BjLZ5E1Om1adGs9W99DJ+pG/rRU0eI1ngoPOE2FXcpg=";
+
+  aliyun-python-sdk-imageseg =
+    buildAliyunSdkPackage "imageseg" "1.1.14"
+      "sha256-MwZmcYqMiloi4ndTZznjnKHg2/pqAEQVeSSwfVSwXdc=";
+
+  aliyun-python-sdk-imarketing =
+    buildAliyunSdkPackage "imarketing" "5.0.2"
+      "sha256-FwreXgR1ToR/RZxeLCjgEi1AFR9LTgLo/tLtRdLzYag=";
+
+  aliyun-python-sdk-imgsearch =
+    buildAliyunSdkPackage "imgsearch" "1.1.7"
+      "sha256-BJ/1s6rJ4hrBMkFJg//XXtPN/9VgO2s795tcU7F0loM=";
+
+  aliyun-python-sdk-imm =
+    buildAliyunSdkPackage "imm" "2.1.17"
+      "sha256-kYfJrmwKBzLwtQ/7QR+SmygIZT2i9F4yvA5Bsy9Wpjw=";
+
+  aliyun-python-sdk-intlmarket =
+    buildAliyunSdkPackage "intlmarket" "1.0.0"
+      "sha256-Rwps1HLqvqoNOstm3u5XpZJ+vfbefogXRP61XGSdK8Q=";
+
+  aliyun-python-sdk-iot =
+    buildAliyunSdkPackage "iot" "8.59.0"
+      "sha256-v0jTMKtYrbEBVjHQokpWSlcJBALZFsuoYHq8wCP8w1E=";
+
+  aliyun-python-sdk-iotcc =
+    buildAliyunSdkPackage "iotcc" "2.0.7"
+      "sha256-kXgLpU2WDoj6NFRovif2GoEWsY5HP5bIEfe0Jx8vPvU=";
+
+  aliyun-python-sdk-iqs =
+    buildAliyunSdkPackage "iqs" "1.0.0"
+      "sha256-V25LxLGU/2Epat/OPzO68qwyUEKOA4mWsH/WmgBndQM=";
+
+  aliyun-python-sdk-itag =
+    buildAliyunSdkPackage "itag" "1.0.0"
+      "sha256-KRFUvvq711zk9RVOZ0yr1EUkVhJtHgsg0kQKQQAswU8=";
+
+  aliyun-python-sdk-ivision =
+    buildAliyunSdkPackage "ivision" "1.2.1"
+      "sha256-uCsU9Uaw/2HxnoZmuyolPyM7ZnWDLS+rufU4W/Ikor8=";
+
+  aliyun-python-sdk-kms =
+    buildAliyunSdkPackage "kms" "2.16.5"
+      "sha256-8yiooZ2D7LuWX/zg7B6ZMHVSFtEEY4zZXs02J1O4E7M=";
+
+  aliyun-python-sdk-lingmou =
+    buildAliyunSdkPackage "lingmou" "1.0.1"
+      "sha256-4YVmlXorroQoinC5Jum1/JU0ucQ4gIPBy0JDtHGsd/k=";
+
+  aliyun-python-sdk-linkvisual =
+    buildAliyunSdkPackage "linkvisual" "1.5.8"
+      "sha256-blZOKkpWFTc0ymT1T4uZjiS2KXTQGV1p2248wjVSetY=";
+
+  aliyun-python-sdk-linkwan =
+    buildAliyunSdkPackage "linkwan" "1.0.4"
+      "sha256-2/7hNZjJMBr4w9WNH2wUMiRFHMjhcGPhvEE2sqyd69A=";
+
+  aliyun-python-sdk-live =
+    buildAliyunSdkWheelPackage "live" "3.9.75"
+      "sha256-XrR7cw1POAgo1wnKQBCpKPzmNWEEF0/7xItuNob5uD0=";
+
+  aliyun-python-sdk-ltl =
+    buildAliyunSdkPackage "ltl" "1.0.0"
+      "sha256-Vv4hDMmt9y3+Gu3IecKkv/xKYIi0PSy50Kgenty9PYk=";
+
+  aliyun-python-sdk-lto =
+    buildAliyunSdkPackage "lto" "1.0.0"
+      "sha256-R51rXfKnIJSr0Yb6g/ru9Ex7ur7gjBx58ue0UlyqmfU=";
+
+  aliyun-python-sdk-market =
+    buildAliyunSdkPackage "market" "2.0.24"
+      "sha256-0aO7EUjvVLa9kHH0C8WyC+vwxPyCEu0iCrmiYHhGH4I=";
+
+  aliyun-python-sdk-marketplaceintl =
+    buildAliyunSdkPackage "marketplaceintl" "1.0.0"
+      "sha256-i/+hBF6VWWxGf9LiDp6wTG19aLJBrc4sX7uzAfAuUAU=";
+
+  aliyun-python-sdk-maxcompute =
+    buildAliyunSdkPackage "maxcompute" "1.0.3"
+      "sha256-ZajrA1MMP72LT9Y2xW0q+cPDwbp2EyuTcwc5uh2Wqrs=";
+
+  aliyun-python-sdk-mns-open =
+    buildAliyunSdkPackage "mns-open" "1.0.2"
+      "sha256-9i65Vcs4VhDPFMZwHGLBMjrH/Wu/pYd686QODTGX4ng=";
+
+  aliyun-python-sdk-moguan-sdk =
+    buildAliyunSdkPackage "moguan-sdk" "1.1.0"
+      "sha256-e5CLXCeZc8zmc4f7tfAlz+74I/wqAD71k3ik6yo7KaQ=";
+
+  aliyun-python-sdk-msccommonquery =
+    buildAliyunSdkPackage "msccommonquery" "0.0.1"
+      "sha256-W9/ZiVDSTwvtSX4jRuZjN04ibEx1yVcPN9v+Bm4CJiI=";
+
+  aliyun-python-sdk-mse =
+    buildAliyunSdkPackage "mse" "3.0.24"
+      "sha256-PcjDrKJBDT0oAz8FFW4HJ3cV1z2pvcCpxx+eRzWh9ew=";
+
+  aliyun-python-sdk-mseap =
+    buildAliyunSdkPackage "mseap" "1.0.4"
+      "sha256-CBYnH7gGaXvRP6Vpa6Xk4YFvK7vd6Ahosfv1wqrXza0=";
+
+  aliyun-python-sdk-mts =
+    buildAliyunSdkWheelPackage "mts" "3.3.46"
+      "sha256-73cn+UWmmtsZZDh+lDbDgwZpZcfb/Qq4iOQpwhAGlxE=";
+
+  aliyun-python-sdk-nas =
+    buildAliyunSdkWheelPackage "nas" "3.14.5"
+      "sha256-VGGauutVaDgoiHq+T+gH+k3seHZ+l4vO1GJXnZAJjpQ=";
+
+  aliyun-python-sdk-nis =
+    buildAliyunSdkPackage "nis" "1.0.2"
+      "sha256-m+uYdGL2KY7qG1HskcI/oSSLu76bB8Tb0OQyCRXELFc=";
+
+  aliyun-python-sdk-nlb =
+    buildAliyunSdkPackage "nlb" "1.0.12"
+      "sha256-DmhrujQjY0HyV3SpJ2W0+600F4gYItikhO+iX+j9rXc=";
+
+  aliyun-python-sdk-nlp-automl =
+    buildAliyunSdkPackage "nlp-automl" "0.0.15"
+      "sha256-9UrzkIOSFcbuYXVJrCFhUG1RNZVmj06we+KeTdrMIn0=";
+
+  aliyun-python-sdk-objectdet =
+    buildAliyunSdkPackage "objectdet" "1.0.16"
+      "sha256-eVStbo/GokFnr5nY9fZNC3GXQ0T/MRuK8F6yYtQaHTs=";
+
+  aliyun-python-sdk-oceanbasepro =
+    buildAliyunSdkPackage "oceanbasepro" "1.0.31"
+      "sha256-3CULwLpDIbCPdp9WYr2VNjf53PS/XtkEY2dNVGmDzVk=";
+
+  aliyun-python-sdk-ocr =
+    buildAliyunSdkPackage "ocr" "1.0.25"
+      "sha256-5xny5tzz9bpnlbwS5+U4XYPgPwWhvn2euQ8cH5fnQpA=";
+
+  aliyun-python-sdk-ocs =
+    buildAliyunSdkPackage "ocs" "0.0.4"
+      "sha256-Nho8LbAkWJTegGeDZjB973YUEyTWzjLrfxGaqYHT7AE=";
+
+  aliyun-python-sdk-oms =
+    buildAliyunSdkPackage "oms" "1.0.0"
+      "sha256-A6M+T0xu4hKt+6mMgZvDDK1d5pGF5vZjxt8174jac9M=";
+
+  aliyun-python-sdk-ons =
+    buildAliyunSdkPackage "ons" "3.2.3"
+      "sha256-hX9+U7/Z8wbn0CJ0y+BO3Y9sl4eOFt0/M+sEG+eu7AY=";
+
+  aliyun-python-sdk-onsmqtt =
+    buildAliyunSdkPackage "onsmqtt" "1.0.5"
+      "sha256-j20bBm6JIlV40b4BVvrH++9AZ1I1wKCuaY2JctfXCWY=";
+
+  aliyun-python-sdk-oos =
+    buildAliyunSdkPackage "oos" "1.5.16"
+      "sha256-8CocGErJCZYOEtPEwTQ+XgoY/lLgpLmfgB37nLk25yM=";
+
+  aliyun-python-sdk-openanalytics-open =
+    buildAliyunSdkPackage "openanalytics-open" "2.0.5"
+      "sha256-um1fqWyp1kervEB954t3nUoJdD41cteGt8wAN2Qq0/Q=";
+
+  aliyun-python-sdk-openitag =
+    buildAliyunSdkPackage "openitag" "1.0.0"
+      "sha256-/tnsRjUgGCRkO7M3KDCOsmdclBECdpYTRjDtwL08oyI=";
+
+  aliyun-python-sdk-opensearch =
+    buildAliyunSdkPackage "opensearch" "0.12.2"
+      "sha256-kyJJt7UM3tbt88lJCa3JlbxsRcDMqMQi487dp+ouw+0=";
+
+  aliyun-python-sdk-osssddp =
+    buildAliyunSdkPackage "osssddp" "1.0.0"
+      "sha256-z2TKT94A2lzXdZqLteuoZZLAua7HKtZ9dcWjySxjdss=";
+
+  aliyun-python-sdk-outboundbot =
+    buildAliyunSdkWheelPackage "outboundbot" "1.6.3"
+      "sha256-nY3+SNpG90lFdRimn5r4SuyI6aPvLJEoZqJZ/j4/XRs=";
+
+  aliyun-python-sdk-pai-dsw =
+    buildAliyunSdkPackage "pai-dsw" "1.0.0"
+      "sha256-htT9Pyz30aQg+KlGqK/QcfyuT3byF/AnV2L9PNyfsJY=";
+
+  aliyun-python-sdk-paielasticdatasetaccelerator =
+    buildAliyunSdkPackage "paielasticdatasetaccelerator" "1.0.3"
+      "sha256-3ydKRQRmsFNThMdPGuW+yxF99olV5Le5AbVC9g1IRwc=";
+
+  aliyun-python-sdk-paifeaturestore =
+    buildAliyunSdkWheelPackage "paifeaturestore" "1.0.19"
+      "sha256-jmltVn0J+PzMTXf8zA4RdYawHDFlMB3k5YcYX03ZF+Y=";
+
+  aliyun-python-sdk-pairecservice =
+    buildAliyunSdkPackage "pairecservice" "1.0.3"
+      "sha256-4TGawz8GlXkoRt+wMejP4duejmk9iqfUpqFj/cfkSTE=";
+
+  aliyun-python-sdk-polardb =
+    buildAliyunSdkWheelPackage "polardb" "1.8.58"
+      "sha256-JHXODBt9NcVTWjp+9EGFitkowhSYK3hb0/yB0XsXzvA=";
+
+  aliyun-python-sdk-polardbx =
+    buildAliyunSdkPackage "polardbx" "20201028"
+      "sha256-rftRnOeKPYWGX9K9NC7gib6Yf8xVgQfg/lp/7PsGoKU=";
+
+  aliyun-python-sdk-privatelink =
+    buildAliyunSdkPackage "privatelink" "1.0.8"
+      "sha256-zmEKxzMJ5+aVNN9ZRNXpYv6bXTBSbXUEwQlcw8DtHnY=";
+
+  aliyun-python-sdk-push =
+    buildAliyunSdkPackage "push" "3.13.21"
+      "sha256-gxkHNOAy6dJmeB2QqugRlPyGe2JIhD/oCz+5nRSRbNg=";
+
+  aliyun-python-sdk-pvtz =
+    buildAliyunSdkPackage "pvtz" "1.3.0"
+      "sha256-3I1oEDRGVI/O+yUQdN/dhHvmq0kXEvR4BdcpsrPJuUc=";
+
+  aliyun-python-sdk-qianzhou =
+    buildAliyunSdkPackage "qianzhou" "1.0.0"
+      "sha256-Y3Ubzt5c6tIZqN3NbFCAPeEtcBZyBdVPDPXqNiT0pmg=";
+
+  aliyun-python-sdk-qualitycheck =
+    buildAliyunSdkPackage "qualitycheck" "4.7.1"
+      "sha256-UG6zzsh1LFo9X/OPhZy0783vy4RneLCRqu0zBsIS+Yo=";
+
+  aliyun-python-sdk-quickbi-public =
+    buildAliyunSdkWheelPackage "quickbi-public" "2.1.20"
+      "sha256-+/JyCEGZsfnfKrSyjh7JXIJM5ssIgZyf5orGrEHoPec=";
+
+  aliyun-python-sdk-quotas =
+    buildAliyunSdkPackage "quotas" "1.0.4"
+      "sha256-oidX8n7QZXxlEqGySwEeIl5nI1bL0tcb1CSduXMO3Jk=";
+
+  aliyun-python-sdk-ram =
+    buildAliyunSdkPackage "ram" "3.3.1"
+      "sha256-D9SC1XdnhizZ29bJkro8RCuOGZ1DvfKzNrXUGk7ceVc=";
+
+  aliyun-python-sdk-rds =
+    buildAliyunSdkPackage "rds" "2.7.53"
+      "sha256-BXtNpOO2RUd+VwLf4BClqp7yG5a00N+L45XbOeCk3g4=";
+
+  aliyun-python-sdk-rds-data =
+    buildAliyunSdkPackage "rds-data" "1.0.0"
+      "sha256-hbwR1Q0MXVLKkAC17GV9Ng+RWXKhPQdKMUDduwR7+n4=";
+
+  aliyun-python-sdk-reid-cloud =
+    buildAliyunSdkWheelPackage "reid-cloud" "1.2.2"
+      "sha256-MeHA5T4UTME6YDLhcw1/7nYMsWnbFTOYiypWb1/sKj0=";
+
+  aliyun-python-sdk-resourcecenter =
+    buildAliyunSdkPackage "resourcecenter" "1.0.7"
+      "sha256-ow1KULDKUPe33GTx6VLDw+n8PJK8MZOZVgiVANsqbes=";
+
+  aliyun-python-sdk-resourcemanager =
+    buildAliyunSdkPackage "resourcemanager" "1.2.7"
+      "sha256-9qpRMmsiCk2mhzNixuPRgshpC9qRVt9Q+wOb32/nOfs=";
+
+  aliyun-python-sdk-resourcesharing =
+    buildAliyunSdkPackage "resourcesharing" "1.0.1"
+      "sha256-bVxAcaG8MLl+9ws0WU/fsF2te9aV2rB6xrTWJycqHcY=";
+
+  aliyun-python-sdk-retailcloud =
+    buildAliyunSdkPackage "retailcloud" "2.0.20"
+      "sha256-85xhtAahv6iQODUe1eXH/Kb7npUmu+IJ34JpAle+egY=";
+
+  aliyun-python-sdk-r-kvstore =
+    buildAliyunSdkWheelPackage "r-kvstore" "2.20.17"
+      "sha256-TGu2Z/k809MSGPtKekyjKdwgpSbRPuqmMSKv5FDKgGg=";
+
+  aliyun-python-sdk-ros =
+    buildAliyunSdkWheelPackage "ros" "3.6.1"
+      "sha256-60pZ+aKlvPvkvN2CCsgGuYyQ9irXjEnz6tD9zbzJchs=";
+
+  aliyun-python-sdk-rsimganalys =
+    buildAliyunSdkPackage "rsimganalys" "4.3.1"
+      "sha256-hdbPPpXIkFNTz7GoEPF2OEX5uCnULnCiwyw2cQkEhmE=";
+
+  aliyun-python-sdk-rtc =
+    buildAliyunSdkPackage "rtc" "1.3.5"
+      "sha256-s4R2hieFYfUOWC8CnH3z5F+ctJtRxgF7d5PJFp9nvUY=";
+
+  aliyun-python-sdk-sae =
+    buildAliyunSdkPackage "sae" "1.22.16"
+      "sha256-ed8s3qqH3VcsYSjygOeBU586+WLqCWz4k4ll4mWfgV8=";
+
+  aliyun-python-sdk-safconsole =
+    buildAliyunSdkPackage "safconsole" "1.0.1"
+      "sha256-eLFa0xt7u7rDd+Q73xva5dlR4RBWR++yJHctvrC4VCM=";
+
+  aliyun-python-sdk-sas =
+    buildAliyunSdkPackage "sas" "2.0.3"
+      "sha256-3i+FIrBmJZk7Yij4DUitRwcyq8FnHxEDoLyBhk7h7rY=";
+
+  aliyun-python-sdk-sasti =
+    buildAliyunSdkPackage "sasti" "1.0.0"
+      "sha256-APuN8zRIfWJT26taeei7iipqml1c5AJqqBhP5Xq64M8=";
+
+  aliyun-python-sdk-scdn =
+    buildAliyunSdkPackage "scdn" "2.2.9"
+      "sha256-9IxJnw+Kyt6PLdiXCAKYOYQWXY4hNux+VBV43WhHjRs=";
+
+  aliyun-python-sdk-schedulerx2 =
+    buildAliyunSdkPackage "schedulerx2" "1.1.15"
+      "sha256-0YOYHRkAsX6W7tdEYkoDASGfenx4MVkc59Zl9zein7w=";
+
+  aliyun-python-sdk-schedulerx3 =
+    buildAliyunSdkPackage "schedulerx3" "1.0.0"
+      "sha256-A3w1FNyuXHF89arZb9LfbR1eDoNTC3M1CCstcbUUrxE=";
+
+  aliyun-python-sdk-scsp =
+    buildAliyunSdkPackage "scsp" "1.0.0"
+      "sha256-/EhUmPTCL9WNflC7CJtejnkOIFtL316Qq1IesAoytHs=";
+
+  aliyun-python-sdk-sddp =
+    buildAliyunSdkPackage "sddp" "1.0.10"
+      "sha256-117kEI1ajHktEWo7kAbqo8BCO6bisJCa37vmFUKOP3Y=";
+
+  aliyun-python-sdk-selectdb =
+    buildAliyunSdkPackage "selectdb" "1.0.0"
+      "sha256-l6EprfJVijI2mhFogTmBqJlc3nNTmMAsdsQoq0fais0=";
+
+  aliyun-python-sdk-sgw =
+    buildAliyunSdkPackage "sgw" "1.0.4"
+      "sha256-XrzjMwpWrOfM5lyIuSR+mP1MgtCGcyB4DH4QDGJlaro=";
+
+  aliyun-python-sdk-slb =
+    buildAliyunSdkPackage "slb" "3.3.22"
+      "sha256-xvrMcLhY1QHEGxSmZ+jnApL/9Mq8notzQM+O0RPUe9g=";
+
+  aliyun-python-sdk-sls =
+    buildAliyunSdkPackage "sls" "1.1.2"
+      "sha256-79zKRPvRP+oGvaUelmAz6/WBP8iYjemJU1zJPzAb7gI=";
+
+  aliyun-python-sdk-smartag =
+    buildAliyunSdkPackage "smartag" "2.0.4"
+      "sha256-Go1afkSl0PtZUtj4sfiiK9Ayc2C+4k80NXq1RMqWus8=";
+
+  aliyun-python-sdk-smartsales =
+    buildAliyunSdkPackage "smartsales" "1.0.0"
+      "sha256-AeYCWNxjjKEtwft1x5bKmYprPg20mBBZcWirswfK5pA=";
+
+  aliyun-python-sdk-smc =
+    buildAliyunSdkPackage "smc" "1.0.4"
+      "sha256-cGWbBlrepDU4ZcsUzXiPZr3uY/jVAykU1p3s3QVSijE=";
+
+  aliyun-python-sdk-snsuapi =
+    buildAliyunSdkPackage "snsuapi" "1.7.1"
+      "sha256-gEDulzmGBEeX4A8VL5XeSVS4PjSF+9dYs9R3SBlOixY=";
+
+  aliyun-python-sdk-sophonsoar =
+    buildAliyunSdkWheelPackage "sophonsoar" "1.0.1"
+      "sha256-+90QDFwFVh6hpktaNxeA5pkPbb5UjN3nSoC0MsUUSks=";
+
+  aliyun-python-sdk-sts =
+    buildAliyunSdkPackage "sts" "3.1.3"
+      "sha256-Iv7bi60T+WbnEaH0Zi7te52zNEG8BapLD5GKoB4JuWc=";
+
+  aliyun-python-sdk-swas-open =
+    buildAliyunSdkWheelPackage "swas-open" "1.0.14"
+      "sha256-OX9aJgRE25fsbfHVT+EPppSjneGiKkLw7hJ67d2HUM4=";
+
+  aliyun-python-sdk-tag =
+    buildAliyunSdkPackage "tag" "1.0.6"
+      "sha256-yvCSPp3NPmA6/EU8ZfJeHKB+8GckOXDusjGbyVyxJRM=";
+
+  aliyun-python-sdk-threedvision =
+    buildAliyunSdkPackage "threedvision" "1.0.4"
+      "sha256-HLzum3x3lTEY+6Xq6cR33eBI3EqRVUnPTSW+k2I9Y/s=";
+
+  aliyun-python-sdk-tingwu =
+    buildAliyunSdkPackage "tingwu" "1.0.7"
+      "sha256-7ytBiepU7WaiJuZZUNyzEx6jBA7g5EZzUo4GFowfApU=";
+
+  aliyun-python-sdk-unimkt =
+    buildAliyunSdkPackage "unimkt" "2.4.8"
+      "sha256-GEWnH4X/Ia4+JRzUIZ8folr0S9Sduji7UL+riONwnG4=";
+
+  aliyun-python-sdk-ververica =
+    buildAliyunSdkPackage "ververica" "1.0.2"
+      "sha256-Yphxd3ea9F0aIJXhphX2dt1TgWbOlLkZ8YzR8at8Kk4=";
+
+  aliyun-python-sdk-viapi =
+    buildAliyunSdkPackage "viapi" "1.0.0"
+      "sha256-iWgIKfAxm1qu+CEG/6l1v0aUvekCNqTbNGeawz+LavU=";
+
+  aliyun-python-sdk-viapi-oxs-cross =
+    buildAliyunSdkPackage "viapi-oxs-cross" "1.0.0"
+      "sha256-Jvk/w59tz/38ewhzLQuySVChBXi0GL2Gr3azqv1EZYc=";
+
+  aliyun-python-sdk-viapi-regen =
+    buildAliyunSdkPackage "viapi-regen" "1.0.4"
+      "sha256-DzY354VlVaz5iCt8LfZtMlEsGe2XJ4UxXj1GhtHydnU=";
+
+  aliyun-python-sdk-videoenhan =
+    buildAliyunSdkPackage "videoenhan" "1.0.24"
+      "sha256-TXqCmWdFI0nJdKrJAfwPI2HG3vZKxMMZI/PWiIu310E=";
+
+  aliyun-python-sdk-videorecog =
+    buildAliyunSdkPackage "videorecog" "1.0.9"
+      "sha256-oG4xaUnu9oKj0WkBZJISRqEmpXqmY9zYYtp4THE2XpY=";
+
+  aliyun-python-sdk-videoseg =
+    buildAliyunSdkPackage "videoseg" "1.0.4"
+      "sha256-VfiVkrojVajATTO9uuHS+YNXb19hiHHnq1INXaUnSR8=";
+
+  aliyun-python-sdk-vod =
+    buildAliyunSdkWheelPackage "vod" "2.16.32"
+      "sha256-Gnfx0O+68jD6ZWhrpLW1ylNjriN6mTuD2btO/XkNf9I=";
+
+  aliyun-python-sdk-voicenavigator =
+    buildAliyunSdkPackage "voicenavigator" "1.7.0"
+      "sha256-AH1ETCJY5Z1HQR7hF0Efcl1B1+1Tbsy0iR8giNDeGi0=";
+
+  aliyun-python-sdk-vpc =
+    buildAliyunSdkWheelPackage "vpc" "3.0.48"
+      "sha256-s5FdKBu3XmsaI/CBQmch+pAutgb1gg3C+acc+nEMRuE=";
+
+  aliyun-python-sdk-vpcpeer =
+    buildAliyunSdkPackage "vpcpeer" "1.0.3"
+      "sha256-RniPFzNXnWlkjoCxz8L9ffOu6NVWw49wSNhtoKV5Ot8=";
+
+  aliyun-python-sdk-vs =
+    buildAliyunSdkPackage "vs" "1.10.4"
+      "sha256-sY9NbIctyDZ8XmtZhOccqY5NXMeRsk0FMtZecIu/mWE=";
+
+  aliyun-python-sdk-waf-openapi =
+    buildAliyunSdkPackage "waf-openapi" "1.1.10"
+      "sha256-p43bVHBFdKGh8+4OU5PtuoFAQnNLRp1WISDMB23RzYE=";
+
+  aliyun-python-sdk-websitebuild =
+    buildAliyunSdkWheelPackage "websitebuild" "1.0.8"
+      "sha256-ESCFQ3kt/BfPf+THkjWj4g5Bj9/WrJCj98Ht96liVsE=";
+
+  aliyun-python-sdk-wfts =
+    buildAliyunSdkPackage "wfts" "1.0.0"
+      "sha256-V2kHxs5AFGF7i8MLkUZF32zBbU/MY98p8hy46XoEtB4=";
+
+  aliyun-python-sdk-workbench-ide =
+    buildAliyunSdkPackage "workbench-ide" "2.0.5"
+      "sha256-Y1dHLXUTGkKaxMXLHlHzbqLrH0/kcXG1IDACKeyKahI=";
+
+  aliyun-python-sdk-workorder =
+    buildAliyunSdkPackage "workorder" "3.1.4"
+      "sha256-BesoQV444cBAOAyVKa7y7rej67ABOcIiL33IdsZYmv0=";
+
+  aliyun-python-sdk-wss =
+    buildAliyunSdkPackage "wss" "1.0.1"
+      "sha256-dZmvmKU0rBgvo66Lu78mtEGtBkjRp4K18Bw6YWBj0gI=";
+
+  aliyun-python-sdk-xtrace =
+    buildAliyunSdkPackage "xtrace" "0.2.2"
+      "sha256-q3RGQd8C0IiM+TjottDv2laZ0Wrgs4bPfqDqYLyZy+s=";
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd67189f07c7..d48d59c04d0d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -744,22 +744,255 @@ self: super: with self; {
 
   aliyun-log-fastpb = callPackage ../development/python-modules/aliyun-log-fastpb { };
 
-  aliyun-python-sdk-alimt = callPackage ../development/python-modules/aliyun-python-sdk-alimt { };
-
-  aliyun-python-sdk-cdn = callPackage ../development/python-modules/aliyun-python-sdk-cdn { };
-
-  aliyun-python-sdk-config = callPackage ../development/python-modules/aliyun-python-sdk-config { };
+  inherit (callPackage ../development/python-modules/aliyun-python-sdk { })
+    aliyun-python-sdk-actiontrail
+    aliyun-python-sdk-adb
+    aliyun-python-sdk-adcp
+    aliyun-python-sdk-address-purification
+    aliyun-python-sdk-aicontent
+    aliyun-python-sdk-aigen
+    aliyun-python-sdk-aimath
+    aliyun-python-sdk-aimiaobi
+    aliyun-python-sdk-aipodcast
+    aliyun-python-sdk-airec
+    aliyun-python-sdk-airticketopen
+    aliyun-python-sdk-alb
+    aliyun-python-sdk-alidns
+    aliyun-python-sdk-alikafka
+    aliyun-python-sdk-alimt
+    aliyun-python-sdk-alinlp
+    aliyun-python-sdk-amqp-open
+    aliyun-python-sdk-antiddos-public
+    aliyun-python-sdk-anytrans
+    aliyun-python-sdk-apds
+    aliyun-python-sdk-appstream-center
+    aliyun-python-sdk-aps
+    aliyun-python-sdk-arms
+    aliyun-python-sdk-avatar
+    aliyun-python-sdk-bailianchatbot
+    aliyun-python-sdk-beian
+    aliyun-python-sdk-bpstudio
+    aliyun-python-sdk-brain-industrial
+    aliyun-python-sdk-brinekingdom
+    aliyun-python-sdk-bssopenapi
+    aliyun-python-sdk-btripopen
+    aliyun-python-sdk-buss
+    aliyun-python-sdk-cams
+    aliyun-python-sdk-captcha
+    aliyun-python-sdk-cassandra
+    aliyun-python-sdk-cbn
+    aliyun-python-sdk-cc5g
+    aliyun-python-sdk-ccc
+    aliyun-python-sdk-cciotgw
+    aliyun-python-sdk-cdn
+    aliyun-python-sdk-cdrs
+    aliyun-python-sdk-ciomarketpop
+    aliyun-python-sdk-clickhouse
+    aliyun-python-sdk-cloudapi
+    aliyun-python-sdk-cloudauth
+    aliyun-python-sdk-cloudauth-console
+    aliyun-python-sdk-cloudesl
+    aliyun-python-sdk-cloudphone
+    aliyun-python-sdk-cloud-siem
+    aliyun-python-sdk-cms
+    aliyun-python-sdk-codeup
+    aliyun-python-sdk-companyreg
+    aliyun-python-sdk-computenest
+    aliyun-python-sdk-computenestsupplier
+    aliyun-python-sdk-config
+    aliyun-python-sdk-csas
+    aliyun-python-sdk-das
+    aliyun-python-sdk-dashdeviceconsole
+    aliyun-python-sdk-dataphin-public
+    aliyun-python-sdk-dataworks-public
+    aliyun-python-sdk-dbfs
+    aliyun-python-sdk-dbs
+    aliyun-python-sdk-dcdn
+    aliyun-python-sdk-ddosbgp
+    aliyun-python-sdk-ddoscoo
+    aliyun-python-sdk-ddosdiversion
+    aliyun-python-sdk-dds
+    aliyun-python-sdk-devops-rdc
+    aliyun-python-sdk-dfs
+    aliyun-python-sdk-dg
+    aliyun-python-sdk-dms
+    aliyun-python-sdk-dms-dg
+    aliyun-python-sdk-dms-enterprise
+    aliyun-python-sdk-documentautoml
+    aliyun-python-sdk-domain
+    aliyun-python-sdk-drds
+    aliyun-python-sdk-dt-oc-info
+    aliyun-python-sdk-dts
+    aliyun-python-sdk-dybaseapi
+    aliyun-python-sdk-dyplsapi
+    aliyun-python-sdk-dypnsapi
+    aliyun-python-sdk-dypnsapi-intl
+    aliyun-python-sdk-dysmsapi
+    aliyun-python-sdk-dytnsapi
+    aliyun-python-sdk-dyvmsapi
+    aliyun-python-sdk-eais
+    aliyun-python-sdk-eas
+    aliyun-python-sdk-ebs
+    aliyun-python-sdk-ecd
+    aliyun-python-sdk-eci
+    aliyun-python-sdk-ecs
+    aliyun-python-sdk-ecs-workbench
+    aliyun-python-sdk-edas
+    aliyun-python-sdk-eds-user
+    aliyun-python-sdk-eduinterpreting
+    aliyun-python-sdk-eflo
+    aliyun-python-sdk-eflo-controller
+    aliyun-python-sdk-ehpc
+    aliyun-python-sdk-ehpcinstant
+    aliyun-python-sdk-eiam
+    aliyun-python-sdk-eipanycast
+    aliyun-python-sdk-elasticsearch
+    aliyun-python-sdk-emas-appmonitor
+    aliyun-python-sdk-emr
+    aliyun-python-sdk-emrstudio
+    aliyun-python-sdk-ens
+    aliyun-python-sdk-esa
+    aliyun-python-sdk-ess
+    aliyun-python-sdk-es-serverless
+    aliyun-python-sdk-et-industry-openapi
+    aliyun-python-sdk-eventbridge
+    aliyun-python-sdk-facebody
+    aliyun-python-sdk-fnf
+    aliyun-python-sdk-foas
+    aliyun-python-sdk-ft
+    aliyun-python-sdk-ga
+    aliyun-python-sdk-gdb
+    aliyun-python-sdk-geoip
+    aliyun-python-sdk-governance
+    aliyun-python-sdk-gpdb
+    aliyun-python-sdk-grace
+    aliyun-python-sdk-green
+    aliyun-python-sdk-gwlb
+    aliyun-python-sdk-hbase
+    aliyun-python-sdk-hbr
+    aliyun-python-sdk-hcs-mgw
+    aliyun-python-sdk-hitsdb
+    aliyun-python-sdk-ice
+    aliyun-python-sdk-idaas-doraemon
+    aliyun-python-sdk-imageaudit
+    aliyun-python-sdk-imageenhan
+    aliyun-python-sdk-imageprocess
+    aliyun-python-sdk-imagerecog
+    aliyun-python-sdk-imageseg
+    aliyun-python-sdk-imarketing
+    aliyun-python-sdk-imgsearch
+    aliyun-python-sdk-imm
+    aliyun-python-sdk-intlmarket
+    aliyun-python-sdk-iot
+    aliyun-python-sdk-iotcc
+    aliyun-python-sdk-iqs
+    aliyun-python-sdk-itag
+    aliyun-python-sdk-ivision
+    aliyun-python-sdk-kms
+    aliyun-python-sdk-lingmou
+    aliyun-python-sdk-linkvisual
+    aliyun-python-sdk-linkwan
+    aliyun-python-sdk-live
+    aliyun-python-sdk-ltl
+    aliyun-python-sdk-lto
+    aliyun-python-sdk-market
+    aliyun-python-sdk-marketplaceintl
+    aliyun-python-sdk-maxcompute
+    aliyun-python-sdk-mns-open
+    aliyun-python-sdk-moguan-sdk
+    aliyun-python-sdk-msccommonquery
+    aliyun-python-sdk-mse
+    aliyun-python-sdk-mseap
+    aliyun-python-sdk-mts
+    aliyun-python-sdk-nas
+    aliyun-python-sdk-nis
+    aliyun-python-sdk-nlb
+    aliyun-python-sdk-nlp-automl
+    aliyun-python-sdk-objectdet
+    aliyun-python-sdk-oceanbasepro
+    aliyun-python-sdk-ocr
+    aliyun-python-sdk-ocs
+    aliyun-python-sdk-oms
+    aliyun-python-sdk-ons
+    aliyun-python-sdk-onsmqtt
+    aliyun-python-sdk-oos
+    aliyun-python-sdk-openanalytics-open
+    aliyun-python-sdk-openitag
+    aliyun-python-sdk-opensearch
+    aliyun-python-sdk-osssddp
+    aliyun-python-sdk-outboundbot
+    aliyun-python-sdk-pai-dsw
+    aliyun-python-sdk-paielasticdatasetaccelerator
+    aliyun-python-sdk-paifeaturestore
+    aliyun-python-sdk-pairecservice
+    aliyun-python-sdk-polardb
+    aliyun-python-sdk-polardbx
+    aliyun-python-sdk-privatelink
+    aliyun-python-sdk-push
+    aliyun-python-sdk-pvtz
+    aliyun-python-sdk-qianzhou
+    aliyun-python-sdk-qualitycheck
+    aliyun-python-sdk-quickbi-public
+    aliyun-python-sdk-quotas
+    aliyun-python-sdk-ram
+    aliyun-python-sdk-rds
+    aliyun-python-sdk-rds-data
+    aliyun-python-sdk-reid-cloud
+    aliyun-python-sdk-resourcecenter
+    aliyun-python-sdk-resourcemanager
+    aliyun-python-sdk-resourcesharing
+    aliyun-python-sdk-retailcloud
+    aliyun-python-sdk-r-kvstore
+    aliyun-python-sdk-ros
+    aliyun-python-sdk-rsimganalys
+    aliyun-python-sdk-rtc
+    aliyun-python-sdk-sae
+    aliyun-python-sdk-safconsole
+    aliyun-python-sdk-sas
+    aliyun-python-sdk-sasti
+    aliyun-python-sdk-scdn
+    aliyun-python-sdk-schedulerx2
+    aliyun-python-sdk-schedulerx3
+    aliyun-python-sdk-scsp
+    aliyun-python-sdk-sddp
+    aliyun-python-sdk-selectdb
+    aliyun-python-sdk-sgw
+    aliyun-python-sdk-slb
+    aliyun-python-sdk-sls
+    aliyun-python-sdk-smartag
+    aliyun-python-sdk-smartsales
+    aliyun-python-sdk-smc
+    aliyun-python-sdk-snsuapi
+    aliyun-python-sdk-sophonsoar
+    aliyun-python-sdk-sts
+    aliyun-python-sdk-swas-open
+    aliyun-python-sdk-tag
+    aliyun-python-sdk-threedvision
+    aliyun-python-sdk-tingwu
+    aliyun-python-sdk-unimkt
+    aliyun-python-sdk-ververica
+    aliyun-python-sdk-viapi
+    aliyun-python-sdk-viapi-oxs-cross
+    aliyun-python-sdk-viapi-regen
+    aliyun-python-sdk-videoenhan
+    aliyun-python-sdk-videorecog
+    aliyun-python-sdk-videoseg
+    aliyun-python-sdk-vod
+    aliyun-python-sdk-voicenavigator
+    aliyun-python-sdk-vpc
+    aliyun-python-sdk-vpcpeer
+    aliyun-python-sdk-vs
+    aliyun-python-sdk-waf-openapi
+    aliyun-python-sdk-websitebuild
+    aliyun-python-sdk-wfts
+    aliyun-python-sdk-workbench-ide
+    aliyun-python-sdk-workorder
+    aliyun-python-sdk-wss
+    aliyun-python-sdk-xtrace
+    ;
 
   aliyun-python-sdk-core = callPackage ../development/python-modules/aliyun-python-sdk-core { };
 
-  aliyun-python-sdk-dbfs = callPackage ../development/python-modules/aliyun-python-sdk-dbfs { };
-
-  aliyun-python-sdk-iot = callPackage ../development/python-modules/aliyun-python-sdk-iot { };
-
-  aliyun-python-sdk-kms = callPackage ../development/python-modules/aliyun-python-sdk-kms { };
-
-  aliyun-python-sdk-sts = callPackage ../development/python-modules/aliyun-python-sdk-sts { };
-
   allantools = callPackage ../development/python-modules/allantools { };
 
   allpairspy = callPackage ../development/python-modules/allpairspy { };

From 090187b7bedbddd48009abe36ad47727b149a610 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 17:00:12 +0200
Subject: [PATCH 062/166] python3Packages.httplib2shim: init at 0.0.2

Urllib3 sanity for httplib2 users

https://github.com/GoogleCloudPlatform/httplib2shim
---
 .../python-modules/httplib2shim/default.nix   | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/httplib2shim/default.nix

diff --git a/pkgs/development/python-modules/httplib2shim/default.nix b/pkgs/development/python-modules/httplib2shim/default.nix
new file mode 100644
index 000000000000..b11ceba962db
--- /dev/null
+++ b/pkgs/development/python-modules/httplib2shim/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  certifi,
+  fetchFromGitHub,
+  httplib2,
+  nix-update-script,
+  setuptools,
+  six,
+  urllib3,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "httplib2shim";
+  version = "0.0.2";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "GoogleCloudPlatform";
+    repo = "httplib2shim";
+    tag = finalAttrs.version;
+    hash = "sha256-1dBrO8vkqJKsz+ADZNRtjUr+eVRGdt4iN1GFrse1sFc=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    certifi
+    httplib2
+    six
+    urllib3
+  ];
+
+  # Tests require a network access
+  doCheck = false;
+
+  pythonImportsCheck = [ "httplib2shim" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Urllib3 sanity for httplib2 users";
+    homepage = "https://github.com/GoogleCloudPlatform/httplib2shim";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d48d59c04d0d..376409fed21d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7671,6 +7671,8 @@ self: super: with self; {
 
   httplib2 = callPackage ../development/python-modules/httplib2 { };
 
+  httplib2shim = callPackage ../development/python-modules/httplib2shim { };
+
   httpretty = callPackage ../development/python-modules/httpretty { };
 
   httpserver = callPackage ../development/python-modules/httpserver { };

From 337d44a6821dd3c4bc7915c3680265daff8152e8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 4 Jul 2026 17:12:10 +0200
Subject: [PATCH 063/166] scoutsuite: init at 5.14.0

Multi-Cloud Security Auditing Tool

https://github.com/nccgroup/scoutsuite
---
 pkgs/by-name/sc/scoutsuite/package.nix | 119 +++++++++++++++++++++++++
 1 file changed, 119 insertions(+)
 create mode 100644 pkgs/by-name/sc/scoutsuite/package.nix

diff --git a/pkgs/by-name/sc/scoutsuite/package.nix b/pkgs/by-name/sc/scoutsuite/package.nix
new file mode 100644
index 000000000000..662c670c27bf
--- /dev/null
+++ b/pkgs/by-name/sc/scoutsuite/package.nix
@@ -0,0 +1,119 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonApplication (finalAttrs: {
+  pname = "scoutsuite";
+  version = "5.14.0";
+  pyproject = true;
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "nccgroup";
+    repo = "scoutsuite";
+    tag = finalAttrs.version;
+    hash = "sha256-bSnmb1grm8aoRjvvuc30QKBjcKz8wxnDXMdzFMDkiDE=";
+  };
+
+  pythonRelaxDeps = [
+    "asyncio-throttle"
+    "azure-identity"
+    "azure-mgmt-authorization"
+    "azure-mgmt-compute"
+    "azure-mgmt-keyvault"
+    "azure-mgmt-monitor"
+    "azure-mgmt-network"
+    "azure-mgmt-rdbms"
+    "azure-mgmt-redis"
+    "azure-mgmt-resource"
+    "azure-mgmt-security"
+    "azure-mgmt-sql"
+    "azure-mgmt-storage"
+    "azure-mgmt-web"
+    "coloredlogs"
+    "google-cloud-kms"
+    "google-cloud-monitoring"
+    "httplib2shim"
+    "msgraph-core"
+    "python-dateutil"
+  ];
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    aliyun-python-sdk-actiontrail
+    aliyun-python-sdk-core
+    aliyun-python-sdk-ecs
+    aliyun-python-sdk-kms
+    aliyun-python-sdk-ocs
+    aliyun-python-sdk-ram
+    aliyun-python-sdk-rds
+    aliyun-python-sdk-sts
+    aliyun-python-sdk-vpc
+    asyncio-throttle
+    azure-identity
+    azure-mgmt-authorization
+    azure-mgmt-compute
+    azure-mgmt-keyvault
+    azure-mgmt-monitor
+    azure-mgmt-network
+    azure-mgmt-rdbms
+    azure-mgmt-redis
+    azure-mgmt-resource
+    azure-mgmt-security
+    azure-mgmt-sql
+    azure-mgmt-storage
+    azure-mgmt-web
+    boto3
+    botocore
+    cherrypy
+    cherrypy-cors
+    coloredlogs
+    google-api-python-client
+    google-cloud-container
+    google-cloud-core
+    google-cloud-iam
+    google-cloud-kms
+    google-cloud-logging
+    google-cloud-monitoring
+    google-cloud-resource-manager
+    google-cloud-storage
+    grpcio
+    httplib2shim
+    kubernetes
+    msgraph-core
+    netaddr
+    oauth2client
+    oci
+    oss2
+    policyuniverse
+    pydo
+    python-dateutil
+    sqlitedict
+  ];
+
+  nativeCheckInputs = with python3Packages; [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "ScoutSuite" ];
+
+  disabledTests = [
+    # AssertionError
+    "test_scout_suite_help"
+    "test_snake_case"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Multi-Cloud Security Auditing Tool";
+    homepage = "https://github.com/nccgroup/scoutsuite";
+    changelog = "https://github.com/nccgroup/scoutsuite/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "scout";
+  };
+})

From 0df1f0ce7ab019da2b29c8d06435f1834a3dc507 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sat, 4 Jul 2026 18:58:28 +0200
Subject: [PATCH 064/166] youtrack: 2026.1.13757 -> 2026.2.17012

https://youtrack.jetbrains.com/releaseNotes?q=%23JT%20%23Resolved%20Released%20in%20build:%202026.2.16593&title=YouTrack+2026.2.16593+Release+Notes
https://youtrack.jetbrains.com/releaseNotes?q=%23JT%20%23Resolved%20Released%20in%20build:%202026.2.17012&title=YouTrack%202026.2.17012%20Release%20Notes

fixes:
- CVE-2026-57926
- CVE-2026-57925
- CVE-2026-57924
- CVE-2026-57923
- CVE-2026-57922
- CVE-2026-57921
---
 pkgs/by-name/yo/youtrack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/yo/youtrack/package.nix b/pkgs/by-name/yo/youtrack/package.nix
index 93e2aa0b451a..4d310ebc1ac4 100644
--- a/pkgs/by-name/yo/youtrack/package.nix
+++ b/pkgs/by-name/yo/youtrack/package.nix
@@ -10,15 +10,15 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "youtrack";
-  version = "2026.1.13757";
+  version = "2026.2.17012";
 
   src = dockerTools.exportImage {
     diskSize = 8192;
     fromImage = dockerTools.pullImage {
       imageName = "jetbrains/youtrack";
       arch = "amd64";
-      imageDigest = "sha256:56c4d6b6cb3781e21a369857943a366931b69f22dee76c16b2173de0fd56a0a9";
-      hash = "sha256-vWNe/1PTLX1rNR66iOZizubH2YVda8GTfXrQikWTML0=";
+      imageDigest = "sha256:fa50e2e07435dc91461c00ef05ee064ff76748d4d8feaf8aeaa9f9e4a9bf6606";
+      hash = "sha256-8hoMtFqG5T4gnMDorIe6UXs/d3z7epAS352reipPjWI=";
     };
   };
   unpackPhase = ''

From 5c406c84cefa687f282a5328cb29e7d53cd2a8c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 18:06:26 +0000
Subject: [PATCH 065/166] python3Packages.nicegui-highcharts: 3.2.1 -> 3.3.0

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

diff --git a/pkgs/development/python-modules/nicegui-highcharts/default.nix b/pkgs/development/python-modules/nicegui-highcharts/default.nix
index 43fe73e6919a..bb84800e51be 100644
--- a/pkgs/development/python-modules/nicegui-highcharts/default.nix
+++ b/pkgs/development/python-modules/nicegui-highcharts/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "nicegui-highcharts";
-  version = "3.2.1";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zauberzeug";
     repo = "nicegui-highcharts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/lQ2E2kcFjS3FbuOgixAu1E24dzwR/ppT0DRlRjrp6E=";
+    hash = "sha256-wzpgTDXTI3INQrkio6lgge07r+76wUKd193mt5ugc6g=";
   };
 
   pythonRelaxDeps = [ "docutils" ];

From e256f0995a4359ee887f53c265c68dad8496a39b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 18:22:20 +0000
Subject: [PATCH 066/166] xaos: 4.3.5 -> 4.3.6

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

diff --git a/pkgs/by-name/xa/xaos/package.nix b/pkgs/by-name/xa/xaos/package.nix
index b3e117834837..e0c07b43f34d 100644
--- a/pkgs/by-name/xa/xaos/package.nix
+++ b/pkgs/by-name/xa/xaos/package.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xaos";
-  version = "4.3.5";
+  version = "4.3.6";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "xaos-project";
     repo = "XaoS";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-dGfmX55bm2BCFl7mRit88ULAcJ0VP15yVGI7nhRH0Ig=";
+    hash = "sha256-1Tr9R4xfqQwky2o3uBqyL9su2YPYgJySDTpQkabjVM4=";
   };
 
   nativeBuildInputs = [

From abf8d5cce1302ae7a2b6eada60b021f5dca47ebd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 18:52:07 +0000
Subject: [PATCH 067/166] sigma-cli: 3.0.2 -> 3.0.3

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

diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index 1cdb5ff94d00..e1f582cbe6e2 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sigma-cli";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
     tag = "v${version}";
-    hash = "sha256-46M/WD2BIPMpABai4WZBmxjgI+skwcaRJwPFGXje5y4=";
+    hash = "sha256-7zPB2eb+PeJ0xKygf/oRGZfntHiHHkk9L5Pr7oUfvkY=";
   };
 
   pythonRelaxDeps = [ "click" ];

From dcfe7833820b396779037236c4db251c523d4bb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:05:57 +0000
Subject: [PATCH 068/166] rmux: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/rm/rmux/package.nix b/pkgs/by-name/rm/rmux/package.nix
index 98c0f4816a70..9823ce9fa05e 100644
--- a/pkgs/by-name/rm/rmux/package.nix
+++ b/pkgs/by-name/rm/rmux/package.nix
@@ -8,18 +8,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rmux";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Helvesec";
     repo = "rmux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W+H5MBh+EPkppdDaHMTPUVM1ZpPca/MeVOs/GM1x8UQ=";
+    hash = "sha256-73pSH4wowEWYyKQf1htbB0RnCw3qHe0rENr66eyFnM4=";
   };
 
   __structuredAttrs = true;
 
-  cargoHash = "sha256-kGZczNoHKHWR4fpAvXRhldpYHVgSkIOgAa/OUSaZVvs=";
+  cargoHash = "sha256-YcCYMEM+u+Vq5mzqlL1rqyJmSYt2VxZNBt6cJ4t0Als=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 2f85997471681aa029ba0ed1c8ac817a2eaa0116 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:40:10 +0000
Subject: [PATCH 069/166] jetbrains.rust-rover: 2026.1.3 -> 2026.1.4

---
 .../editors/jetbrains/ides/rust-rover.nix     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
index db6201d672b8..3f82ae6aea2e 100644
--- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix
@@ -18,20 +18,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3.tar.gz";
-      hash = "sha256-0+v05zxvFqXV13c8oV9dTTwtO+shgywD75cwUiZAab0=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.tar.gz";
+      hash = "sha256-8x/AP6uKSVJavwjA9tYT1IM1xVspOZZzwmcwpGloIcw=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3-aarch64.tar.gz";
-      hash = "sha256-SZ4OkWgAGeSafFo1ml5dv5tN5su+HgzbEhQ5GzPqGdo=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3.dmg";
-      hash = "sha256-JA++mbKvRTvjHEblbgmjBzbWbxcV7ss3+W9M6i6ePu0=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.dmg";
+      hash = "sha256-2BwgAD0xF9IxRJh+gW4vLzBW13rFQSzQPbEwdmQGvLU=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.3-aarch64.dmg";
-      hash = "sha256-ndipMTztrYeUdo4MfOHjJHk3liHutWmMj+J6G8xjtWA=";
+      url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg";
+      hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE=";
     };
   };
   # update-script-end: urls
@@ -45,8 +45,8 @@ in
   product = "RustRover";
 
   # update-script-start: version
-  version = "2026.1.3";
-  buildNumber = "261.25134.134";
+  version = "2026.1.4";
+  buildNumber = "261.26222.73";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 8ff45729fc349986a8791b388be0ab8dbfedf6d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:40:31 +0000
Subject: [PATCH 070/166] jetbrains.ruby-mine: 2026.1.3 -> 2026.1.4

---
 .../editors/jetbrains/ides/ruby-mine.nix      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
index 807fe17c4e06..b4ab8c0b34c4 100644
--- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
+++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.tar.gz";
-      hash = "sha256-0KF/IEVRT8kgHpULEmqMy9gOf06IIDA4vEV3RujjQoE=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.tar.gz";
+      hash = "sha256-0EhtU4XKWI9i7ij+m5uvxHSYnbQaYJy8Sa6S1OW4CFU=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.tar.gz";
-      hash = "sha256-kiuRp9JhdS0aUFPX1brI1T9ik/iWhglIckHvv4bdPWk=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.dmg";
-      hash = "sha256-UjpwMCXhI+bMOvyyEbRBoNW3GGCDpi7aF6hUxffW/h0=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.dmg";
+      hash = "sha256-BLo2weIJK8gQAcMtAiETM7FMdhw9aoFIGh5Yqjv3k7s=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.dmg";
-      hash = "sha256-lqa3L+rBiEH/hPmFcevWBumvvyBBzoUR3ttvA8s0uT0=";
+      url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg";
+      hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "RubyMine";
 
   # update-script-start: version
-  version = "2026.1.3";
-  buildNumber = "261.25134.97";
+  version = "2026.1.4";
+  buildNumber = "261.26222.67";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 7404316a8ed0d35f477103ee44ae1b3e01ad6fa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:50:25 +0000
Subject: [PATCH 071/166] jetbrains.clion: 2026.1.2 -> 2026.1.4

---
 .../editors/jetbrains/ides/clion.nix          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix
index 5b6885bb4614..063d2c752ad2 100644
--- a/pkgs/applications/editors/jetbrains/ides/clion.nix
+++ b/pkgs/applications/editors/jetbrains/ides/clion.nix
@@ -21,20 +21,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.tar.gz";
-      hash = "sha256-Q3LOhpwpU6vrPWEzA+s2ZnbRxo+EeodBUHUYs3Xikrs=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.tar.gz";
+      hash = "sha256-uOhFuDqVw3pxtqBvOQH+FpJTFrneaD/R0VcpJZRYD2o=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-YM105ozP78oLDmwKL0t4Z4wGjCDh6xvhf/C1oCD6Qi8=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.dmg";
-      hash = "sha256-UEkYDJBjRvvUUB2UFsc37kdp/i+1ctqULSKs62/t9/I=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.dmg";
+      hash = "sha256-AJt+K1zv4eyjdzubUeFGwB9mqzvOeb3ffA2k0MajPBs=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.dmg";
-      hash = "sha256-scMwDF+mIfx/66cBrvdxp+gU3+qA2sUWqoGCEhPItjE=";
+      url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg";
+      hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ=";
     };
   };
   # update-script-end: urls
@@ -48,8 +48,8 @@ in
   product = "CLion";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.148";
+  version = "2026.1.4";
+  buildNumber = "261.26222.59";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 125a0d91f96202aa60ee5395efca510c776e7932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:51:07 +0000
Subject: [PATCH 072/166] jetbrains.phpstorm: 2026.1.3 -> 2026.1.4

---
 .../editors/jetbrains/ides/phpstorm.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
index a034954c8e1e..be56d33d23bc 100644
--- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.tar.gz";
-      hash = "sha256-hXb2KcCaNKIJOGbN0ZUDxMKuX++dO1FRoxvC580VIHQ=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.tar.gz";
+      hash = "sha256-SF25D7dDn7b6AzcXEDLKwhpjTnCqYz1fEmvND5dl8Is=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.tar.gz";
-      hash = "sha256-+As41qcyCvAICIttMEi30b8mBTZoWKK4rjxjkVx4TXs=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.dmg";
-      hash = "sha256-Q9m/XIgDg4F4yH0P35IaInk/se5CXqewvp248VqA4uc=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.dmg";
+      hash = "sha256-W7EwYu7S3hs1564tXq8H1Uok/Gwx/8QJO4brUGOfFY4=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.dmg";
-      hash = "sha256-Yo50EhVQDg7c/C3JZ9utZxpsOY0DuZfgYzYtBN9Nmwk=";
+      url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg";
+      hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ mkJetBrainsProduct {
   product = "PhpStorm";
 
   # update-script-start: version
-  version = "2026.1.3";
-  buildNumber = "261.25134.104";
+  version = "2026.1.4";
+  buildNumber = "261.26222.71";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 9107cb10c2b47a1437ec6487c5835754ce63c487 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:53:43 +0000
Subject: [PATCH 073/166] jetbrains.goland: 2026.1.2 -> 2026.1.4

---
 .../editors/jetbrains/ides/goland.nix         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix
index fe92428cd2a8..692e2ba49fc8 100644
--- a/pkgs/applications/editors/jetbrains/ides/goland.nix
+++ b/pkgs/applications/editors/jetbrains/ides/goland.nix
@@ -12,20 +12,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.2.tar.gz";
-      hash = "sha256-1FkDEaapyDbTPe4soOdyCHLkp/UT3rZ6siGyGyjmGJo=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.4.tar.gz";
+      hash = "sha256-pHSbmAZ+tSfa0wdtDp/3Ib/GNMP30OFNQlHWUfMwrW0=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-E8WpA4s/ePEDAs47IPC0v10C1VKl9UYU7VNX/5igpm4=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.2.dmg";
-      hash = "sha256-iWYTMImwzMh9KSJgek8a84o/KlLWBaOj80vKlB8Ftes=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.4.dmg";
+      hash = "sha256-RbvcLpLVyeL4B1DJ2/9Ub/6Cz6fJGXMPCHsJ705GsAo=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.dmg";
-      hash = "sha256-TFnEMq7u51UvtaOjnxS+abJhsR3aSnaQjNFfF8EQrcQ=";
+      url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg";
+      hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM=";
     };
   };
   # update-script-end: urls
@@ -39,8 +39,8 @@ in
   product = "Goland";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.154";
+  version = "2026.1.4";
+  buildNumber = "261.26222.72";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 57a3c807905515da56a9079fa66a039f3f804585 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 20:54:37 +0000
Subject: [PATCH 074/166] jetbrains.pycharm: 2026.1.2 -> 2026.1.4

---
 .../editors/jetbrains/ides/pycharm.nix        | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
index e972abdd1633..4f418ef23a3b 100644
--- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix
+++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix
@@ -13,20 +13,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.2.tar.gz";
-      hash = "sha256-kcd1vhb7CFn5sY69RW2I4THK3zN7DOn52O0YeIZWGWY=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.4.tar.gz";
+      hash = "sha256-RIufgZhg/n+D1uEdcDyYRjTDfh8Jicyz4h0B1kTbVXs=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-5rTyUmevreBL5nZPa7FuodFhWcrjSQ+7T1jMFo7P/uM=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.2.dmg";
-      hash = "sha256-Fej8KylKSFKVxCMrBAcUIDwb0v5B5r1RysMAvcBVgh8=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.4.dmg";
+      hash = "sha256-Q5hTcYoNUzmAxwcsXJNS4medQjFKWc/Sgkybt4PQPfg=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.dmg";
-      hash = "sha256-oau/wa9spYnn7XE07NGsINyqof3Mu9t9WQLuPAQ4TDc=";
+      url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg";
+      hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0=";
     };
   };
   # update-script-end: urls
@@ -40,8 +40,8 @@ in
   product = "PyCharm";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.152";
+  version = "2026.1.4";
+  buildNumber = "261.26222.68";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 5c0e5053ef10917093580bdfce7d74835958e5c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 21:02:05 +0000
Subject: [PATCH 075/166] jetbrains.idea: 2026.1.3 -> 2026.1.4

---
 .../editors/jetbrains/ides/idea.nix           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix
index bf9dbdae54be..e77c6a800f61 100644
--- a/pkgs/applications/editors/jetbrains/ides/idea.nix
+++ b/pkgs/applications/editors/jetbrains/ides/idea.nix
@@ -15,20 +15,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.tar.gz";
-      hash = "sha256-pvBJcW2h0J2eDsFQDGC/AaX/ig/iQZF43R/y/bK3dWM=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.tar.gz";
+      hash = "sha256-MQTYXZUH/4ggZeP465UGQCtKgSkJLSaCZiu26cTwY/w=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.tar.gz";
-      hash = "sha256-dlnnkWCSM8Pmv2fBv8yG9foRdkd8pYFa5hJbDq6EqIs=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.dmg";
-      hash = "sha256-Sv6A37Y5yIkaE+qnFEGDBq/q9fSSSZPjJC59NB2Fsns=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.dmg";
+      hash = "sha256-8K+LiewiINP4S9eqV0kGWtfy2Ff/zvBwX89iX7mYZ78=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.dmg";
-      hash = "sha256-LRyg2DLmTgChdFKR8NMGGjWDZTAWnjQpoTp3NIBvYrI=";
+      url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg";
+      hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s=";
     };
   };
   # update-script-end: urls
@@ -43,8 +43,8 @@ mkJetBrainsProduct {
   productShort = "IDEA";
 
   # update-script-start: version
-  version = "2026.1.3";
-  buildNumber = "261.25134.95";
+  version = "2026.1.4";
+  buildNumber = "261.26222.65";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 8cda5019af43e58f0a56e9597c3eb4bd1e33e70d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 4 Jul 2026 17:15:52 -0400
Subject: [PATCH 076/166] python3Packages.beets-importreplace: init at 0.3

---
 .../beets-importreplace/default.nix           | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/beets-importreplace/default.nix

diff --git a/pkgs/development/python-modules/beets-importreplace/default.nix b/pkgs/development/python-modules/beets-importreplace/default.nix
new file mode 100644
index 000000000000..d5216530c8b8
--- /dev/null
+++ b/pkgs/development/python-modules/beets-importreplace/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  beets-minimal,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+buildPythonPackage (finalAttrs: {
+  pname = "beets-importreplace";
+  version = "0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "edgars-supe";
+    repo = "beets-importreplace";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lTfHuOBFzBM/uN4GCX6btQy0KRDP/tzG0fp9/qppQtw=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = [
+    beets-minimal
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "beetsplug.importreplace" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Plugin for beets to perform regex replacements during import";
+    homepage = "https://github.com/edgars-supe/beets-importreplace";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    license = [ lib.licenses.mit ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07ba15628bb2..023f11eb2996 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2062,6 +2062,8 @@ self: super: with self; {
 
   beets-filetote = callPackage ../development/python-modules/beets-filetote { };
 
+  beets-importreplace = callPackage ../development/python-modules/beets-importreplace { };
+
   beets-minimal = beets.override {
     disableAllPlugins = true;
   };

From 7a865d13273e0b833023422cd884330ea8bb46c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 21:21:16 +0000
Subject: [PATCH 077/166] werf: 2.72.1 -> 2.73.0

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

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index d155117d3932..08ec0c59694a 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.72.1";
+  version = "2.73.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6CspoMRKPf20zQrmgD2RO6xMnTuyvM56AElKvMNNUM0=";
+    hash = "sha256-4YLJv5YDJUaoQlyljK4e8ilhCU67K7jJiDkFm7sYwxo=";
   };
 
   proxyVendor = true;

From 2976dad409c9b240b720c8ef7b546b262a9a7cf6 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 4 Jul 2026 21:28:18 +0000
Subject: [PATCH 078/166] linux_xanmod: 6.18.37 -> 6.18.38

- Changelog: https://dl.xanmod.org/changelog/6.18/ChangeLog-6.18.38-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.18.37-xanmod1..6.18.38-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 17dadd967c92..5b7d95e663e3 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.18.37";
-      hash = "sha256-8H8V9z8fizt/2DCTTCme0DVYOfJ4431SFs0iubUHONE=";
+      version = "6.18.38";
+      hash = "sha256-PJq69EQXiOJKgQnegxsEcJqAaL10G542Joh5dBrZN0I=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From f806e3ca4f91480c90fd6734db54750ac18a8616 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 4 Jul 2026 21:30:31 +0000
Subject: [PATCH 079/166] linux_xanmod_latest: 7.0.14 -> 7.1.3

- Changelog: https://dl.xanmod.org/changelog/7.1/ChangeLog-7.1.3-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/7.0.14-xanmod1..7.1.3-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 5b7d95e663e3..1267c15608e5 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "7.0.14";
-      hash = "sha256-9vb4ORzAppq5S/ukEhDHohNQBW+jWwGnjhv21HztWdk=";
+      version = "7.1.3";
+      hash = "sha256-EvxKUWDp0KAKhYO4rZKKx22RCGOimzPm5epchME/pJ8=";
     };
   };
 

From 699f5ed1874a3f3695e35d74452b8766415ddd76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 21:51:28 +0000
Subject: [PATCH 080/166] seaweedfs: 4.36 -> 4.37

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

diff --git a/pkgs/by-name/se/seaweedfs/package.nix b/pkgs/by-name/se/seaweedfs/package.nix
index 4e75bec00cf5..996dc79064a9 100644
--- a/pkgs/by-name/se/seaweedfs/package.nix
+++ b/pkgs/by-name/se/seaweedfs/package.nix
@@ -9,7 +9,7 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "seaweedfs";
-  version = "4.36";
+  version = "4.37";
 
   src = fetchFromGitHub {
     owner = "seaweedfs";
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
       popd
     '';
-    hash = "sha256-y42opbGNVMxWU/k0j5g27RWLBF0PLcOPlXU9eVg0jwY=";
+    hash = "sha256-/aX9f78AsdgvsesGv2vTPoWVcqAhehFuL3NkzOyZSXQ=";
   };
 
   vendorHash = "sha256-peRhKuZ1D+y8Uhw1+P8Ogc1HrOh1/kYVd29lR89+rIo=";

From 6d9f3e3006722d00a561ac628b1e872ae86001f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 22:01:36 +0000
Subject: [PATCH 081/166] mongodb-compass: 1.49.9 -> 1.49.10

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

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 7d463816b7df..dc7104f0b485 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -52,7 +52,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.49.9";
+  version = "1.49.10";
 
   selectSystem =
     attrs:
@@ -67,9 +67,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-Fx//NMDHqVaLwthOM7FeSgUXkvLOSbw5EH1qp1dgPcM=";
-      x86_64-darwin = "sha256-l5Jx0BUQR++tkF0cpctxhku6lB2rHEydp7roJy9AGFc=";
-      aarch64-darwin = "sha256-HCKt1rq6P7Uy6NJiFRBBp4YdpAdhwQQjEGT5h7IcyWE=";
+      x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4=";
+      x86_64-darwin = "sha256-Ddue3jSvQecBjxQlyh/+ujrF9NheZ9PS0Dq7J08SJr8=";
+      aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8=";
     };
   };
 

From d1f61e4f485a57f6de1ad5767e672edebd63f0a0 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:19:39 +0200
Subject: [PATCH 082/166] linux_7_1: 7.1.2 -> 7.1.3

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 636be371ecef..09c58e0552aa 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -35,8 +35,8 @@
         "lts": true
     },
     "7.1": {
-        "version": "7.1.2",
-        "hash": "sha256:0gw8nnq6nix9xk2dhb1jwmhnqjayrn3bn2akzg4lgqkvfa9qq69p",
+        "version": "7.1.3",
+        "hash": "sha256:1p6iknvzmd04alrf49zn8mxw863v0yzgznyckfhl4llgx1lc0hdy",
         "lts": false
     }
 }

From feb9b141d796d15b8295edd9e5c500cd23e3e9a6 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:19:52 +0200
Subject: [PATCH 083/166] linux_6_18: 6.18.37 -> 6.18.38

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 09c58e0552aa..00c64f343014 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.18": {
-        "version": "6.18.37",
-        "hash": "sha256:0maj2ap1m09bxl6a3g9wc65h9sdr6y8rwc5qcqlbavb4wq0d4g58",
+        "version": "6.18.38",
+        "hash": "sha256:0igh9xy1lk2hv2jni00dqyy27j4zqh86waw7i65ryvnmmc4fa9mc",
         "lts": true
     },
     "7.1": {

From c11603a1923ada856cea74cffba085e9f831a27c Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:20:04 +0200
Subject: [PATCH 084/166] linux_6_12: 6.12.94 -> 6.12.95

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 00c64f343014..db706478d6be 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.94",
-        "hash": "sha256:1ln83ljmc7wr1nrjjq1hp1m1vx54j7i6i15m3hqb73a1p4ra5679",
+        "version": "6.12.95",
+        "hash": "sha256:1xmrsi0kimirky4cailnkkrbd72pp9n8irfx6lfmss8yrcgwbs59",
         "lts": true
     },
     "6.18": {

From 5ec65ba5803e1ec9fd106810a961b071db58f758 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:20:17 +0200
Subject: [PATCH 085/166] linux_6_6: 6.6.143 -> 6.6.144

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index db706478d6be..69f256e17563 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.143",
-        "hash": "sha256:0ci9b6kjp7r2xwqifs2963l9ihk2rllk4zpl2kgzbny0r66izkns",
+        "version": "6.6.144",
+        "hash": "sha256:1hzcax2ypzhrjzmq4b0jyqyc4al0ncyfcj9pq36phl29gcqbh6gc",
         "lts": true
     },
     "6.12": {

From 577b2f9caec2fb96c982404fe4f2ef47c21166a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 22:20:19 +0000
Subject: [PATCH 086/166] rqlite: 10.2.4 -> 10.2.6

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

diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index 308d2118b59b..2a774b5903a5 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -12,13 +12,13 @@ buildGoModule (
   in
   {
     pname = "rqlite";
-    version = "10.2.4";
+    version = "10.2.6";
 
     src = fetchFromGitHub {
       owner = "rqlite";
       repo = "rqlite";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-Ays/H+nlS7Rien+0zutLMDx3cJDdURQNvXZn1XSwzuw=";
+      hash = "sha256-YFEvsEjpJSYoGEqYxVP9Qo6JRTD1peVP9a3Bf1hsdLU=";
     };
 
     vendorHash = "sha256-rWyDyypKbettuwL8tfXmkvKtIg5fm5EzZud2/5RL0kY=";

From 072138c75ff9c17f766491828f3232d584dec4c2 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:20:29 +0200
Subject: [PATCH 087/166] linux_6_1: 6.1.176 -> 6.1.177

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 69f256e17563..a2836cf15976 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,8 +5,8 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.176",
-        "hash": "sha256:1xj4ms4gd8ghd0l0dzsyi762dgpdrmqhc3f0arrp7sa0p8npf6da",
+        "version": "6.1.177",
+        "hash": "sha256:0c0ayz4nygcmz4865r7mcgmh7hic4fi7zysnj6vdlyj53bz9nlpn",
         "lts": true
     },
     "5.15": {

From 77c8470b04eb90c4cd31e654f7a06038cab18cf5 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:20:41 +0200
Subject: [PATCH 088/166] linux_5_15: 5.15.210 -> 5.15.211

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index a2836cf15976..35d6d8ad4e5a 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -10,8 +10,8 @@
         "lts": true
     },
     "5.15": {
-        "version": "5.15.210",
-        "hash": "sha256:008a55av0x9fa3fspcz43sycik143gqxg2agcalrax2yw5ma82wi",
+        "version": "5.15.211",
+        "hash": "sha256:0qfry534wl5sbm6b4hf6fxqrr6mzf1k9pa2435sqp4hp6vjm9fdy",
         "lts": true
     },
     "5.10": {

From f95ba6fbb8ddf0ccc5483b9205e8e29c07d4b5c8 Mon Sep 17 00:00:00 2001
From: Bart Oostveen <bart@bartoostveen.nl>
Date: Sun, 5 Jul 2026 00:20:53 +0200
Subject: [PATCH 089/166] linux_5_10: 5.10.259 -> 5.10.260

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 35d6d8ad4e5a..5da7c32252b6 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -15,8 +15,8 @@
         "lts": true
     },
     "5.10": {
-        "version": "5.10.259",
-        "hash": "sha256:02dn8rf9p0afkl8kbdv28ijq974zfnv8zdsqcqbmapjm19c8wpma",
+        "version": "5.10.260",
+        "hash": "sha256:113bka32apz5pfqjfnv97k9hf9arkn5asfcd6cw7snsh65qjka27",
         "lts": true
     },
     "6.6": {

From 24e0dd57fe0c2c07929a80a63e734dde06b0f886 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 5 Jul 2026 00:43:13 +0200
Subject: [PATCH 090/166] jjui: 0.10.7 -> 0.10.8

Changelog: https://github.com/idursun/jjui/releases/tag/v0.10.8
Diff: https://github.com/idursun/jjui/compare/v0.10.7...v0.10.8
---
 pkgs/by-name/jj/jjui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index ffa1858ce80b..9ed459e2d028 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "jjui";
-  version = "0.10.7";
+  version = "0.10.8";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IcJImxowBuQy9MBsz4QesDJM484qSvfQxPx4ykQ0ttA=";
+    hash = "sha256-ZbmCPCTsSbphLUy+lrTt4/6DVq70edKGI59U0HDbawE=";
   };
 
   vendorHash = "sha256-thGlfZ0SwHpynYydxu6Sg8OUe5kr7jiPKvl6BXS5BWA=";

From 389d9db0412e472160b0f69c4483a0c8ac2e260e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Jul 2026 23:33:48 +0000
Subject: [PATCH 091/166] postgresqlPackages.pgvector: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/servers/sql/postgresql/ext/pgvector.nix b/pkgs/servers/sql/postgresql/ext/pgvector.nix
index 9998466e704a..761fb99f0ea9 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvector.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvector.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pgvector";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchFromGitHub {
     owner = "pgvector";
     repo = "pgvector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Tpa+OGau8RRMVgWQiAwjL3ez72hx6J+01yVvuCj7zVU=";
+    hash = "sha256-DczatZRfNHb2OHRkJMqshOuRCgI7+7r25o8E2rc+qLU=";
   };
 
   meta = {

From 498e60d6708f46b1bdc1be4ae8c5798cef6e7dc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 00:25:40 +0000
Subject: [PATCH 092/166] emcee: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix
index 1bc921e4fa5e..06c7bc02722d 100644
--- a/pkgs/by-name/em/emcee/package.nix
+++ b/pkgs/by-name/em/emcee/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "emcee";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "mattt";
     repo = "emcee";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-czOUhaPBxzuqZ72Y3TuzZ8r0Ab3OqGbDPZipkcak3Cw=";
+    hash = "sha256-S3hSexTjedfmjLuFHXtyiDiKM4NaLeUIJCEl2PKAOCw=";
   };
 
   vendorHash = "sha256-e8LPcKue7rhAh03uCRG0VTcwwyj3kDOBoeo3t7Hwvi0=";

From 419dbda9a0a2fe971474de0071b624fbb2123c66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 00:37:03 +0000
Subject: [PATCH 093/166] code-cursor: 3.9.8 -> 3.9.16

---
 pkgs/by-name/co/code-cursor/sources.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json
index 61e4c4c2969a..29774683e1bb 100644
--- a/pkgs/by-name/co/code-cursor/sources.json
+++ b/pkgs/by-name/co/code-cursor/sources.json
@@ -1,22 +1,22 @@
 {
-  "version": "3.9.8",
+  "version": "3.9.16",
   "vscodeVersion": "1.105.1",
   "sources": {
     "x86_64-linux": {
-      "url": "https://downloads.cursor.com/production/4aa8ff1b7877ed7bd01bcba308698f71a6735380/linux/x64/Cursor-3.9.8-x86_64.AppImage",
-      "hash": "sha256-xcyFowrW5yzIDCwbFGmpDRSNa3OUXsHwpLkbyNcSzqM="
+      "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/linux/x64/Cursor-3.9.16-x86_64.AppImage",
+      "hash": "sha256-dG61VYGMHPip57ldzNICEi1yPc4s1dON+MlDGiKadKc="
     },
     "aarch64-linux": {
-      "url": "https://downloads.cursor.com/production/4aa8ff1b7877ed7bd01bcba308698f71a6735380/linux/arm64/Cursor-3.9.8-aarch64.AppImage",
-      "hash": "sha256-ZhRMvfJkt8NZT45tYxfO2gBFaVw6hR2nVeRzmrxQfeE="
+      "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/linux/arm64/Cursor-3.9.16-aarch64.AppImage",
+      "hash": "sha256-7tkupyy8EFeOpzQqoHQsYxWQlFoW6VBpXkuCJsRIhRw="
     },
     "x86_64-darwin": {
-      "url": "https://downloads.cursor.com/production/4aa8ff1b7877ed7bd01bcba308698f71a6735380/darwin/x64/Cursor-darwin-x64.dmg",
-      "hash": "sha256-IOQsZQAncDgZGEnCZWg/LQqD/PquFifBmuk2hnJ1L/s="
+      "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/darwin/x64/Cursor-darwin-x64.dmg",
+      "hash": "sha256-5sAj/FiPAs1facGmNKgXiNzs1Kc1ht9eXYU1aZ1VoUA="
     },
     "aarch64-darwin": {
-      "url": "https://downloads.cursor.com/production/4aa8ff1b7877ed7bd01bcba308698f71a6735380/darwin/arm64/Cursor-darwin-arm64.dmg",
-      "hash": "sha256-GxpBKyx0Yo3e8AUS9Oxei/hHm1m3JdxMKjX7qAxUGm4="
+      "url": "https://downloads.cursor.com/production/042b3c1a4c53f2c3808067f519fbfc67b72cad8b/darwin/arm64/Cursor-darwin-arm64.dmg",
+      "hash": "sha256-pnSsOvyFiBKJsPUPkfnSY1l+LEzz3g5kbepIco7dDIM="
     }
   }
 }

From cb3c5372ea1eeffd70963f4a10de2a8e0ab89588 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 00:42:45 +0000
Subject: [PATCH 094/166] diskwatch: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/by-name/di/diskwatch/package.nix b/pkgs/by-name/di/diskwatch/package.nix
index c5465d0814a6..2e071b4c4372 100644
--- a/pkgs/by-name/di/diskwatch/package.nix
+++ b/pkgs/by-name/di/diskwatch/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "diskwatch";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "matthart1983";
     repo = "diskwatch";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pveHyT3ljQQ9GdOMhZhcY7QD/pMvL3fLrbM6D5fO+h4=";
+    hash = "sha256-8tQXcbY/sguw42vE0p5Q8/psmwfYQihWcSIsApI4OmE=";
   };
 
   __structuredAttrs = true;
 
-  cargoHash = "sha256-PufgQqJGsPMBcnNV/QXQnE/wrI4FAJWXLvoHEqLQm5k=";
+  cargoHash = "sha256-kO6g5JJogNN5xqD5Qoj6Ncd6scA7PFAjg6y0AWnNhAM=";
 
   nativeCheckInputs = [ versionCheckHook ];
 

From 6356ebaa3b02b1bfbad48263683777473911f394 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jul 2026 02:59:18 +0200
Subject: [PATCH 095/166] sigma-cli: migrate to finalAttrs

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

diff --git a/pkgs/by-name/si/sigma-cli/package.nix b/pkgs/by-name/si/sigma-cli/package.nix
index e1f582cbe6e2..29236e94a306 100644
--- a/pkgs/by-name/si/sigma-cli/package.nix
+++ b/pkgs/by-name/si/sigma-cli/package.nix
@@ -5,7 +5,7 @@
   writableTmpDirAsHomeHook,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "sigma-cli";
   version = "3.0.3";
   pyproject = true;
@@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "SigmaHQ";
     repo = "sigma-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7zPB2eb+PeJ0xKygf/oRGZfntHiHHkk9L5Pr7oUfvkY=";
   };
 
@@ -45,9 +45,9 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Sigma command line interface";
     homepage = "https://github.com/SigmaHQ/sigma-cli";
-    changelog = "https://github.com/SigmaHQ/sigma-cli/releases/tag/${src.tag}";
+    changelog = "https://github.com/SigmaHQ/sigma-cli/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sigma";
   };
-}
+})

From 9dbfa1b923bd92b33c5f25f0d3560d239dfd1697 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 01:46:58 +0000
Subject: [PATCH 096/166] secretspec: 0.12.2 -> 0.13.0

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

diff --git a/pkgs/by-name/se/secretspec/package.nix b/pkgs/by-name/se/secretspec/package.nix
index 94697b2996ad..83fae43fdf7f 100644
--- a/pkgs/by-name/se/secretspec/package.nix
+++ b/pkgs/by-name/se/secretspec/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "secretspec";
-  version = "0.12.2";
+  version = "0.13.0";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-Oj1CaiL0uGhlyrJK+xfKLH3f9wYDQTIiDTxop3BTnNs=";
+    hash = "sha256-pOlfDWFjhndp+Wq/UzL/bYcgQHkWTrnuUd7w2WiqJog=";
   };
 
-  cargoHash = "sha256-5VKiagAQnUIL1i36hQ+zUgScfBkg0uwKG3FMQdrlIq4=";
+  cargoHash = "sha256-ITv4MGpg11mnp5YbfUd/xd7dLl2ll21ybGCyTO4UAx4=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus ];

From e6de71bc8b1b7ffb178d722de9544fd4d8fdecab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 02:02:17 +0000
Subject: [PATCH 097/166] mcp-server-sequential-thinking: 2026.1.26 -> 2026.7.4

---
 pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
index 019fbab0393d..474ccdd71d47 100644
--- a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
+++ b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "mcp-server-sequential-thinking";
-  version = "2026.1.26";
+  version = "2026.7.4";
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "servers";
     tag = finalAttrs.version;
-    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+    hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
 
   dontNpmPrune = true;
   npmWorkspace = "src/sequentialthinking";
-  npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
+  npmDepsHash = "sha256-KhlTXcS+VDSPGnEus9fA0xhIxfTGwX1Cr5hbxFvdc2k=";
 
   # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
   postInstall = ''

From 8469d65425d8f5b56481c4620742655af050659c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 02:02:41 +0000
Subject: [PATCH 098/166] mcp-server-memory: 2026.1.26 -> 2026.7.4

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

diff --git a/pkgs/by-name/mc/mcp-server-memory/package.nix b/pkgs/by-name/mc/mcp-server-memory/package.nix
index 8ce6a1dd34e9..941f884c76a4 100644
--- a/pkgs/by-name/mc/mcp-server-memory/package.nix
+++ b/pkgs/by-name/mc/mcp-server-memory/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "mcp-server-memory";
-  version = "2026.1.26";
+  version = "2026.7.4";
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "servers";
     tag = finalAttrs.version;
-    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+    hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
 
   dontNpmPrune = true;
   npmWorkspace = "src/memory";
-  npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
+  npmDepsHash = "sha256-KhlTXcS+VDSPGnEus9fA0xhIxfTGwX1Cr5hbxFvdc2k=";
 
   # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
   postInstall = ''

From fa2a9d1f394182cf3a3a5a58231163f22dd821e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 02:06:51 +0000
Subject: [PATCH 099/166] mcp-server-filesystem: 2026.1.26 -> 2026.7.4

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

diff --git a/pkgs/by-name/mc/mcp-server-filesystem/package.nix b/pkgs/by-name/mc/mcp-server-filesystem/package.nix
index 190cba24a12d..c8c0cfa81c1b 100644
--- a/pkgs/by-name/mc/mcp-server-filesystem/package.nix
+++ b/pkgs/by-name/mc/mcp-server-filesystem/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "mcp-server-filesystem";
-  version = "2026.1.26";
+  version = "2026.7.4";
 
   src = fetchFromGitHub {
     owner = "modelcontextprotocol";
     repo = "servers";
     tag = finalAttrs.version;
-    hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk=";
+    hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90=";
   };
 
   nativeBuildInputs = [
@@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: {
 
   dontNpmPrune = true;
   npmWorkspace = "src/filesystem";
-  npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE=";
+  npmDepsHash = "sha256-KhlTXcS+VDSPGnEus9fA0xhIxfTGwX1Cr5hbxFvdc2k=";
 
   # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed
   postInstall = ''

From d38aeefdcbe7d24159a074c495cb4c23da848c60 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 4 Jul 2026 17:19:19 +0200
Subject: [PATCH 100/166] rocmPackages.rocshmem: init at 7.2.3

---
 pkgs/development/rocm-modules/default.nix     |  2 +
 .../rocm-modules/rocshmem/default.nix         | 70 +++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/rocshmem/default.nix

diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix
index 2633e4e2a612..42f7041775b6 100644
--- a/pkgs/development/rocm-modules/default.nix
+++ b/pkgs/development/rocm-modules/default.nix
@@ -117,6 +117,8 @@ let
 
       rccl = self.callPackage ./rccl { };
 
+      rocshmem = self.callPackage ./rocshmem { };
+
       hipcub = self.callPackage ./hipcub { };
 
       hipsparse = self.callPackage ./hipsparse { };
diff --git a/pkgs/development/rocm-modules/rocshmem/default.nix b/pkgs/development/rocm-modules/rocshmem/default.nix
new file mode 100644
index 000000000000..c23e4b239945
--- /dev/null
+++ b/pkgs/development/rocm-modules/rocshmem/default.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rocmUpdateScript,
+  cmake,
+  rocm-cmake,
+  rocm-core,
+  rocm-runtime,
+  clr,
+  mpi,
+  useMpi ? true,
+  useReverseOffload ? useMpi,
+  buildExamples ? false,
+  gpuTargets ? (clr.localGpuTargets or [ ]),
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "rocshmem${clr.gpuArchSuffix}";
+  version = "7.2.3";
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "rocSHMEM";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-7TiUABwCVPvosoLdR8zN+QGiX+OD7iD+HKMLnGMmRYA=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    rocm-cmake
+    clr
+  ];
+
+  buildInputs = [
+    rocm-runtime
+  ]
+  ++ lib.optionals useMpi [
+    mpi
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeBool "CMAKE_POSITION_INDEPENDENT_CODE" true)
+    (lib.cmakeFeature "CMAKE_CXX_COMPILER" "hipcc")
+    (lib.cmakeFeature "ROCM_PATH" "${clr}")
+    (lib.cmakeFeature "ROCM_VERSION" rocm-core.ROCM_LIBPATCH_VERSION)
+    (lib.cmakeBool "USE_IPC" true)
+    (lib.cmakeBool "USE_RO" useReverseOffload)
+    (lib.cmakeBool "USE_SINGLE_NODE" (!useMpi))
+    (lib.cmakeBool "USE_EXTERNAL_MPI" useMpi)
+    (lib.cmakeBool "BUILD_EXAMPLES" buildExamples)
+    (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+  ]
+  ++ lib.optionals (gpuTargets != [ ]) [
+    (lib.cmakeFeature "GPU_TARGETS" (lib.concatStringsSep ";" gpuTargets))
+  ];
+
+  passthru.updateScript = rocmUpdateScript { inherit finalAttrs; };
+
+  meta = {
+    description = "The ROCm OpenSHMEM (rocSHMEM) runtime";
+    homepage = "https://github.com/ROCm/rocSHMEM";
+    license = with lib.licenses; [ mit ];
+    teams = [ lib.teams.rocm ];
+    platforms = lib.platforms.linux;
+  };
+})

From b04589a1a95b547de84e3f269ea8cef4e719ed4c Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 4 Jul 2026 17:34:34 +0200
Subject: [PATCH 101/166] rocmPackages.hipsparselt: init at 7.2.3

---
 pkgs/development/rocm-modules/default.nix     |   2 +
 .../rocm-modules/hipsparselt/default.nix      | 123 ++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 pkgs/development/rocm-modules/hipsparselt/default.nix

diff --git a/pkgs/development/rocm-modules/default.nix b/pkgs/development/rocm-modules/default.nix
index 42f7041775b6..0fb398078995 100644
--- a/pkgs/development/rocm-modules/default.nix
+++ b/pkgs/development/rocm-modules/default.nix
@@ -157,6 +157,8 @@ let
 
       hipblaslt = self.callPackage ./hipblaslt { };
 
+      hipsparselt = self.callPackage ./hipsparselt { };
+
       # hipTensor - Only supports GFX9
 
       composable_kernel_base = self.callPackage ./composable_kernel/base.nix { };
diff --git a/pkgs/development/rocm-modules/hipsparselt/default.nix b/pkgs/development/rocm-modules/hipsparselt/default.nix
new file mode 100644
index 000000000000..c82c3d40ed67
--- /dev/null
+++ b/pkgs/development/rocm-modules/hipsparselt/default.nix
@@ -0,0 +1,123 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rocmUpdateScript,
+  cmake,
+  ninja,
+  git,
+  pkg-config,
+  rocm-cmake,
+  rocm-smi,
+  clr,
+  hipsparse,
+  openmp,
+  llvm,
+  msgpack-cxx,
+  libxml2,
+  zlib,
+  zstd,
+  python3,
+  python3Packages,
+  # hipsparselt only supports gfx942/gfx950
+  gpuTargets ? (clr.localGpuTargets or clr.gpuTargets),
+}:
+
+let
+  supportedTargets = (
+    lib.lists.intersectLists gpuTargets [
+      "gfx942"
+      "gfx950"
+    ]
+  );
+  supportsTargetArches = supportedTargets != [ ];
+  py = python3.withPackages (ps: [
+    ps.pyyaml
+    ps.setuptools
+    ps.packaging
+    ps.nanobind
+    ps.msgpack
+    ps.joblib
+  ]);
+  compiler = "amdclang++";
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "hipsparselt${clr.gpuArchSuffix}";
+  version = "7.2.3";
+
+  src = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "rocm-libraries";
+    rev = "rocm-${finalAttrs.version}";
+    hash = "sha256-Al/0yZPn/wqtBFQU1FcGoSquDMObk6HQ3D5sSh5biHg=";
+    sparseCheckout = [
+      "projects/hipsparselt"
+      "projects/hipblaslt/tensilelite"
+      "projects/hipblaslt/cmake"
+      "projects/hipblaslt/device-library"
+      "shared/origami"
+    ];
+  };
+  sourceRoot = "${finalAttrs.src.name}/projects/hipsparselt";
+
+  env.CXX = compiler;
+  env.ROCM_PATH = "${clr}";
+  env.TENSILE_ROCM_ASSEMBLER_PATH = lib.getExe' clr "amdclang++";
+  env.TENSILE_GEN_ASSEMBLY_TOOLCHAIN = lib.getExe' clr "amdclang++";
+  requiredSystemFeatures = [ "big-parallel" ];
+
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    git
+    pkg-config
+    rocm-cmake
+    rocm-smi
+    py
+    clr
+  ];
+
+  buildInputs = [
+    llvm.llvm
+    clr
+    rocm-cmake
+    hipsparse
+    openmp
+    msgpack-cxx
+    libxml2
+    python3Packages.msgpack
+    zlib
+    zstd
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "GPU_TARGETS" (lib.concatStringsSep ";" supportedTargets))
+    (lib.cmakeBool "HIPSPARSELT_ENABLE_DEVICE" supportsTargetArches)
+    (lib.cmakeBool "HIPSPARSELT_ENABLE_CLIENT" false)
+    (lib.cmakeBool "HIPSPARSELT_BUILD_TESTING" false)
+    (lib.cmakeBool "HIPSPARSELT_ENABLE_MARKER" false)
+    (lib.cmakeBool "HIPBLASLT_ENABLE_ROCROLLER" false)
+    (lib.cmakeBool "HIPBLASLT_ENABLE_MARKER" false)
+    (lib.cmakeFeature "CMAKE_C_COMPILER" "amdclang")
+    (lib.cmakeFeature "CMAKE_HIP_COMPILER" compiler)
+    (lib.cmakeFeature "CMAKE_CXX_COMPILER" compiler)
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_NANOBIND" "${python3Packages.nanobind.src}")
+    (lib.cmakeFeature "CMAKE_INSTALL_BINDIR" "bin")
+    (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib")
+    (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include")
+  ];
+
+  passthru.supportsTargetArches = supportsTargetArches;
+  passthru.updateScript = rocmUpdateScript { inherit finalAttrs; };
+
+  meta = {
+    description = "ROCm hipSPARSELt - a SPARSE marshalling library";
+    homepage = "https://github.com/ROCm/rocm-libraries/tree/develop/projects/hipsparselt";
+    license = with lib.licenses; [ mit ];
+    teams = [ lib.teams.rocm ];
+    platforms = lib.platforms.linux;
+  };
+})

From e3aa4813c27b267b41878e3ba377614275e713fe Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sat, 4 Jul 2026 16:37:33 +0200
Subject: [PATCH 102/166] python3Packages.plotly: 6.7.0 -> 6.8.0

---
 .../python-modules/plotly/default.nix         | 21 ++--------
 .../plotly/numpy-2.4-in1d.patch               | 38 -------------------
 2 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/plotly/numpy-2.4-in1d.patch

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index c2eec531c728..aa72823e4158 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -37,32 +37,17 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "plotly";
-  version = "6.7.0";
+  version = "6.8.0";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gykhl1aBgKCkJVv507UJk4xdYaruV/aU+JLYmvyFYbY=";
+    hash = "sha256-bXMFCRieoWNQZZA9eDTcZqO1vu71CMIk4+TlL0R9+5A=";
   };
 
-  patches = [
-    # https://numpy.org/devdocs/release/2.4.0-notes.html#removed-numpy-in1d
-    # Upstream PR: https://github.com/plotly/plotly.py/pull/5522
-    ./numpy-2.4-in1d.patch
-  ];
-
-  postPatch = ''
-    # `pytest_ignore_collect` takes only `collection_path` starting with
-    # pytest 9. Most of the paths referenced in `plotly/conftest.py`
-    # don't exist anymore and wouldn't be collected anyway, so we can just
-    # remove the file.
-    # https://docs.pytest.org/en/latest/deprecations.html#py-path-local-arguments-for-hooks-replaced-with-pathlib-path
-    # Upstream PR: https://github.com/plotly/plotly.py/pull/5521
-    rm plotly/conftest.py
-  '';
-
   env.SKIP_NPM = true;
 
   build-system = [
diff --git a/pkgs/development/python-modules/plotly/numpy-2.4-in1d.patch b/pkgs/development/python-modules/plotly/numpy-2.4-in1d.patch
deleted file mode 100644
index b6229478184d..000000000000
--- a/pkgs/development/python-modules/plotly/numpy-2.4-in1d.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9531e7ff00be577560f2cebf6739343646d3c770 Mon Sep 17 00:00:00 2001
-From: Tom Hunze <dev@thunze.de>
-Date: Mon, 23 Feb 2026 19:21:45 +0100
-Subject: [PATCH] Use `np.isin` instead of `np.in1d` to fix numpy 2.4 test
- compatibility
-
-https://numpy.org/devdocs/release/2.4.0-notes.html#removed-numpy-in1d
----
- tests/test_optional/test_px/test_px.py           | 2 +-
- tests/test_optional/test_px/test_px_functions.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_optional/test_px/test_px.py b/tests/test_optional/test_px/test_px.py
-index 6c65925a727..a74c4680540 100644
---- a/tests/test_optional/test_px/test_px.py
-+++ b/tests/test_optional/test_px/test_px.py
-@@ -36,7 +36,7 @@ def test_custom_data_scatter(backend):
-     )
-     for data in fig.data:
-         assert np.all(
--            np.in1d(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())
-+            np.isin(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())
-         )
-     # Hover and custom data, no repeated arguments
-     fig = px.scatter(
-diff --git a/tests/test_optional/test_px/test_px_functions.py b/tests/test_optional/test_px/test_px_functions.py
-index 0814898f89d..8220ec7a33a 100644
---- a/tests/test_optional/test_px/test_px_functions.py
-+++ b/tests/test_optional/test_px/test_px_functions.py
-@@ -307,7 +307,7 @@ def test_sunburst_treemap_with_path_color(constructor):
-     fig = px.sunburst(
-         df.to_native(), path=path, color="sectors", color_discrete_map=cmap
-     )
--    assert np.all(np.in1d(fig.data[0].marker.colors, list(cmap.values())))
-+    assert np.all(np.isin(fig.data[0].marker.colors, list(cmap.values())))
- 
-     # Numerical column in path
-     df = (

From 7ab80b1cefffc5ce9b596ef4534ad70a9dabd2a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 02:28:34 +0000
Subject: [PATCH 103/166] libretro.stella2014: 0-unstable-2026-04-12 ->
 0-unstable-2026-07-04

---
 pkgs/applications/emulators/libretro/cores/stella2014.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/stella2014.nix b/pkgs/applications/emulators/libretro/cores/stella2014.nix
index 6c7c4a2f6ba4..863d375c6617 100644
--- a/pkgs/applications/emulators/libretro/cores/stella2014.nix
+++ b/pkgs/applications/emulators/libretro/cores/stella2014.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "stella2014";
-  version = "0-unstable-2026-04-12";
+  version = "0-unstable-2026-07-04";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "stella2014-libretro";
-    rev = "eed47e154d1bbda3305e9ef2d486b6710c8973f4";
-    hash = "sha256-QpPjVnFCkn6xlB7LxpE6bsNfYe3HSsEKUjqmEf2yTvA=";
+    rev = "8ddf2146ed2d2053cff9df64192f920e57709629";
+    hash = "sha256-VDywbP7PhcQPHhu/KMvV1LlI/iOGjMzRooqvoT+Tnxc=";
   };
 
   makefile = "Makefile";

From 88ce6ae2b57e54110e0f1f3adf23305c105f101d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 02:51:04 +0000
Subject: [PATCH 104/166] etcd_3_5: 3.5.31 -> 3.5.32

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

diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix
index 3e506da7b4bd..333a792212ae 100644
--- a/pkgs/by-name/et/etcd_3_5/package.nix
+++ b/pkgs/by-name/et/etcd_3_5/package.nix
@@ -7,11 +7,11 @@
 }:
 
 let
-  version = "3.5.31";
-  etcdSrcHash = "sha256-X3b1TBimNYo03fW0c5NeiD4uALMqtOQbJwPot11FCk8=";
-  etcdServerVendorHash = "sha256-1/XJGpyYuTsb+1hReksX5VyD+6xbKaiLA8520cDKc/4=";
-  etcdUtlVendorHash = "sha256-dUXAoIcOSlEbiSmy1M+oPaHt089gOttQwrB9ZhYc7v0=";
-  etcdCtlVendorHash = "sha256-l1j00Mzv1z021rfBbFZrIce2pifQyRkST0bkZhVoST0=";
+  version = "3.5.32";
+  etcdSrcHash = "sha256-pqCMgY5veIF5kQDjqTg9B7aSL+V6bdMZpc464wjTLMo=";
+  etcdServerVendorHash = "sha256-FDzAF2J9wbRmQETvrdJK3gL4cfAhiiihb5EOrimE11M=";
+  etcdUtlVendorHash = "sha256-0xfq7f7Xr3SWxiU8C1bWQPxdFvEaoIrlK+gX3hkd4ho=";
+  etcdCtlVendorHash = "sha256-59e/TORi/XX+GXRjMO/45SMumYgrFbOHEXqV7sM72H8=";
 
   src = fetchFromGitHub {
     owner = "etcd-io";

From 38bc3d8f2cac3d221b0a8918432fd2f22872783d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 03:17:10 +0000
Subject: [PATCH 105/166] codex: 0.142.3 -> 0.142.5

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

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index ddce6625ad54..bb15ec6f77af 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -26,13 +26,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.142.3";
+  version = "0.142.5";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-dxkyaWpgzqpAVFojDYQ6JpMPNBIX+d7xjIyLic4Cs8A=";
+    hash = "sha256-Ua1UVArTvjHcg3bPK1FYyShYiIUH3AOxtoUTvA4UZwU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";

From d9546ea619dd7afa65a33367b3c064bd3d49c684 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 03:28:52 +0000
Subject: [PATCH 106/166] jetbrains.rider: 2026.1.2 -> 2026.1.4

---
 .../editors/jetbrains/ides/rider.nix          | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix
index df8d35ea2f20..c962306f3389 100644
--- a/pkgs/applications/editors/jetbrains/ides/rider.nix
+++ b/pkgs/applications/editors/jetbrains/ides/rider.nix
@@ -24,20 +24,20 @@ let
   # update-script-start: urls
   urls = {
     x86_64-linux = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.tar.gz";
-      hash = "sha256-OmysaGXGMxxAAa2qrHvX8yXIwJLU7tKG8/EBGhr55EA=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.tar.gz";
+      hash = "sha256-K+X2M4idv+oDqC/dkbzMTX3W3zx0b0e8ZTsxkP7rAfI=";
     };
     aarch64-linux = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.tar.gz";
-      hash = "sha256-xcwd4OgobMXFQ2W+SN6O5I3mud4kedVQ/0rZBWbXIGY=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz";
+      hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo=";
     };
     x86_64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.dmg";
-      hash = "sha256-uoOP+EYB11M99MlAFF7efZSKmCk0fwjCImFiasUQPUw=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.dmg";
+      hash = "sha256-GfQ5WpKunJ+JhE1VcArm3UxZ5udCbfnS1Kw3D4gZorA=";
     };
     aarch64-darwin = {
-      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.dmg";
-      hash = "sha256-Mo6gxWatX6wlL3s8Li19F58cnKZtOtFUfNyGPrC6CtA=";
+      url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg";
+      hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE=";
     };
   };
   # update-script-end: urls
@@ -51,8 +51,8 @@ in
   product = "Rider";
 
   # update-script-start: version
-  version = "2026.1.2";
-  buildNumber = "261.24374.190";
+  version = "2026.1.4";
+  buildNumber = "261.26222.60";
   # update-script-end: version
 
   src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}"));

From 1e6f5a1711c37d6a26bd10b277e6f93c32f776d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 04:14:56 +0000
Subject: [PATCH 107/166] opencode: 1.17.12 -> 1.17.13

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

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 987de5bfc3fa..b432d4482ff1 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -16,7 +16,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.17.12";
+  version = "1.17.13";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     owner = "anomalyco";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eM+K/JrSjM5OtDLvPAXLQQx45K15rCxkac+HA8nq5gw=";
+    hash = "sha256-WE8+O+Od8M71fKoOOhE9CbTsJ0JMAi0ZajmYd//VG2k=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -78,7 +78,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash = "sha256-bHEJKhmaqPO4+H3x7lNBxU/9dMd354bJ1hg7wakHXJQ=";
+    outputHash = "sha256-SUNfdHtASPh1mpxKvIKJ2GrDHAxmv7Gu7B7vr3PX5W4=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };

From f47146ff12a89e9842ce2f853bf87b8c9984519b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 04:23:36 +0000
Subject: [PATCH 108/166] matterjs-server: 1.1.2 -> 1.1.7

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

diff --git a/pkgs/by-name/ma/matterjs-server/package.nix b/pkgs/by-name/ma/matterjs-server/package.nix
index 2c39891d83e9..a783efe28a6d 100644
--- a/pkgs/by-name/ma/matterjs-server/package.nix
+++ b/pkgs/by-name/ma/matterjs-server/package.nix
@@ -12,7 +12,7 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "matterjs-server";
-  version = "1.1.2";
+  version = "1.1.7";
   __structuredAttrs = true;
   strictDeps = true;
 
@@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: {
     owner = "matter-js";
     repo = "matterjs-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+ICWKZAcKwfd72eWUwmM7XmCwC4F6P+o1JsHNK2+ROE=";
+    hash = "sha256-8b4bLDVHTFcOHj3h/VuIxwdHJBleibZe9gUQvUD+aPA=";
   };
 
-  npmDepsHash = "sha256-L1G8/Y23deIjA4azMFLn+ZS95sKoRPSR1O7R8kZF5MU=";
+  npmDepsHash = "sha256-wkxYJtHwwpP87PDuE2HWA/2GDEUWfcSN2sEvjWz27a8=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From b76bf041c7e5465b47654ddf015235e8fcadc184 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sun, 5 Jul 2026 01:13:47 -0400
Subject: [PATCH 109/166] nixos/immersed: openPorts -> openFirewall

The PR that added this is only a few hours old (https://github.com/NixOS/nixpkgs/pull/399766) and hasn't had the chance to enter an unstable released, which is why I haven't added a rename flag.
---
 nixos/modules/programs/immersed.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/immersed.nix b/nixos/modules/programs/immersed.nix
index 53c984c74c9f..7c7b8d13592d 100644
--- a/nixos/modules/programs/immersed.nix
+++ b/nixos/modules/programs/immersed.nix
@@ -26,7 +26,7 @@ in
     programs.immersed = {
       enable = lib.mkEnableOption "immersed";
 
-      openPorts = lib.mkOption {
+      openFirewall = lib.mkOption {
         type = lib.types.bool;
         default = false;
         description = "Whether to open firewall ports for Immersed";
@@ -51,7 +51,7 @@ in
     environment.systemPackages = [ cfg.package ];
 
     # https://immersed.helpscoutdocs.com/article/23-connection-troubleshooting-linux
-    networking.firewall = lib.mkIf cfg.openPorts {
+    networking.firewall = lib.mkIf cfg.openFirewall {
       allowedTCPPorts = [ 21000 ];
       allowedUDPPorts = [
         21000

From 59ea75a823367ecfd72dbdf6b1af2a980d260fb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 07:00:46 +0000
Subject: [PATCH 110/166] tpnote: 1.26.1 -> 1.26.4

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 099b940c9195..5de922579090 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.26.1";
+  version = "1.26.4";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FZ/7dDg2SjNV1nEA0WFTKF7G8nJeeq3dD3UOD5bSA98=";
+    hash = "sha256-RoFamyNkUkB+94ZcVcyIJ6OvX0T9NAzkYido5sU6IAc=";
   };
 
-  cargoHash = "sha256-hf3H2pgc+ftJItJjMtXCW8qhpp1fugaIcRZIrydEpxo=";
+  cargoHash = "sha256-kJCp285pQCUtHCUEDehNFlz87K72XmYp5z6vJD790sQ=";
 
   nativeBuildInputs = [
     cmake

From 96ec540b85b092695c1e54027d8fa455852ce540 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 5 Jul 2026 10:03:56 +0300
Subject: [PATCH 111/166] nixos/lasuite-meet: refactor systemd units

---
 .../services/web-apps/lasuite-meet.nix        | 196 +++++++++---------
 1 file changed, 95 insertions(+), 101 deletions(-)

diff --git a/nixos/modules/services/web-apps/lasuite-meet.nix b/nixos/modules/services/web-apps/lasuite-meet.nix
index 421af1596483..52b20cdc1c48 100644
--- a/nixos/modules/services/web-apps/lasuite-meet.nix
+++ b/nixos/modules/services/web-apps/lasuite-meet.nix
@@ -36,48 +36,62 @@ let
       toString value
   ) cfg.settings;
 
-  commonServiceConfig = {
-    RuntimeDirectory = "lasuite-meet";
-    StateDirectory = "lasuite-meet";
-    WorkingDirectory = "/var/lib/lasuite-meet";
+  commonSystemdConfig = {
+    after = [
+      "network.target"
+    ]
+    ++ (optional cfg.postgresql.createLocally "postgresql.service")
+    ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service");
 
-    User = "lasuite-meet";
-    DynamicUser = true;
-    SupplementaryGroups = mkIf cfg.redis.createLocally [
-      config.services.redis.servers.lasuite-meet.group
-    ];
-    # hardening
-    AmbientCapabilities = "";
-    CapabilityBoundingSet = [ "" ];
-    DevicePolicy = "closed";
-    LockPersonality = true;
-    NoNewPrivileges = true;
-    PrivateDevices = true;
-    PrivateTmp = true;
-    PrivateUsers = true;
-    ProcSubset = "pid";
-    ProtectClock = true;
-    ProtectControlGroups = true;
-    ProtectHome = true;
-    ProtectHostname = true;
-    ProtectKernelLogs = true;
-    ProtectKernelModules = true;
-    ProtectKernelTunables = true;
-    ProtectProc = "invisible";
-    ProtectSystem = "strict";
-    RemoveIPC = true;
-    RestrictAddressFamilies = [
-      "AF_INET"
-      "AF_INET6"
-      "AF_UNIX"
-    ];
-    RestrictNamespaces = true;
-    RestrictRealtime = true;
-    RestrictSUIDSGID = true;
-    SystemCallArchitectures = "native";
-    MemoryDenyWriteExecute = true;
-    EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile;
-    UMask = "0077";
+    wants =
+      (optional cfg.postgresql.createLocally "postgresql.service")
+      ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service");
+
+    environment = pythonEnvironment;
+
+    serviceConfig = {
+      RuntimeDirectory = "lasuite-meet";
+      StateDirectory = "lasuite-meet";
+      WorkingDirectory = "/var/lib/lasuite-meet";
+
+      User = "lasuite-meet";
+      DynamicUser = true;
+      SupplementaryGroups = mkIf cfg.redis.createLocally [
+        config.services.redis.servers.lasuite-meet.group
+      ];
+      # hardening
+      AmbientCapabilities = "";
+      CapabilityBoundingSet = [ "" ];
+      DevicePolicy = "closed";
+      LockPersonality = true;
+      NoNewPrivileges = true;
+      PrivateDevices = true;
+      PrivateTmp = true;
+      PrivateUsers = true;
+      ProcSubset = "pid";
+      ProtectClock = true;
+      ProtectControlGroups = true;
+      ProtectHome = true;
+      ProtectHostname = true;
+      ProtectKernelLogs = true;
+      ProtectKernelModules = true;
+      ProtectKernelTunables = true;
+      ProtectProc = "invisible";
+      ProtectSystem = "strict";
+      RemoveIPC = true;
+      RestrictAddressFamilies = [
+        "AF_INET"
+        "AF_INET6"
+        "AF_UNIX"
+      ];
+      RestrictNamespaces = true;
+      RestrictRealtime = true;
+      RestrictSUIDSGID = true;
+      SystemCallArchitectures = "native";
+      MemoryDenyWriteExecute = true;
+      EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile;
+      UMask = "0077";
+    };
   };
 in
 {
@@ -342,74 +356,54 @@ in
   };
 
   config = mkIf cfg.enable {
-    systemd.services.lasuite-meet = {
-      description = "Meet from SuiteNumérique";
-      after = [
-        "network.target"
-      ]
-      ++ (optional cfg.postgresql.createLocally "postgresql.service")
-      ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service");
+    systemd.services.lasuite-meet = lib.mkMerge [
+      {
+        description = "Meet from SuiteNumérique";
 
-      wants =
-        (optional cfg.postgresql.createLocally "postgresql.service")
-        ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service");
+        wantedBy = [ "multi-user.target" ];
 
-      wantedBy = [ "multi-user.target" ];
-
-      preStart = ''
-        if [ ! -f .version ]; then
-          touch .version
-        fi
-
-        ${optionalString (cfg.secretKeyPath == null) ''
-          if [[ ! -f /var/lib/lasuite-meet/django_secret_key ]]; then
-            (
-              umask 0377
-              tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge /var/lib/lasuite-meet/django_secret_key
-            )
+        preStart = ''
+          if [ ! -f .version ]; then
+            touch .version
           fi
-        ''}
-        if [ "${cfg.package.version}" != "$(cat .version)" ]; then
-          ${getExe cfg.package} migrate
-          echo -n "${cfg.package.version}" > .version
-        fi
-      '';
 
-      environment = pythonEnvironment;
+          ${optionalString (cfg.secretKeyPath == null) ''
+            if [[ ! -f /var/lib/lasuite-meet/django_secret_key ]]; then
+              (
+                umask 0377
+                tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge /var/lib/lasuite-meet/django_secret_key
+              )
+            fi
+          ''}
+          if [ "${cfg.package.version}" != "$(cat .version)" ]; then
+            ${getExe cfg.package} migrate
+            echo -n "${cfg.package.version}" > .version
+          fi
+        '';
 
-      serviceConfig = {
-        BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-meet/static";
+        serviceConfig = {
+          BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-meet/static";
 
-        ExecStart = utils.escapeSystemdExecArgs (
-          [
-            (lib.getExe' cfg.package "gunicorn")
-            "--bind=${cfg.bind}"
-          ]
-          ++ cfg.gunicorn.extraArgs
-          ++ [ "meet.wsgi:application" ]
-        );
+          ExecStart = utils.escapeSystemdExecArgs (
+            [
+              (lib.getExe' cfg.package "gunicorn")
+              "--bind=${cfg.bind}"
+            ]
+            ++ cfg.gunicorn.extraArgs
+            ++ [ "meet.wsgi:application" ]
+          );
+        };
       }
-      // commonServiceConfig;
-    };
+      commonSystemdConfig
+    ];
 
-    systemd.services.lasuite-meet-celery = {
-      description = "Meet Celery broker from SuiteNumérique";
-      after = [
-        "network.target"
-      ]
-      ++ (optional cfg.postgresql.createLocally "postgresql.service")
-      ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service");
+    systemd.services.lasuite-meet-celery = lib.mkMerge [
+      {
+        description = "Meet Celery broker from SuiteNumérique";
 
-      wants =
-        (optional cfg.postgresql.createLocally "postgresql.service")
-        ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service");
+        wantedBy = [ "multi-user.target" ];
 
-      wantedBy = [ "multi-user.target" ];
-
-      environment = pythonEnvironment;
-
-      serviceConfig = {
-        ExecStart = utils.escapeSystemdExecArgs (
+        serviceConfig.ExecStart = utils.escapeSystemdExecArgs (
           [ (lib.getExe' cfg.package "celery") ]
           ++ cfg.celery.extraArgs
           ++ [
@@ -418,8 +412,8 @@ in
           ]
         );
       }
-      // commonServiceConfig;
-    };
+      commonSystemdConfig
+    ];
 
     services.postgresql = mkIf cfg.postgresql.createLocally {
       enable = true;

From 21af0e8e78265c709f6cc620066a571a36e5f5a7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 5 Jul 2026 10:07:10 +0300
Subject: [PATCH 112/166] nixos/lasuite-meet: add cronjobs for cleanup tasks

---
 .../modules/services/web-apps/lasuite-meet.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/nixos/modules/services/web-apps/lasuite-meet.nix b/nixos/modules/services/web-apps/lasuite-meet.nix
index 52b20cdc1c48..b2a3c4fe60d8 100644
--- a/nixos/modules/services/web-apps/lasuite-meet.nix
+++ b/nixos/modules/services/web-apps/lasuite-meet.nix
@@ -415,6 +415,24 @@ in
       commonSystemdConfig
     ];
 
+    systemd.services.lasuite-meet-clean-pending-files = lib.mkMerge [
+      {
+        description = "Scheduled job to clean up pending uploads from LaSuite Meet";
+        startAt = "daily";
+        serviceConfig.ExecStart = "${getExe cfg.package} clean_pending_files";
+      }
+      commonSystemdConfig
+    ];
+
+    systemd.services.lasuite-meet-purge-deleted-files = lib.mkMerge [
+      {
+        description = "Scheduled job to purge deleted files from LaSuite Meet";
+        startAt = "daily";
+        serviceConfig.ExecStart = "${getExe cfg.package} purge_deleted_files";
+      }
+      commonSystemdConfig
+    ];
+
     services.postgresql = mkIf cfg.postgresql.createLocally {
       enable = true;
       ensureDatabases = [ "lasuite-meet" ];

From 1937aa62b71a77558807958fc4e129b089153e20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 08:16:42 +0000
Subject: [PATCH 113/166] oh-my-posh: 29.19.0 -> 29.20.0

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

diff --git a/pkgs/by-name/oh/oh-my-posh/package.nix b/pkgs/by-name/oh/oh-my-posh/package.nix
index 93fbf33e6a40..0999756f48aa 100644
--- a/pkgs/by-name/oh/oh-my-posh/package.nix
+++ b/pkgs/by-name/oh/oh-my-posh/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "oh-my-posh";
-  version = "29.19.0";
+  version = "29.20.0";
 
   src = fetchFromGitHub {
     owner = "jandedobbeleer";
     repo = "oh-my-posh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KhE0JWOY9j4rSmVZOmUxC9pQbjSpISph+6RyntlryFs=";
+    hash = "sha256-EzdrqeWM85hh8lPxrweSPezydICRFyOStgDlEq8g9+8=";
   };
 
-  vendorHash = "sha256-SI2FjnRlWSsS9Uju8R+FW6/IpqewXsiOwKXfueZ7KPY=";
+  vendorHash = "sha256-PAdk6nf750wL619W6nyt1Ne/eYYlVkewIhWirNi9rK8=";
 
   sourceRoot = "${finalAttrs.src.name}/src";
 

From e05c72c89baf15c14685215edbaa3003374c40ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 08:34:42 +0000
Subject: [PATCH 114/166] bazaar: 0.8.3 -> 0.9.0

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

diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix
index 5ef3c44b4f71..945fd707bf14 100644
--- a/pkgs/by-name/ba/bazaar/package.nix
+++ b/pkgs/by-name/ba/bazaar/package.nix
@@ -34,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bazaar";
-  version = "0.8.3";
+  version = "0.9.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "bazaar-org";
     repo = "bazaar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s0l548kuVD+eNAxA3BnbpuMHD1alq0/xGBIkXb7WpC0=";
+    hash = "sha256-6MDrMXwtNcNJtnoRwfIKVulHu4FtVb4hhCtqIxmlz4A=";
   };
 
   nativeBuildInputs = [

From c950d93be8afbf80cb6164b7836e08dce905384e Mon Sep 17 00:00:00 2001
From: e1mo <git@e1mo.de>
Date: Sun, 5 Jul 2026 10:44:56 +0200
Subject: [PATCH 115/166] freescout: 1.8.226 -> 1.8.229

Primarily patches for security vulnerabilities and subsequent bugfixes.

- https://github.com/freescout-help-desk/freescout/releases/tag/1.8.227
- https://github.com/freescout-help-desk/freescout/releases/tag/1.8.228
- https://github.com/freescout-help-desk/freescout/releases/tag/1.8.229
---
 pkgs/by-name/fr/freescout/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/freescout/package.nix b/pkgs/by-name/fr/freescout/package.nix
index 20a2a42f6bad..d344c205fc2f 100644
--- a/pkgs/by-name/fr/freescout/package.nix
+++ b/pkgs/by-name/fr/freescout/package.nix
@@ -7,13 +7,13 @@
 stdenv.mkDerivation (finalAttrs: {
   preferLocalBuild = true;
   pname = "freescout";
-  version = "1.8.226";
+  version = "1.8.229";
 
   src = fetchFromGitHub {
     owner = "freescout-help-desk";
     repo = "freescout";
     tag = finalAttrs.version;
-    hash = "sha256-9fojG6S6yb2+W94cHrLuYIRjRL8JWspsj4bNE4QKSuk=";
+    hash = "sha256-oA/GWEhdqmXt7v6iRKqud75uUBj1a6nKN7EjaYF0USk=";
   };
 
   patches = [

From f76955e3860838cf1eb99e556b561e454e84efff Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Fri, 26 Jun 2026 19:52:56 +0100
Subject: [PATCH 116/166] immich: 2.7.5 -> 3.0.1

---
 nixos/tests/web-apps/immich.nix               |  2 +-
 pkgs/by-name/im/immich-cli/package.nix        |  9 +----
 .../im/immich-machine-learning/package.nix    | 10 ------
 pkgs/by-name/im/immich/package.nix            | 33 +++++++++----------
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix
index 406b51600c4e..bf8df063fa63 100644
--- a/nixos/tests/web-apps/immich.nix
+++ b/nixos/tests/web-apps/immich.nix
@@ -8,7 +8,7 @@
       # These tests need a little more juice
       virtualisation = {
         cores = 2;
-        memorySize = 2048;
+        memorySize = 4096;
         diskSize = 4096;
       };
 
diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index 3c16240a6ba3..a719db4480ea 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -12,12 +12,6 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "immich-cli";
   inherit (immich) version src pnpmDeps;
 
-  postPatch = ''
-    local -r cli_version="$(jq -r .version cli/package.json)"
-    test "$cli_version" = ${finalAttrs.version} \
-      || (echo "error: update immich-cli version to $cli_version" && exit 1)
-  '';
-
   nativeBuildInputs = [
     jq
     makeWrapper
@@ -29,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
-    pnpm --filter @immich/sdk build
-    pnpm --filter @immich/cli build
+    pnpm --filter @immich/cli... build
 
     runHook postBuild
   '';
diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index d562c395af1a..9c968802d3fd 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  fetchpatch2,
   immich,
   python3,
   nixosTests,
@@ -17,15 +16,6 @@ python.pkgs.buildPythonApplication rec {
   src = "${immich.src}/machine-learning";
   pyproject = true;
 
-  patches = [
-    (fetchpatch2 {
-      name = "fix_tests_with_openvino_ep.patch";
-      relative = "machine-learning";
-      url = "https://github.com/immich-app/immich/commit/7f611d90317d75ac3d75adf428f367376171e106.patch?full_index=1";
-      hash = "sha256-dntL5AZS3VIp7++yUec4HWIdtwltrnIePNFPJaiZdy4=";
-    })
-  ];
-
   pythonRelaxDeps = [
     "huggingface-hub"
     "insightface"
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index e94ad087378e..b39e88a2eab5 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchPnpmDeps,
   pnpmConfigHook,
-  pnpm_10,
+  pnpm_11,
   python3,
   nodejs,
   node-gyp,
@@ -37,7 +37,7 @@
   buildPackages,
 }:
 let
-  pnpm = pnpm_10;
+  pnpm = pnpm_11;
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -45,12 +45,12 @@ let
       buildPackages.buildGoModule (
         args
         // rec {
-          version = "0.25.5";
+          version = "0.28.1";
           src = fetchFromGitHub {
             owner = "evanw";
             repo = "esbuild";
             tag = "v${version}";
-            hash = "sha256-jemGZkWmN1x2+ZzJ5cLp3MoXO0oDKjtZTmZS9Be/TDw=";
+            hash = "sha256-V+HKaWGAIs24ynFFIS9fQ0EAJJdNmlAMeL1sgDEAqWM=";
           };
           vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
         }
@@ -115,20 +115,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "immich";
-  version = "2.7.5";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "immich-app";
     repo = "immich";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EC1IXM7KObAWfwG5KEao5VDp79d8WGNEI7E89lLOJ44=";
+    hash = "sha256-Z18SEjUdFP2/grQtHFI6J7CVcAMalshPt3Sd4tGXsDw=";
   };
 
   pnpmDeps = fetchPnpmDeps {
     inherit (finalAttrs) pname version src;
     inherit pnpm;
-    fetcherVersion = 3;
-    hash = "sha256-FEesjbhxP7ydFfNshF3iFIk9N3Z53jrEZ9DRBjgEfs0=";
+    fetcherVersion = 4;
+    hash = "sha256-kCMFAPWcv2/qqVUoR5pbRxmkGg3mLPrpm8ce7R+9VYM=";
   };
 
   postPatch = ''
@@ -174,7 +174,7 @@ stdenv.mkDerivation (finalAttrs: {
     # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH
     rm node_modules/.pnpm/node_modules/exiftool-vendored.pl
 
-    pnpm --filter immich build
+    pnpm --filter immich... build
 
     runHook postBuild
   '';
@@ -196,8 +196,8 @@ stdenv.mkDerivation (finalAttrs: {
       -o -name '*.target.mk' \
     \) -exec rm -r {} +
 
-    mkdir -p "$packageOut/build"
-    ln -s '${finalAttrs.passthru.plugins}' "$packageOut/build/corePlugin"
+    mkdir -p "$packageOut/build/plugins"
+    ln -s '${finalAttrs.passthru.plugin-core}' "$packageOut/build/plugins/immich-plugin-core"
     ln -s '${finalAttrs.passthru.web}' "$packageOut/build/www"
     ln -s '${geodata}' "$packageOut/build/geodata"
 
@@ -231,8 +231,8 @@ stdenv.mkDerivation (finalAttrs: {
       immich = finalAttrs.finalPackage;
     };
 
-    plugins = stdenv.mkDerivation {
-      pname = "immich-plugins";
+    plugin-core = stdenv.mkDerivation {
+      pname = "immich-plugin-core";
       inherit (finalAttrs) version src pnpmDeps;
 
       nativeBuildInputs = [
@@ -246,7 +246,7 @@ stdenv.mkDerivation (finalAttrs: {
       buildPhase = ''
         runHook preBuild
 
-        pnpm --filter plugins build
+        pnpm --filter @immich/plugin-core... build
 
         runHook postBuild
       '';
@@ -254,7 +254,7 @@ stdenv.mkDerivation (finalAttrs: {
       installPhase = ''
         runHook preInstall
 
-        cd plugins
+        cd packages/plugin-core
         mkdir $out
         cp -r dist manifest.json $out
 
@@ -275,8 +275,7 @@ stdenv.mkDerivation (finalAttrs: {
       buildPhase = ''
         runHook preBuild
 
-        pnpm --filter @immich/sdk build
-        pnpm --filter immich-web build
+        pnpm --filter immich-web... build
 
         runHook postBuild
       '';

From ab2f6986d21a8ce3371d687af89698dafcfce374 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 09:04:27 +0000
Subject: [PATCH 117/166] fzf-zsh-plugin: 1.0.0-unstable-2026-06-21 ->
 1.0.0-unstable-2026-06-30

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

diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
index 231eb7ee2f57..705e4a99b5f1 100644
--- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
+++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "fzf-zsh-plugin";
-  version = "1.0.0-unstable-2026-06-21";
+  version = "1.0.0-unstable-2026-06-30";
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "fzf-zsh-plugin";
-    rev = "70e2ac8a12c137c1b097a6ecfdc0236e5ef51d1b";
-    hash = "sha256-qwqezNXBRFKTWyMp+9Ss2hEAU9Bznc/DK0XNGZOfVOE=";
+    rev = "6f953534d4c69a7340d27b7dcf14f406a22bed61";
+    hash = "sha256-RQrxCU7f3LSepUYm0+2ljvJfzVh8yp4NMJHxssA60Vk=";
   };
 
   strictDeps = true;

From 07a5504e195f5ff4742d6beb44cdbbaaddbd0571 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 09:52:31 +0000
Subject: [PATCH 118/166] python3Packages.pontos: 26.5.0 -> 26.6.0

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

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 7c56eb41bc0f..300c5a1a9405 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "26.5.0";
+  version = "26.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "pontos";
     tag = "v${version}";
-    hash = "sha256-P18RqOSY2g6R5m79nJbfoP9w1RhYiQ2HPWZrhwIHknI=";
+    hash = "sha256-NKe5kM4YPxsGge1UG7DjE3SDXlfZIVazOVmF5RBCbSo=";
   };
 
   build-system = [ poetry-core ];

From 0d0f425671a7f18c70baa48914f8c1dd2ffd0b49 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 5 Jul 2026 17:57:34 +0800
Subject: [PATCH 119/166] emacsPackages.ghostel: 0.39.0-unstable-2026-06-26 ->
 0.41.0-unstable-2026-07-05

---
 .../manual-packages/ghostel/package.nix       | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
index e16b1fce0dc6..22ff6038d4c8 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix
@@ -14,13 +14,13 @@ let
 
   pname = "ghostel";
 
-  version = "0.39.0-unstable-2026-06-26";
+  version = "0.41.0-unstable-2026-07-05";
 
   src = fetchFromGitHub {
     owner = "dakra";
     repo = "ghostel";
-    rev = "92bfcc57dc85f254ce95dcb51dbdd2411fea5f02";
-    hash = "sha256-havDs3fZENB/ozMWWKQkdsyHUIBIeewmrjL+3xJKM94=";
+    rev = "f77efee9172854abc08652637d23adc26faa25a2";
+    hash = "sha256-6ME+aStZ9X1pkTr0uwwhrJXEHu/uLStPHsKtbudXl9I=";
   };
 
   module = stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ let
     deps = zig.fetchDeps {
       inherit (finalAttrs) src pname version;
       fetchAll = true;
-      hash = "sha256-CTsG3dXu3DECDbklBAtr2fYou82WNvQ1Q3JET0TmuyM=";
+      hash = "sha256-lFU0ywNyP1q2NL9MkIfWciH03VAA/Act5dGYAV4V7EY=";
     };
 
     nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
@@ -48,19 +48,6 @@ let
 
     zigBuildFlags = finalAttrs.zigCheckFlags;
 
-    postPatch = ''
-      # https://github.com/dakra/ghostel/issues/446
-      substituteInPlace build.zig \
-        --replace-fail 'addInstallFile(version_file, "../ghostel-module.version")' \
-                       'addInstallFile(version_file, "ghostel-module.version")'
-
-      # remove copy_step
-      substituteInPlace build.zig \
-        --replace-fail 'b.getInstallStep().dependOn(&copy_step.step);' ' ' \
-        --replace-fail 'const copy_step = b.addInstallFile' \
-                       '_ = b.addInstallFile'
-    '';
-
     postConfigure = ''
       cp -rLT ${finalAttrs.deps} "$ZIG_GLOBAL_CACHE_DIR/p"
       chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p"
@@ -77,7 +64,7 @@ melpaBuild {
   '';
 
   preBuild = ''
-    install ${module}/lib/libghostel-module${libExt} ghostel-module${libExt}
+    install ${module}/ghostel-module${libExt} ghostel-module${libExt}
     install --mode=444 ${module}/ghostel-module.version ghostel-module.version
   '';
 

From cc7208bbeafe36a212a6793d93eecce7d0b7bef9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 10:05:21 +0000
Subject: [PATCH 120/166] python3Packages.pipdeptree: 3.1.0 -> 3.1.1

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

diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix
index 1bae5e6dae8a..e9eb3d6bee24 100644
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "pipdeptree";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tox-dev";
     repo = "pipdeptree";
     tag = finalAttrs.version;
-    hash = "sha256-poUults9ev+5aryrZPxnxF/X9u0iivnlc1ceLxB7dys=";
+    hash = "sha256-EDpKJBDb3CkTMfiLyYMakbm5riIHsf+49yM99uQDPT8=";
   };
 
   build-system = [

From 1202f81a750f8141ad7c71ca0f8212214f9e8be2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 10:14:36 +0000
Subject: [PATCH 121/166] cargo-feature-combinations: 0.0.54 -> 0.2.3

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

diff --git a/pkgs/by-name/ca/cargo-feature-combinations/package.nix b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
index 8c8d78496239..d7d52def6bcc 100644
--- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix
+++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix
@@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   pname = "cargo-feature-combinations";
-  version = "0.0.54";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "romnn";
     repo = "cargo-feature-combinations";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SgVwgG7lNFrDMH1t9yvYTTm7pQth2hcEAjwMuRkC5Kg=";
+    hash = "sha256-5QQrWdq1jTGUCnzZkzJ2WzJRpxhRtaZMLpgCIktaiPc=";
   };
 
-  cargoHash = "sha256-S0I2itkyAhZwk+S/k/Sr3bpENpIQNHSaJwVpA8rvQ+E=";
+  cargoHash = "sha256-PMZGYxdB9cbWLVtvfRtWsRqVwJWayPbrdhpKvxmq3dM=";
 
   passthru.updateScript = nix-update-script { };
 

From fae9fa8ca360f22bad8162552294a2194807725c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 03:02:48 +0300
Subject: [PATCH 122/166] nanoarrow: init at 0.8.0

https://github.com/apache/arrow-nanoarrow
---
 pkgs/by-name/na/nanoarrow/package.nix | 89 +++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)
 create mode 100644 pkgs/by-name/na/nanoarrow/package.nix

diff --git a/pkgs/by-name/na/nanoarrow/package.nix b/pkgs/by-name/na/nanoarrow/package.nix
new file mode 100644
index 000000000000..07b48bdb0dbf
--- /dev/null
+++ b/pkgs/by-name/na/nanoarrow/package.nix
@@ -0,0 +1,89 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchzip,
+
+  # nativeBuildInputs
+  meson,
+  ninja,
+  pkg-config,
+
+  # buildInputs
+  arrow-cpp,
+  gbenchmark,
+  gtest,
+  nlohmann_json,
+  zlib,
+  zstd,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nanoarrow";
+  version = "0.8.0";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "arrow-nanoarrow";
+    tag = "apache-arrow-nanoarrow-${finalAttrs.version}";
+    hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+  ];
+
+  buildInputs = [
+    arrow-cpp
+    gbenchmark
+    gtest
+    nlohmann_json
+    zlib
+    zstd
+  ];
+
+  doCheck = true;
+
+  # Pre-populate the meson subproject with the flatcc source so meson doesn't try to download it.
+  # The wrap's patch_directory overlay (meson.build) must also be applied.
+  postPatch = ''
+    cp -r --no-preserve=mode ${finalAttrs.finalPackage.passthru.flatcc-src} ${finalAttrs.finalPackage.passthru.flatcc-src-dest}
+    cp subprojects/packagefiles/flatcc/meson.build ${finalAttrs.finalPackage.passthru.flatcc-src-dest}/
+  '';
+  mesonFlags = [
+    # Needed only on Darwin, because otherwise a metal-cpp dependency is
+    # required. It doesn't hurt to enable it for all platforms, so it'd be
+    # easier to spot if the option will disappear in the future for instance..
+    (lib.mesonOption "metal" "disabled")
+  ];
+
+  passthru = {
+    # Nanoarrow requires a specific post-0.6.1 flatcc commit that adds `_with_size` API variants not
+    # present in the upstream 0.6.1 release.
+    flatcc-src = fetchFromGitHub {
+      owner = "dvidelabs";
+      repo = "flatcc";
+      rev = "fd3c4ae5cd39f0651eda6a3a1a374278070135d6";
+      hash = "sha256-8MqazKuwfFWVJ/yjT5fNrRzexFQ2ky4YTcZqOYjk9Qc=";
+    };
+    flatcc-src-dest = "subprojects/flatcc-${finalAttrs.finalPackage.passthru.flatcc-src.rev}";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  meta = {
+    description = "Helpers for Arrow C Data & Arrow C Stream interfaces";
+    homepage = "https://github.com/apache/arrow-nanoarrow";
+    changelog = "https://github.com/apache/arrow-nanoarrow/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    platforms = lib.platforms.all;
+  };
+})

From b0492b791bf032791031d1c1ef3c5f0850cc1a5a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 03:30:24 +0300
Subject: [PATCH 123/166] python3Packages.nanoarrow: base upon top-level
 nanoarrow

---
 .../python-modules/nanoarrow/default.nix      | 47 +++++--------------
 pkgs/top-level/python-packages.nix            |  5 +-
 2 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/python-modules/nanoarrow/default.nix b/pkgs/development/python-modules/nanoarrow/default.nix
index 7993c3e2668e..29e3d8e311a9 100644
--- a/pkgs/development/python-modules/nanoarrow/default.nix
+++ b/pkgs/development/python-modules/nanoarrow/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  nanoarrow-c,
 
   # build-system
   cython,
@@ -18,39 +18,15 @@
   pytestCheckHook,
 }:
 
-let
-  # Nanoarrow requires a specific post-0.6.1 flatcc commit that adds `_with_size` API variants not
-  # present in the upstream 0.6.1 release.
-  flatcc-src = fetchFromGitHub {
-    owner = "dvidelabs";
-    repo = "flatcc";
-    rev = "fd3c4ae5cd39f0651eda6a3a1a374278070135d6";
-    hash = "sha256-8MqazKuwfFWVJ/yjT5fNrRzexFQ2ky4YTcZqOYjk9Qc=";
-  };
-in
 buildPythonPackage (finalAttrs: {
-  pname = "nanoarrow";
-  version = "0.8.0";
+  inherit (nanoarrow-c)
+    pname
+    version
+    src
+    postPatch
+    ;
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "apache";
-    repo = "arrow-nanoarrow";
-    tag = "apache-arrow-nanoarrow-${finalAttrs.version}";
-    hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls=";
-  };
-
-  # Pre-populate the meson subproject with the flatcc source so meson doesn't try to download it.
-  # The wrap's patch_directory overlay (meson.build) must also be applied.
-  postPatch =
-    let
-      flatcc-src-dest = "subprojects/flatcc-${flatcc-src.rev}";
-    in
-    ''
-      cp -r --no-preserve=mode ${flatcc-src} ${flatcc-src-dest}
-      cp subprojects/packagefiles/flatcc/meson.build ${flatcc-src-dest}/
-    '';
-
   sourceRoot = "${finalAttrs.src.name}/python";
 
   build-system = [
@@ -79,11 +55,12 @@ buildPythonPackage (finalAttrs: {
     pytestCheckHook
   ];
 
-  meta = {
+  meta = nanoarrow-c.meta // {
     description = "Python bindings to the nanoarrow C library";
     homepage = "https://github.com/apache/arrow-nanoarrow/tree/main/python";
-    changelog = "https://github.com/apache/arrow-nanoarrow/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ GaetanLepage ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      doronbehar
+    ];
   };
 })
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea463c91d272..e76e16fe9b95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11132,7 +11132,10 @@ self: super: with self; {
 
   nampa = callPackage ../development/python-modules/nampa { };
 
-  nanoarrow = callPackage ../development/python-modules/nanoarrow { zstd-c = pkgs.zstd; };
+  nanoarrow = callPackage ../development/python-modules/nanoarrow {
+    zstd-c = pkgs.zstd;
+    nanoarrow-c = pkgs.nanoarrow;
+  };
 
   nanobind = callPackage ../development/python-modules/nanobind { };
 

From afb9cd82ef49e73216dfe1fb4eea335ca4c36a37 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 02:53:00 +0300
Subject: [PATCH 124/166] arrow-adbc: init at 23

https://github.com/apache/arrow-adbc
---
 pkgs/by-name/ar/arrow-adbc/package.nix | 107 +++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 pkgs/by-name/ar/arrow-adbc/package.nix

diff --git a/pkgs/by-name/ar/arrow-adbc/package.nix b/pkgs/by-name/ar/arrow-adbc/package.nix
new file mode 100644
index 000000000000..eb631d4b920c
--- /dev/null
+++ b/pkgs/by-name/ar/arrow-adbc/package.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+
+  # nativeBuildInputs
+  cmake,
+  pkg-config,
+
+  # buildInputs
+  nanoarrow,
+  fmt,
+  gtest,
+  libpq,
+  sqlite,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "arrow-adbc";
+  version = "23";
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "arrow-adbc";
+    tag = "apache-arrow-adbc-${finalAttrs.version}";
+    fetchSubmodules = true;
+    hash = "sha256-33JUx4ZI+BHIZMvlCO43mjU34zShJZGQpAkqRrvgl2w=";
+  };
+
+  vendorHash = "sha256-uGxCTllRNtXkrl31d88TOK36X09ylo++gtorx0uFR8A=";
+
+  # We are building the C project
+  preConfigure = ''
+    cd c/
+  '';
+  # Upstream's build invoces a custom `go build` command to build one of the
+  # targets. We use buildGoModule's engineering to supply it the offline
+  # `goModules` path and other GO[A-Z] environment variables. Ideally, there
+  # should be setup hooks for the mechanisms of buildGoModule, that would make
+  # it easier.
+  modRoot = "../../go/adbc";
+  inherit (finalAttrs.finalPackage.passthru.bigquery-go-package) goModules;
+  preBuild =
+    (lib.pipe finalAttrs.finalPackage.passthru.bigquery-go-package.configurePhase [
+      # Make that this configure phase doesn't run our configure hooks.
+      (lib.replaceString "runHook preConfigure" "")
+      (lib.replaceString "runHook postConfigure" "")
+    ])
+    # Return to original meson build directory.
+    + ''
+      cd ../../c/build
+    '';
+
+  nativeBuildInputs = [
+    # NOTE that the meson build system has a bug that it puts a few shared
+    # objects in $out and not in $out/lib.
+    cmake
+    pkg-config
+    finalAttrs.finalPackage.passthru.bigquery-go-package.passthru.go
+  ];
+
+  cmakeFlags = map (driver: lib.cmakeBool "ADBC_DRIVER_${driver}" true) [
+    "BIGQUERY"
+    "FLIGHTSQL"
+    "MANAGER"
+    "POSTGRESQL"
+    "SNOWFLAKE"
+    "SQLITE"
+  ];
+
+  buildInputs = [
+    fmt
+    gtest
+    libpq
+    nanoarrow
+    sqlite
+  ];
+
+  passthru = {
+    bigquery-go-package = buildGoModule (finalGoAttrs: {
+      inherit (finalAttrs)
+        pname
+        version
+        src
+        vendorHash
+        ;
+      sourceRoot = "${finalAttrs.src.name}/go/adbc";
+      # This derivation is not really evaluated anyway, but it is used to
+      # update the vendorHash... TODO: Check that nix-update is capable of
+      # updating vendorHash automatically.
+      dontBuild = true;
+      dontInstall = true;
+    });
+  };
+
+  meta = {
+    description = "Database connectivity API standard and libraries for Apache Arrow";
+    homepage = "https://arrow.apache.org/adbc/";
+    changelog = "https://github.com/apache/arrow-adbc/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.afl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    platforms = lib.platforms.all;
+  };
+})

From 8fb3a890e51ce8442616966bf676ca3489b75b02 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 04:29:12 +0300
Subject: [PATCH 125/166] python3Packages.adbc-driver-manager: init at 1.11.0

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

diff --git a/pkgs/development/python-modules/adbc-driver-manager/default.nix b/pkgs/development/python-modules/adbc-driver-manager/default.nix
new file mode 100644
index 000000000000..ede872592456
--- /dev/null
+++ b/pkgs/development/python-modules/adbc-driver-manager/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # dependencies
+  typing-extensions,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbc-driver-manager";
+  version = "1.11.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "adbc_driver_manager";
+    inherit (finalAttrs) version;
+    hash = "sha256-xkqqvrWBAQmrPSlhAI8bAU6fLYez30QWwqCApAI3r1A=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  dependencies = [
+    typing-extensions
+  ];
+
+  # Tests create a circular dependency on adbc-driver-sqlite
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "adbc_driver_manager"
+  ];
+
+  meta = {
+    description = "A generic entrypoint for ADBC drivers";
+    homepage = "https://pypi.org/project/adbc-driver-manager";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e76e16fe9b95..58c2f075df0a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -83,6 +83,8 @@ self: super: with self; {
 
   adb-shell = callPackage ../development/python-modules/adb-shell { };
 
+  adbc-driver-manager = callPackage ../development/python-modules/adbc-driver-manager { };
+
   adblock = callPackage ../development/python-modules/adblock { };
 
   adbutils = callPackage ../development/python-modules/adbutils { };

From 9ce13a30500010a3f3fd67737f76efaa718f5e5c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 04:51:31 +0300
Subject: [PATCH 126/166] python3Packages.adbc-driver-sqlite: init at 1.11.0

---
 .../adbc-driver-sqlite/default.nix            | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/development/python-modules/adbc-driver-sqlite/default.nix

diff --git a/pkgs/development/python-modules/adbc-driver-sqlite/default.nix b/pkgs/development/python-modules/adbc-driver-sqlite/default.nix
new file mode 100644
index 000000000000..00816f444912
--- /dev/null
+++ b/pkgs/development/python-modules/adbc-driver-sqlite/default.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  adbc-driver-manager,
+  importlib-resources,
+  arrow-adbc,
+
+  # tests
+  pytestCheckHook,
+  pandas,
+  pyarrow,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbc-driver-sqlite";
+  version = "1.11.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "adbc_driver_sqlite";
+    inherit (finalAttrs) version;
+    hash = "sha256-pMa0liYQ981nzXVMQt104YosEfq+7JSIxVAdc65i3GI=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    adbc-driver-manager
+    importlib-resources
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pandas
+    pyarrow
+  ];
+  env.ADBC_SQLITE_LIBRARY = "libadbc_driver_sqlite${stdenv.hostPlatform.extensions.sharedLibrary}";
+  preBuild = ''
+    cp ${lib.getLib arrow-adbc}/lib/$ADBC_SQLITE_LIBRARY .
+    chmod u+w $ADBC_SQLITE_LIBRARY
+  '';
+
+  pythonImportsCheck = [
+    "adbc_driver_sqlite"
+  ];
+
+  meta = {
+    description = "ADBC driver for working with SQLite";
+    homepage = "https://pypi.org/project/adbc-driver-sqlite";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58c2f075df0a..4a0e97ac53c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -85,6 +85,8 @@ self: super: with self; {
 
   adbc-driver-manager = callPackage ../development/python-modules/adbc-driver-manager { };
 
+  adbc-driver-sqlite = callPackage ../development/python-modules/adbc-driver-sqlite { };
+
   adblock = callPackage ../development/python-modules/adblock { };
 
   adbutils = callPackage ../development/python-modules/adbutils { };

From d9e6eca5540251691075aea08ec2dac178fca443 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 18:07:32 +0300
Subject: [PATCH 127/166] python3Packages.adbc-driver-snowflake: init at 1.11.0

---
 .../adbc-driver-snowflake/default.nix         | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/adbc-driver-snowflake/default.nix

diff --git a/pkgs/development/python-modules/adbc-driver-snowflake/default.nix b/pkgs/development/python-modules/adbc-driver-snowflake/default.nix
new file mode 100644
index 000000000000..4ab406a46ef8
--- /dev/null
+++ b/pkgs/development/python-modules/adbc-driver-snowflake/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  adbc-driver-manager,
+  importlib-resources,
+  arrow-adbc,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbc-driver-snowflake";
+  version = "1.11.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "adbc_driver_snowflake";
+    inherit (finalAttrs) version;
+    hash = "sha256-f85UrnVAxsY6rWzJ7CeVoFZHzBR8ivQcor1OlUVejq4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    adbc-driver-manager
+    importlib-resources
+  ];
+
+  # Tests don't work - they require an unknown pytest fixture `snowflake`
+  doCheck = false;
+
+  env.ADBC_SNOWFLAKE_LIBRARY = "libadbc_driver_snowflake${stdenv.hostPlatform.extensions.sharedLibrary}";
+  preBuild = ''
+    cp ${lib.getLib arrow-adbc}/lib/$ADBC_SNOWFLAKE_LIBRARY .
+    chmod u+w $ADBC_SNOWFLAKE_LIBRARY
+  '';
+
+  pythonImportsCheck = [
+    "adbc_driver_snowflake"
+  ];
+
+  meta = {
+    description = "ADBC driver for working with Snowflake";
+    homepage = "https://pypi.org/project/adbc-driver-snowflake";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a0e97ac53c8..750a23ad7243 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -85,6 +85,8 @@ self: super: with self; {
 
   adbc-driver-manager = callPackage ../development/python-modules/adbc-driver-manager { };
 
+  adbc-driver-snowflake = callPackage ../development/python-modules/adbc-driver-snowflake { };
+
   adbc-driver-sqlite = callPackage ../development/python-modules/adbc-driver-sqlite { };
 
   adblock = callPackage ../development/python-modules/adblock { };

From 79b2a3cd2d860f25fe18a9e9611dbd153d01ba66 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 18:12:18 +0300
Subject: [PATCH 128/166] python3Packages.adbc-driver-flightsql: init at 1.11.0

---
 .../adbc-driver-flightsql/default.nix         | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/adbc-driver-flightsql/default.nix

diff --git a/pkgs/development/python-modules/adbc-driver-flightsql/default.nix b/pkgs/development/python-modules/adbc-driver-flightsql/default.nix
new file mode 100644
index 000000000000..92bcbe9a991c
--- /dev/null
+++ b/pkgs/development/python-modules/adbc-driver-flightsql/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  adbc-driver-manager,
+  importlib-resources,
+  arrow-adbc,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbc-driver-flightsql";
+  version = "1.11.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "adbc_driver_flightsql";
+    inherit (finalAttrs) version;
+    hash = "sha256-dfcD7vGBLDky5fRkPF4htWkLI99+CeiLcn95UqpVnyo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    adbc-driver-manager
+    importlib-resources
+  ];
+
+  # Tests require several unknown pytest fixtures such as `dremio` & `test_dbapi`
+  doCheck = false;
+
+  env.ADBC_FLIGHTSQL_LIBRARY = "libadbc_driver_flightsql${stdenv.hostPlatform.extensions.sharedLibrary}";
+  preBuild = ''
+    cp ${lib.getLib arrow-adbc}/lib/$ADBC_FLIGHTSQL_LIBRARY .
+    chmod u+w $ADBC_FLIGHTSQL_LIBRARY
+  '';
+
+  pythonImportsCheck = [
+    "adbc_driver_flightsql"
+  ];
+
+  meta = {
+    description = "ADBC driver for working with Apache Arrow Flight SQL";
+    homepage = "https://pypi.org/project/adbc-driver-flightsql";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 750a23ad7243..a3bf0f6cb180 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -83,6 +83,8 @@ self: super: with self; {
 
   adb-shell = callPackage ../development/python-modules/adb-shell { };
 
+  adbc-driver-flightsql = callPackage ../development/python-modules/adbc-driver-flightsql { };
+
   adbc-driver-manager = callPackage ../development/python-modules/adbc-driver-manager { };
 
   adbc-driver-snowflake = callPackage ../development/python-modules/adbc-driver-snowflake { };

From 445b1dab912ac1288be7a862b38e84cc0e67d5ee Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 18:22:02 +0300
Subject: [PATCH 129/166] python3Packages.adbc-driver-bigquery: init at 1.11.0

---
 .../adbc-driver-bigquery/default.nix          | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/adbc-driver-bigquery/default.nix

diff --git a/pkgs/development/python-modules/adbc-driver-bigquery/default.nix b/pkgs/development/python-modules/adbc-driver-bigquery/default.nix
new file mode 100644
index 000000000000..158c42af594d
--- /dev/null
+++ b/pkgs/development/python-modules/adbc-driver-bigquery/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  adbc-driver-manager,
+  importlib-resources,
+  arrow-adbc,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbc-driver-bigquery";
+  version = "1.11.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "adbc_driver_bigquery";
+    inherit (finalAttrs) version;
+    hash = "sha256-N/wqkN/sH3Qbx0db31DHRMItBewTXQhYk0EXkSwGB34=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    adbc-driver-manager
+    importlib-resources
+  ];
+
+  # Tests don't work - they require an unknown pytest fixture `bigquery_auth_type`
+  doCheck = false;
+
+  env.ADBC_BIGQUERY_LIBRARY = "libadbc_driver_bigquery${stdenv.hostPlatform.extensions.sharedLibrary}";
+  preBuild = ''
+    cp ${lib.getLib arrow-adbc}/lib/$ADBC_BIGQUERY_LIBRARY .
+    chmod u+w $ADBC_BIGQUERY_LIBRARY
+  '';
+
+  pythonImportsCheck = [
+    "adbc_driver_bigquery"
+  ];
+
+  meta = {
+    description = "ADBC driver for working with BigQuery";
+    homepage = "https://pypi.org/project/adbc-driver-bigquery";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3bf0f6cb180..a57a524745b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -83,6 +83,8 @@ self: super: with self; {
 
   adb-shell = callPackage ../development/python-modules/adb-shell { };
 
+  adbc-driver-bigquery = callPackage ../development/python-modules/adbc-driver-bigquery { };
+
   adbc-driver-flightsql = callPackage ../development/python-modules/adbc-driver-flightsql { };
 
   adbc-driver-manager = callPackage ../development/python-modules/adbc-driver-manager { };

From 5bdd4b74fb1b8b4533ec194ca16d457652b26701 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 23 Jun 2026 18:26:07 +0300
Subject: [PATCH 130/166] python3Packages.adbc-driver-postgresql: init at
 1.11.0

---
 .../adbc-driver-postgresql/default.nix        | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/python-modules/adbc-driver-postgresql/default.nix

diff --git a/pkgs/development/python-modules/adbc-driver-postgresql/default.nix b/pkgs/development/python-modules/adbc-driver-postgresql/default.nix
new file mode 100644
index 000000000000..0087c0eb385f
--- /dev/null
+++ b/pkgs/development/python-modules/adbc-driver-postgresql/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  adbc-driver-manager,
+  importlib-resources,
+  arrow-adbc,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "adbc-driver-postgresql";
+  version = "1.11.0";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  src = fetchPypi {
+    pname = "adbc_driver_postgresql";
+    inherit (finalAttrs) version;
+    hash = "sha256-9WiLhkiseobYuJNAIxuzaGrF31buldHKC4ddrV1StIo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    adbc-driver-manager
+    importlib-resources
+  ];
+
+  # Tests require several unknown pytest fixture `postgres_uri`
+  doCheck = false;
+
+  env.ADBC_POSTGRESQL_LIBRARY = "libadbc_driver_postgresql${stdenv.hostPlatform.extensions.sharedLibrary}";
+  preBuild = ''
+    cp ${lib.getLib arrow-adbc}/lib/$ADBC_POSTGRESQL_LIBRARY .
+    chmod u+w $ADBC_POSTGRESQL_LIBRARY
+  '';
+
+  pythonImportsCheck = [
+    "adbc_driver_postgresql"
+  ];
+
+  meta = {
+    description = "libpq-based ADBC driver for working with PostgreSQL";
+    homepage = "https://pypi.org/project/adbc-driver-postgresql";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a57a524745b2..6535b9ee5f74 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -89,6 +89,8 @@ self: super: with self; {
 
   adbc-driver-manager = callPackage ../development/python-modules/adbc-driver-manager { };
 
+  adbc-driver-postgresql = callPackage ../development/python-modules/adbc-driver-postgresql { };
+
   adbc-driver-snowflake = callPackage ../development/python-modules/adbc-driver-snowflake { };
 
   adbc-driver-sqlite = callPackage ../development/python-modules/adbc-driver-sqlite { };

From e788bf2c748a1debb5eddabdc9fb376142f172f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jul 2026 13:04:44 +0200
Subject: [PATCH 131/166] python3Packages.pontos: migrate to finalAttrs

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

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 300c5a1a9405..0f500c2091ab 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -16,7 +16,7 @@
   tomlkit,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "pontos";
   version = "26.6.0";
   pyproject = true;
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "pontos";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-NKe5kM4YPxsGge1UG7DjE3SDXlfZIVazOVmF5RBCbSo=";
   };
 
@@ -75,8 +75,8 @@ buildPythonPackage rec {
   meta = {
     description = "Collection of Python utilities, tools, classes and functions";
     homepage = "https://github.com/greenbone/pontos";
-    changelog = "https://github.com/greenbone/pontos/releases/tag/${src.tag}";
+    changelog = "https://github.com/greenbone/pontos/releases/tag/${finalAttrs.src.tag}";
     license = with lib.licenses; [ gpl3Plus ];
     maintainers = with lib.maintainers; [ fab ];
   };
-}
+})

From f0a5c3958a04a29215bb2dbadd752150061e5a7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 11:06:33 +0000
Subject: [PATCH 132/166] dcp: 0.25.1 -> 0.25.2

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

diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix
index 616d7c9002de..6dffa4736f19 100644
--- a/pkgs/by-name/dc/dcp/package.nix
+++ b/pkgs/by-name/dc/dcp/package.nix
@@ -15,13 +15,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dcp";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "dcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mWTGwM1y5zGd610N6Mg3Q3o2Lqf4ANdCWTjNNG/3dBg=";
+    hash = "sha256-afQa5arDC9GD0jzzKBSc+zHrNmHpn91HdcWDeFzpbzQ=";
   };
 
   vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw=";

From 91cb1fb477c683caf71267199780cb6bd36b7262 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Jul 2026 13:10:45 +0200
Subject: [PATCH 133/166] python3Packages.ghapi: 1.0.14 -> 1.0.15

Diff: https://github.com/fastai/ghapi/compare/1.0.14...1.0.15

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

diff --git a/pkgs/development/python-modules/ghapi/default.nix b/pkgs/development/python-modules/ghapi/default.nix
index e0ff98a9d3a7..a75b0af20bc7 100644
--- a/pkgs/development/python-modules/ghapi/default.nix
+++ b/pkgs/development/python-modules/ghapi/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "ghapi";
-  version = "1.0.14";
+  version = "1.0.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "ghapi";
     tag = finalAttrs.version;
-    hash = "sha256-vVGVX8mWzEenaoDYGd4RjD/u2k/N9Ajm/pheKHPNEWM=";
+    hash = "sha256-H1DuoESnGtU3nsKzW3Zj0RdGNXj1bBGpt6W3mprpVeg=";
   };
 
   build-system = [ setuptools ];

From 5db209dd734bf82622cff40a42e933adceeec46c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 11:51:37 +0000
Subject: [PATCH 134/166] libretro.opera: 0-unstable-2026-06-19 ->
 0-unstable-2026-06-28

---
 pkgs/applications/emulators/libretro/cores/opera.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix
index 227d42278623..b1c2a0b39b02 100644
--- a/pkgs/applications/emulators/libretro/cores/opera.nix
+++ b/pkgs/applications/emulators/libretro/cores/opera.nix
@@ -6,13 +6,13 @@
 }:
 mkLibretroCore {
   core = "opera";
-  version = "0-unstable-2026-06-19";
+  version = "0-unstable-2026-06-28";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "opera-libretro";
-    rev = "eb3a9162e99a71da221107aa58e7650fd076bbca";
-    hash = "sha256-swFdGY8ScsQG/8E/JWzGRL80jdMVzsr1BJ+UAisSJ9g=";
+    rev = "340f9e9014c292fc47a8844a871a71dafe072b6d";
+    hash = "sha256-geBK8RIlaRcWn4CDzVl3pjK0WOFQcMZl7zFMXE2oZNo=";
   };
 
   makefile = "Makefile";

From 37aac0fb06e2ca890d463b35af6d45bad44a9f91 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 5 Jul 2026 14:25:34 +0100
Subject: [PATCH 135/166] ci/update-pinned.sh: import Nixpkgs relative to
 script

Paths within a --expr expression are relative to the script file,
while relative paths in NIX_PATH are relative to the caller's CWD.

We want the Nixpkgs import to be relative to update-pinned.sh itself,
so that it does not matter where it's executed from.

See https://github.com/NixOS/nixpkgs/issues/425551
---
 ci/update-pinned.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh
index 69ba7df9131d..51c99b0da98d 100755
--- a/ci/update-pinned.sh
+++ b/ci/update-pinned.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p npins -I nixpkgs=../
+#!nix-shell -i bash -E 'with import ../. {}; mkShell { packages = [ npins ]; }'
 
 set -euo pipefail
 

From aebe5f9e52afe698d21af224b8c63da71c0c6716 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 13:29:07 +0000
Subject: [PATCH 136/166] copilot-language-server: 1.513.0 -> 1.517.0

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

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index cadc8f9ad0cc..851e409fad4b 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.513.0";
+  version = "1.517.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-wVibxZjUW6BX4YhdYlyE0/zp0fst2H/XmmqZLqxGXH8=";
+    hash = "sha256-BzvUARAI8DOEYHPMavJdtSkr+ZCj/E+mM9wQtmEGyjY=";
     stripRoot = false;
   };
 

From 88419eba7e6314c03f95abd11f08af6a031f6792 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 13:32:33 +0000
Subject: [PATCH 137/166] osm2pgsql: 2.3.0 -> 2.3.1

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

diff --git a/pkgs/by-name/os/osm2pgsql/package.nix b/pkgs/by-name/os/osm2pgsql/package.nix
index 7f5f6ac5945b..ba1b472acb0e 100644
--- a/pkgs/by-name/os/osm2pgsql/package.nix
+++ b/pkgs/by-name/os/osm2pgsql/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "osm2pgsql";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "osm2pgsql-dev";
     repo = "osm2pgsql";
     rev = finalAttrs.version;
-    hash = "sha256-+l74TWD2CJr0vj2uNuCCf5EHHTVysKBqEeWHInF4Ols=";
+    hash = "sha256-tvcnXsbHjke/25PKfWMANHI9K3CModTW8uxI2JxCWi4=";
   };
 
   postPatch = ''

From 0ffdd818b55156d6916c8004e04e298db18204c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 25 Apr 2026 12:34:34 +0200
Subject: [PATCH 138/166] =?UTF-8?q?ci:=20nix=5F2=5F28=20=E2=86=92=20stable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally part of commit 07457776ad0ec171d6c728237b7cbe76685b6165
but dropped to avoid backporting #536372
---
 ci/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/default.nix b/ci/default.nix
index 6aa80f977901..06fa75bbc38f 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -70,7 +70,7 @@ rec {
   };
   parse = pkgs.lib.recurseIntoAttrs {
     nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; };
-    nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; };
+    stable = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.stable; };
     lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; };
     lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; };
   };

From a6eeac86f7099fbb4a3d41106e385c367009f4b5 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sun, 5 Jul 2026 14:36:01 +0100
Subject: [PATCH 139/166] ci: update pinned
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps nixpkgs-vet 0.3.2 → 0.3.4

https://github.com/NixOS/nixpkgs-vet/blob/main/CHANGELOG.md#034-2026-07-01
---
 ci/pinned.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index fc034a85bccf..0b3d817d1b06 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "8c91a71d13451abc40eb9dae8910f972f979852f",
-      "url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz",
-      "hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE="
+      "revision": "6edbf1a6a03e75886a6609c088801a0856449e88",
+      "url": "https://github.com/NixOS/nixpkgs/archive/6edbf1a6a03e75886a6609c088801a0856449e88.tar.gz",
+      "hash": "sha256-0lkauQbtrljJqwtzTCILPAiHAJyMvn6XDo264moDv30="
     }
   },
   "version": 8

From 4e5ec8423ee22dba82b01ca4fe4696a2059f9556 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 30 Jun 2026 11:41:41 +0200
Subject: [PATCH 140/166] ocamlPackages.alcobar: init at 0.3.1

---
 .../ocaml-modules/alcobar/default.nix         | 49 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/alcobar/default.nix

diff --git a/pkgs/development/ocaml-modules/alcobar/default.nix b/pkgs/development/ocaml-modules/alcobar/default.nix
new file mode 100644
index 000000000000..fa91d72dacd8
--- /dev/null
+++ b/pkgs/development/ocaml-modules/alcobar/default.nix
@@ -0,0 +1,49 @@
+{
+  afl-persistent,
+  alcotest,
+  buildDunePackage,
+  calendar,
+  cmdliner,
+  fetchurl,
+  fpath,
+  lib,
+  ocaml,
+  pprint,
+  uucp,
+  uunf,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "alcobar";
+  version = "0.3.1";
+  minimalOCamlVersion = "4.10";
+  __structuredAttrs = true;
+
+  src = fetchurl {
+    url = "https://github.com/samoht/alcobar/releases/download/v${finalAttrs.version}/alcobar-${finalAttrs.version}.tbz";
+    hash = "sha256-V2UnvLrtf+XXkp7uFlrIpxg6+fZqwhCS/J7C3Nw+eVU=";
+  };
+
+  propagatedBuildInputs = [
+    afl-persistent
+    alcotest
+    cmdliner
+  ];
+
+  checkInputs = [
+    calendar
+    fpath
+    pprint
+    uucp
+    uunf
+  ];
+  doCheck = lib.versionAtLeast ocaml.version "5.0";
+
+  meta = {
+    description = "Crowbar with an Alcotest-compatible API";
+    homepage = "https://github.com/samoht/alcobar";
+    changelog = "https://github.com/samoht/alcobar/blob/v${finalAttrs.version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vog ];
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 6858539d4229..754f86881773 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -24,6 +24,8 @@ let
 
         aeneas = callPackage ../development/ocaml-modules/aeneas { };
 
+        alcobar = callPackage ../development/ocaml-modules/alcobar { };
+
         alcotest = callPackage ../development/ocaml-modules/alcotest { };
 
         alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix { };

From a7f2fc98cf6b5be2bf283b29245e0a8ac61b920f Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 30 Jun 2026 11:42:25 +0200
Subject: [PATCH 141/166] ocamlPackages.cascade: init at 0-unstable-2026-06-26

---
 .../ocaml-modules/cascade/default.nix         | 52 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/cascade/default.nix

diff --git a/pkgs/development/ocaml-modules/cascade/default.nix b/pkgs/development/ocaml-modules/cascade/default.nix
new file mode 100644
index 000000000000..e59bc6fec7d0
--- /dev/null
+++ b/pkgs/development/ocaml-modules/cascade/default.nix
@@ -0,0 +1,52 @@
+{
+  alcobar,
+  buildDunePackage,
+  dune-build-info,
+  fetchFromGitHub,
+  lambdasoup,
+  lib,
+  logs,
+  mdx,
+  memtrace,
+  psq,
+  uutf,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "cascade";
+  version = "0-unstable-2026-06-26";
+  minimalOCamlVersion = "5.2";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "samoht";
+    repo = "cascade";
+    rev = "434c07be7ec1a63213a234946d57937e4d080feb";
+    hash = "sha256-6g8UKsXdR0PxihrOiMVC36q7+bomMByPDbmuISL7h4U=";
+  };
+
+  propagatedBuildInputs = [
+    dune-build-info
+    logs
+    psq
+    uutf
+  ];
+  buildInputs = [
+    lambdasoup
+    memtrace
+  ];
+
+  nativeCheckInputs = [ mdx.bin ];
+  checkInputs = [
+    (mdx.override { inherit logs; })
+    alcobar
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "CSS generation and manipulation library for OCaml";
+    homepage = "https://github.com/samoht/cascade";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vog ];
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 754f86881773..4f5e425673bf 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -245,6 +245,8 @@ let
           git-binary = pkgs.git;
         };
 
+        cascade = callPackage ../development/ocaml-modules/cascade { };
+
         cbor = callPackage ../development/ocaml-modules/cbor { };
 
         cfstream = callPackage ../development/ocaml-modules/cfstream { };

From 8ea5e3ec1c2a922575fddb19b45c9b0ccad15327 Mon Sep 17 00:00:00 2001
From: Volker Diels-Grabsch <v@njh.eu>
Date: Tue, 30 Jun 2026 11:43:09 +0200
Subject: [PATCH 142/166] ocamlPackages.tw: init at 0-unstable-2026-06-23

---
 pkgs/development/ocaml-modules/tw/default.nix | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/ocaml-packages.nix             |  2 +
 3 files changed, 59 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tw/default.nix

diff --git a/pkgs/development/ocaml-modules/tw/default.nix b/pkgs/development/ocaml-modules/tw/default.nix
new file mode 100644
index 000000000000..55f73dbe105c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tw/default.nix
@@ -0,0 +1,55 @@
+{
+  buildDunePackage,
+  cascade,
+  cmdliner,
+  fetchFromGitHub,
+  fmt,
+  lib,
+  ocaml,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "tw";
+  version = "0-unstable-2026-06-23";
+  minimalOCamlVersion = "5.2";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "samoht";
+    repo = "tw";
+    rev = "594d35df46ec2afcfe97632923331badf2940b93";
+    hash = "sha256-vCRq0FCBIxc/AQg+R2Hig7nqwJGxgy2jedLbAsKaIoA=";
+  };
+
+  propagatedBuildInputs = [ cascade ];
+  buildInputs = [
+    cmdliner
+    fmt
+  ];
+
+  # Disabling tests because they check for byte-for-byte identical
+  # output with tailwindcss, so they are tied to a specific
+  # tailwindcss version, and would prevent independent upgrades of tw
+  # and tailwindcss.
+  doCheck = false;
+
+  outputs = [
+    "bin"
+    "lib"
+    "out"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Type-safe Tailwind CSS v4 in OCaml";
+    homepage = "https://github.com/samoht/tw";
+    mainProgram = "tw";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vog ];
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b1e4c87fc3a..287d06540253 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1213,6 +1213,8 @@ with pkgs;
     )
   );
 
+  tw = ocamlPackages.tw.bin;
+
   wrapRetroArch = retroarch-bare.wrapper;
 
   # Aliases kept here because they are easier to use
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 4f5e425673bf..974759c5491b 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -2191,6 +2191,8 @@ let
 
         tuntap = callPackage ../development/ocaml-modules/tuntap { };
 
+        tw = callPackage ../development/ocaml-modules/tw { };
+
         twt = callPackage ../development/ocaml-modules/twt { };
 
         type_eq = callPackage ../development/ocaml-modules/type_eq { };

From 4deaf115f815143f40c74c842674187d633ffe2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 14:29:01 +0000
Subject: [PATCH 143/166] libretro.prboom: 0-unstable-2026-06-15 ->
 0-unstable-2026-07-01

---
 pkgs/applications/emulators/libretro/cores/prboom.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix
index 20ad06e03cc6..907e3f47386f 100644
--- a/pkgs/applications/emulators/libretro/cores/prboom.nix
+++ b/pkgs/applications/emulators/libretro/cores/prboom.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "prboom";
-  version = "0-unstable-2026-06-15";
+  version = "0-unstable-2026-07-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "libretro-prboom";
-    rev = "b760de6a1eb1bfcd7833c5b677ff9170d104302f";
-    hash = "sha256-JZrQbhntCGV4WIktUbtVXCSGAEmh9gTPn+tLiMyt6ZY=";
+    rev = "141978db577b52cb943641629401776e49ccbbe6";
+    hash = "sha256-USRBq+h2HAoDIdYVd47wGLEnUzJAEOvikuvSNTHpboI=";
   };
 
   makefile = "Makefile";

From 3f2694f060a30319cbbaf241b11d537bc4bad687 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 5 Jul 2026 14:33:33 +0000
Subject: [PATCH 144/166] vimPlugins.meson: remove meta.mainProgram and change
 meta.description

---
 .../editors/vim/plugins/non-generated/meson/default.nix       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
index cc81c6815cb9..c442bb136623 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix
@@ -8,11 +8,9 @@ vimUtils.buildVimPlugin {
   preInstall = "cd data/syntax-highlighting/vim";
 
   meta = {
+    description = "Vim plugin for meson providing syntax highlighting";
     inherit (meson.meta)
       homepage
-      description
-      mainProgram
-      longDescription
       license
       platforms
       ;

From ffba9cbb2b835c44cb474a1d5a6a8ff2986dcc9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 5 Jul 2026 16:38:51 +0200
Subject: [PATCH 145/166]  python3Packages.python-mpv-jsonipc: 1.2.1 -> 1.2.2

 Diff: https://github.com/iwalton3/python-mpv-jsonipc/compare/v1.2.1...v1.2.2
---
 .../python-mpv-jsonipc/default.nix            | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
index 4ddb70266c80..63b4be98a1d0 100644
--- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
+++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix
@@ -2,38 +2,32 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  requests,
-  tqdm,
-  websocket-client,
+  setuptools,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage (finalAttrs: {
   pname = "python-mpv-jsonipc";
-  version = "1.2.1";
-  format = "setuptools";
+  version = "1.2.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iwalton3";
     repo = "python-mpv-jsonipc";
-    rev = "v${version}";
-    hash = "sha256-ugdLUmo5w+IbtmL2b6+la1X01mWNmnXr9j6e99oPWpE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9QfGsJW08YqATP4+G3bADkjxHoauSF7BmcsIi56fBKI=";
   };
 
+  build-system = [ setuptools ];
+
   # 'mpv-jsonipc' does not have any tests
   doCheck = false;
 
-  propagatedBuildInputs = [
-    requests
-    tqdm
-    websocket-client
-  ];
-
   pythonImportsCheck = [ "python_mpv_jsonipc" ];
 
   meta = {
     homepage = "https://github.com/iwalton3/python-mpv-jsonipc";
     description = "Python API to MPV using JSON IPC";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.asl20;
     maintainers = [ ];
   };
-}
+})

From 4f13bde50c0b3b4d5e010593684f400830ebe795 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 14:49:32 +0000
Subject: [PATCH 146/166] dprint: 0.54.0 -> 0.55.1

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

diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix
index d8aca72dd913..00d6545bc097 100644
--- a/pkgs/by-name/dp/dprint/package.nix
+++ b/pkgs/by-name/dp/dprint/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dprint";
-  version = "0.54.0";
+  version = "0.55.1";
 
   # Prefer repository rather than crate here
   #   - They have Cargo.lock in the repository
@@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "dprint";
     repo = "dprint";
     tag = finalAttrs.version;
-    hash = "sha256-dNs2LQeEndeXS8xR9SXVFWT9PS+haB9SDZ+3PUPkFjg=";
+    hash = "sha256-OXXLpKgP2cUuPl7ikgZVPFgJiLY0Zy8MmBkz8Kp2+XM=";
   };
 
-  cargoHash = "sha256-fmbO14eTObK1cZu9gDls25KRmzAJPGiqQ8uURGD2vV0=";
+  cargoHash = "sha256-IDxJPicTq0/7LI/07QfJrteaKAHDoeKdzpbEv871xxE=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 658578f71040eb6267f91140f3cc2a92d73a989f Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Sun, 5 Jul 2026 16:53:38 +0200
Subject: [PATCH 147/166] gram: fix darwin build

Hydra reports libclang to be missing, which is fixed by adding the
bindgen hook.

https://hydra.nixos.org/build/334182361
---
 pkgs/by-name/gr/gram/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix
index 5ff5ef2d9d67..894b90cddfc5 100644
--- a/pkgs/by-name/gr/gram/package.nix
+++ b/pkgs/by-name/gr/gram/package.nix
@@ -65,6 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cargo-bundle
+    rustPlatform.bindgenHook
   ];
 
   dontUseCmakeConfigure = true;

From 1260e09ca5af86099c31cb61670884100a8c5265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 30 Jun 2026 23:12:55 +0200
Subject: [PATCH 148/166] jellyfin-mpv-shim: 2.9.0 -> 2.10.0, minor cleanup

Changelog: https://github.com/jellyfin/jellyfin-mpv-shim/releases/tag/v2.10.0
Diff: https://github.com/jellyfin/jellyfin-mpv-shim/compare/v2.9.0...v2.10.0
---
 pkgs/by-name/je/jellyfin-mpv-shim/package.nix | 35 +++++++++----------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/je/jellyfin-mpv-shim/package.nix b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix
index 0f1334afafdb..09bc30ca7aa4 100644
--- a/pkgs/by-name/je/jellyfin-mpv-shim/package.nix
+++ b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix
@@ -10,12 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "jellyfin-mpv-shim";
-  version = "2.9.0";
+  version = "2.10.0";
   pyproject = true;
 
+  # contains shaderpacks
   src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-YrwMvP66LAWKgx/yWBkWIkZtJ4a0YnhCiL7xB6fGm0E=";
+    pname = "jellyfin_mpv_shim";
+    inherit version;
+    hash = "sha256-ZWmJQJAGAonStZyWww4P+034f2vGnTwLua7KUOqoBBE=";
   };
 
   nativeBuildInputs = [
@@ -29,29 +31,23 @@ python3Packages.buildPythonApplication rec {
   dependencies = with python3Packages; [
     jellyfin-apiclient-python
     mpv
-    pillow
     python-mpv-jsonipc
+    requests
 
-    # gui dependencies
+    # gui + mirror dependencies
+    pillow
     pystray
     tkinter
 
-    # display_mirror dependencies
-    jinja2
-    pywebview
-
     # discord rich presence dependency
     pypresence
   ];
 
-  # override $HOME directory:
-  #   error: [Errno 13] Permission denied: '/homeless-shelter'
-  #
-  # remove jellyfin_mpv_shim/win_utils.py:
-  #   ModuleNotFoundError: No module named 'win32gui'
   preCheck = ''
     export HOME=$TMPDIR
 
+    # remove jellyfin_mpv_shim/win_utils.py:
+    #   ModuleNotFoundError: No module named 'win32gui'
     rm jellyfin_mpv_shim/win_utils.py
   '';
 
@@ -60,7 +56,7 @@ python3Packages.buildPythonApplication rec {
       --replace-fail "check_updates: bool = True" "check_updates: bool = False" \
       --replace-fail "notify_updates: bool = True" "notify_updates: bool = False"
     # python-mpv renamed to mpv with 1.0.4
-    substituteInPlace setup.py \
+    substituteInPlace pyproject.toml \
       --replace-fail "python-mpv" "mpv" \
       --replace-fail "mpv-jsonipc" "python_mpv_jsonipc"
   '';
@@ -70,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     for s in 16 32 48 64 128 256; do
       mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps
       ln -s $out/${python3Packages.python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \
-        $out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png
+        $out/share/icons/hicolor/''${s}x''${s}/apps/jellyfin-mpv-shim.png
     done
   '';
 
@@ -84,9 +80,9 @@ python3Packages.buildPythonApplication rec {
 
   desktopItems = [
     (makeDesktopItem {
-      name = pname;
-      exec = pname;
-      icon = pname;
+      name = "jellyfin-mpv-shim";
+      exec = "jellyfin-mpv-shim";
+      icon = "jellyfin-mpv-shim";
       desktopName = "Jellyfin MPV Shim";
       categories = [
         "Video"
@@ -123,5 +119,6 @@ python3Packages.buildPythonApplication rec {
     ];
     maintainers = with lib.maintainers; [ jojosch ];
     mainProgram = "jellyfin-mpv-shim";
+    platforms = lib.platforms.linux;
   };
 }

From fab9a7e4cbebc8c0426d1b617fd23b96eca94a20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Jul 2026 15:12:42 +0000
Subject: [PATCH 149/166] avdl: 0.1.9+1.12.1 -> 0.1.10+1.12.1

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

diff --git a/pkgs/by-name/av/avdl/package.nix b/pkgs/by-name/av/avdl/package.nix
index 73fc9d463746..a9ef6507d626 100644
--- a/pkgs/by-name/av/avdl/package.nix
+++ b/pkgs/by-name/av/avdl/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "avdl";
-  version = "0.1.9+1.12.1";
+  version = "0.1.10+1.12.1";
 
   src = fetchFromGitHub {
     owner = "jonhoo";
     repo = "avdl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-HfcDSv3RzmoFbwt7iAP/UXdeJupfng8oeaeerUwW1Ik=";
+    hash = "sha256-DGRBLXE8YMZs1fBBuTtUuhsc490IJB3G9Khddk3l8gw=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-5ftBXywOUQKzIwjaQVHtxO/6A1bb1jGZAxYYY7GttCg=";
+  cargoHash = "sha256-wTiQ1Ssn6Q1ZjR52a4+qyDrQqVUcP+/4paOjKKPJuII=";
 
   meta = {
     description = "Rust port of avro-tools' IDL tooling";

From 1d4564e4347f5ce3bab771176b558f592ef88108 Mon Sep 17 00:00:00 2001
From: aaravrav <37036762+aaravrav@users.noreply.github.com>
Date: Sun, 5 Jul 2026 20:16:17 +0530
Subject: [PATCH 150/166] maintainers: fix wrong githubId and github for
 aaravrav

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b173625d8611..6632e685f469 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -411,8 +411,8 @@
   };
   aaravrav = {
     name = "aaravrav";
-    github = "Aarav";
-    githubId = 3279912;
+    github = "aaravrav";
+    githubId = 37036762;
   };
   aarnphm = {
     email = "contact@aarnphm.xyz";

From dfec9c87b58fe53e820f7ae518c90cc41270188f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 5 Jul 2026 11:23:01 -0400
Subject: [PATCH 151/166] google-chrome: 149.0.7827.201 -> 150.0.7871.47
 (Darwin only)

Linux was done in 8b266eba3a0771c00461183d9b4ca4a59bdd9be2.

Release note: https://chromereleases.googleblog.com/2026/06/stable-channel-update-for-desktop_0175352312.html
---
 pkgs/by-name/go/google-chrome/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index e639b0005187..f0f9d5ba9f5b 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -289,11 +289,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "149.0.7827.201";
+    version = "150.0.7871.47";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/ph3mj7mqtvbfhr67ckmjvjj5a4_149.0.7827.201/GoogleChrome-149.0.7827.201.dmg";
-      hash = "sha256-AI5oBE0uB2/YacF9LB4d6rXlAqEuZtlPYNQwLbs1K7E=";
+      url = "http://dl.google.com/release2/chrome/ad2pojsfcj6hr5telal5kk4t6gua_150.0.7871.47/GoogleChrome-150.0.7871.47.dmg";
+      hash = "sha256-1VTMVSBLfSRp9CxPaRkmdgAC0H5KNuZNWywTGLSphUI=";
     };
 
     dontPatch = true;

From 57913879330fdfe28db8c5a0cb11e19ed0c96a5a Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Tue, 5 May 2026 20:33:14 -0400
Subject: [PATCH 152/166] python3Packages.bleak: reorder formals

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

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index b3be05444068..2c2c342bff31 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -3,16 +3,20 @@
   stdenv,
   bluez,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  uv-build,
+
+  # dependencies
   bumble,
   dbus-fast,
-  fetchFromGitHub,
   pyobjc-core,
   pyobjc-framework-CoreBluetooth,
   pyobjc-framework-libdispatch,
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  uv-build,
 }:
 
 buildPythonPackage (finalAttrs: {

From 705374990b5f9f335c72039caaaf31a6aa257538 Mon Sep 17 00:00:00 2001
From: Ryan Hendrickson <ryan.hendrickson@alum.mit.edu>
Date: Tue, 5 May 2026 20:33:14 -0400
Subject: [PATCH 153/166] python3Packages.bleak: add rhendric to maintainers

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

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 2c2c342bff31..b47a1f70f0c2 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -72,6 +72,6 @@ buildPythonPackage (finalAttrs: {
     changelog = "https://github.com/hbldh/bleak/blob/${finalAttrs.src.tag}/CHANGELOG.rst";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ rhendric ];
   };
 })

From 6511b075695f432e5554621d729b8214b006f0ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Apr 2026 16:44:26 +0000
Subject: [PATCH 154/166] python3Packages.texsoup: 0.3.1 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/texsoup/default.nix b/pkgs/development/python-modules/texsoup/default.nix
index 361904d641ff..a3b1149c6602 100644
--- a/pkgs/development/python-modules/texsoup/default.nix
+++ b/pkgs/development/python-modules/texsoup/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "texsoup";
-  version = "0.3.1";
+  version = "0.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alvinwan";
     repo = "TexSoup";
     tag = finalAttrs.version;
-    hash = "sha256-XKYJycYivtrszU46B3Bd4JLrvckBpQu9gKDMdr6MyZU=";
+    hash = "sha256-CKUDDq+97kktQnsdwOkwLILdsE7CkQMxId30fbWX90c=";
   };
 
   nativeBuildInputs = [ setuptools ];

From bc13a5880debd2da5bbf9d312c9fb525e963f7da Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 4 Jul 2026 16:34:15 -0400
Subject: [PATCH 155/166] python3Packages.beets-ytimport: init at 1.13.0

---
 .../python-modules/beets-ytimport/default.nix | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/beets-ytimport/default.nix

diff --git a/pkgs/development/python-modules/beets-ytimport/default.nix b/pkgs/development/python-modules/beets-ytimport/default.nix
new file mode 100644
index 000000000000..9b1de1ea6de0
--- /dev/null
+++ b/pkgs/development/python-modules/beets-ytimport/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+  setuptools,
+  ytmusicapi,
+  yt-dlp,
+  beets-minimal,
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
+  nix-update-script,
+}:
+buildPythonPackage rec {
+  pname = "beets-ytimport";
+  version = "1.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "mgoltzsche";
+    repo = "beets-ytimport";
+    tag = "v${version}";
+    hash = "sha256-EwSL1rBEPTcMfrlTkQcqRuhR8OtibBZqA0qQz4+qLEw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    ytmusicapi
+    yt-dlp
+  ];
+
+  nativeBuildInputs = [
+    beets-minimal
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/mgoltzsche/beets-ytimport/releases/tag/v${version}";
+    description = "Beets plugin to import music from Youtube and SoundCloud";
+    homepage = "https://github.com/mgoltzsche/beets-ytimport";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    license = [ lib.licenses.asl20 ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07ba15628bb2..30fb2156435d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2066,6 +2066,8 @@ self: super: with self; {
     disableAllPlugins = true;
   };
 
+  beets-ytimport = callPackage ../development/python-modules/beets-ytimport { };
+
   beewi-smartclim = callPackage ../development/python-modules/beewi-smartclim { };
 
   before-after = callPackage ../development/python-modules/before-after { };

From a95a7de300f15ec875124f80512f47b39612b608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 20 Nov 2025 09:17:34 +0000
Subject: [PATCH 156/166] flintlock: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/by-name/fl/flintlock/package.nix b/pkgs/by-name/fl/flintlock/package.nix
index a7ec82cf2afb..f8be779f5ec8 100644
--- a/pkgs/by-name/fl/flintlock/package.nix
+++ b/pkgs/by-name/fl/flintlock/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "flintlock";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "liquidmetal-dev";
     repo = "flintlock";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk=";
+    sha256 = "sha256-WQbZUbTrg50vYvFY5ng8LtT4d6aVsUzZUIy8tMUr50M=";
   };
 
-  vendorHash = "sha256-Iv1qHEQLgw6huCA/6PKNmm+dS2yHgOvY/oy2fKjwEpY=";
+  vendorHash = "sha256-SjKxnLsC6RAg7is+ABRG1NyKX01cRNwCcW5B3Fgo/FQ=";
 
   subPackages = [
     "cmd/flintlock-metrics"

From 85622c9ca4efd82c8ef2cd9d8ce2c5163deae054 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 17 Dec 2025 12:11:59 +0000
Subject: [PATCH 157/166] python3Packages.python-apt: 2.9.9 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/python-apt/default.nix b/pkgs/development/python-modules/python-apt/default.nix
index 316a3f8eb9e3..9df487e14ac0 100644
--- a/pkgs/development/python-modules/python-apt/default.nix
+++ b/pkgs/development/python-modules/python-apt/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "apt";
-  version = "2.9.9";
+  version = "3.1.0";
 
   pyproject = true;
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "apt-team";
     repo = "python-apt";
     tag = version;
-    hash = "sha256-3mRMqbhKy5CYwpSttq8MgXY147Ov3lPuZaTjUMtmHik=";
+    hash = "sha256-ISvPBBvo6PGYsGS/tKsBEOAEviuFRj5rgydJ5BQ1f+4=";
   };
 
   buildInputs = [ apt.dev ];

From ca87cf7b5f751d1e3be6a964b365345d989bdb36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 21 Nov 2025 07:00:38 +0000
Subject: [PATCH 158/166] fatsort: 1.6.5.640 -> 1.7.679

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

diff --git a/pkgs/by-name/fa/fatsort/package.nix b/pkgs/by-name/fa/fatsort/package.nix
index 25f877dcba63..1af3b96ab23b 100644
--- a/pkgs/by-name/fa/fatsort/package.nix
+++ b/pkgs/by-name/fa/fatsort/package.nix
@@ -7,12 +7,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.6.5.640";
+  version = "1.7.679";
   pname = "fatsort";
 
   src = fetchurl {
     url = "mirror://sourceforge/fatsort/fatsort-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-Yw7OVtnrOlVSSvCuw6reeFQ2DrqUkXKmz7R2jLj75C4=";
+    sha256 = "sha256-EBL1UTgmOdaeGU6r++mTQu3nyFaxzWeIKH+d/UvY0SI=";
   };
 
   buildInputs = [

From 9c66314ac7940c56a55c72d07fc506d89249fc70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Dec 2025 02:58:44 +0000
Subject: [PATCH 159/166] terraform-local: 0.24.1 -> 0.25.0

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

diff --git a/pkgs/by-name/te/terraform-local/package.nix b/pkgs/by-name/te/terraform-local/package.nix
index 40309d681ce0..6c5c7f88e43b 100644
--- a/pkgs/by-name/te/terraform-local/package.nix
+++ b/pkgs/by-name/te/terraform-local/package.nix
@@ -5,12 +5,12 @@
 }:
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "terraform_local";
-  version = "0.24.1";
+  version = "0.25.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit (finalAttrs) pname version;
-    hash = "sha256-LPrrKDoXUwg/P1m+Gi4I0iUoaRNjNpTWlbBLupkTrpE=";
+    hash = "sha256-hzDPyS3Nv8sQKTQgyvsiVm1Woq9YE56Kl2gosQ4Hx+I=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 052ed6d3ef021bb54cc82f97bde4d534be92aa14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Jan 2026 19:12:01 +0000
Subject: [PATCH 160/166] trackma-qt: 0.9 -> 0.10.3

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

diff --git a/pkgs/by-name/tr/trackma/package.nix b/pkgs/by-name/tr/trackma/package.nix
index 87417d91dd16..63f1a6211f8a 100644
--- a/pkgs/by-name/tr/trackma/package.nix
+++ b/pkgs/by-name/tr/trackma/package.nix
@@ -33,14 +33,14 @@ let
 in
 python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "trackma";
-  version = "0.9";
+  version = "0.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "z411";
     repo = "trackma";
     tag = "v${finalAttrs.version}";
-    sha256 = "Hov9qdVabu1k3SIoUmvcRtSK8TcETqGPXI2RqN/bei4=";
+    sha256 = "HiHeq8mLNT54BWXXwOfeY+c+wGHWnlN5rA2WgXdrRY8=";
     fetchSubmodules = true; # for anime-relations submodule
   };
 

From ef2619c39439e10896f80305514858f67d61fab4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 6 Jan 2026 00:26:41 +0000
Subject: [PATCH 161/166] python3Packages.omniorb: 4.3.3 -> 4.3.4

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

diff --git a/pkgs/by-name/om/omniorb/package.nix b/pkgs/by-name/om/omniorb/package.nix
index 4c82dd4c8241..966cf0dedbc9 100644
--- a/pkgs/by-name/om/omniorb/package.nix
+++ b/pkgs/by-name/om/omniorb/package.nix
@@ -9,11 +9,11 @@
 stdenv.mkDerivation (finalAttrs: {
 
   pname = "omniorb";
-  version = "4.3.3";
+  version = "4.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${finalAttrs.version}/omniORB-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-rM0l4stwxOM+0iew2T6WaeOMRgGWN4h8dxOYhw7UXno=";
+    hash = "sha256-eXINQV0jzY2pkoek702gqhvTTT5MexUwcVYArcXtPcM=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 7ecd8eb1a6fc003cceccb8e68517bc999af67590 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Dec 2025 00:47:39 +0000
Subject: [PATCH 162/166] fsverity-utils: 1.6 -> 1.7

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

diff --git a/pkgs/by-name/fs/fsverity-utils/package.nix b/pkgs/by-name/fs/fsverity-utils/package.nix
index 72eac55086af..b52e19121c67 100644
--- a/pkgs/by-name/fs/fsverity-utils/package.nix
+++ b/pkgs/by-name/fs/fsverity-utils/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fsverity-utils";
-  version = "1.6";
+  version = "1.7";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/snapshot/fsverity-utils-v${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-FZN4MKNmymIXZ2Q0woA0SLzPf4SaUJkj4ssKPsY4xXc=";
+    sha256 = "sha256-c8dillkgGh41elo/a5EqGQIrS4TZeDLsYkmyNke6koc=";
   };
 
   patches = lib.optionals (!enableShared) [

From 98737c282de022af10d939ea1a8938069a8d6a23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 21 Dec 2025 12:40:23 +0000
Subject: [PATCH 163/166] evilwm: 1.4.3 -> 1.5

---
 pkgs/applications/window-managers/evilwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix
index 832f7306bb6e..11bbebb5dcd6 100644
--- a/pkgs/applications/window-managers/evilwm/default.nix
+++ b/pkgs/applications/window-managers/evilwm/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evilwm";
-  version = "1.4.3";
+  version = "1.5";
 
   src = fetchurl {
     url = "https://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz";
-    sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ=";
+    sha256 = "sha256-YQSFJBPm1QZpNh3K3aWiXTnisrDJWmOEAiyQWVeidA8=";
   };
 
   buildInputs = [

From db95ac286ce60ff8c26aaab92c834c9653d30013 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Jan 2026 01:28:25 +0000
Subject: [PATCH 164/166] firezone-headless-client: 1.5.5 -> 1.5.6

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

diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix
index 877f40279af8..7d80fc1e0f50 100644
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "firezone-headless-client";
-  version = "1.5.5";
+  version = "1.5.6";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "headless-client-${finalAttrs.version}";
-    hash = "sha256-Lo5iUXlpAecglr0uohOdsefeaDQZor2YoF0O99CxvEo=";
+    hash = "sha256-yEceZJBqSF35herNjbqFHKaIoFJwbkDN28wlxFa1UbU=";
   };
 
-  cargoHash = "sha256-1e2uqxZFDbtcQREB0s2jxfSFgs/hnPxTlUGFeK5L9yw=";
+  cargoHash = "sha256-3V2eMxUtNcnWsh7cYA5Wf979sKmFl7bjwwrqwcfW4tI=";
   sourceRoot = "${finalAttrs.src.name}/rust";
   buildAndTestSubdir = "headless-client";
   env.RUSTFLAGS = "--cfg system_certs";

From b25dcd3eb1d0106fc2d2082898fb3f86402335c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jan 2026 12:29:31 +0000
Subject: [PATCH 165/166] wimlib: 1.14.4 -> 1.14.5

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

diff --git a/pkgs/by-name/wi/wimlib/package.nix b/pkgs/by-name/wi/wimlib/package.nix
index 489a4984dfa7..8278133d5de1 100644
--- a/pkgs/by-name/wi/wimlib/package.nix
+++ b/pkgs/by-name/wi/wimlib/package.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.14.4";
+  version = "1.14.5";
   pname = "wimlib";
 
   nativeBuildInputs = [
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://wimlib.net/downloads/wimlib-${finalAttrs.version}.tar.gz";
-    hash = "sha256-NjPbK2yLJV64bTvz3zBZeWvR8I5QuMlyjH62ZmLlEwA=";
+    hash = "sha256-hCIaOr1bkSKPFfjmBlwzWjNiN7VzgZe3W/QZ7qVhoZQ=";
   };
 
   enableParallelBuilding = true;

From 6d59678cd9373c7462ce775d8e544d165e20ea53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 Jan 2026 10:09:26 +0000
Subject: [PATCH 166/166] stig: 0.14.1a0 -> 0.14.2a0

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

diff --git a/pkgs/by-name/st/stig/package.nix b/pkgs/by-name/st/stig/package.nix
index 281347638a79..1feb9ec5165d 100644
--- a/pkgs/by-name/st/stig/package.nix
+++ b/pkgs/by-name/st/stig/package.nix
@@ -10,14 +10,14 @@ python3Packages.buildPythonApplication (finalAttrs: {
   pname = "stig";
   # This project has a different concept for pre release / alpha,
   # Read the project's README for details: https://github.com/rndusr/stig#stig
-  version = "0.14.1a0";
+  version = "0.14.2a0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rndusr";
     repo = "stig";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-DwZG/HB2oyLtCL2uY8X2LnXU86OYCTh6BdY3rVheJgU=";
+    hash = "sha256-g37be8EiuQGnGC6uKNadtG9Z78f+NutHHpAwzGcsmD8=";
   };
 
   build-system = with python3Packages; [