From 8eae4972240f69c834bf56d5a5c9b39adb1c02c4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 5 Jun 2025 15:10:09 +0200
Subject: [PATCH 01/83] python3Packages.triton: 3.1.0 -> 3.3.1

Diff: https://github.com/triton-lang/triton/compare/cf34004b8a67d290a962da166f5aa2fc66751326...cf34004b8a67d290a962da166f5aa2fc66751326
---
 .../0001-_build-allow-extra-cc-flags.patch    | 28 +++---------
 ...driver-short-circuit-before-ldconfig.patch | 43 ++++++------------
 .../python-modules/triton/default.nix         | 45 ++++++++-----------
 3 files changed, 39 insertions(+), 77 deletions(-)

diff --git a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch
index 1e473dc59f46..b814e6ff2235 100644
--- a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch
+++ b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch
@@ -1,20 +1,11 @@
-From 2751c5de5c61c90b56e3e392a41847f4c47258fd Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else+aalto@someonex.net>
-Date: Sun, 13 Oct 2024 14:16:48 +0000
-Subject: [PATCH 1/3] _build: allow extra cc flags
-
----
- python/triton/runtime/build.py | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
 diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py
-index d7baeb286..d334dce77 100644
+index 1b76548d4..1edbfd3da 100644
 --- a/python/triton/runtime/build.py
 +++ b/python/triton/runtime/build.py
-@@ -42,9 +42,17 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
-     py_include_dir = sysconfig.get_paths(scheme=scheme)["include"]
-     include_dirs = include_dirs + [srcdir, py_include_dir]
-     cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-o", so]
+@@ -30,6 +30,14 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
+     include_dirs = include_dirs + [srcdir, py_include_dir, *custom_backend_dirs]
+     # for -Wno-psabi, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111047
+     cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-Wno-psabi", "-o", so]
 +
 +    # Nixpkgs support branch
 +    # Allows passing e.g. extra -Wl,-rpath
@@ -25,11 +16,4 @@ index d7baeb286..d334dce77 100644
 +
      cc_cmd += [f'-l{lib}' for lib in libraries]
      cc_cmd += [f"-L{dir}" for dir in library_dirs]
--    cc_cmd += [f"-I{dir}" for dir in include_dirs]
-+    cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
-     ret = subprocess.check_call(cc_cmd)
-     if ret == 0:
-         return so
--- 
-2.46.0
-
+     cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
diff --git a/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch b/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch
index aa65cad58ed8..a3f22631c162 100644
--- a/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch
+++ b/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch
@@ -1,45 +1,33 @@
-From 7407cb03eec82768e333909d87b7668b633bfe86 Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else+aalto@someonex.net>
-Date: Sun, 13 Oct 2024 14:28:48 +0000
-Subject: [PATCH 2/3] {nvidia,amd}/driver: short-circuit before ldconfig
-
----
- python/triton/runtime/build.py       | 6 +++---
- third_party/amd/backend/driver.py    | 7 +++++++
- third_party/nvidia/backend/driver.py | 3 +++
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
 diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py
-index d334dce77..a64e98da0 100644
+index 1edbfd3da..2756dccdb 100644
 --- a/python/triton/runtime/build.py
 +++ b/python/triton/runtime/build.py
-@@ -42,6 +42,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
-     py_include_dir = sysconfig.get_paths(scheme=scheme)["include"]
-     include_dirs = include_dirs + [srcdir, py_include_dir]
-     cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-o", so]
+@@ -30,6 +30,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
+     include_dirs = include_dirs + [srcdir, py_include_dir, *custom_backend_dirs]
+     # for -Wno-psabi, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111047
+     cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-Wno-psabi", "-o", so]
 +    cc_cmd += [f'-l{lib}' for lib in libraries]
 +    cc_cmd += [f"-L{dir}" for dir in library_dirs]
 +    cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
  
      # Nixpkgs support branch
      # Allows passing e.g. extra -Wl,-rpath
-@@ -50,9 +53,6 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
+@@ -38,8 +41,5 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
          import shlex
          cc_cmd.extend(shlex.split(cc_cmd_extra_flags))
  
 -    cc_cmd += [f'-l{lib}' for lib in libraries]
 -    cc_cmd += [f"-L{dir}" for dir in library_dirs]
 -    cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
-     ret = subprocess.check_call(cc_cmd)
-     if ret == 0:
-         return so
+     subprocess.check_call(cc_cmd, stdout=subprocess.DEVNULL)
+     return so
 diff --git a/third_party/amd/backend/driver.py b/third_party/amd/backend/driver.py
-index 0a8cd7bed..aab8805f6 100644
+index b99ff86c8..ea8bc103d 100644
 --- a/third_party/amd/backend/driver.py
 +++ b/third_party/amd/backend/driver.py
-@@ -24,6 +24,13 @@ def _get_path_to_hip_runtime_dylib():
-             return env_libhip_path
-         raise RuntimeError(f"TRITON_LIBHIP_PATH '{env_libhip_path}' does not point to a valid {lib_name}")
+@@ -79,6 +79,13 @@ def _get_path_to_hip_runtime_dylib():
+             return mmapped_path
+         raise RuntimeError(f"memory mapped '{mmapped_path}' in process does not point to a valid {lib_name}")
  
 +    # ...on release/3.1.x:
 +    #         return mmapped_path
@@ -52,10 +40,10 @@ index 0a8cd7bed..aab8805f6 100644
  
      import site
 diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py
-index 90f71138b..30fbadb2a 100644
+index 5f2621ae5..e7762a3ec 100644
 --- a/third_party/nvidia/backend/driver.py
 +++ b/third_party/nvidia/backend/driver.py
-@@ -21,6 +21,9 @@ def libcuda_dirs():
+@@ -23,6 +23,9 @@ def libcuda_dirs():
      if env_libcuda_path:
          return [env_libcuda_path]
  
@@ -65,6 +53,3 @@ index 90f71138b..30fbadb2a 100644
      libs = subprocess.check_output(["/sbin/ldconfig", "-p"]).decode()
      # each line looks like the following:
      # libcuda.so.1 (libc6,x86-64) => /lib/x86_64-linux-gnu/libcuda.so.1
--- 
-2.46.0
-
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 2f8dcecc023a..7eff3418e718 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -16,6 +16,7 @@
   pybind11,
   python,
   pytestCheckHook,
+  writableTmpDirAsHomeHook,
   stdenv,
   replaceVars,
   setuptools,
@@ -27,22 +28,21 @@
   triton,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "triton";
-  version = "3.1.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "triton-lang";
     repo = "triton";
-    # latest branch commit from https://github.com/triton-lang/triton/commits/release/3.1.x/
-    rev = "cf34004b8a67d290a962da166f5aa2fc66751326";
-    hash = "sha256-233fpuR7XXOaSKN+slhJbE/CMFzAqCRCE4V4rIoJZrk=";
+    tag = "v${version}";
+    hash = "sha256-XLw7s5K0j4mfIvNMumlHkUpklSzVSTRyfGazZ4lLpn0=";
   };
 
   patches =
     [
-      ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
+      # ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
       (replaceVars ./0001-_build-allow-extra-cc-flags.patch {
         ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib";
       })
@@ -65,24 +65,15 @@ buildPythonPackage {
     # Use our `cmakeFlags` instead and avoid downloading dependencies
     # remove any downloads
     substituteInPlace python/setup.py \
-      --replace-fail "get_json_package_info(), get_pybind11_package_info()" ""\
-      --replace-fail "get_pybind11_package_info(), get_llvm_package_info()" ""\
-      --replace-fail 'packages += ["triton/profiler"]' ""\
-      --replace-fail "curr_version != version" "False"
+      --replace-fail "[get_json_package_info()]" "[]"\
+      --replace-fail "[get_llvm_package_info()]" "[]"\
+      --replace-fail 'packages += ["triton/profiler"]' "pass"\
+      --replace-fail "curr_version.group(1) != version" "False"
 
     # Don't fetch googletest
-    substituteInPlace unittest/CMakeLists.txt \
-      --replace-fail "include (\''${CMAKE_CURRENT_SOURCE_DIR}/googletest.cmake)" ""\
+    substituteInPlace cmake/AddTritonUnitTest.cmake \
+      --replace-fail "include(\''${PROJECT_SOURCE_DIR}/unittest/googletest.cmake)" ""\
       --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)"
-
-    # Patch the source code to make sure it doesn't specify a non-existent PTXAS version.
-    # CUDA 12.6 (the current default/max) tops out at PTXAS version 8.5.
-    # NOTE: This is fixed in `master`:
-    # https://github.com/triton-lang/triton/commit/f48dbc1b106c93144c198fbf3c4f30b2aab9d242
-    substituteInPlace "$NIX_BUILD_TOP/$sourceRoot/third_party/nvidia/backend/compiler.py" \
-      --replace-fail \
-        'return 80 + minor' \
-        'return 80 + min(minor, 5)'
   '';
 
   build-system = [ setuptools ];
@@ -97,6 +88,9 @@ buildPythonPackage {
     # because we only support cudaPackages on x86_64-linux atm
     lit
     llvm
+
+    # Upstream's setup.py tries to write cache somewhere in ~/
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [
@@ -125,9 +119,6 @@ buildPythonPackage {
     # Ensure that the build process uses the requested number of cores
     export MAX_JOBS="$NIX_BUILD_CORES"
 
-    # Upstream's setup.py tries to write cache somewhere in ~/
-    export HOME=$(mktemp -d)
-
     # Upstream's github actions patch setup.cfg to write base-dir. May be redundant
     echo "
     [build_ext]
@@ -193,13 +184,15 @@ buildPythonPackage {
     ];
 
     dontBuild = true;
-    nativeCheckInputs = [ pytestCheckHook ];
+    nativeCheckInputs = [
+      pytestCheckHook
+      writableTmpDirAsHomeHook
+    ];
 
     doCheck = true;
 
     preCheck = ''
       cd python/test/unit
-      export HOME=$TMPDIR
     '';
     checkPhase = "pytestCheckPhase";
 

From 4e7fb0c25da4ed40c5804c94734a7b0f2d4c4c16 Mon Sep 17 00:00:00 2001
From: lily!! <git@ilyli.ly>
Date: Sun, 22 Jun 2025 18:03:19 -0700
Subject: [PATCH 02/83] portablemc: don't grab linux deps on non-linux

fixes build for x86_64-darwin and aarch64-darwin
---
 pkgs/by-name/po/portablemc/package.nix | 35 +++++++++++++++-----------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/po/portablemc/package.nix b/pkgs/by-name/po/portablemc/package.nix
index 1f2d0f9d60ae..326d7949cdf7 100644
--- a/pkgs/by-name/po/portablemc/package.nix
+++ b/pkgs/by-name/po/portablemc/package.nix
@@ -23,23 +23,28 @@
 
 let
   # Copied from the `prismlauncher` package
-  runtimeLibs = [
-    libX11
-    libXext
-    libXcursor
-    libXrandr
-    libXxf86vm
+  runtimeLibs =
+    [
+      # lwjgl
+      libGL
+      glfw
+      openal
+      (lib.getLib stdenv.cc.cc)
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      libX11
+      libXext
+      libXcursor
+      libXrandr
+      libXxf86vm
 
-    # lwjgl
-    libpulseaudio
-    libGL
-    glfw
-    openal
-    (lib.getLib stdenv.cc.cc)
+      # lwjgl
+      libpulseaudio
 
-    # oshi
-    udev
-  ] ++ lib.optional textToSpeechSupport flite;
+      # oshi
+      udev
+    ]
+    ++ lib.optional textToSpeechSupport flite;
 in
 python3Packages.buildPythonApplication rec {
   pname = "portablemc";

From 5d17f562c88df43033caa4c01da9ba82303db338 Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Tue, 24 Jun 2025 11:01:28 +0200
Subject: [PATCH 03/83] wikicurses: install man page via installManPage

---
 pkgs/applications/misc/wikicurses/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix
index 64f8f2cbac36..4ba44c57360a 100644
--- a/pkgs/applications/misc/wikicurses/default.nix
+++ b/pkgs/applications/misc/wikicurses/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchFromGitHub,
   pythonPackages,
+  installShellFiles,
 }:
 
 pythonPackages.buildPythonApplication rec {
@@ -20,6 +21,10 @@ pythonPackages.buildPythonApplication rec {
     "man"
   ];
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+
   propagatedBuildInputs = with pythonPackages; [
     urwid
     beautifulsoup4
@@ -27,9 +32,7 @@ pythonPackages.buildPythonApplication rec {
   ];
 
   postInstall = ''
-    mkdir -p $man/share/man/man{1,5}
-    cp wikicurses.1 $man/share/man/man1/
-    cp wikicurses.conf.5 $man/share/man/man5/
+    installManPage wikicurses.1 wikicurses.conf.5
   '';
 
   doCheck = false;

From 6fa771782bd048f1f4bc678a85a74c908472b1fa Mon Sep 17 00:00:00 2001
From: ppom <>
Date: Tue, 24 Jun 2025 12:00:00 +0200
Subject: [PATCH 04/83] reaction: 2.0.1 -> 2.1.0

- Compilation for Darwin is restored.
- Time-based tests are disabled, as they fail when not enough CPU
  resources are available, such as in CI
---
 pkgs/by-name/re/reaction/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/reaction/package.nix b/pkgs/by-name/re/reaction/package.nix
index ab1a9051f01f..657a9ec2d0e1 100644
--- a/pkgs/by-name/re/reaction/package.nix
+++ b/pkgs/by-name/re/reaction/package.nix
@@ -7,22 +7,29 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "reaction";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "ppom";
     repo = "reaction";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HpnLh0JfGZsHcvDQSiKfW62QcCe/QDsVP/nGBo9x494=";
+    hash = "sha256-3FJv1n1+cpV4yrBR6PKTAhSkjas/4uTZqn4nW948jAk=";
   };
 
-  cargoHash = "sha256-i8KZygESxgty8RR3C+JMuE1aAsBxoLuGsL4jqjdGr0E=";
+  cargoHash = "sha256-Is8Mkl7Qfbe2CwYB+Da99NDQZd9+qR4NnT8iU/JMPJ0=";
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
+  checkFlags = [
+    # Those time-based tests behave poorly in low-resource environments (CI...)
+    "--skip=daemon::filter::tests"
+    "--skip=treedb::raw::tests::write_then_read_1000"
+    "--skip=simple"
+  ];
+
   postInstall = ''
     installBin $releaseDir/ip46tables $releaseDir/nft46
     installManPage $releaseDir/reaction*.1
@@ -41,6 +48,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.agpl3Plus;
     mainProgram = "reaction";
     maintainers = with lib.maintainers; [ ppom ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 })

From 69d04f67806830ecfd6b7261201341b50cc05efa Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 10 Jun 2025 15:59:14 +0200
Subject: [PATCH 05/83] lomiri.lomiri-gsettings-overrides: init

Override the default for the launcher icon this way. Wallpaper would be settable too, but at least the VM tests don't seem happy with changing the wallpaper in any way.
---
 .../services/desktop-managers/lomiri.nix      | 30 +++++++++--
 .../lomiri-gsettings-overrides/default.nix    | 51 +++++++++++++++++++
 pkgs/desktops/lomiri/default.nix              |  1 +
 3 files changed, 78 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix

diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix
index 57b38f81f0f3..364acd2dfde2 100644
--- a/nixos/modules/services/desktop-managers/lomiri.nix
+++ b/nixos/modules/services/desktop-managers/lomiri.nix
@@ -7,6 +7,9 @@
 
 let
   cfg = config.services.desktopManager.lomiri;
+  nixos-gsettings-overrides = pkgs.lomiri.lomiri-gsettings-overrides.override {
+    inherit (cfg) extraGSettingsOverrides extraGSettingsOverridePackages;
+  };
 in
 {
   options.services.desktopManager.lomiri = {
@@ -22,6 +25,18 @@ in
       type = lib.types.bool;
       default = config.services.xserver.displayManager.lightdm.greeters.lomiri.enable || cfg.enable;
     };
+
+    extraGSettingsOverrides = lib.mkOption {
+      description = "Additional GSettings overrides.";
+      type = lib.types.lines;
+      default = "";
+    };
+
+    extraGSettingsOverridePackages = lib.mkOption {
+      description = "List of packages for which GSettings are overridden.";
+      type = lib.types.listOf lib.types.path;
+      default = [ ];
+    };
   };
 
   config = lib.mkMerge [
@@ -43,10 +58,17 @@ in
           "/share/wallpapers"
         ];
 
-        systemPackages = with pkgs.lomiri; [
-          lomiri-wallpapers # default + additional wallpaper
-          suru-icon-theme # basic indicator icons
-        ];
+        # Override GSettings defaults
+        sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-overrides}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas";
+
+        systemPackages =
+          [
+            nixos-gsettings-overrides # GSettings default overrides
+          ]
+          ++ (with pkgs.lomiri; [
+            lomiri-wallpapers # default + additional wallpaper
+            suru-icon-theme # basic indicator icons
+          ]);
       };
 
       fonts.packages = with pkgs; [
diff --git a/pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix b/pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix
new file mode 100644
index 000000000000..672c7adbeb8b
--- /dev/null
+++ b/pkgs/desktops/lomiri/data/lomiri-gsettings-overrides/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  runCommand,
+  glib,
+  lomiri-schemas,
+  lomiri-wallpapers,
+  nixos-icons,
+  writeText,
+  extraGSettingsOverrides ? "",
+  extraGSettingsOverridePackages ? [ ],
+  nixos-artwork,
+}:
+
+let
+  # Overriding the background picture should be possible, but breaks within the VM tests.
+  # It results in either a grey background (prolly indicating an error somewhere)
+  # or hangs the session (also happens when using LSS, which sets it via AccountsService).
+  #
+  # So we can only override the launcher button details.
+  # Button colour: https://github.com/NixOS/nixos-artwork/blob/51a27e4a011e95cb559e37d32c44cf89b50f5154/logo/README.md#colours
+  gsettingsOverrides = writeText "lomiri-gschema-overrides" ''
+    [com.lomiri.Shell.Launcher]
+    logo-picture-uri='file://${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg'
+    home-button-background-color='#5277C3'
+
+    ${extraGSettingsOverrides}
+  '';
+
+  gsettingsOverridePackages = [
+    lomiri-schemas
+  ] ++ extraGSettingsOverridePackages;
+in
+runCommand "lomiri-gsettings-overrides" { preferLocalBuild = true; } ''
+  dataDir="$out/share/gsettings-schemas/nixos-gsettings-overrides"
+  schemaDir="$dataDir/glib-2.0/schemas"
+  mkdir -p "$schemaDir"
+
+  ${lib.strings.concatMapStringsSep "\n" (
+    pkg:
+    "cp -rf \"${glib.getSchemaPath pkg}\"/*.xml \"${glib.getSchemaPath pkg}\"/*.gschema.override \"$schemaDir\""
+  ) gsettingsOverridePackages}
+
+  chmod -R a+w "$dataDir"
+  cp --no-preserve=mode "${gsettingsOverrides}" "$schemaDir/zz-nixos-defaults.gschema.override"
+
+  ${lib.getExe' glib.dev "glib-compile-schemas"} --strict "$schemaDir" | tee gcs.log
+
+  if grep 'No schema files found' gcs.log >/dev/null; then
+    exit 1
+  fi
+''
diff --git a/pkgs/desktops/lomiri/default.nix b/pkgs/desktops/lomiri/default.nix
index 893165171bb5..fbcb046f2caa 100644
--- a/pkgs/desktops/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/default.nix
@@ -31,6 +31,7 @@ let
       teleports = callPackage ./applications/teleports { };
 
       #### Data
+      lomiri-gsettings-overrides = callPackage ./data/lomiri-gsettings-overrides { };
       lomiri-schemas = callPackage ./data/lomiri-schemas { };
       lomiri-session = callPackage ./data/lomiri-session { };
       lomiri-sounds = callPackage ./data/lomiri-sounds { };

From ef3fba0687151a4f5b6a5fdbbc8a675d88c91cfc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 23 Jun 2025 11:19:23 +0200
Subject: [PATCH 06/83] lomiri.lomiri: 0.4.1 -> 0.5.0

---
 .../lomiri/applications/lomiri/default.nix    | 61 +++++++++++--------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/lomiri/applications/lomiri/default.nix b/pkgs/desktops/lomiri/applications/lomiri/default.nix
index 88242fef27cc..162a6b6973fa 100644
--- a/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -61,37 +61,54 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri";
     tag = finalAttrs.version;
-    hash = "sha256-5fwSLUTntVyV5FIVnPishrU/55tyTyx0Fzh6oitaWwo=";
+    hash = "sha256-blXEfDauwtDH+0OdUx0vAR+8lnAGrREssqjsBNmvomk=";
   };
 
   patches = [
-    # Fix greeter & related settings
-    # These patches are seemingly not submitted upstream yet
+    # Fix broken multimedia suspend due to missing media-hub
     (fetchpatch {
-      name = "1000-lomiri-QT_IM_MODULE-maliit.patch";
-      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/ebbe0f3f568bd145bb58a2e47f7112442328a0a5/debian/patches/2003_maliit-not-maliitphablet-as-im-module-namespace.patch";
-      hash = "sha256-5HEMl0x1S9Hb7spxPRgu8OBebmpaLa6zko2uVEYtBmY=";
+      name = "2012-lomiri-dont-suspend-apps.patch";
+      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/1d6e83446f69299d1206927c2adbf78470ba27ec/debian/patches/2012_no-app-suspension-on-Debian+Ubuntu-proper.patch";
+      hash = "sha256-9mvkILrkig18fAw5KyA2+5vXup6Le7X0blgY0PJ2Trc=";
+    })
+
+    # Fix convergence on some tablets
+    (fetchpatch {
+      name = "1013-lomiri-fix-convergence-on-high-resolution-tablets.patch";
+      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/4d4904b728a3e66706c756f911ddc79b01f863a2/debian/patches/1013_fix-convergence-on-high-resolution-tablets.patch";
+      hash = "sha256-pQYIa8U0gEFdwZBuWMp8nL5j2HPSivMrsuKUC9scKg0=";
+    })
+
+    # Make greeter behave nicer & more Wayland-native
+    (fetchpatch {
+      name = "2014-lomiri-greeter-wrapper-on-wayland.patch";
+      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/e655e14c7d420021193e37debd3e7da620b45429/debian/patches/2014_lomiri-greeter-wrapper-on-wayland.patch";
+      hash = "sha256-aEId3UDqH1iUi9gV5IpW/5S5rke93UyZVr0jWlNYnOU=";
     })
     (fetchpatch {
-      name = "1001-lomiri-QT_QPA_PLATFORM-wayland.patch";
-      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/ebbe0f3f568bd145bb58a2e47f7112442328a0a5/debian/patches/2004_qt-qpa-platform-is-wayland.patch";
-      hash = "sha256-4C6X2TW+yjZhqYPIcQ3GJeTKbz785i7p/DpT+vX1DSQ=";
+      name = "2015-lomiri-greeter-use-wayland.patch";
+      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/2f5acfa085c901359bf6f6cccbce36d7e2981555/debian/patches/2015_lomiri-greeter-use-wayland.patch";
+      hash = "sha256-fnTEVQnOBQVd95ucs+iDMcQFOevfQ8dckQg0PrtL/A0=";
     })
+
+    # Reduce desyncing of cursor
     (fetchpatch {
-      name = "1002-lomiri-Fix-Lomiri-greeter.patch";
-      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/5f9d28fe6f0ba9ab7eed149b4da7f6b3f4eae55a/debian/patches/1008_lomiri-greeter-wayland.patch";
-      hash = "sha256-vuNTKWA50krtx/+XB2pMI271q57N+kqWlfq54gtf/HI=";
+      name = "1005-lomiri-cursor-always-follow-cursor-position-from-mir.patch";
+      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/f3ba943006f5469a8a7aa24f232d6383afb3bc74/debian/patches/1005_cursor-always-follow-cursor-position-from-mir.patch";
+      hash = "sha256-FYWRHt3//gm3jT9dr35tH4PlZssMMA/zBhjkszgqTYo=";
     })
+
+    # Undo start-here integration & uglier colours for launcher
     (fetchpatch {
-      name = "1004-lomiri-Dont-reset-OSK-setting.patch";
-      url = "https://salsa.debian.org/ubports-team/lomiri/-/raw/ebbe0f3f568bd145bb58a2e47f7112442328a0a5/debian/patches/2005_dont-reset-alwaysShowOsk-to-system-defaults-on-login.patch";
-      hash = "sha256-guq/Ykcq4WcuXxNKO1eA4sJFyGSpZo0gtyFTdeK/GeE=";
+      name = "0001-lomiri-LauncherPanel-Use-Lomiri-upstream-home-logo-and-home-background-color.patch";
+      url = "https://gitlab.com/ubports/development/core/lomiri/-/commit/defaabfaf4818ee6b618c97b34acf5e0ed2ebb2e.patch";
+      hash = "sha256-9YRWMV+1UT+EQd9Uq1+6enNzz+HDlSt3LTPM1BKJxiE=";
     })
 
     ./9901-lomiri-Disable-Wizard.patch
@@ -119,15 +136,11 @@ stdenv.mkDerivation (finalAttrs: {
       substituteInPlace tests/mocks/CMakeLists.txt \
         --replace-fail 'add_subdirectory(QtMir/Application)' ""
 
-      # This needs to launch the *lomiri* indicators, now that datetime is split into lomiri and non-lomiri variants
+      # Seems like the Debian patch that added this didn't read the lightdm greeter entry properly, so everything gets passed twice
+      substituteInPlace data/lomiri-greeter.desktop.in.in \
+        --replace-fail 'lomiri-greeter-wrapper @CMAKE_INSTALL_FULL_BINDIR@/lomiri --mode=greeter' 'lomiri-greeter-wrapper'
       substituteInPlace data/lomiri-greeter-wrapper \
-        --replace-fail 'ayatana-indicators.target' 'lomiri-indicators.target'
-
-      # NixOS-ify
-
-      # Use Nix flake instead of Canonical's Ubuntu logo
-      rm qml/Launcher/graphics/home.svg
-      ln -s ${nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake-white.svg qml/Launcher/graphics/home.svg
+        --replace-fail 'LOMIRI_BINARY:-lomiri' "LOMIRI_BINARY:-$out/bin/lomiri"
 
       # Look up default wallpaper in current system
       substituteInPlace plugins/Utils/constants.cpp \

From d0f3dc903f40cc492e694ca6068d78eab017a911 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 25 Jun 2025 20:41:52 +0000
Subject: [PATCH 07/83] livebook: 0.16.2 -> 0.16.4

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

diff --git a/pkgs/by-name/li/livebook/package.nix b/pkgs/by-name/li/livebook/package.nix
index 33e0df984151..317f2bf5ccf5 100644
--- a/pkgs/by-name/li/livebook/package.nix
+++ b/pkgs/by-name/li/livebook/package.nix
@@ -11,7 +11,7 @@
 }:
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.16.2";
+  version = "0.16.4";
 
   inherit elixir;
 
@@ -23,13 +23,13 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-x4h5vT2p1SL/8p04DRpKbIbwL7XzctH27f4ZAwj0QOg=";
+    hash = "sha256-Cwzcoslqjaf7z9x2Sgnzrrl4zUcH2f7DEWaFPBIi3ms=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
     pname = "mix-deps-${pname}";
     inherit src version;
-    hash = "sha256-0gmUCVLrNfcRCPhaXuOfrYW05TDbDN5Zt9IA8OBU8Gc=";
+    hash = "sha256-OEYkWh0hAl7ZXP2Cq+TgVGF4tnWlpF6W5uRSdyrswlA=";
   };
 
   postInstall = ''

From efd1e065c6bac23ff88411dc92f71ec5a59a3531 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 26 Jun 2025 12:34:08 +0200
Subject: [PATCH 08/83] nixosTests.lomiri: Fix mouse coords

We now apply a patch to lomiri that fixes some mouse issues in regular & VM usage, but causes some of our hardcoded coordinates to no longer work.

Update any coords that got broken by this.
---
 nixos/tests/lomiri.nix | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 42d882fd1454..42c93f3070f8 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -139,12 +139,8 @@ let
       Move the mouse to a screen location and hit left-click.
       """
 
-      # Need to reset to top-left, --absolute doesn't work?
-      machine.execute("ydotool mousemove -- -10000 -10000")
-      machine.sleep(2)
-
       # Move
-      machine.execute(f"ydotool mousemove -- {xpos} {ypos}")
+      machine.execute(f"ydotool mousemove --absolute -- {xpos} {ypos}")
       machine.sleep(2)
 
       # Click (C0 - left button: down & up)
@@ -157,7 +153,7 @@ let
       """
 
       # Using the keybind has a chance of instantly closing the menu again? Just click the button
-      mouse_click(20, 30)
+      mouse_click(15, 15)
 
   '';
 
@@ -653,7 +649,7 @@ in
               machine.screenshot("settings_lomiri-content-hub_peers")
 
               # Select Morph as content source
-              mouse_click(370, 100)
+              mouse_click(340, 80)
 
               # Expect Morph to be brought into the foreground, with its Downloads page open
               wait_for_text("No downloads")
@@ -853,8 +849,8 @@ in
       ocr = [ "Log Out" ];
       extraCheck = ''
         # We should be able to log out and return to the greeter
-        mouse_click(720, 280) # "Log Out"
-        mouse_click(400, 240) # confirm logout
+        mouse_click(600, 280) # "Log Out"
+        mouse_click(340, 220) # confirm logout
         machine.wait_until_fails("pgrep -u ${user} -f 'lomiri --mode=full-shell'")
       '';
     })

From f84c95ec49498fff8a12671288ab5ebb409fea94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 26 Jun 2025 19:50:36 +0000
Subject: [PATCH 09/83] gate: 0.49.2 -> 0.50.0

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

diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index c72da6602620..60d085208de2 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.49.2";
+  version = "0.50.0";
 in
 buildGoModule {
   inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-u90cQh6mYUrlnWUkwIAhkJJZ6GB0AkNIJVJVkq4cYEM=";
+    hash = "sha256-clWQeFKOLzA99yNqgNPdPdvyaVoRvYjYg7PrGvnuk7o=";
   };
 
-  vendorHash = "sha256-4LJwb4ZXs+CUcxhvRveJy+xu7/UEjxIEwLV5Z5gBbT4=";
+  vendorHash = "sha256-d/D1l+/viJ5OFSpUDpC+4pnDwPJDBuYDjS7niao5D9U=";
 
   ldflags = [
     "-s"

From 5d42e80772a0816845c857352e596da7980adad7 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Fri, 27 Jun 2025 01:39:59 +0000
Subject: [PATCH 10/83] balsa: 2.6.4 -> 2.6.5, modernize

---
 pkgs/by-name/ba/balsa/package.nix | 41 +++++++++++++++++++------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix
index 6d4bbd062237..d13a4d77a6ff 100644
--- a/pkgs/by-name/ba/balsa/package.nix
+++ b/pkgs/by-name/ba/balsa/package.nix
@@ -1,41 +1,44 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   glib,
   gmime3,
   gnutls,
-  gobject-introspection,
   gpgme,
   gtk3,
   gtksourceview4,
   gtkspell3,
-  intltool,
   libcanberra-gtk3,
   libesmtp,
   libical,
   libnotify,
   libsecret,
   openssl,
+  meson,
+  ninja,
   pkg-config,
   sqlite,
   webkitgtk_4_0,
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "balsa";
-  version = "2.6.4";
+  version = "2.6.5";
 
-  src = fetchurl {
-    url = "https://pawsa.fedorapeople.org/balsa/${pname}-${version}.tar.xz";
-    sha256 = "1hcgmjka2x2igdrmvzlfs12mv892kv4vzv5iy90kvcqxa625kymy";
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "GNOME";
+    repo = "balsa";
+    tag = finalAttrs.version;
+    hash = "sha256-KvgDIFbXmVkTqOibKF+8UhupEDgdhje600aSbmeKZqo=";
   };
 
   nativeBuildInputs = [
+    meson
+    ninja
     pkg-config
-    intltool
-    gobject-introspection
     wrapGAppsHook3
   ];
 
@@ -57,6 +60,10 @@ stdenv.mkDerivation rec {
     webkitgtk_4_0
   ];
 
+  mesonFlags = [
+    (lib.mesonOption "sysconfdir" "etc")
+  ];
+
   configureFlags = [
     "--with-canberra"
     "--with-gtksourceview"
@@ -70,11 +77,13 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
-    homepage = "http://pawsa.fedorapeople.org/balsa/";
+  meta = {
     description = "E-mail client for GNOME";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
+    homepage = "https://gitlab.gnome.org/GNOME/balsa";
+    changelog = "https://gitlab.gnome.org/GNOME/balsa/-/blob/master/ChangeLog";
+    mainProgram = "balsa";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ romildo ];
   };
-}
+})

From 00daedd087bdcf96a27dc057030f2504affab8e0 Mon Sep 17 00:00:00 2001
From: Malik <abdelmalik.najhi@hoerbiger.com>
Date: Mon, 23 Jun 2025 12:42:29 +0200
Subject: [PATCH 11/83] python3Packages.lizard: 1.17.30 -> 1.17.31

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

diff --git a/pkgs/development/python-modules/lizard/default.nix b/pkgs/development/python-modules/lizard/default.nix
index c22effdc56ea..a177c8ef9f9f 100644
--- a/pkgs/development/python-modules/lizard/default.nix
+++ b/pkgs/development/python-modules/lizard/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "lizard";
-  version = "1.17.30";
+  version = "1.17.31";
   format = "setuptools";
   disabled = pythonOlder "3.7";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "terryyin";
     repo = "lizard";
     rev = version;
-    hash = "sha256-yXiRbC85IeeNR8rWSqLTQD9qy2CzAhlDD7YeTm5Vj9c=";
+    hash = "sha256-8lu4EknyAI+gn7GOSo13RRHNogpZdgxJ9fTvy7NyIsM=";
   };
 
   propagatedBuildInputs = [

From 74f1c747d5a1afa04b83a90401c59345266802a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 29 Jun 2025 15:00:18 +0000
Subject: [PATCH 12/83] libserdes: 7.9.1 -> 7.9.2

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

diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index 1909f44b4434..b735b084f286 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libserdes";
-  version = "7.9.1";
+  version = "7.9.2";
 
   src = fetchFromGitHub {
     owner = "confluentinc";

From f722b576649c91b4de00fd415fd59d2ae252f70d Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 23 Jun 2025 02:33:06 -0400
Subject: [PATCH 13/83] triton-llvm: 19.1.0-rc1 -> 21.0.0-git

---
 pkgs/by-name/tr/triton-llvm/package.nix | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/tr/triton-llvm/package.nix b/pkgs/by-name/tr/triton-llvm/package.nix
index c57a075e432f..6b2b99aa0264 100644
--- a/pkgs/by-name/tr/triton-llvm/package.nix
+++ b/pkgs/by-name/tr/triton-llvm/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   pkgsBuildBuild,
   pkg-config,
   cmake,
@@ -65,7 +64,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "triton-llvm";
-  version = "19.1.0-rc1"; # One of the tags at https://github.com/llvm/llvm-project/commit/10dc3a8e916d73291269e5e2b82dd22681489aa1
+  version = "21.0.0-git"; # See https://github.com/llvm/llvm-project/blob/main/cmake/Modules/LLVMVersion.cmake
 
   outputs =
     [
@@ -78,23 +77,13 @@ stdenv.mkDerivation (finalAttrs: {
       "man"
     ];
 
-  # See https://github.com/triton-lang/triton/blob/main/python/setup.py
-  # and https://github.com/ptillet/triton-llvm-releases/releases
+  # See https://github.com/triton-lang/triton/blob/main/cmake/llvm-hash.txt
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "llvm-project";
-    rev = "10dc3a8e916d73291269e5e2b82dd22681489aa1";
-    hash = "sha256-9DPvcFmhzw6MipQeCQnr35LktW0uxtEL8axMMPXIfWw=";
+    rev = "a66376b0dc3b2ea8a84fda26faca287980986f78";
+    hash = "sha256-7xUPozRerxt38UeJxA8kYYxOQ4+WzDREndD2+K0BYkU=";
   };
-  patches = [
-    # glibc-2.40 support
-    # [llvm-exegesis] Use correct rseq struct size #100804
-    # https://github.com/llvm/llvm-project/issues/100791
-    (fetchpatch {
-      url = "https://github.com/llvm/llvm-project//commit/84837e3cc1cf17ed71580e3ea38299ed2bfaa5f6.patch";
-      hash = "sha256-QKa+kyXjjGXwTQTEpmKZx5yYjOyBX8A8NQoIYUaGcIw=";
-    })
-  ];
 
   nativeBuildInputs =
     [

From df24b5c8a8144c49775f3d47cf14991c44e0a961 Mon Sep 17 00:00:00 2001
From: Julien Dehos <dehos@univ-littoral.fr>
Date: Mon, 30 Jun 2025 12:26:33 +0200
Subject: [PATCH 14/83] python3Packages.bayesian-optimization: 2.0.4 -> 3.0.0

---
 .../python-modules/bayesian-optimization/default.nix        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix
index 8683c1c8dd85..3be4d88b8cf8 100644
--- a/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -12,6 +12,7 @@
   numpy,
   scipy,
   colorama,
+  packaging,
 
   # tests
   jupyter,
@@ -23,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "bayesian-optimization";
-  version = "2.0.4";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bayesian-optimization";
     repo = "BayesianOptimization";
     tag = "v${version}";
-    hash = "sha256-F1+M5znfI7lHGJRRTgmQxrLTYZmLc90Q0TCvpRoSVTU=";
+    hash = "sha256-ruMxuMTXVpS5oaZk994xIjgUnhpybrvhvy69nvU5feE=";
   };
 
   build-system = [ poetry-core ];
@@ -40,6 +41,7 @@ buildPythonPackage rec {
     numpy
     scipy
     colorama
+    packaging
   ];
 
   nativeCheckInputs = [

From 151c72e1ddb168e225bab7727ae547b1f2196dbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 30 Jun 2025 11:31:42 +0000
Subject: [PATCH 15/83] xmrig-mo: 6.23.0-mo1 -> 6.24.0-mo1

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

diff --git a/pkgs/by-name/xm/xmrig-mo/package.nix b/pkgs/by-name/xm/xmrig-mo/package.nix
index 7a3725e3c952..95a65107c492 100644
--- a/pkgs/by-name/xm/xmrig-mo/package.nix
+++ b/pkgs/by-name/xm/xmrig-mo/package.nix
@@ -6,13 +6,13 @@
 
 xmrig.overrideAttrs (oldAttrs: rec {
   pname = "xmrig-mo";
-  version = "6.23.0-mo1";
+  version = "6.24.0-mo1";
 
   src = fetchFromGitHub {
     owner = "MoneroOcean";
     repo = "xmrig";
     rev = "v${version}";
-    hash = "sha256-9ne2qpN6F6FJyD/Havb7fhY1oB4AxFrB17gI7QtoE1E=";
+    hash = "sha256-l3dN1lKn+Vt2JPmBm452kRe39UCnW3TIhUbHXkHXBrM=";
   };
 
   meta = with lib; {

From 7610339a8f2900ccb70df115595b5849a377c369 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Mon, 30 Jun 2025 09:24:20 -0400
Subject: [PATCH 16/83] amber-lang: remove uncenter from maintainers

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

diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix
index 6a9ed594d886..115d613926dd 100644
--- a/pkgs/by-name/am/amber-lang/package.nix
+++ b/pkgs/by-name/am/amber-lang/package.nix
@@ -78,7 +78,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "amber";
     maintainers = with maintainers; [
       cafkafk
-      uncenter
       aleksana
     ];
     platforms = platforms.unix;

From 76f0efdec98656038e0cb57b725ba4d87c89ae55 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Mon, 30 Jun 2025 09:24:33 -0400
Subject: [PATCH 17/83] cargo-shear: remove uncenter from maintainers

---
 pkgs/by-name/ca/cargo-shear/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix
index 77c3fad0a552..4e2b61782072 100644
--- a/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/pkgs/by-name/ca/cargo-shear/package.nix
@@ -34,6 +34,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/Boshen/cargo-shear";
     changelog = "https://github.com/Boshen/cargo-shear/blob/v${version}/CHANGELOG.md";
     license = [ lib.licenses.mit ];
-    maintainers = with lib.maintainers; [ uncenter ];
+    maintainers = with lib.maintainers; [ ];
   };
 }

From 5b6df2aacd7f65440d1ead1e8c8a5b43061ded03 Mon Sep 17 00:00:00 2001
From: uncenter <uncenter@uncenter.dev>
Date: Mon, 30 Jun 2025 09:24:47 -0400
Subject: [PATCH 18/83] markuplinkchecker: remove uncenter from maintainers

---
 pkgs/by-name/ma/markuplinkchecker/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ma/markuplinkchecker/package.nix b/pkgs/by-name/ma/markuplinkchecker/package.nix
index 59757e472793..1ac6c7d7a1d6 100644
--- a/pkgs/by-name/ma/markuplinkchecker/package.nix
+++ b/pkgs/by-name/ma/markuplinkchecker/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage {
     changelog = "https://github.com/becheran/mlc/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      uncenter
       anas
     ];
     mainProgram = "mlc";

From d1e09e896648d27bf68e2efd4f3b2e174b3f3850 Mon Sep 17 00:00:00 2001
From: Timon Schelling <me@timon.zip>
Date: Mon, 30 Jun 2025 20:55:03 +0000
Subject: [PATCH 19/83] balsa: replace romildo with timon as maintainer

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

diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix
index d13a4d77a6ff..b1fbefb4e7cf 100644
--- a/pkgs/by-name/ba/balsa/package.nix
+++ b/pkgs/by-name/ba/balsa/package.nix
@@ -84,6 +84,6 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "balsa";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ romildo ];
+    maintainers = with lib.maintainers; [ timon ];
   };
 })

From f34a3e9ee09d3fab95c673889fd51e45cff59fca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 04:22:55 +0000
Subject: [PATCH 20/83] libfabric: 2.1.0 -> 2.2.0

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

diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index a9bec3b1ecc7..d32b458a3c28 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libfabric";
-  version = "2.1.0";
+  version = "2.2.0";
 
   enableParallelBuilding = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "ofiwg";
     repo = "libfabric";
     rev = "v${version}";
-    sha256 = "sha256-TK45SCPyFIMhliBYBEMPSKX/UtHGPj075SlTNB92O0Y=";
+    sha256 = "sha256-BY3a7CxtMJl5/+7t4BzJRTbMnDs1oL3UhDOPRB+D3+U=";
   };
 
   outputs = [

From cb468f8dc7e57bbcc8183aef22140867d4e55184 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Tue, 1 Jul 2025 12:44:56 +0200
Subject: [PATCH 21/83] nominatim-ui: rewrite packaging to add missing files

* Rewrite packaging to add missing files which needs to be
  built by yarn

* Drop usage of finalAttrs which is failing when used with
  mkYarnPackage
---
 pkgs/by-name/no/nominatim-ui/package.json | 48 +++++++++++++++++++++++
 pkgs/by-name/no/nominatim-ui/package.nix  | 42 +++++++++++++++++---
 2 files changed, 84 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/no/nominatim-ui/package.json

diff --git a/pkgs/by-name/no/nominatim-ui/package.json b/pkgs/by-name/no/nominatim-ui/package.json
new file mode 100644
index 000000000000..05d40eb226e0
--- /dev/null
+++ b/pkgs/by-name/no/nominatim-ui/package.json
@@ -0,0 +1,48 @@
+{
+    "name": "nominatim-ui",
+    "description": "Debug web interface for Nominatim geocoder",
+    "version": "3.7.1",
+    "license": "GPL-2.0",
+    "scripts": {
+        "build": "rollup -c",
+        "dev": "rollup -c -w",
+        "lint": "eslint --quiet *.js src/ test/",
+        "lint:fix": "eslint --fix *.js src/ test/",
+        "test": "rollup -c && mocha --recursive test/",
+        "start": "static-server dist"
+    },
+    "devDependencies": {
+        "@eslint/eslintrc": "^3.1.0",
+        "@eslint/js": "^9.12.0",
+        "@rollup/plugin-commonjs": "^28.0",
+        "@rollup/plugin-node-resolve": "^16.0",
+        "eslint": "^9.0",
+        "eslint-config-prettier": "^10.1.2",
+        "eslint-plugin-import": "^2.22.1",
+        "eslint-plugin-mocha": "^11.0",
+        "eslint-plugin-prettier": "^5.2.6",
+        "eslint-plugin-security": "^3.0.1",
+        "eslint-plugin-svelte": "^3.5.0",
+        "fs-extra": "^11.0.0",
+        "globals": "^16.0.0",
+        "http": "^0.0.1-security",
+        "http-proxy": "^1.18.1",
+        "mocha": "^11.0",
+        "puppeteer": "^24.0",
+        "rollup": "^4.22.4",
+        "rollup-plugin-css-only": "^4.3.0",
+        "rollup-plugin-livereload": "^2.0.0",
+        "rollup-plugin-svelte": "^7.0.0",
+        "rollup-plugin-terser": "^7.0.0",
+        "static-server": "^2.2.1",
+        "svelte": "^5.0.0"
+    },
+    "dependencies": {
+        "bootstrap": "^5.0.0",
+        "escape-html": "^1.0.3",
+        "leaflet": "1.9.4",
+        "leaflet-minimap": "^3.6.1",
+        "timeago.js": "^4.0.2"
+    },
+    "type": "module"
+}
diff --git a/pkgs/by-name/no/nominatim-ui/package.nix b/pkgs/by-name/no/nominatim-ui/package.nix
index f4b09e84694b..c6f143419663 100644
--- a/pkgs/by-name/no/nominatim-ui/package.nix
+++ b/pkgs/by-name/no/nominatim-ui/package.nix
@@ -1,28 +1,58 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
+  fetchYarnDeps,
+  mkYarnPackage,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# Notes for the upgrade:
+# * Download the tarball of the new version to use.
+# * Replace new `package.json` here.
+# * Update `version`+`hash` and rebuild.
+
+mkYarnPackage rec {
   pname = "nominatim-ui";
   version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "nominatim-ui";
-    tag = "v${finalAttrs.version}";
+    tag = "v${version}";
     hash = "sha256-TliTWDKdIp7Z0uYw5P65i06NQAUNwNymUsSYrihVZFE=";
   };
 
+  offlineCache = fetchYarnDeps {
+    yarnLock = "${src}/yarn.lock";
+    hash = "sha256-IqwsXEd9RSJhkA4BONTJT4xYMTyG9+zddIpD47v6AFc=";
+  };
+
+  packageJSON = ./package.json;
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn --offline build
+
+    runHook postBuild
+  '';
+
+  # Minimal configuration
+  # See https://nominatim.org/release-docs/latest/admin/Setup-Nominatim-UI/#installing-nominatim-ui
+  preInstall = ''
+    echo "Nominatim_Config.Nominatim_API_Endpoint='https://localhost/';" \
+    > deps/nominatim-ui/dist/theme/config.theme.js
+  '';
+
   installPhase = ''
     runHook preInstall
 
-    cp --archive dist $out
+    cp --archive deps/nominatim-ui/dist $out
 
     runHook postInstall
   '';
 
+  doDist = false;
+
   meta = {
     description = "Debugging user interface for Nominatim geocoder";
     homepage = "https://github.com/osm-search/nominatim-ui";
@@ -31,6 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
       geospatial
       ngi
     ];
-    changelog = "https://github.com/osm-search/nominatim-ui/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/osm-search/nominatim-ui/releases/tag/v${version}";
   };
-})
+}

From 5e26c6aaab11bb8039e7a53ba4bbdd620a5cf0be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jul 2025 23:09:19 +0000
Subject: [PATCH 22/83] kyverno: 1.14.3 -> 1.14.4

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

diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix
index 67c7c06d7074..d87efef20e8b 100644
--- a/pkgs/by-name/ky/kyverno/package.nix
+++ b/pkgs/by-name/ky/kyverno/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "kyverno";
-  version = "1.14.3";
+  version = "1.14.4";
 
   src = fetchFromGitHub {
     owner = "kyverno";
     repo = "kyverno";
     rev = "v${version}";
-    hash = "sha256-WKVzx88k9D6unZWNfJesy/Ucmm5u5hJUpEETuOLiF18=";
+    hash = "sha256-hOYNHJfK3EMe6oC3ucymcK8uyu07asRZjYJxm4fN6x8=";
   };
 
   ldflags = [

From 28db7596a94189783a944d5cacae62f110703697 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 2 Jul 2025 21:34:50 +0200
Subject: [PATCH 23/83] tenacity: remove `rec` and `with lib;`

---
 pkgs/by-name/te/tenacity/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index bed63fd78f6a..509290301648 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -47,7 +47,7 @@
   util-linux,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tenacity";
   version = "1.3.4";
 
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
     owner = "tenacityteam";
     repo = "tenacity";
     fetchSubmodules = true;
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-2gndOwgEJK2zDSbjcZigbhEpGv301/ygrf+EQhKp8PI=";
   };
 
@@ -151,12 +151,12 @@ stdenv.mkDerivation rec {
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Sound editor with graphical UI";
     mainProgram = "tenacity";
     homepage = "https://tenacityaudio.org/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ irenes ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ irenes ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 203fca9a072ff0c918d0adddeb04a12f766d53c6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Thu, 3 Jul 2025 08:09:24 +0800
Subject: [PATCH 24/83] esphome: rename build-systems to build-system and use
 versionCheckHook

---
 pkgs/by-name/es/esphome/package.nix | 33 ++++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index a1637948f347..04858f46b74d 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   callPackage,
   python3Packages,
   fetchFromGitHub,
@@ -8,7 +9,7 @@
   esptool,
   git,
   inetutils,
-  stdenv,
+  versionCheckHook,
   nixosTests,
 }:
 
@@ -43,9 +44,8 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-45DhWxBvItl70mx/H42o9PqlIipvzIA/A9H6pKDO2fo=";
   };
 
-  build-systems = with python.pkgs; [
+  build-system = with python.pkgs; [
     setuptools
-    argcomplete
   ];
 
   nativeBuildInputs = [
@@ -123,14 +123,17 @@ python.pkgs.buildPythonApplication rec {
   # Needed for tests
   __darwinAllowLocalNetworking = true;
 
-  nativeCheckInputs = with python3Packages; [
-    hypothesis
-    mock
-    pytest-asyncio
-    pytest-cov-stub
-    pytest-mock
-    pytestCheckHook
-  ];
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      hypothesis
+      mock
+      pytest-asyncio
+      pytest-cov-stub
+      pytest-mock
+      pytestCheckHook
+    ]
+    ++ [ versionCheckHook ];
 
   disabledTests = [
     # race condition, also visible in upstream tests
@@ -157,10 +160,6 @@ python.pkgs.buildPythonApplication rec {
     export PATH=$PATH:$out/bin
   '';
 
-  postCheck = ''
-    $out/bin/esphome --help > /dev/null
-  '';
-
   postInstall =
     let
       argcomplete = lib.getExe' python3Packages.argcomplete "register-python-argcomplete";
@@ -172,6 +171,10 @@ python.pkgs.buildPythonApplication rec {
         --fish <(${argcomplete} --shell fish esphome)
     '';
 
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "--version";
+
   passthru = {
     dashboard = python.pkgs.esphome-dashboard;
     updateScript = callPackage ./update.nix { };

From 68c50246016d14ed2aa21d6744ef39229494cbee Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 2 Jul 2025 21:36:00 +0200
Subject: [PATCH 25/83] tenacity: add darwin support

---
 pkgs/by-name/te/tenacity/package.nix | 60 +++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index 509290301648..31fb7c07b743 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -3,6 +3,7 @@
   lib,
   fetchFromGitea,
   cmake,
+  ninja,
   wxGTK32,
   gtk3,
   pkg-config,
@@ -60,16 +61,42 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-2gndOwgEJK2zDSbjcZigbhEpGv301/ygrf+EQhKp8PI=";
   };
 
-  postPatch = ''
-    mkdir -p build/src/private
-    touch build/src/private/RevisionIdent.h
+  postPatch =
+    ''
+      # GIT_DESCRIBE is used for the version string and can't be passed in
+      # as an option, so we substitute it instead.
+      substituteInPlace CMakeLists.txt \
+        --replace-fail 'set( GIT_DESCRIBE "unknown" )' 'set( GIT_DESCRIBE "${finalAttrs.version}" )'
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      substituteInPlace libraries/lib-files/FileNames.cpp \
+        --replace-fail /usr/include/linux/magic.h ${linuxHeaders}/include/linux/magic.h
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      # Tenacity has special handling for ffmpeg library search on darwin,
+      # looking only in a few specific directories.
+      # Make sure it searches for our version of ffmpeg in the nix store.
+      substituteInPlace libraries/lib-ffmpeg-support/FFmpegFunctions.cpp \
+        --replace-fail /usr/local/lib/tenacity ${lib.getLib ffmpeg}/lib
+    '';
 
-    substituteInPlace libraries/lib-files/FileNames.cpp \
-         --replace /usr/include/linux/magic.h \
-                   ${linuxHeaders}/include/linux/magic.h
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir $out/{bin,Applications}
+    mv $out/{,Applications/}Tenacity.app
+
+    # Symlinking the binary is insufficient as it would be unable to
+    # find the bundle resources
+    cat << EOF > "$out/bin/tenacity"
+    #!${stdenv.shell}
+    open -na "$out/Applications/Tenacity.app" --args "\$@"
+    EOF
+    chmod +x "$out/bin/tenacity"
+
+    # Only contains a static library that is already linked into the tenacity binary
+    rm -r $out/lib
   '';
 
-  postFixup = ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     wrapProgram "$out/bin/tenacity" \
       --suffix AUDACITY_PATH : "$out/share/tenacity" \
       --suffix AUDACITY_MODULES_PATH : "$out/lib/tenacity/modules" \
@@ -77,10 +104,9 @@ stdenv.mkDerivation (finalAttrs: {
       --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
-  env.NIX_CFLAGS_COMPILE = "-D GIT_DESCRIBE=\"\"";
-
-  # tenacity only looks for ffmpeg at runtime, so we need to link it in manually
-  NIX_LDFLAGS = toString [
+  # Tenacity only looks for ffmpeg at runtime, so we need to link it in manually.
+  # On darwin, these are ignored by the ffmpeg search even when linked.
+  NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isLinux (toString [
     "-lavcodec"
     "-lavdevice"
     "-lavfilter"
@@ -89,23 +115,23 @@ stdenv.mkDerivation (finalAttrs: {
     "-lpostproc"
     "-lswresample"
     "-lswscale"
-  ];
+  ]);
 
   nativeBuildInputs =
     [
       cmake
+      ninja
       gettext
-      makeWrapper
       pkg-config
       python3
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
+      makeWrapper
       linuxHeaders
     ];
 
   buildInputs =
     [
-      alsa-lib
       expat
       ffmpeg
       file
@@ -134,6 +160,7 @@ stdenv.mkDerivation (finalAttrs: {
       gtk3
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
+      alsa-lib
       at-spi2-core
       dbus
       libepoxy
@@ -149,6 +176,9 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     # RPATH of binary /nix/store/.../bin/... contains a forbidden reference to /build/
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
+    # Disabled by default on Linux but enabled on Darwin, so we disable it explicitly for all platforms,
+    # as we provide dependencies from nixpkgs regardless of the target platform.
+    "-DVCPKG=OFF"
   ];
 
   meta = {
@@ -157,6 +187,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://tenacityaudio.org/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ irenes ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
   };
 })

From aa1f0203701ad325009ff082f8d9958d0ba4b1ec Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 2 Jul 2025 22:08:47 +0200
Subject: [PATCH 26/83] tenacity: add maintainer niklaskorz

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

diff --git a/pkgs/by-name/te/tenacity/package.nix b/pkgs/by-name/te/tenacity/package.nix
index 31fb7c07b743..b00c4655146f 100644
--- a/pkgs/by-name/te/tenacity/package.nix
+++ b/pkgs/by-name/te/tenacity/package.nix
@@ -186,7 +186,10 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "tenacity";
     homepage = "https://tenacityaudio.org/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ irenes ];
+    maintainers = with lib.maintainers; [
+      irenes
+      niklaskorz
+    ];
     platforms = lib.platforms.unix;
   };
 })

From ed1ead2dd22c8c1f79c7a45c3007ba02c14d3f6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jul 2025 16:38:06 +0000
Subject: [PATCH 27/83] frida-tools: 14.1.2 -> 14.4.0

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

diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix
index d7325fda5188..5ef11d72dde6 100644
--- a/pkgs/by-name/fr/frida-tools/package.nix
+++ b/pkgs/by-name/fr/frida-tools/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "frida-tools";
-  version = "14.1.2";
+  version = "14.4.0";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ORNgNpzZWoW/Ex6DOUk/mgRPySTv/cWybcHnEMdKeIU=";
+    hash = "sha256-ACiznCkOZvnPUSB+Xcs4IZfbPGyknr193gLok0FrzqA=";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 7da9354563de175dc5d46c20235e8c2bbfb4e9d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 19:28:17 +0000
Subject: [PATCH 28/83] miller: 6.13.0 -> 6.14.0

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

diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix
index 9c2567906453..afcd19a6398d 100644
--- a/pkgs/by-name/mi/miller/package.nix
+++ b/pkgs/by-name/mi/miller/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "miller";
-  version = "6.13.0";
+  version = "6.14.0";
 
   src = fetchFromGitHub {
     owner = "johnkerl";
     repo = "miller";
     rev = "v${version}";
-    sha256 = "sha256-eHiYIw/sQMXLow2Vy4zFTGeON28LmG0pK2Uca4ooInU=";
+    sha256 = "sha256-tpM+Y65zYvnTd9VNJPDTWyj0RC+VmdmVCNzXyVGs/EI=";
   };
 
   outputs = [
@@ -20,7 +20,7 @@ buildGoModule rec {
     "man"
   ];
 
-  vendorHash = "sha256-oc6Lp4rQ+MLmQDVcuNJ3CqYH277Vuuwu4zSSO2ICXsw=";
+  vendorHash = "sha256-KgQZg8+6Vo4t0yx7AwuOyRWIMT7vwUO5nfDgBSVceIA=";
 
   postInstall = ''
     mkdir -p $man/share/man/man1

From 13da9f33eab910cd3c13c1549683197b6a99f3e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 19:33:23 +0000
Subject: [PATCH 29/83] python3Packages.python-gitlab: 6.0.0 -> 6.1.0

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

diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix
index 77fac81541e3..fb351f79bb97 100644
--- a/pkgs/development/python-modules/python-gitlab/default.nix
+++ b/pkgs/development/python-modules/python-gitlab/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "python-gitlab";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "python_gitlab";
     inherit version;
-    hash = "sha256-cEv1SMJY8c/i8JuOzprxzI+mroKKxv5qHL6VfJhDFBQ=";
+    hash = "sha256-Bi1pQ2mbCbzkD3J/DQkGoLJUykVVk/gXRbsaNSU17nc=";
   };
 
   build-system = [ setuptools ];

From 41b19900cf5ec4e183d788e95600aa1d77de36a3 Mon Sep 17 00:00:00 2001
From: Stephen Huan <stephen.huan@cgdct.moe>
Date: Mon, 23 Jun 2025 02:40:50 -0400
Subject: [PATCH 30/83] python3Packages.triton: fix patches

---
 .../0001-_build-allow-extra-cc-flags.patch    | 15 ++---
 ...up.py-introduce-TRITON_OFFLINE_BUILD.patch | 64 -------------------
 ...driver-short-circuit-before-ldconfig.patch | 33 +---------
 .../0004-nvidia-allow-static-ptxas-path.patch | 22 ++-----
 .../python-modules/triton/default.nix         |  2 +-
 5 files changed, 16 insertions(+), 120 deletions(-)
 delete mode 100644 pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch

diff --git a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch
index b814e6ff2235..7b97c7f87b0d 100644
--- a/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch
+++ b/pkgs/development/python-modules/triton/0001-_build-allow-extra-cc-flags.patch
@@ -1,11 +1,11 @@
 diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py
-index 1b76548d4..1edbfd3da 100644
+index 1b76548d4..2756dccdb 100644
 --- a/python/triton/runtime/build.py
 +++ b/python/triton/runtime/build.py
-@@ -30,6 +30,14 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
-     include_dirs = include_dirs + [srcdir, py_include_dir, *custom_backend_dirs]
-     # for -Wno-psabi, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111047
-     cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-Wno-psabi", "-o", so]
+@@ -33,5 +33,13 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
+     cc_cmd += [f'-l{lib}' for lib in libraries]
+     cc_cmd += [f"-L{dir}" for dir in library_dirs]
+     cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
 +
 +    # Nixpkgs support branch
 +    # Allows passing e.g. extra -Wl,-rpath
@@ -14,6 +14,5 @@ index 1b76548d4..1edbfd3da 100644
 +        import shlex
 +        cc_cmd.extend(shlex.split(cc_cmd_extra_flags))
 +
-     cc_cmd += [f'-l{lib}' for lib in libraries]
-     cc_cmd += [f"-L{dir}" for dir in library_dirs]
-     cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
+     subprocess.check_call(cc_cmd, stdout=subprocess.DEVNULL)
+     return so
diff --git a/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch b/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
deleted file mode 100644
index 5b195fd7f882..000000000000
--- a/pkgs/development/python-modules/triton/0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 587d1f3428eca63544238802f19e0be670d03244 Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else@someonex.net>
-Date: Mon, 29 Jul 2024 14:31:11 +0000
-Subject: [PATCH] setup.py: introduce TRITON_OFFLINE_BUILD
-
-To prevent any vendoring whatsoever
----
- python/setup.py | 26 ++++++++++++++++++++++++--
- 1 file changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 73800ec40..4e5b04de4 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -112,6 +112,20 @@ def get_env_with_keys(key: list):
-             return os.environ[k]
-     return ""
- 
-+def is_offline_build() -> bool:
-+    """
-+    Downstream projects and distributions which bootstrap their own dependencies from scratch
-+    and run builds in offline sandboxes
-+    may set `TRITON_OFFLINE_BUILD` in the build environment to prevent any attempts at downloading
-+    pinned dependencies from the internet or at using dependencies vendored in-tree.
-+
-+    Dependencies must be defined using respective search paths (cf. `syspath_var_name` in `Package`).
-+    Missing dependencies lead to an early abortion.
-+    Dependencies' compatibility is not verified.
-+
-+    Note that this flag isn't tested by the CI and does not provide any guarantees.
-+    """
-+    return os.environ.get("TRITON_OFFLINE_BUILD", "") != ""
- 
- # --- third party packages -----
- 
-@@ -220,8 +234,14 @@ def get_thirdparty_packages(packages: list):
-         if os.environ.get(p.syspath_var_name):
-             package_dir = os.environ[p.syspath_var_name]
-         version_file_path = os.path.join(package_dir, "version.txt")
--        if p.syspath_var_name not in os.environ and\
--           (not os.path.exists(version_file_path) or Path(version_file_path).read_text() != p.url):
-+
-+        input_defined = p.syspath_var_name not in os.environ
-+        input_exists = input_defined and os.path.exists(version_file_path)
-+        input_compatible = input_exists and Path(version_file_path).read_text() == p.url
-+
-+        if is_offline_build() and not input_defined:
-+            raise RuntimeError(f"Requested an offline build but {p.syspath_var_name} is not set")
-+        if not is_offline_build() and not input_compatible:
-             with contextlib.suppress(Exception):
-                 shutil.rmtree(package_root_dir)
-             os.makedirs(package_root_dir, exist_ok=True)
-@@ -245,6 +265,8 @@ def get_thirdparty_packages(packages: list):
- 
- 
- def download_and_copy(name, src_path, variable, version, url_func):
-+    if is_offline_build():
-+        return
-     triton_cache_path = get_triton_cache_path()
-     if variable in os.environ:
-         return
--- 
-2.45.1
-
diff --git a/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch b/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch
index a3f22631c162..9600680567ce 100644
--- a/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch
+++ b/pkgs/development/python-modules/triton/0002-nvidia-amd-driver-short-circuit-before-ldconfig.patch
@@ -1,38 +1,11 @@
-diff --git a/python/triton/runtime/build.py b/python/triton/runtime/build.py
-index 1edbfd3da..2756dccdb 100644
---- a/python/triton/runtime/build.py
-+++ b/python/triton/runtime/build.py
-@@ -30,6 +30,9 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
-     include_dirs = include_dirs + [srcdir, py_include_dir, *custom_backend_dirs]
-     # for -Wno-psabi, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111047
-     cc_cmd = [cc, src, "-O3", "-shared", "-fPIC", "-Wno-psabi", "-o", so]
-+    cc_cmd += [f'-l{lib}' for lib in libraries]
-+    cc_cmd += [f"-L{dir}" for dir in library_dirs]
-+    cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
- 
-     # Nixpkgs support branch
-     # Allows passing e.g. extra -Wl,-rpath
-@@ -38,8 +41,5 @@ def _build(name, src, srcdir, library_dirs, include_dirs, libraries):
-         import shlex
-         cc_cmd.extend(shlex.split(cc_cmd_extra_flags))
- 
--    cc_cmd += [f'-l{lib}' for lib in libraries]
--    cc_cmd += [f"-L{dir}" for dir in library_dirs]
--    cc_cmd += [f"-I{dir}" for dir in include_dirs if dir is not None]
-     subprocess.check_call(cc_cmd, stdout=subprocess.DEVNULL)
-     return so
 diff --git a/third_party/amd/backend/driver.py b/third_party/amd/backend/driver.py
-index b99ff86c8..ea8bc103d 100644
+index ca712f904..0961d2dda 100644
 --- a/third_party/amd/backend/driver.py
 +++ b/third_party/amd/backend/driver.py
-@@ -79,6 +79,13 @@ def _get_path_to_hip_runtime_dylib():
+@@ -79,6 +79,9 @@ def _get_path_to_hip_runtime_dylib():
              return mmapped_path
          raise RuntimeError(f"memory mapped '{mmapped_path}' in process does not point to a valid {lib_name}")
  
-+    # ...on release/3.1.x:
-+    #         return mmapped_path
-+    #     raise RuntimeError(f"memory mapped '{mmapped_path}' in process does not point to a valid {lib_name}")
-+
 +    if os.path.isdir("@libhipDir@"):
 +        return ["@libhipDir@"]
 +
@@ -40,7 +13,7 @@ index b99ff86c8..ea8bc103d 100644
  
      import site
 diff --git a/third_party/nvidia/backend/driver.py b/third_party/nvidia/backend/driver.py
-index 5f2621ae5..e7762a3ec 100644
+index d088ec092..625de2db8 100644
 --- a/third_party/nvidia/backend/driver.py
 +++ b/third_party/nvidia/backend/driver.py
 @@ -23,6 +23,9 @@ def libcuda_dirs():
diff --git a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
index eea1834d1750..188133fe1408 100644
--- a/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
+++ b/pkgs/development/python-modules/triton/0004-nvidia-allow-static-ptxas-path.patch
@@ -1,26 +1,14 @@
-From e503e572b6d444cd27f1cdf124aaf553aa3a8665 Mon Sep 17 00:00:00 2001
-From: SomeoneSerge <else+aalto@someonex.net>
-Date: Mon, 14 Oct 2024 00:12:05 +0000
-Subject: [PATCH 4/4] nvidia: allow static ptxas path
-
----
- third_party/nvidia/backend/compiler.py | 3 +++
- 1 file changed, 3 insertions(+)
-
 diff --git a/third_party/nvidia/backend/compiler.py b/third_party/nvidia/backend/compiler.py
-index 6d7994923..6720e8f97 100644
+index 960334744..269e22e6e 100644
 --- a/third_party/nvidia/backend/compiler.py
 +++ b/third_party/nvidia/backend/compiler.py
-@@ -20,6 +20,9 @@ def _path_to_binary(binary: str):
+@@ -38,6 +38,9 @@ def _path_to_binary(binary: str):
          os.path.join(os.path.dirname(__file__), "bin", binary),
      ]
  
 +    import shlex
 +    paths.extend(shlex.split("@nixpkgsExtraBinaryPaths@"))
 +
-     for bin in paths:
-         if os.path.exists(bin) and os.path.isfile(bin):
-             result = subprocess.check_output([bin, "--version"], stderr=subprocess.STDOUT)
--- 
-2.46.0
-
+     for path in paths:
+         if os.path.exists(path) and os.path.isfile(path):
+             result = subprocess.check_output([path, "--version"], stderr=subprocess.STDOUT)
diff --git a/pkgs/development/python-modules/triton/default.nix b/pkgs/development/python-modules/triton/default.nix
index 7eff3418e718..2c8d2f9c9347 100644
--- a/pkgs/development/python-modules/triton/default.nix
+++ b/pkgs/development/python-modules/triton/default.nix
@@ -33,6 +33,7 @@ buildPythonPackage rec {
   version = "3.3.1";
   pyproject = true;
 
+  # Remember to bump triton-llvm as well!
   src = fetchFromGitHub {
     owner = "triton-lang";
     repo = "triton";
@@ -42,7 +43,6 @@ buildPythonPackage rec {
 
   patches =
     [
-      # ./0001-setup.py-introduce-TRITON_OFFLINE_BUILD.patch
       (replaceVars ./0001-_build-allow-extra-cc-flags.patch {
         ccCmdExtraFlags = "-Wl,-rpath,${addDriverRunpath.driverLink}/lib";
       })

From cd2bea6ef5006b6c432a70834eb9f1a60a8dacb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jul 2025 20:51:54 +0000
Subject: [PATCH 31/83] python3Packages.globus-sdk: 3.57.0 -> 3.59.0

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index 0ac0cabdaef1..5b781e656d1d 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.57.0";
+  version = "3.59.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     tag = version;
-    hash = "sha256-pwAr8Z8Qoc+LjRtF2NRu4lAN/7ha7jogw1RnDhuobZs=";
+    hash = "sha256-95CcuKCGjFezFpz7UJaA/j9ubFNaNkDQsPnwrt1ZyvA=";
   };
 
   build-system = [ setuptools ];

From ac410be10248b07c0c39dc76584ade430c99d23b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 00:47:08 +0000
Subject: [PATCH 32/83] polymake: 4.13 -> 4.14

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

diff --git a/pkgs/by-name/po/polymake/package.nix b/pkgs/by-name/po/polymake/package.nix
index 4997e4ce3eee..d60bc12bb1b1 100644
--- a/pkgs/by-name/po/polymake/package.nix
+++ b/pkgs/by-name/po/polymake/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "polymake";
-  version = "4.13";
+  version = "4.14";
 
   src = fetchurl {
     # "The minimal version is a packager friendly version which omits
     # the bundled sources of cdd, lrs, libnormaliz, nauty and jReality."
     url = "https://polymake.org/lib/exe/fetch.php/download/polymake-${version}-minimal.tar.bz2";
-    sha256 = "sha256-862s0GO56mDV6cN8YYP127dFiwyzSR66Pvw48gxWXOs=";
+    sha256 = "sha256-4nZncZpZECwbJ/X5j6g807QUf2MpKUBZLyFxUd79v40=";
   };
 
   nativeBuildInputs = [

From 9958fc16cb16acb255ad203cca2376ec180d3eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= <arcadio@pm.me>
Date: Fri, 4 Jul 2025 19:55:50 +0200
Subject: [PATCH 33/83] minimap2: cleanup and add correct 32-bit ARM flag

---
 pkgs/by-name/mi/minimap2/package.nix | 33 ++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix
index 247f5b19be1a..ece612e9b74e 100644
--- a/pkgs/by-name/mi/minimap2/package.nix
+++ b/pkgs/by-name/mi/minimap2/package.nix
@@ -3,6 +3,9 @@
   stdenv,
   fetchFromGitHub,
   zlib,
+  minimap2,
+  testers,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,24 +21,36 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
-  makeFlags = lib.optionals stdenv.hostPlatform.isAarch64 [
-    "arm_neon=1"
-    "aarch64=1"
-  ];
+  makeFlags =
+    lib.optionals stdenv.hostPlatform.isAarch [ "arm_neon=1" ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "aarch64=1" ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp minimap2 $out/bin
-    mkdir -p $out/share/man/man1
-    cp minimap2.1 $out/share/man/man1
+    runHook preInstall
+    install -m755 -Dt $out/bin minimap2
+    install -m644 -Dt $out/share/man/man1 minimap2.1
+    runHook postInstall
   '';
 
+  passthru.tests.version = testers.testVersion {
+    package = minimap2;
+    command = "minimap2 --version";
+  };
+
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Versatile pairwise aligner for genomic and spliced nucleotide sequences";
+    longDescription = ''
+      Minimap2 is a versatile sequence alignment program that aligns
+      DNA or mRNA sequences against a large reference database. It is
+      particularly efficient for long reads and can handle various
+      sequencing technologies including PacBio and Oxford Nanopore.
+    '';
     mainProgram = "minimap2";
     homepage = "https://lh3.github.io/minimap2";
     license = licenses.mit;
-    platforms = platforms.all;
+    platforms = platforms.unix;
     maintainers = [ maintainers.arcadio ];
   };
 }

From 79a4fd11dc5a089beae6ff4ea0551068b2a556ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jul 2025 14:52:30 +0000
Subject: [PATCH 34/83] reindeer: 2025.06.23.00 -> 2025.06.30.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 59c523dbd685..05e0671b98d4 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.06.23.00";
+  version = "2025.06.30.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-4g5CbKFsZaZWSNCw04G1zMR873VeW3fdtvIM9HrrVJc=";
+    hash = "sha256-9TvYewY74ntI8iTo5UOTQ+OA6eJHmA/fUPRW0maZn00=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-sL15ziVSW70m4XhqpQoCeZBvmp7bB6tKPUCvwUFqvRg=";
+  cargoHash = "sha256-yxxh/ikFioEAHpuS/AAIpQClWvQxL/5/UkiSbbKRnBA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From efd27f4846fc0c0b5e7a39571bc80b64652627b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arcadio=20Rubio=20Garc=C3=ADa?= <arcadio@pm.me>
Date: Sat, 5 Jul 2025 17:34:57 +0200
Subject: [PATCH 35/83] minimap2: cleanup and add correct 32-bit ARM flag

---
 pkgs/by-name/mi/minimap2/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/mi/minimap2/package.nix b/pkgs/by-name/mi/minimap2/package.nix
index ece612e9b74e..863f3be16dae 100644
--- a/pkgs/by-name/mi/minimap2/package.nix
+++ b/pkgs/by-name/mi/minimap2/package.nix
@@ -2,9 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  installShellFiles,
+  versionCheckHook,
   zlib,
-  minimap2,
-  testers,
   nix-update-script,
 }:
 
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   makeFlags =
     lib.optionals stdenv.hostPlatform.isAarch [ "arm_neon=1" ]
     ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "aarch64=1" ];
@@ -28,14 +30,13 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     install -m755 -Dt $out/bin minimap2
-    install -m644 -Dt $out/share/man/man1 minimap2.1
+    installManPage minimap2.1
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = minimap2;
-    command = "minimap2 --version";
-  };
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
   passthru.updateScript = nix-update-script { };
 

From 48a64a050394c34dcc43cf26a8b8ec7f2fb76218 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Sun, 29 Jun 2025 11:05:47 +0200
Subject: [PATCH 36/83] python3Packages.hickle: fix testing with numpy 2.3

---
 .../python-modules/hickle/default.nix         |  3 ++
 .../hickle/numpy-2.3-ndarray-tostring.patch   | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/hickle/numpy-2.3-ndarray-tostring.patch

diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix
index 823136c83a2f..619f5368b37e 100644
--- a/pkgs/development/python-modules/hickle/default.nix
+++ b/pkgs/development/python-modules/hickle/default.nix
@@ -34,6 +34,9 @@ buildPythonPackage rec {
       url = "https://github.com/cjwatson/hickle/commit/246d8e82c805e2e49ea0abd39abc9b2d800bde59.patch";
       hash = "sha256-IEVw2K7S1nCkzgn9q0xghm4brfXcallNjzXpt2cRq1M=";
     })
+    # fixes test failing with numpy 2.3 as ndarray.tostring was deleted
+    # FIXME: delete once https://github.com/telegraphic/hickle/pull/187 is merged
+    ./numpy-2.3-ndarray-tostring.patch
   ];
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/hickle/numpy-2.3-ndarray-tostring.patch b/pkgs/development/python-modules/hickle/numpy-2.3-ndarray-tostring.patch
new file mode 100644
index 000000000000..4539cbebe032
--- /dev/null
+++ b/pkgs/development/python-modules/hickle/numpy-2.3-ndarray-tostring.patch
@@ -0,0 +1,33 @@
+From 7a0d0e625dd9e92159a145a26dd68ef3b61fde6e Mon Sep 17 00:00:00 2001
+From: Sergey Volkov <taranarmo@gmail.com>
+Date: Sun, 29 Jun 2025 10:54:00 +0200
+Subject: [PATCH] replace `ndarray.tostring` with `ndarray.tobytes`
+
+`ndarray.tostring` is deprecated since numpy 1.19 and removed in numpy 2.3
+https://numpy.org/doc/stable/release/2.3.0-notes.html
+---
+ hickle/tests/test_06_load_astropy.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/hickle/tests/test_06_load_astropy.py b/hickle/tests/test_06_load_astropy.py
+index 628a4b3..b630bfd 100755
+--- a/hickle/tests/test_06_load_astropy.py
++++ b/hickle/tests/test_06_load_astropy.py
+@@ -166,7 +166,7 @@ def test_astropy_time_array(h5_data,compression_kwargs):
+         assert reloaded.format == t1.format
+         assert reloaded.scale == t1.scale
+         for index in range(len(t1)):
+-             assert reloaded.value[index].tostring() == t1.value[index].tostring()
++             assert reloaded.value[index].tobytes() == t1.value[index].tobytes()
+         del h_dataset.attrs['np_dtype']
+ 
+         reloaded = load_astropy.load_astropy_time_dataset(h_dataset,b'astropy_time',t1.__class__)
+@@ -174,7 +174,7 @@ def test_astropy_time_array(h5_data,compression_kwargs):
+         assert reloaded.format == t1.format
+         assert reloaded.scale == t1.scale
+         for index in range(len(t1)):
+-            assert reloaded.value[index].tostring() == t1.value[index].tostring()
++            assert reloaded.value[index].tobytes() == t1.value[index].tobytes()
+         loop_counter += 1
+ 
+ 

From 6dc1e9576963b4518ac32087b86e523d63db7615 Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Sat, 5 Jul 2025 18:51:18 +0200
Subject: [PATCH 37/83] python3Packages.hickle: make first patch vendored

---
 .../python-modules/hickle/default.nix         |  5 +-
 .../hickle/numpy-2.x-support.patch            | 92 +++++++++++++++++++
 2 files changed, 93 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/hickle/numpy-2.x-support.patch

diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix
index 619f5368b37e..48190f2cfa18 100644
--- a/pkgs/development/python-modules/hickle/default.nix
+++ b/pkgs/development/python-modules/hickle/default.nix
@@ -30,10 +30,7 @@ buildPythonPackage rec {
   patches = [
     # fixes support for numpy 2.x, the PR is not yet merged https://github.com/telegraphic/hickle/pull/186
     # FIXME: Remove this patch when the numpy 2.x support arrives
-    (fetchpatch {
-      url = "https://github.com/cjwatson/hickle/commit/246d8e82c805e2e49ea0abd39abc9b2d800bde59.patch";
-      hash = "sha256-IEVw2K7S1nCkzgn9q0xghm4brfXcallNjzXpt2cRq1M=";
-    })
+    ./numpy-2.x-support.patch
     # fixes test failing with numpy 2.3 as ndarray.tostring was deleted
     # FIXME: delete once https://github.com/telegraphic/hickle/pull/187 is merged
     ./numpy-2.3-ndarray-tostring.patch
diff --git a/pkgs/development/python-modules/hickle/numpy-2.x-support.patch b/pkgs/development/python-modules/hickle/numpy-2.x-support.patch
new file mode 100644
index 000000000000..8e88a67abbf1
--- /dev/null
+++ b/pkgs/development/python-modules/hickle/numpy-2.x-support.patch
@@ -0,0 +1,92 @@
+From 246d8e82c805e2e49ea0abd39abc9b2d800bde59 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Mon, 3 Feb 2025 15:28:10 +0000
+Subject: [PATCH] Support numpy 2.0
+
+See: https://numpy.org/devdocs/numpy_2_0_migration_guide.html#adapting-to-changes-in-the-copy-keyword
+---
+ hickle/legacy_v3/loaders/load_numpy.py | 2 +-
+ hickle/loaders/load_builtins.py        | 4 ++--
+ hickle/loaders/load_numpy.py           | 2 +-
+ hickle/tests/test_02_hickle_lookup.py  | 6 +++---
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/hickle/legacy_v3/loaders/load_numpy.py b/hickle/legacy_v3/loaders/load_numpy.py
+index 0fd6c0a4..d17044bc 100644
+--- a/hickle/legacy_v3/loaders/load_numpy.py
++++ b/hickle/legacy_v3/loaders/load_numpy.py
+@@ -115,7 +115,7 @@ def load_np_scalar_dataset(h_node):
+ 
+ def load_ndarray_dataset(h_node):
+     py_type, data = get_type_and_data(h_node)
+-    return np.array(data, copy=False)
++    return np.asarray(data)
+ 
+ def load_ndarray_masked_dataset(h_node):
+     py_type, data = get_type_and_data(h_node)
+diff --git a/hickle/loaders/load_builtins.py b/hickle/loaders/load_builtins.py
+index 7cfbf281..53b74429 100644
+--- a/hickle/loaders/load_builtins.py
++++ b/hickle/loaders/load_builtins.py
+@@ -170,7 +170,7 @@ def create_listlike_dataset(py_obj, h_group, name,list_len = -1,item_dtype = Non
+         # strings and bytes are stored as array of bytes with strings encoded
+         # using utf8 encoding
+         string_data = bytearray(py_obj,"utf8") if isinstance(py_obj,str) else memoryview(py_obj)
+-        string_data = np.array(string_data,copy=False)
++        string_data = np.asarray(string_data)
+         string_data.dtype = 'S1'
+         dataset = h_group.create_dataset( name, data = string_data,shape = (1,string_data.size), **kwargs)
+         dataset.attrs["str_type"] = py_obj.__class__.__name__.encode("ascii")
+@@ -385,7 +385,7 @@ def load_list_dataset(h_node,base_type,py_obj_type):
+         if h_node.dtype.itemsize > 1 and 'bytes' in h_node.dtype.name:
+ 
+             # string dataset 4.0.x style convert it back to python string
+-            content = np.array(content, copy=False, dtype=str).tolist()
++            content = np.asarray(content, dtype=str).tolist()
+         else:
+ 
+             # decode bytes representing python string before final conversion
+diff --git a/hickle/loaders/load_numpy.py b/hickle/loaders/load_numpy.py
+index a4c76e91..bff98187 100644
+--- a/hickle/loaders/load_numpy.py
++++ b/hickle/loaders/load_numpy.py
+@@ -232,7 +232,7 @@ def load_ndarray_dataset(h_node,base_type,py_obj_type):
+             # not converted to list of string but saved as ar consequently
+             # itemsize of dtype is > 1
+             string_data = bytes(string_data).decode("utf8")
+-        return np.array(string_data,copy=False,dtype=dtype)
++        return np.asarray(string_data,dtype=dtype)
+     if issubclass(py_obj_type,np.matrix):
+         return py_obj_type(data=h_node[()],dtype=dtype)
+     # TODO how to restore other ndarray derived object_types
+diff --git a/hickle/tests/test_02_hickle_lookup.py b/hickle/tests/test_02_hickle_lookup.py
+index 628a2b12..dd91ffd1 100644
+--- a/hickle/tests/test_02_hickle_lookup.py
++++ b/hickle/tests/test_02_hickle_lookup.py
+@@ -816,7 +816,7 @@ def test_ReferenceManager_get_root(h5_data):
+     content = data_group.create_dataset('mydata',data=12)
+     type_table = root_group.create_group('hickle_types_table')
+     int_pickle_string = bytearray(pickle.dumps(int))
+-    int_np_entry = np.array(int_pickle_string,copy=False)
++    int_np_entry = np.asarray(int_pickle_string)
+     int_np_entry.dtype = 'S1'
+     int_entry = type_table.create_dataset(str(len(type_table)),data = int_np_entry,shape =(1,int_np_entry.size))
+     int_base_type = b'int'
+@@ -878,7 +878,7 @@ def test_ReferenceManager(h5_data):
+     with pytest.raises(lookup.ReferenceError):
+         reference_manager = lookup.ReferenceManager(false_root)
+     int_pickle_string = bytearray(pickle.dumps(int))
+-    int_np_entry = np.array(int_pickle_string,copy=False)
++    int_np_entry = np.asarray(int_pickle_string)
+     int_np_entry.dtype = 'S1'
+     int_entry = type_table.create_dataset(str(len(type_table)),data = int_np_entry,shape =(1,int_np_entry.size))
+     int_base_type = b'int'
+@@ -1052,7 +1052,7 @@ def test_ReferenceManager_store_type(h5_data,compression_kwargs):
+ @pytest.mark.no_compression
+ def test_ReferenceManager_get_manager(h5_data):
+     h_node = h5_data.create_group('some_list')
+-    item_data = np.array(memoryview(b'hallo welt lore grueszet dich ipsum aus der lore von ipsum gelort in ipsum'),copy=False)
++    item_data = np.asarray(memoryview(b'hallo welt lore grueszet dich ipsum aus der lore von ipsum gelort in ipsum'))
+     item_data.dtype = 'S1'
+     h_item = h_node.create_dataset('0',data=item_data,shape=(1,item_data.size))
+     with lookup.ReferenceManager.create_manager(h5_data) as memo:

From 3c21dc88a701c39bb4ca997e56d2614f848d74b2 Mon Sep 17 00:00:00 2001
From: necrophcodr <nc@scalehost.eu>
Date: Mon, 7 Jul 2025 00:03:16 +0200
Subject: [PATCH 38/83] fteqw: unstable-2024-04-13 -> unstable-2025-06-25

---
 pkgs/games/fteqw/default.nix | 1 +
 pkgs/games/fteqw/generic.nix | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/fteqw/default.nix b/pkgs/games/fteqw/default.nix
index c6b959e61e65..b6e6415e057e 100644
--- a/pkgs/games/fteqw/default.nix
+++ b/pkgs/games/fteqw/default.nix
@@ -46,6 +46,7 @@
         libopus
         xorg.libXrandr
         xorg.libXcursor
+        xorg.libXScrnSaver
       ];
 
       postFixup = ''
diff --git a/pkgs/games/fteqw/generic.nix b/pkgs/games/fteqw/generic.nix
index 1c158602bf87..096638764764 100644
--- a/pkgs/games/fteqw/generic.nix
+++ b/pkgs/games/fteqw/generic.nix
@@ -22,13 +22,13 @@ stdenv.mkDerivation {
     nativeBuildInputs
     postFixup
     ;
-  version = "0-unstable-2024-04-13";
+  version = "0-unstable-2025-06-25";
 
   src = fetchFromGitHub {
     owner = "fte-team";
     repo = "fteqw";
-    rev = "1f9f3635f0aef3b2eed6b40e35fcf6223c6ad533";
-    hash = "sha256-AgTkkP8pT6yioIcVNpxmfCFF0M+7BGx3TXgQSkOgfPI=";
+    rev = "41f35720eda2d1e54d039975db28f46d68a963cb";
+    hash = "sha256-g8dKNRHAZvNfCT3ciDSyKJVqjENml39k26NqkP7sQvA=";
   };
 
   makeFlags = [

From 42960a5b75caeb0072eed81994c36b08999aa016 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 00:08:44 +0000
Subject: [PATCH 39/83] thunderbird-latest-bin-unwrapped: 139.0.2 -> 140.0

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

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 712fd2d22bbb..b022c742a775 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "139.0.2";
+  version = "140.0";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/af/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/af/thunderbird-140.0.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "fac575196a0f674af9bc4a0bbcf28b4b6378d0f85c0027784ddaaae3e7948c82";
+      sha256 = "6354d0a716a87e2d9f86dc9a57932ffe23220832546edd57608660c9d73cf0d5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ar/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ar/thunderbird-140.0.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "e607f615cc37d11b068608023eb04106a41610c055406bcd1ee8c0efb14e466d";
+      sha256 = "bdd3aa60081a66b131f9ee748e92bccac7082bbe89bc6b1bcbe34ae576018920";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ast/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ast/thunderbird-140.0.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "f054f3460f07341a1b5d698d5fe68b6f4ac43715eabfde348137fa2aeee9245c";
+      sha256 = "e2d673b6987b98f4d594349cdf5a51044e121292d7c7d1a28a705be161d76892";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/be/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/be/thunderbird-140.0.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "6d992740e1c8804e6eb21b5a54f58aa0d3038e97b0cb190f757d0998e9d332a2";
+      sha256 = "31243db3dacdb29f952b14f65cfccd60e67fa3faf40e3b44bd54f50bcd9f28cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/bg/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/bg/thunderbird-140.0.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9e0052b94a39ea779f25476f21695b6aaaa3d2e1a9728b8cf023844832a43407";
+      sha256 = "ffbcf5f5a37a365af15b37223c7bd81a5b9a078f879ffc224aa99b0b10e687ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/br/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/br/thunderbird-140.0.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "9820286b62f9b19eaeab280a4dc44b47c9bde7c6207bd303be3ab2cdb841fa32";
+      sha256 = "eb45793925a22ec63ba29c2312a16350db81d32ae2d290f748a48c877875b552";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ca/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ca/thunderbird-140.0.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "5bbff46917963b11a4d27407f6e696aa1c1e1ae013574f7ba5f0a216dc1e5c1b";
+      sha256 = "30609db086163d6c56780162e9e7b97405a15325523cbf7a2826016acbf2ef20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cak/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cak/thunderbird-140.0.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "b230111ca99527b06a437a1515da5e6985843a11b9aa05c1a67063bebe4ae0ad";
+      sha256 = "612bf6a5290c3f963016aade4fecb354fc7c94a40d4fc00c8a7ce4a6c1ac6e1a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cs/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cs/thunderbird-140.0.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "c1395573306bb7a8992c82ccee300588dbcec55db623e4818c1741d30f7db1ae";
+      sha256 = "140f8b7c77ad71a2a8eb60bebe43fde97bd72d17e3ed1728d42b2b7d2d00e0f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/cy/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/cy/thunderbird-140.0.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "b8b9e3642b8e4d979f96ecda5175c65eaf5186589292cfdcf1707b4647f656cf";
+      sha256 = "67cc821c9097ad4b4ed444b2a2797263738ad84cb4447b34f6576af7bd25a191";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/da/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/da/thunderbird-140.0.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "0e7602f34ccfb74069c5da866c56620c2d3ec7c8f4631cbcc9fe310ad6e2a11b";
+      sha256 = "d4e898dd01a3a22c9f48b97bfe63f12ab0c16b8d33006e427322a1b78dcefb98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/de/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/de/thunderbird-140.0.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "f554153c2e3fbc1234c173fed2cbabdc4da217a79bb9076ea0e63973ff377c2c";
+      sha256 = "4ad26d439c433d4ed4dd0d23d73b4ccc15119d329961eeada2914d2ea14fa0d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/dsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/dsb/thunderbird-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "1b6ce6fff33ee7cc0fcb1ade2f5aecad3d33b8842ad0f91651b0479495900214";
+      sha256 = "bc12c9e11f42ad39871c7e58fe53645987c497ee6ac5246f06196562f4cfd412";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/el/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/el/thunderbird-140.0.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "adeb90cbca0d092dd7d03f9295c880a757aa4ec98da1912c30fe068e054804c2";
+      sha256 = "bc9559721e71a1eff511b453ddd81ec23bd2e4e61222218f3256f3b33e97fec8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-CA/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-CA/thunderbird-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "71eba2aeff733dd2d21700a7a92d7741b52aa1a2297003fdb612066e0846c5f2";
+      sha256 = "0d563912d384682e5f71cdd2b4800c3331ad7f59cbdd1a47bfe46786d0d93540";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-GB/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-GB/thunderbird-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "2e9b4009229e378bf42a7f9a56fa4d8c84850323f94123bf69bd88877501f281";
+      sha256 = "221a194d22ce3d370a10f0abebf35bd3ca3f5c7e0077ea70b45a9641283c71c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/en-US/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/en-US/thunderbird-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "586a26ae67befe3a9b435e5f704d8a802d89dd52f7f3c644b73ff3510effb546";
+      sha256 = "ffc88e3bd1bdf0d4318e550c00ed90a1ca8f18b60c4bc29f37284fba95ecf696";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-AR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-AR/thunderbird-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "265da7fe5b88196c220a287b4e8de3c3728c633ab85fa02dd352a25337b4a073";
+      sha256 = "cd5f41c9f8eb8a00add3e2a5f57ba80d9ededc061da7a0d3a36dd232e3e196ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-ES/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-ES/thunderbird-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "3e573a6363b0fb85485df4cdc20a59d3b5af25daf40930abef2c9e480203d248";
+      sha256 = "7ad1a1711db299378df882740a2da3564c69e7c27c55616aaec9813f8d8d2b53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/es-MX/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/es-MX/thunderbird-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "e5fe333f6461143366441f2d9ed22fb423e5f9bb8b3d9fde064f15f37c7306dc";
+      sha256 = "71d6812accf0b8a9e833ae7c8b1f6dadfe7ac61ae3e58364b1a131490d97be95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/et/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/et/thunderbird-140.0.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "182a2b9bfd8711b694ada070426e06c29b6b6b07755e3caa813ea5e4776a17fd";
+      sha256 = "01b630c2f27f1f62e1ec77c557ce62eaf7caca3b614e9d2ccc8f8ab89fb972c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/eu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/eu/thunderbird-140.0.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "f948dc2e081de225381908f0cd7e488610d47fec1de74eee4bd2d64083db6456";
+      sha256 = "228c87bc59c30cb64480025b9587f7796cb35d98f6ce3529b816cb2385cafc12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fi/thunderbird-140.0.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "88e46da83192cec302e860ac87a7da89f4315fcc7075309738e8620f83d18c1c";
+      sha256 = "f880467f6947ca1a67534f6483cd8c4130cc8611dee3596e0f7be2e2c8cf7fe1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fr/thunderbird-140.0.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "756f63ecbb4174fecdd65caed5813deeaf500c15d3762f966bf49a51a04f7343";
+      sha256 = "262c951e723aadac59be50279b2c0cb2cdf853dd7d7702f4d1f67eddf536116a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/fy-NL/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/fy-NL/thunderbird-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "ee21ad76da5a373d2de3121e8b2a3cf894b522d1ee88e7b5690c78352c505d60";
+      sha256 = "e071dc9b626ba983ab3269272c61b95247cd4fa99b69ab0ed4059bdd750016c2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ga-IE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ga-IE/thunderbird-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "35fe29248d87da93b544acc514180f55fa874b645fab57e7db41a019157652bf";
+      sha256 = "905da7820ad428b8b6ceddf01a3bbbed545956e4b84663fb06b2b8c5e49fb52c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/gd/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/gd/thunderbird-140.0.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "37c75f8635251cf91de32a95b1d146f276cb2c03fed5aa0f3e49fe7f65b04211";
+      sha256 = "f804b289a4cb9caa0cf68325be33ffdfd0692108e021e18b6671229651c98231";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/gl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/gl/thunderbird-140.0.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "6f9b6701d431112d4f3288834d029151ba8be7212258de4a1b9fa27aa7f3e3a0";
+      sha256 = "70bbdf657b5a26309074c8690b7a040616255d0e45edfc9cb9cee4bbd700af6a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/he/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/he/thunderbird-140.0.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "7d47acafcda302e129804763670e8440f0968b7ea1307ffd1f6a7cc4c8461ca0";
+      sha256 = "75567442db641f6f2604296b78173aa1cc1ea53bfa89d0a3e21d77877ef0a0ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hr/thunderbird-140.0.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "cdcdeb674f9289a7267c46c86e347dcd4255a5962cbbdca79fb2951ea5b71b27";
+      sha256 = "a4171c5177cdc925d378a94f87f76c0bf506b2bde0a45924bb624720f5563236";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hsb/thunderbird-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "0756e367e329ea10a87590954ea97b2b17a2475b8d72dc59919541539b0a7b30";
+      sha256 = "99655cc4b350dedad6e11bbfa8e083d950563cf812ff6ce89d7aa18f13ba864a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hu/thunderbird-140.0.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "1b3279673b30b342da299cbaa2973ba48ddc4b739b88c5e6e5825b954b731f6c";
+      sha256 = "9eb199a44fc710f2cbcedccc181208d6e4873eb0df81273758068b670c3dd240";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/hy-AM/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/hy-AM/thunderbird-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "82c9d1f617a56cbd300ae6d0fa0ac6a633cf8a1610d1ab612902a6503ca55a3e";
+      sha256 = "7f3f1efc50f72a3351a86840860e0775b7f28eca4f0029aed1ec93af82b8e4b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/id/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/id/thunderbird-140.0.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "c420f360bd82e4f840e0a20f25c3a8dc3984d2b95594310930e20f55693a1e92";
+      sha256 = "b72756286ff157812d987234f89931605346f4f2d71c374fe262bfa538e58379";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/is/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/is/thunderbird-140.0.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "bbdf9ca3a40f1808312238dbda332bdbeb82aad249c62e9ea578e0e0e10abbbd";
+      sha256 = "348296059015e7a8dda122b71f7c3731be9de6fdad4f67cbecd88d1f1c468e15";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/it/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/it/thunderbird-140.0.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "6a320104a48724bfe7a4b30108fe36d2858dac36977555f7c8cb8258c0213a3b";
+      sha256 = "e548f08ad67dab6b91f5156f6f1d3be2fec90fa1603e9fe95e9685465e16d68f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ja/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ja/thunderbird-140.0.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "abaf0566a742c1e362f3e26d58a148bfa1e8e1e7cdcb2ab2bdee0f9c1d5c6672";
+      sha256 = "d551b224c9ab2f28d7414c1f939a90cd3203c5d07142aea72784d1f28282aec1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ka/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ka/thunderbird-140.0.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "944155d09532a22bc3d3df1bd98c4f60156e2be13387469c25c7f0afcc802dc6";
+      sha256 = "84becb5da99d053735cea0d29957c2a7e3f1eb9fee96110159aafa1c5ed67767";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/kab/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/kab/thunderbird-140.0.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "6961557b8f8b1861859cbb4f434934b108864417ea154ae39a20090f4473e987";
+      sha256 = "69646edf14b7cec8912925c49c5a334a9d343aed3e938af29efd819b12d4ade2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/kk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/kk/thunderbird-140.0.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "c5b3822594e14f87e79864d51d9601dc28402bd137cece61b1ab5e8090cc15cb";
+      sha256 = "2d6232763c573ef055ae10b059d0b0b597472d8070dd579821da1b20873415d2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ko/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ko/thunderbird-140.0.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "a15e35c955dbb8afce11bfd3d760e3e82008513ff8616e9467aade7e51f9e1c8";
+      sha256 = "15507a11e06c77b4d579074edf3cbff109da4cedf1a1fca0805e558e7db5ab86";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/lt/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/lt/thunderbird-140.0.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "710861d995c73b852ec829a743c026448894b21b564fceb10b954af20c762f96";
+      sha256 = "aab5591736adde55aa7d0e26e3441405de44f3052d9d575535d0d3904936fe83";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/lv/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/lv/thunderbird-140.0.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "383bcfc9abe761fb567ced9f148e8185d87f180e5e2098ed820756b9909aa517";
+      sha256 = "75f4e93bc8b3a998a48015410dd7e4d341f2eab54efdfeaadb3bd69a13cf7645";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ms/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ms/thunderbird-140.0.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "dcf7c77542edb9035d588a5e313642235840168a93d3a317f772c4f519e2d38a";
+      sha256 = "20439444f08f44a8e85e7c44cb2362bbeaca0c5c911c46badeea47f1b342571d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nb-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nb-NO/thunderbird-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "39e277927fa2b5b6e2fd407e03eabf17d67b44b3941fc07488c2cac6bdf8b136";
+      sha256 = "ddbaaec2c26f5cf82ed4f4ad72b02700421c980eed7141aa690e9b56309ad2f7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nl/thunderbird-140.0.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "1e3d4bd0a56e06a51280503a4240039456a485be67b5078a52ac40bac76d021a";
+      sha256 = "21452959174a4b3f9395f97537aac634bdab54306f227b6f3335e1f564567e6a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/nn-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/nn-NO/thunderbird-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "7dec758e056e9360979ca8f2dd4222d4cee6960f3280f5d3f78cbf83fb4e3740";
+      sha256 = "57caf6a22fa2c95eb8fd9a52d7edb081fd7d1549ccf017ebbb7fc489c9a45bf7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pa-IN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pa-IN/thunderbird-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "f9ea9a44b5568bfc17df45a498d7179c3f545bd9fee4fd14e0df6f6ca264e0e5";
+      sha256 = "e6c849b01908011bdda27cc672837fc3f3fdfd54c114ea5c6f9c43ad301c9fa8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pl/thunderbird-140.0.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "5f9adcc99df0fdd3f5f7456d8ad8a3cb51d05e723922c240ec9f4af83ab58160";
+      sha256 = "ccc6121aad53aff78753503996eb10a921b3fd6259165f87841700572efaf4e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pt-BR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pt-BR/thunderbird-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "c8503ec2ab35b46ea7dc9bb75e88899751f9cce7cbefc61035a1e7a0998cb1e6";
+      sha256 = "7cabbc00f73f8ff0f6d86a663bea9930564ed7b27216fb2bc989069a04fc50fc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/pt-PT/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/pt-PT/thunderbird-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "9b94ece80963bd911fc11ac56519139e91aa3147e877cc47c16560e684d92f03";
+      sha256 = "934cec97e4323853f85897e696b6547c3d00488c3d711621a9dffae12e5200eb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/rm/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/rm/thunderbird-140.0.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "339fb7a75f6d69f25548c05fac908f85a7930bf444505957977d813c8338221a";
+      sha256 = "ffb0a2f9758b86a6d690cd3454b4365346be563cdbc2985f0f8891a6e217c592";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ro/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ro/thunderbird-140.0.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "91fd8f9585ea0fa013fc9de142c3ac901baf84ee68135130ac95f5f8971da709";
+      sha256 = "8e7df89c2f0f0cd98c54476daa018063504af2d46e645e0746518650e5edd3dc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/ru/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/ru/thunderbird-140.0.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "0f080d4d070fc51976996c9fb12a9041742790a9e5caffd89c79c11045748de1";
+      sha256 = "2eaa88a13225228150c8cc61bc1ac1e9e199ee7d223bcbc20a6b6150bea54e91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sk/thunderbird-140.0.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "271900618cebfaf8cff7c26289e03b3685144b560eff2c5542348f67cd9f24e7";
+      sha256 = "110160e8de26053558531b7adfaecd14e4b898ffe4159821cf524904e7d4eabd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sl/thunderbird-140.0.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "ce1e33c9c0b5825993300b235eb53bb566c277d1b00d6654f2c36c469031bc33";
+      sha256 = "d72793cbb7e62261ce04f9aeb0590a67363108f10d39dda0fb72e4ef82fd7917";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sq/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sq/thunderbird-140.0.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "b1982a4733bc0cc9666b563bbf3ca6bdffb6af7a54b2522c05a9248fdbd44661";
+      sha256 = "54786c45ee8bc52cbf9b4e7aac2c5f106652619e1f887468dcac430cb594799d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sr/thunderbird-140.0.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "f4f5ea86865068be75bb9d5af34fed1a53ab22f6a17f6d46ca3ff99de77bab4b";
+      sha256 = "eb153716a80c183b02fa952371af879027e492062f8d2fa522008a07384155ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/sv-SE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/sv-SE/thunderbird-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "18c709cd269b4fc3f5ed34457e86da5491bfdad8437e47861ea751cddab43ce3";
+      sha256 = "32cb08c8772a0d3339e1685450a9d5ead03d6e230f730484e94f9bcfe3e6d757";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/th/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/th/thunderbird-140.0.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "b3ee51fb55022fef4451eb6a18c0ec0c560d68e3c071a3976f150f539b7498d2";
+      sha256 = "76acd6bbf6a2fa568b6c4cf65211efe0574402bc0951346fce02f2ba4928065a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/tr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/tr/thunderbird-140.0.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "e9039353ef4084148a827889b4e1ddaabe138aa38e3b4312b40b9979ff763649";
+      sha256 = "5b4856017192421d304f0daf2eb1e62002b45a9f0a0a75041fb9e9f6517514d8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/uk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/uk/thunderbird-140.0.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "32f4a7528ce0bf4a8fbcc584fc9b4e6469cd5a206b14fcc6dc52c3c8dd223a0e";
+      sha256 = "f8585be150061fe2ff91efed3680cdc3375a27aeb9d390dccff3f72fb2ad79aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/uz/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/uz/thunderbird-140.0.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "4f5a39e05fb4d1fb7a6ab0524f5ecd57a341c5134ecf40a90e2cf1fc8a325a0d";
+      sha256 = "93ee30de280017844ae7b1fbbeb37ac365ed7ecae7aca9c8a763280a0d79b924";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/vi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/vi/thunderbird-140.0.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "ed23cfe4810df01e7ad6e56fbd1154fa85a06bfb8477f7fd267e063774c9ff38";
+      sha256 = "a40a3ebae3e7dc588a55849461248e0ef3f68d365f46453a174e80188c29cac5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/zh-CN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/zh-CN/thunderbird-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "3235b83d0f06a37de13785dbab4d08224db04d7ea130926806bac2d113208d51";
+      sha256 = "a26e6e39bd829a21a2064af6d81f8d0e8d8546400c5657ce6d8b78ff4c2b26ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-x86_64/zh-TW/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-x86_64/zh-TW/thunderbird-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "eb7b50e215c8cbf75bc320c92c9248c9378dec2dd638975a9175ad4569b98bee";
+      sha256 = "6bc03ef62ff76a62a3509e217164708e84b1d666362cc3de8b8c7db89c810531";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/af/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/af/thunderbird-140.0.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "34e11a2e2d94e9657a8c754370894c5bff35394d812d57f198836d2aca2cdfb7";
+      sha256 = "a91fefe7408d62f7ea0af18a3fd108b252a03b5a25624ba1d3caf12d02881a08";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ar/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ar/thunderbird-140.0.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "b59436ab074c8e032787ff20c54ddc3c6fe7a48dcc6c18b153dcac6233cb0a83";
+      sha256 = "a41b7756988ff75a04319d93cd3348d4f9b74c1a10922070e53251ecc9e68c4a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ast/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ast/thunderbird-140.0.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "0c2048333df674b1e8944c068ad1dd985696e87bd86671819675d6b7994d9f57";
+      sha256 = "9fd09f2fa6760b158bbd038d0bb17549a2c5dd1aa0daf62a816cb649c3c2ba12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/be/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/be/thunderbird-140.0.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "d08eed9fbca8220fa5a4186197ea82090b1fa490c27c1186b7278ddb3b730f9c";
+      sha256 = "49235072baf87ff33fa292951e47cfb53fb2bff6538eb827b34e9b16f034e072";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/bg/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/bg/thunderbird-140.0.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "e16524042ba4390587ad0db661c515d0679eeb2c76f8e0b5343e7e1832ce5935";
+      sha256 = "4c7f9e9139539ff49f16b6ce1cfece5fc6d81a611ced6a87733c0e52a90fb5e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/br/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/br/thunderbird-140.0.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "28a5e0bcd7f18be8ffadc1cbf211084304db07ca3068b054ef11e694a282de80";
+      sha256 = "5537cc4c623567dbb8e608eae176472c153ac2e4fe84ea4ff3ad39b6b72ebe58";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ca/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ca/thunderbird-140.0.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "ec8690303c76f35278c9240caa004812196f765dab26de27baeaee51cc773c8f";
+      sha256 = "905ef4d1afd39ecc32846be863745b8bbcf9ff11ee3df861040b5db27375d5ac";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cak/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cak/thunderbird-140.0.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "4f3454a77c571208bc016e740df81feb659ddc2a112b54d8aff7e6cc62d68b84";
+      sha256 = "96203f34b37aa25641dcc5becf358765c177a68909bb419606356cb77764c9b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cs/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cs/thunderbird-140.0.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "78dbbfd0e1a38e2bb34c95ca9e2773333364e762f028d744abb8385d445582c1";
+      sha256 = "fb13f8fd08bafa5e39b7ba2148ad78d77bd5b7e16d977a7bfd9211099f69eca6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/cy/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/cy/thunderbird-140.0.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "1362148e056cc2aa0677f3211624d800eadd8a82bb7e0e8830dbbf18429db0d4";
+      sha256 = "9611ac5b70716dde90d5362c7f8e11fc34b091eaffe350d02513e540f92c9ed0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/da/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/da/thunderbird-140.0.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "390a3acc9847a6577305b761590774a3380bab0eebe0b485d8276c8a66e02e75";
+      sha256 = "436e3018bddb83cc5aa84077362259f3efca6c28e2860141b9af13da670e4d3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/de/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/de/thunderbird-140.0.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "9a27987742b0ae03da6ce9862859d1d6f03d282eca853753e784964047dbd919";
+      sha256 = "9fc2ff5ce2d4b15a1b0cbaa0f29cbff86ee541ee1fae98b9a802bdf14a7d4089";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/dsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/dsb/thunderbird-140.0.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "fa4559b51e0c8e6b0ac9814cc512242ec66761998cddcd3080de3c72233183c1";
+      sha256 = "8578968b77b28132a8fb48c29df104b610058e861d4433767a1f4a4062b6ba10";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/el/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/el/thunderbird-140.0.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "f4da4d59391a4cc1752aa5bf8b1dc407b67772a754502ef82e4b8fc7cf10d41f";
+      sha256 = "65d2972306ab4db693279b3b5f48c212eb9cd03d3e123b3022f9497b774516ed";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-CA/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-CA/thunderbird-140.0.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "b576214306853bebee0b65fb5c76e2f616be56e3b9cb0943fcbadfdfdc7883a9";
+      sha256 = "d7994fc12415eebd76819c884838e2d835227e2430be681bd133414d55d672f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-GB/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-GB/thunderbird-140.0.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "88c97b1642fe6ea9628388943be43d9d119133f85e19f64bb62981a9abb786c4";
+      sha256 = "4a3b31487a8ca4c11c2a1490e3fdd392bfa7d95ef3522b50d43ea42455e65733";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/en-US/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/en-US/thunderbird-140.0.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "ea3f53da34b54b4597214f3192badaf823e5ff925e64e2b673ed8705419df05d";
+      sha256 = "3864e8e76cf4bd95a35bd4a9668fe6d2bb2d4d20a09359f6f3247a5f0d9ed40c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-AR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-AR/thunderbird-140.0.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "f81d7ec8abb4fe7a725ccbe327da201cd9ea816252f140d06fb11a8fa4714abb";
+      sha256 = "79cf6de1fd1539f4590c72b6792df914785c0b98e012e375723236df36db1c18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-ES/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-ES/thunderbird-140.0.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "dc5a3770044a0c3f845ade493ffa687a93cfe862bc5b0216baf5728c332ff675";
+      sha256 = "a94f0873c03dda93463985af28c2b1732b57f84a90a6b1aeaea15c2c068457ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/es-MX/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/es-MX/thunderbird-140.0.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "38cec780ab13337890478ae1636a48e7288b1d8c504f148e0dda0ab62281327d";
+      sha256 = "36f6d0500a88f1cbd685fa9a8df396d7375ab329cac952ceddc30f14cd23b42e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/et/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/et/thunderbird-140.0.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "669a2a9f5bd3b2458538e586dcefeca44a4cfc599b594fad169f80e773eb044d";
+      sha256 = "ae9393e20a4901e50fecc386533a2d97e95730123f1e65669e173e116a872958";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/eu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/eu/thunderbird-140.0.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "312a9efed65dafe8de66a5945b0cf8cb166d11ccc69c29e7e23452e2e0d5cbbc";
+      sha256 = "0b14e26d85591f5c71923358cef7659ab32fca83cf273537f1d7ef2f395d2762";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fi/thunderbird-140.0.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "039340a1d2827f487d8dab42a96612c778d97e580f76d4def7e99c2a9778c988";
+      sha256 = "3fc0d97fd77f73556d0d322b06256424d3c518c65cc01945cd20a2dc50789499";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fr/thunderbird-140.0.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "7779c1fb1de816f21f7e57005daa33c518dd70d2959eef371fa4c515c83b2ca5";
+      sha256 = "f87f9817365810800f24b2d4336bd0f597afeea60665380997353f8841fc7bd9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/fy-NL/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/fy-NL/thunderbird-140.0.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "14e1ed8f73ffa9d13ac1435f9bbd4d063043a903b1dc20373cc7f1fe7bc45429";
+      sha256 = "7edd73a351ca4495e630f49e49a3da41a144baba19d73e0801413b9d5c701fca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ga-IE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ga-IE/thunderbird-140.0.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "bdd42c055f8b513f3e48918a41f57b2924f0954afea225f87198713652330af9";
+      sha256 = "5dcf3f4fc9339d2b18362ef7821efc841c183ec5d775ac88173c92ade2a0188b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/gd/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/gd/thunderbird-140.0.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "0b88ef782d44d2c19ed5b0237cd8188559a34234f3583e6946ceafe9a8446cf9";
+      sha256 = "a0be320036814966c3897b23b4680776de5a4a67cdbc03851815ff6463708d75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/gl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/gl/thunderbird-140.0.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "445fb6df2197ee8c74da712ba8b28334c1d27e85bcda9f6b31b7575def7668dc";
+      sha256 = "b2600fab294ae36dcb5393fa2614b992232f23f4048030bcda43968d52b5ba41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/he/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/he/thunderbird-140.0.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "811e91e0e2afef963216a1d26e07cda9a0bac11fd8b9fe2f9ad4663462fc077f";
+      sha256 = "1cec5c2acadd3cda9400702488a8fdaece9c831d7563153acc6f915a634243f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hr/thunderbird-140.0.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "0bac2285f4af03d706bbe6493664e6e2984569c586c3b903e121775870c4b01e";
+      sha256 = "792c86c253538d5523f933f250c6654d3819a35f9d73bd8284ee14ae55fc4968";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hsb/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hsb/thunderbird-140.0.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "84fc58865bc74698ac752ea727bc1f0a5a2a3588aceead0f23e93cf4eb23f889";
+      sha256 = "c7225883ecd455644457d994111e38f1906854d280056c51075fd441392d51fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hu/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hu/thunderbird-140.0.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "63d3ab7a51ec864d8eadc6deec795df7749125daef11c6ea005458eafa7cff2d";
+      sha256 = "a4043c636233c7ae06aa9e2bcafc92bb0cd2a020e52a6da82bca88e8cf125e47";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/hy-AM/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/hy-AM/thunderbird-140.0.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "b471fee3eb6a3b99ac4f725becb3f601d19bec8846a58e7fe6a2ca3c56f04753";
+      sha256 = "4b339dd83e431c91b9ff29308ab585a26aa95e23d248e8bf11115255693ce275";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/id/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/id/thunderbird-140.0.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "a63d0ed8cc126418cd091bc83dbda70fde8386851a210df80de082ce7d5f7ec4";
+      sha256 = "8b91323db69d9c70aacf78d58516b26a61145654ec158d81af0e59813abf4127";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/is/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/is/thunderbird-140.0.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "46ea1c252119a08f67a617f03cd41ddcac1527dc8580046f6d7ab0b20a21f160";
+      sha256 = "20132bf94b743c43605f1c1627d8e493a8eed3eebac4c174ad036228721ee958";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/it/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/it/thunderbird-140.0.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "5bab030946df404f59cfaed24f4da0093cd80412b0b2481811d14ee526040420";
+      sha256 = "75eb75dc9869326984f15391cb855588399a201a35ee3c74ddbb04dac62f723e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ja/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ja/thunderbird-140.0.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "544d91494571e8d087e5ca4f8f91e2ab0174732abb1d279afa993a0b59d74a08";
+      sha256 = "f9b2477ef6f6aeb89587c4f26c0be6a8faf2b295df4885539c90b5897947b2b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ka/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ka/thunderbird-140.0.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "119ec25a042e86c10e6177c010ba4d997fe1e9ea318648ae0997d2ef1bb7f0c5";
+      sha256 = "7ea6caffff18eb871593a94d4a79c5a1dac5933be29ffdf89fabaf2a8e1d87a9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/kab/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/kab/thunderbird-140.0.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "7026bb2dafa0515fb627fd83f421f886ee7cd7d83f1b2f844d5c82fc1563811a";
+      sha256 = "72606d61c2c8632d594be3c96bc735430c1c7ee786355671404e226b5efb8623";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/kk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/kk/thunderbird-140.0.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "fc45f5780091bec2d0b6af5e36d1afe6ae0e260caf376920396cf84539698769";
+      sha256 = "9ab86be14f7e53ecd6a40a8d8ee57cfd8f12c62e3c6d4622d32420f912b0ea2c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ko/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ko/thunderbird-140.0.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "f543b32938ca1c3b592747f7a679c6232c904a970d7455032acbc95c56f916ce";
+      sha256 = "822a1b4fd9c0b8bc3210292024a8c7e1e688208b9a9bbc6b8b1fcb9cc20ad102";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/lt/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/lt/thunderbird-140.0.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6923123d16ce0ca096e68287da656171186cec69c302bb670566e1fe5d11c2fe";
+      sha256 = "e9c44ac87b9437e5d1502dfcf17bd5453f9fe252c9e2c41b15b3ce0445143457";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/lv/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/lv/thunderbird-140.0.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "64fe698210c6dd3deadb21cb0c4081e54e36daf1050a39292afb58d3029a46a8";
+      sha256 = "f2c7bea3b5888bddbd6502f65140cec0f7680a9edaed4c0738832cd5edd91740";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ms/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ms/thunderbird-140.0.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "29fd892970167197bea3c185d76f40485b1df6cd4fb84a591b63b4dbabb6382b";
+      sha256 = "8a9c1e30d9195a8cb50a797b15fb9f4462429eeacd58e055b172f686149e7c8f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nb-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nb-NO/thunderbird-140.0.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "ee4930d126e47def1372e37b240d364acd9ed94cb8158e5124a9a5101b23c43c";
+      sha256 = "73a05643c78e9da748898274e2df7fac2aa41fddc61860661bb61f0e7e6d5553";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nl/thunderbird-140.0.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "586791b524608a950339be697c6c0dc59328f624526b1d92da1f6042cbcfe473";
+      sha256 = "f7015c51d4ee48b1042056f2b59ebcaf2af91aa4b3f810a77ac5b76d2694c707";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/nn-NO/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/nn-NO/thunderbird-140.0.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "defad7e7923e171af30922a422f125c50f2a5aa60a2f805bf23a5054772853f8";
+      sha256 = "f6cf5fa7e9a4748666289a3da001e7c5f57996603df8e516c29381a5c5c5adcb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pa-IN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pa-IN/thunderbird-140.0.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "fb9b4af5628bf0eb4b393fdca6f454ee7db3de32c515566782fb796dc305371f";
+      sha256 = "e0f1d2c53919030437e8f232ed7ec8df0a5fe5ee0a6fe028be264fd082f797d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pl/thunderbird-140.0.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "796eb258b22557cb60f7697c2475d8c16be3ac6f985c360c6fd7f8302e383eaa";
+      sha256 = "ddef5b7962ccc2013872bebeb7cbea5ab80d6b81404a0716b87e0bfb7b693fe7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pt-BR/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pt-BR/thunderbird-140.0.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "5ef494b8549e11a0e78ac7bb16ea866167fdcee39585c269734ac9bd1c50b058";
+      sha256 = "a0e63aba6273fc6968388999ba37e9451f015a98b4b11b2c33db4d91c7901d33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/pt-PT/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/pt-PT/thunderbird-140.0.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "fc8123905a82e7da9e13154d0f6b029064cdbfe397c64e08040492b46ef5b327";
+      sha256 = "4e5928c237cd89d5eb112f1377d8d6a2ca6f356f71e0578125b82676eefb4b95";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/rm/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/rm/thunderbird-140.0.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "e3cafa658e415528b4bd597becf2dd3aeb4871a0dc0d8f70ffb291b2a4918d38";
+      sha256 = "b4735becdcbf517487eb0a7d164b9a4262a54f2af3051cf4246891e209b9461c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ro/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ro/thunderbird-140.0.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "f9d21387a574f7fdf4bc72b8fd5f349a6a97d6a4bbfdb2c526c242c417e7227f";
+      sha256 = "881ced0d351edceeccf6b35657c25b50a089c1dbbfc67e8fcb2deac49b2a92df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/ru/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/ru/thunderbird-140.0.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "f1a4714261183df17b037910253305ea7301ba8cafa66cb45fb68b159292d7a6";
+      sha256 = "f891e5752e6d241e19360e1384b961170a943a4b74e560ec8cf2a06cd62171ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sk/thunderbird-140.0.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "917b5c547936497403cd2b146155921c0ded6c6ed348e83a0534906940b2885e";
+      sha256 = "062862c0e8bc406449d191f0bbece63ea40d514e0462366663eed1f4a37ba971";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sl/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sl/thunderbird-140.0.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "083fbd0f56ecddd4f00466790f71f70e80453622f9df2da1d8ece8ccca86495c";
+      sha256 = "4c8896aa30f9b32e88f803978a1b75ebe9856254935996b6fa88fa76855bff38";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sq/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sq/thunderbird-140.0.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "b7c1c94f601a28693ecb1a8bb812f76e4737a4c17c97598fc4ecb55e96efa762";
+      sha256 = "e6a43d7bf0f7d764a77a1a722ef65811341be1d015c3908890f585a2bc8369bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sr/thunderbird-140.0.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "7a69d6e63d0b5a90e6ed9ca3323eafa343c36c9c1c7a4f998d3e804fe9ffb669";
+      sha256 = "bc7d6c8d8d76a7b38f5b5fabf3b3bec7c0ca89f22c7e1e19ce84f940ea68ccad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/sv-SE/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/sv-SE/thunderbird-140.0.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "46f4bae52bb547162f09fe26d834b5476a939371e96e2e0d2f0d185f3a6f5c10";
+      sha256 = "55925cb98253a3f99c587a0ee4528d23bf461ca896fb9471c6ec9dacdab95d66";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/th/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/th/thunderbird-140.0.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "f55ce5dcddefcd1054514901ff5918f0482c6e9606616fbc536c3e46ab8bd139";
+      sha256 = "e9e5b38971157790a5d465769bac529e119f789de873b3bec39c8b3e2d1f720b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/tr/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/tr/thunderbird-140.0.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "9cb5477b1f8c2a5417a8b4dfd3af2b4fc208a237c98a275ae4e0a6b56b9fcda7";
+      sha256 = "a929741aa566daf92d95320e8e3ce29629499bb43772195fa919b57d155be1a1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/uk/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/uk/thunderbird-140.0.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b6160900240f929d8732066000751d225d453eef13202bd14e9a70ba7b41813e";
+      sha256 = "fcfa2eda01b46c676d6aec712debd649348e9b4451bba08668228d661073a03b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/uz/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/uz/thunderbird-140.0.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "20abb2db65a2ca78f314d4f98f7980b013d1cd5e821206402b20afe44d17a2a1";
+      sha256 = "600b636148de51f010f37d8d14aedb290f73837091621c4346d74a4cb8359970";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/vi/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/vi/thunderbird-140.0.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "94b19085f1faba4a43b35e20e508058481fea8dea53c933e3eb8ccdb055f9107";
+      sha256 = "f29356887a4f781b129b4038db9c8b692f6a0952d8297ac78ed236fe2fd42536";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/zh-CN/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/zh-CN/thunderbird-140.0.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "ee8fe6fb8f1ad0246d776669b155da2b3807efd2a97ba4d8d470e613f7368624";
+      sha256 = "8a9e51234e8b6822da950ee53c252a741ae9ee1daea2367bb0ca0f72742302fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/linux-i686/zh-TW/thunderbird-139.0.2.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/linux-i686/zh-TW/thunderbird-140.0.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "1487702e849700c49b2a2c4966d129fff2d8b593e28da76a4c59c431c5c8d6ed";
+      sha256 = "1880865c7fc077a70c954f53f5058fffbe07ee617f1bcf2d778cba2020cf1b41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/af/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/af/Thunderbird%20140.0.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "99b6cccc4eb25cb2ba996e7c2a5661c7b1f321172f4f7b99feb3af13d11bd771";
+      sha256 = "e91d7f46433c767c98498768e9fbccc539411442f7ad41b2c4292691351c784c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ar/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ar/Thunderbird%20140.0.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "b6e290908664af8d4eddd1ff87ccafa347dbd8a1f8e9e525e9597efa06152a7e";
+      sha256 = "f11ed7f71473b4bccf32ad4513b34cb8a2b0728e974cfbd2fbcd584ad4a6c7e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ast/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ast/Thunderbird%20140.0.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "a8f93706a1d527245eb8518b6dd578444c66ffe9fa2988803dc46677ee34cb71";
+      sha256 = "10dcb7006b4ecfbb70e76aadfce0678ab60a12a87163cb00777f0bc2c5fec0fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/be/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/be/Thunderbird%20140.0.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "d091cfe07d3caf4f7eaf43f887c9aa2a13a11137b3d79a8758a0321474ad35c0";
+      sha256 = "caee7a92770a61d0339ffbb4768dc59857a5ae7903b1c4056d34f2b941cdb97b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/bg/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/bg/Thunderbird%20140.0.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "e51370e8a83494522536d3baf10f62bfb8583eaf92d663024aa227b145ca3e99";
+      sha256 = "3296326478ff0f022f0975e643c908d17525279061d8ee2b2a6410ff9a28d385";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/br/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/br/Thunderbird%20140.0.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "04f8805e10f645f678baf227a6f65c88e37ebdea8e73e4fb633e5960b8be4cdf";
+      sha256 = "c40e3be45d4cb1a724d21441e4b60e0fb69c3180783a955e9147251a3fc8d3f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ca/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ca/Thunderbird%20140.0.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "fa5239daad9d2a4d38d54d27e151e545329e144653454897d8a999e02d75f5c6";
+      sha256 = "02b39a0ec2869741c482c4f75e91464a378cc14547e2a51b7742534d23c77302";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cak/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cak/Thunderbird%20140.0.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "de5119f83f0b9cc7a903ac88f1b6d667cb3fba29b8536792b80fa17e5392ae08";
+      sha256 = "c9ff87e4cc3db36c1c4cb427666e889676567b6c348eaf268ead21e696b2b286";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cs/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cs/Thunderbird%20140.0.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "8b790dfa4555e91ea8696086ff0fb234cc7d836b5267742adf41470a16bc6118";
+      sha256 = "66d6da3986c06fe82c9a407c74ce7a70c78bec7dcca6dfe4d37c5589e209882c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/cy/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/cy/Thunderbird%20140.0.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "fb585c04de777dde121f415591d92b1af9d7a1d48cd3d34483d4f6333a5882e8";
+      sha256 = "04ae480b5f73048b9c9af3b57e3de1e6afa78cb518706010ff278c4cae40f3f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/da/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/da/Thunderbird%20140.0.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "9220241ddd83e9228cce19af38f214e5f33881ae31473d61356b735e10a99af4";
+      sha256 = "8ca809dff042734d644d8728a48c4208a73a0d1e70f86a032ef47f5cb86278f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/de/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/de/Thunderbird%20140.0.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "e79485fa5396c270d40e900b2ca18a9362bbd200cc349f9e5b0c4b575e27d469";
+      sha256 = "242962d9d99725ca033471494c0b6f20c5ca289588e8765296891bb6f2052eae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/dsb/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/dsb/Thunderbird%20140.0.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "485d894e39295de13e2a057b97b7516d50ef8a95fb78129fb1aec3366fc47a15";
+      sha256 = "3d67db019027d6c7e62adb1b60ca227839440d68e699ddb388e1218b97485faf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/el/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/el/Thunderbird%20140.0.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "2e907cf8c39668761bf4e2465c4253c97e44b7056c45385903405d09877c1643";
+      sha256 = "f50f066f2097e0cd5ef4716d8fe70ab315d6edbb855230b523303ab8ce6f5ff3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-CA/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-CA/Thunderbird%20140.0.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "ddc491a837452668e58eaf210b028cb8cb976e39ee7da8e38710f5d6f0b0103a";
+      sha256 = "93a6e80d8c19c81d9dc3f908b41e99cdafddd2eb2e14150b148cdccb5468f9a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-GB/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-GB/Thunderbird%20140.0.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "d6db8f91f2f257968edb8da8a50f8b631dc7077c1425e08e91cbe4619c79017e";
+      sha256 = "d1764196b7050fee605ff323bd9e0ae94a6a797ed014e14eaaed102c81c37f57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/en-US/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/en-US/Thunderbird%20140.0.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "b7d1168590e0a777320bf8be4628cbd74d0385537187608fea0aff796d5d6805";
+      sha256 = "34a1e19d932e9f01bb7197ff510c72fa3ef97dcfc413839bce5e188e292157db";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-AR/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-AR/Thunderbird%20140.0.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "e595a17a6c22bd6bde428de42045db4cb8471202cd3d493874cecaf30ff5c53e";
+      sha256 = "fae74cf7b68f2055329de913867f3ed0075a6fcb373a5cc4c3a0013a3f8a6afb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-ES/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-ES/Thunderbird%20140.0.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "ca22719fbd05f2735c22a02788ab67e3143f5416ced0779a23f121b1b2c2888d";
+      sha256 = "4a96697a2673c1a6ccc8aa394589d89b67d6965a97f07da11e410c21d7588d7d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/es-MX/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/es-MX/Thunderbird%20140.0.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "cd31aadea61077b041dc52e0e932003e98e912a606f325538c909b8a47e60e6d";
+      sha256 = "7c225e7f189fe567bc6c7759fb01446fd398d9e194e8be956ac0edf33b7de008";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/et/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/et/Thunderbird%20140.0.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "4609da896d29d21c4d1a01b7706ee6a11bafc1ab1fdb24c28216c251d22453c2";
+      sha256 = "9e3ebeb24ebba2e87d2e1a22a47a9bb31b81cb891a6a94b4be6aba92dcd9ab77";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/eu/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/eu/Thunderbird%20140.0.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "5747357e5c51ad5964a6d9d7d8a2113584d7c69e862d0e883457f340f42cce66";
+      sha256 = "35661b198f01c2c76c096254612a7160440127519cf4e0c97435a83fd1e4bb45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fi/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fi/Thunderbird%20140.0.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "c46e1516a9f225db947d30474d3db24dfe52fb615ff65d3fb9215e657283a0e9";
+      sha256 = "fd606dc9ae8dee3aa1accb799ea94daa1fa7fe6c203de961ae61710f58e65941";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fr/Thunderbird%20140.0.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "f015ae56a6aca04658ed6cca2efd0d4c148d78b6ec0034ac5589388bf578a40e";
+      sha256 = "71103db6af97b921a73b1f1963e420c17b08eb63d75f015778b2213046f53e70";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/fy-NL/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/fy-NL/Thunderbird%20140.0.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "a5e64f9049dd98e8c002658bb86fe51dfd4fb42c5f26f527ef755fa76ef52380";
+      sha256 = "6886f636b4ce8a2c711f051ca6edec37396b399c61c212c4e81b82e8fb0ffe90";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ga-IE/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ga-IE/Thunderbird%20140.0.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "74eccba37c3992556dfe124b85fc9134b78fc03fa6fc3a4c81c8131470592895";
+      sha256 = "fb96cf25e618199c2bc16ecfd5f5f136916300c154170335822bc4ed45e79b33";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/gd/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/gd/Thunderbird%20140.0.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "1176cc0c6a23df107264ad7cd7d83862b29d354c03c198f9bd2558f0a2d218d8";
+      sha256 = "3672567442dd18ba2a3e4aece3080168381f11f71a2e511f6fc7c8bbb2674911";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/gl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/gl/Thunderbird%20140.0.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "3af59caf92d2195b039218a6517d68c557452b20d888f9ac1cbadb60ce9fd4d0";
+      sha256 = "f99690206ef559d90d308d96d841c7946928c15cd63ec1e7bb61e0e6ffa29bf5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/he/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/he/Thunderbird%20140.0.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "38793e93483928207ed0a599546c85eaaf987f15351bac52bda811183c86e225";
+      sha256 = "c37157620a24874643aed902ec63dfa6dd87baa9793f762c8a899a4537fdb590";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hr/Thunderbird%20140.0.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "e07947d0b4f147c5fe44c9da4b020e3756dd59bb7aa02c23d9693326ea336808";
+      sha256 = "c9dfe1d36cbf946c7d0470e4795e6763e6a858b30f1ed970911e7767acbdcb11";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hsb/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hsb/Thunderbird%20140.0.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "94f3fb73dc47589750d398939181919cabcd50f1d68088ae8356a078db6ef357";
+      sha256 = "c33da4110bcde79556c5a10249d237cb537f567f66e8e6c4282a03c843bed07e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hu/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hu/Thunderbird%20140.0.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "616254454de1a74a14c2851f74fb6db75d1119df4d38630cc11edba5ce8f8499";
+      sha256 = "c0b29fc2f564854a1cc8ca0cae0c7776a2b9039fbdf802c22c83f72d0bcf1657";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/hy-AM/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/hy-AM/Thunderbird%20140.0.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "8be90ac6541d8822ae6758066c9caea176a3b9d4cec5f4d79f885912388e1f1f";
+      sha256 = "5e3ce57c38c9086dff3e2fdef8fdd010a0631a6b4dc2802e614a01b733141a7f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/id/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/id/Thunderbird%20140.0.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "5720d86da6ba258d897db7ce66fe178da13e5410c73d31f259b5b9160caeee72";
+      sha256 = "722da355ddf1f167c33bd551c23e9848b4c0543236b613b6a1596e025394b7ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/is/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/is/Thunderbird%20140.0.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "c78d3389d2da92b9a8f7bf9c423750a0c9a40f80be726b692c2795d24dad5f02";
+      sha256 = "1366f639310cfe346619a00da8bb100d8010b2e288b94ce31c1151a74aaeb1a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/it/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/it/Thunderbird%20140.0.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "d140f278b8a540edfebe6d877630549e5c2fec775d11dc29c0d9226581efe814";
+      sha256 = "719d86b1c6a26f08bf1331c51c73b5fd43f5c9e773ecac8b691c84fdc6967913";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ja-JP-mac/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ja-JP-mac/Thunderbird%20140.0.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "f5a78c402cb350e8dcfa7d97ee320619dd49159c37779f0fb119909ade6e2637";
+      sha256 = "32862a5676057710330afb65f93a1702a21f579c91d0cb3effd3bc87ec147440";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ka/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ka/Thunderbird%20140.0.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "9d46dd6cb1317c55a62aa914f7ade3dde1dec0b339b20a7175944354f37eea3e";
+      sha256 = "95c590bdefa41ca99a2a9e3d7b67cbf935a828301207247b03f6bf636536601a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/kab/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/kab/Thunderbird%20140.0.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "2618a2a5ad922275f410c7a36d3e15e82ce667bfc8597005f3dc062403be5348";
+      sha256 = "fdbbb3e523eb7bab02278453bf64e7748d8034a8e244013200471e4cc659ef20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/kk/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/kk/Thunderbird%20140.0.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "1b5cafd8bab4e543aa78bf964ad8d49cf1acbc48c6ed087dc036d5d322effc0e";
+      sha256 = "4d5bae92ac0fd6c86f6a2296e774b91074653713d72ff37f589d1ec1afaaeb78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ko/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ko/Thunderbird%20140.0.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "f8173e84dd82ac4da522c71a875242eaf8eb107b8987606992d7393f992b1743";
+      sha256 = "a7fd1b29ea7834e078ad3a1495fcb44012419d204afde5940f8faa6ac0aac0d1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/lt/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/lt/Thunderbird%20140.0.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "ffc5b3bb98a45b5bc4c4dea4737d820db8654c8e68d0441d179333a43a04e5ae";
+      sha256 = "a1c547989111a3a9e7719fc2aae5e6629446db0f4e5ba5c0eb7badb9d7e13a1c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/lv/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/lv/Thunderbird%20140.0.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "920dbeed505f3d55a750aa047b899fb18844751833268a733a9afe87501b36af";
+      sha256 = "70bb9ccc58374fee15faaee0d475fd821fc13b146dd4bf517312d81b670d48f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ms/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ms/Thunderbird%20140.0.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "0d4cd6ab0b8da80c5ee4c263f59e132d417dd91b081441d7edb0ead9a3f1c57f";
+      sha256 = "df6391501862a1c671eb9307adf10406fd94772fde777c133fa0c0715be14ed8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nb-NO/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nb-NO/Thunderbird%20140.0.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "3aa1bf5c6f157b2c1c4ca100e3690242390f344a9ce66f4be31655fab46c486a";
+      sha256 = "cc37ccfdd8e1969abbc5e40d89967e555f6edb73551778d992520eea5da0000b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nl/Thunderbird%20140.0.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "8e0990be0ee10000d2c27a8fa81636eda6e14bdd1e4620da9c64e25d6665650a";
+      sha256 = "843f557a0bf080adb6e07b1cd599a27520436c50ea27e40120be772f13ff5d09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/nn-NO/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/nn-NO/Thunderbird%20140.0.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "d23c36020effe227a591bb743c440df3c54866b641b6a1c15e113c7fb4e65098";
+      sha256 = "fa0f91df5692ef0434ebb85ff705956cd6b5b73b6c019c873ad83af0c9a06461";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pa-IN/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pa-IN/Thunderbird%20140.0.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "2779f912dcd7001e601291c112c46f4be8fdc249942637e65293ca4c84741e97";
+      sha256 = "4206104601c0aefd646fa5d930b11dec7903f3c77a5a74a9f1321afccd7e655a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pl/Thunderbird%20140.0.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "ef86339886b50f980bbbd69720e8fb134859eb17a0435c2cdfd8b7238e155cd6";
+      sha256 = "32736afce67be152bba80e13f50fbf63d2c6cf15b17428f30c7d24846781f0e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pt-BR/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pt-BR/Thunderbird%20140.0.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "f4a755f3e3628537083efdf067e9162d7a654c8d8bf93ee207c46c3b858a7ba6";
+      sha256 = "71ae795a2be7a6bf7ef43ddcc1388f24b77c6f68c70530e876185f79d71cb405";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/pt-PT/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/pt-PT/Thunderbird%20140.0.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9af8fc19266867a83912fa38cdf3ec6dfbff4edb33e6b3d4722e77ffeeb83f78";
+      sha256 = "f5fa99e49892c89cea123acdca405f16124d711755eab0131d25d0b7ed7704a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/rm/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/rm/Thunderbird%20140.0.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "f21d4b178e0287333e8d98e11e2d5068505528ea2414034258eef581cc9c30c0";
+      sha256 = "7923f1b61c3b7b24a2f2867415605afc7771a29318f0e09fe6f752b0816397cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ro/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ro/Thunderbird%20140.0.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "5f40545ad6094ad600b1627386a7943f81266380c41674c781ffd9fe62612903";
+      sha256 = "02ef69f67af8ce479928252aaf93aa74a766b5d4ad2674b1520aeb51287b24f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/ru/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/ru/Thunderbird%20140.0.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "96026e6d4ad332a010fee85fd4d6241479baea225edf3259dd80121608fb3481";
+      sha256 = "8d3788a2ca39fe81e3ccb28dd46f1c69945987db7ab26439e3fb5524eed45d64";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sk/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sk/Thunderbird%20140.0.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "bf4adb8af0be6cc6318be35a41382fd8fad396e650e4773d61431629ec9bd0d4";
+      sha256 = "876347a307912740ee40d1b7aae19ae448f73f4093bd82c3bfb0b2ebdc9e0705";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sl/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sl/Thunderbird%20140.0.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "8e43e059551181d03b9c9b93fe41669c648b5b63efd8ef629ba46d06ac185ead";
+      sha256 = "50975cc67ec3db95a5ac17ca1ff6bbf5d688743d491b5a5a034f2fd178477ac9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sq/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sq/Thunderbird%20140.0.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "ad063957d9adbe51531703b622c8a563b52db1d2833e49e5c835597c04bd113c";
+      sha256 = "97ca3700aa41bde20c12f0a789c13f7e5098db67a9601f8766778af0547fd376";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sr/Thunderbird%20140.0.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "ac81d1bf3b680a89e56f7e774aef826def3f98902e1b0bb106782a35849ee566";
+      sha256 = "290bd2b71e2ff189050fac56d71803d063271226006ecf87621b83fdf83a1572";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/sv-SE/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/sv-SE/Thunderbird%20140.0.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "1675bc5e895bc9ee16d966c7fd830b602d91636ed9c931dda17d7cede0e21c76";
+      sha256 = "fb493eb5d4a5e50c49e49c12ed99c556b80e86bff0efa6356bdce94f83f69ca7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/th/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/th/Thunderbird%20140.0.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "6ed2b08ba111ec75537be28e4f2719a04e7e27e9781ec4de42c47100d5f98b6e";
+      sha256 = "4442017719a0dcc84a31f2a9d5d806cab03834b0c9c54ea9e3c409941195a9f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/tr/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/tr/Thunderbird%20140.0.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "4775f57c64fbb5ee8376b63e59b87fcfaf6d84aa3ce6091b9b10b197a8e856c5";
+      sha256 = "abae3714a23b03e97791937b7fa30a287eb21087bee5f486309a46cba53ab4ca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/uk/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/uk/Thunderbird%20140.0.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "eb29798c3f2d82bda2d2597b89c9b8f7371dd487f9756197159d83fe25054902";
+      sha256 = "73dc58c076fd95b613e471edc4b8991bfac6e6ace1a6127112620ac105c9c0b7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/uz/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/uz/Thunderbird%20140.0.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "c3eda53b62436fe773f5af0232e3acdb7c201d9f20e6953de1ed7d7bc7e017c3";
+      sha256 = "100fee1106e2dc0dac058b9021a2a420661a04c8f4f53f674d34d510098732c0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/vi/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/vi/Thunderbird%20140.0.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "514cc224a22d25c7c14fd1737e0e41b2a414abdfc1ff160b243ee4e211e0baf0";
+      sha256 = "2d9745cb1becf8cabe819c41d730cbb787eab5111ac1365a821c53c0eba27fcb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/zh-CN/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/zh-CN/Thunderbird%20140.0.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "64ebd8b5af4ecf2b6c67be685c0b3a1e2f4f6ebbe88f35d5ee3e8d54eb5528dc";
+      sha256 = "a06f684942163984300dc96a64b0637c408bc7b61a43b9fa30a556a634033fbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/139.0.2/mac/zh-TW/Thunderbird%20139.0.2.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.0/mac/zh-TW/Thunderbird%20140.0.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "eedcf8b19809349b8f622917bf3d161d75cbc384207f2425e9afd911927640cf";
+      sha256 = "634062fb991d8b9bbfb98c739478cf25208a3dc2132956ddc94426c3057a9a52";
     }
   ];
 }

From 6a20d8aed09d56b1f13548fb9bd46e36b27f66d6 Mon Sep 17 00:00:00 2001
From: Shogo Takata <peshogo@gmail.com>
Date: Tue, 1 Jul 2025 09:22:23 +0900
Subject: [PATCH 40/83] super-productivity: 13.0.10 -> 14.0.5

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

diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index 787b57039a6e..3be5ecbcb5ef 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -7,25 +7,66 @@
   makeDesktopItem,
   nix-update-script,
   npm-lockfile-fix,
+  prefetch-npm-deps,
+  rsync,
   stdenv,
 }:
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "13.0.10";
+  version = "14.0.5";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-2K/6T4f9tLlrKimT/DPSdoz8LHij5nsaF6BWSQf6u7U=";
+    hash = "sha256-VoE86uBl6DM6aXz7MLYekEzfixVSLjLL3yYgc2vBhp0=";
 
     postFetch = ''
-      ${lib.getExe npm-lockfile-fix} -r $out/package-lock.json
+      find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
     '';
   };
 
-  npmDepsHash = "sha256-l9P11ZvLYiTu/cVPQIw391ZTJ0K+cNPUzoVMsdze2uo=";
+  # Use custom fetcher for deps because super-productivity uses multiple
+  # package-lock.json files to manage plugins.  It checks all lock
+  # files and produces a merged output.  This should still be compatible
+  # with nix-update.
+  npmDeps = stdenv.mkDerivation (
+    lib.fetchers.normalizeHash { } {
+      pname = "super-productivity-deps";
+      inherit version src;
+
+      nativeBuildInputs = [
+        prefetch-npm-deps
+        rsync
+      ];
+
+      # Some lockfiles do not include any dependencies to install so
+      # prefertch-npm-deps produces an error.  Those can be ignored with
+      # this flag.
+      env.FORCE_EMPTY_CACHE = true;
+
+      buildPhase = ''
+        mkdir -p $out
+        find -name package-lock.json | while read -r lockfile; do
+          prefetch-npm-deps $lockfile /tmp/cache
+          # Merge output
+          rsync -a /tmp/cache/ $out
+          rm -rf /tmp/cache
+        done
+        # Ensure that the root package-lock.json is placed in the output.
+        # This means only the root lockfile is checked for consistancy,
+        # but that should not be an issue.
+        cp package-lock.json $out
+      '';
+
+      dontInstall = true;
+
+      outputHashMode = "recursive";
+      hash = "sha256-Jj7ulTjC19Q9PmOeVui/FAyfpsSviGLHiiz8gwsLXAg=";
+    }
+  );
+
   makeCacheWritable = true;
 
   env = {
@@ -64,13 +105,13 @@ buildNpmPackage rec {
       if stdenv.hostPlatform.isDarwin then
         ''
           mkdir -p $out/Applications
-          cp -r "app-builds/mac"*"/Super Productivity.app" "$out/Applications"
+          cp -r ".tmp/app-builds/mac"*"/Super Productivity.app" "$out/Applications"
           makeWrapper "$out/Applications/Super Productivity.app/Contents/MacOS/Super Productivity" "$out/bin/super-productivity"
         ''
       else
         ''
           mkdir -p $out/share/{super-productivity,icons/hicolor/scalable/apps}
-          cp -r app-builds/*-unpacked/resources/app.asar $out/share/super-productivity
+          cp -r .tmp/app-builds/*-unpacked/resources/app.asar $out/share/super-productivity
           cp electron/assets/icons/ico-circled.svg $out/share/icons/hicolor/scalable/apps/super-productivity.svg
 
           makeWrapper '${lib.getExe electron}' "$out/bin/super-productivity" \

From 7a14b70bccfb8f7c23a1d00559875c20fe494efb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 07:21:28 +0000
Subject: [PATCH 41/83] ipxe: 1.21.1-unstable-2025-06-26 ->
 1.21.1-unstable-2025-07-04

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

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 7d737bd454df..ff77ddfe246e 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-06-26";
+  version = "1.21.1-unstable-2025-07-04";
 
   nativeBuildInputs = [
     mtools
@@ -65,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "4262328c13a3ec085eac7c6c58fbed27d2466a0d";
-    hash = "sha256-FvYGM+NApTloA7vV1KPpsAzIT7oZ2GK6rKw+3mosvTA=";
+    rev = "c21443f0b9a4dee56ab0f47b096540d6443cda9f";
+    hash = "sha256-rCMTtzNZM3KElNYwnpQOINU4CsMhIgla8JQT5Fgx2tQ=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 8ea2c8843958bb54dc2e0263676f2fefe12dbcb8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 10:03:22 +0200
Subject: [PATCH 42/83] buildPgrxExtension: require pinning cargo-pgrx

Each extension always depends on a specific cargo-pgrx version, so make
pinning a requirement.
---
 .../rust/cargo-pgrx/buildPgrxExtension.nix    |   3 +-
 .../sql/postgresql/ext/pgvecto-rs/package.nix | 180 +++++++++---------
 .../postgresql/ext/pgvectorscale/package.nix  |   9 +-
 pkgs/servers/sql/postgresql/ext/pgx_ulid.nix  |   9 +-
 .../postgresql/ext/timescaledb_toolkit.nix    |   3 +-
 .../postgresql/ext/vectorchord/package.nix    |   9 +-
 6 files changed, 97 insertions(+), 116 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
index 304b901a18a9..73c7c0d1e350 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/buildPgrxExtension.nix
@@ -29,7 +29,6 @@
 
 {
   lib,
-  cargo-pgrx,
   pkg-config,
   rustPlatform,
   stdenv,
@@ -64,6 +63,8 @@ lib.extendMkDerivation {
       buildFeatures ? [ ],
       cargoBuildFlags ? [ ],
       cargoPgrxFlags ? [ ],
+      # pinned dependencies
+      cargo-pgrx,
       postgresql,
       # cargo-pgrx calls rustfmt on generated bindings, this is not strictly necessary, so we avoid the
       # dependency here. Set to false and provide rustfmt in nativeBuildInputs, if you need it, e.g.
diff --git a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
index b78d948cd26b..b0c7157a409d 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvecto-rs/package.nix
@@ -23,112 +23,106 @@ let
   };
 
 in
-(buildPgrxExtension.override {
-  # Upstream only works with a fixed version of cargo-pgrx for each release,
-  # so we're pinning it here to avoid future incompatibility.
-  # See https://docs.vectorchord.ai/developers/development.html#set-up-development-environment, step 5
+(buildPgrxExtension.override { rustPlatform = rustPlatform'; }) (finalAttrs: {
+  inherit postgresql;
   cargo-pgrx = cargo-pgrx_0_12_0_alpha_1;
-  rustPlatform = rustPlatform';
-})
-  (finalAttrs: {
-    inherit postgresql;
 
-    pname = "pgvecto-rs";
-    version = "0.3.0";
+  pname = "pgvecto-rs";
+  version = "0.3.0";
 
-    buildInputs = [ openssl ];
-    nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+  nativeBuildInputs = [ pkg-config ];
 
-    patches = [
-      # Tell the `c` crate to use the flags from the rust bindgen hook
-      (replaceVars ./0001-read-clang-flags-from-environment.diff {
-        clang = lib.getExe clang;
-      })
-    ];
+  patches = [
+    # Tell the `c` crate to use the flags from the rust bindgen hook
+    (replaceVars ./0001-read-clang-flags-from-environment.diff {
+      clang = lib.getExe clang;
+    })
+  ];
 
-    src = fetchFromGitHub {
-      owner = "tensorchord";
-      repo = "pgvecto.rs";
-      tag = "v${finalAttrs.version}";
-      hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE=";
-    };
+  src = fetchFromGitHub {
+    owner = "tensorchord";
+    repo = "pgvecto.rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X7BY2Exv0xQNhsS/GA7GNvj9OeVDqVCd/k3lUkXtfgE=";
+  };
 
-    useFetchCargoVendor = true;
-    cargoHash = "sha256-8otJ1uqGrCmlxAqvfAL3OjhBI4I6dAu6EoajstO46Sw=";
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-8otJ1uqGrCmlxAqvfAL3OjhBI4I6dAu6EoajstO46Sw=";
 
-    # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL
-    postPatch = ''
-      substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${finalAttrs.version}
-    '';
+  # Set appropriate version on vectors.control, otherwise it won't show up on PostgreSQL
+  postPatch = ''
+    substituteInPlace ./vectors.control --subst-var-by CARGO_VERSION ${finalAttrs.version}
+  '';
 
-    # Include upgrade scripts in the final package
-    # https://github.com/tensorchord/pgvecto.rs/blob/v0.2.0/scripts/ci_package.sh#L6-L8
-    postInstall = ''
-      cp sql/upgrade/* $out/share/postgresql/extension/
-    '';
+  # Include upgrade scripts in the final package
+  # https://github.com/tensorchord/pgvecto.rs/blob/v0.2.0/scripts/ci_package.sh#L6-L8
+  postInstall = ''
+    cp sql/upgrade/* $out/share/postgresql/extension/
+  '';
 
-    env = {
-      # Needed to get openssl-sys to use pkg-config.
-      OPENSSL_NO_VENDOR = 1;
+  env = {
+    # Needed to get openssl-sys to use pkg-config.
+    OPENSSL_NO_VENDOR = 1;
 
-      # Bypass rust nightly features not being available on rust stable
-      RUSTC_BOOTSTRAP = 1;
-    };
+    # Bypass rust nightly features not being available on rust stable
+    RUSTC_BOOTSTRAP = 1;
+  };
 
-    # This crate does not have the "pg_test" feature
-    usePgTestCheckFeature = false;
+  # This crate does not have the "pg_test" feature
+  usePgTestCheckFeature = false;
 
-    passthru = {
-      updateScript = nix-update-script { };
-      tests.extension = postgresqlTestExtension {
-        inherit (finalAttrs) finalPackage;
-        postgresqlExtraSettings = ''
-          shared_preload_libraries='vectors'
-        '';
-        sql = ''
-          CREATE EXTENSION vectors;
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.extension = postgresqlTestExtension {
+      inherit (finalAttrs) finalPackage;
+      postgresqlExtraSettings = ''
+        shared_preload_libraries='vectors'
+      '';
+      sql = ''
+        CREATE EXTENSION vectors;
 
-          CREATE TABLE items (
-            id bigserial PRIMARY KEY,
-            content text NOT NULL,
-            embedding vectors.vector(3) NOT NULL -- 3 dimensions
-          );
+        CREATE TABLE items (
+          id bigserial PRIMARY KEY,
+          content text NOT NULL,
+          embedding vectors.vector(3) NOT NULL -- 3 dimensions
+        );
 
-          INSERT INTO items (content, embedding) VALUES
-            ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'),
-            ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'),
-            ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'),
-            ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]');
-        '';
-        asserts = [
-          {
-            query = "SELECT default_version FROM pg_available_extensions WHERE name = 'vectors'";
-            expected = "'${finalAttrs.version}'";
-            description = "Extension vectors has correct version.";
-          }
-          {
-            query = "SELECT COUNT(embedding) FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery";
-            expected = "2";
-            description = "Stores and returns vectors.";
-          }
-        ];
-      };
-    };
-
-    meta = {
-      # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343
-      broken =
-        (lib.versionOlder postgresql.version "14")
-        ||
-          # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607
-          # Check after next package update.
-          lib.versionAtLeast postgresql.version "17" && finalAttrs.version == "0.3.0";
-      description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres";
-      homepage = "https://github.com/tensorchord/pgvecto.rs";
-      license = lib.licenses.asl20;
-      maintainers = with lib.maintainers; [
-        diogotcorreia
-        esclear
+        INSERT INTO items (content, embedding) VALUES
+          ('a fat cat sat on a mat and ate a fat rat', '[1, 2, 3]'),
+          ('a fat dog sat on a mat and ate a fat rat', '[4, 5, 6]'),
+          ('a thin cat sat on a mat and ate a thin rat', '[7, 8, 9]'),
+          ('a thin dog sat on a mat and ate a thin rat', '[10, 11, 12]');
+      '';
+      asserts = [
+        {
+          query = "SELECT default_version FROM pg_available_extensions WHERE name = 'vectors'";
+          expected = "'${finalAttrs.version}'";
+          description = "Extension vectors has correct version.";
+        }
+        {
+          query = "SELECT COUNT(embedding) FROM items WHERE to_tsvector('english', content) @@ 'cat & rat'::tsquery";
+          expected = "2";
+          description = "Stores and returns vectors.";
+        }
       ];
     };
-  })
+  };
+
+  meta = {
+    # Upstream removed support for PostgreSQL 13 on 0.3.0: https://github.com/tensorchord/pgvecto.rs/issues/343
+    broken =
+      (lib.versionOlder postgresql.version "14")
+      ||
+        # PostgreSQL 17 support issue upstream: https://github.com/tensorchord/pgvecto.rs/issues/607
+        # Check after next package update.
+        lib.versionAtLeast postgresql.version "17" && finalAttrs.version == "0.3.0";
+    description = "Scalable, Low-latency and Hybrid-enabled Vector Search in Postgres";
+    homepage = "https://github.com/tensorchord/pgvecto.rs";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      diogotcorreia
+      esclear
+    ];
+  };
+})
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
index 236460ade8b0..1dcc46ffcb5a 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
@@ -7,13 +7,7 @@
   postgresqlTestExtension,
 }:
 
-let
-  buildPgrxExtension' = buildPgrxExtension.override {
-    # Upstream only works with a fixed minor version of cargo-pgrx for each release.
-    cargo-pgrx = cargo-pgrx_0_12_6;
-  };
-in
-buildPgrxExtension' (finalAttrs: {
+buildPgrxExtension (finalAttrs: {
   pname = "pgvectorscale";
   version = "0.7.0";
 
@@ -38,6 +32,7 @@ buildPgrxExtension' (finalAttrs: {
   ];
 
   inherit postgresql;
+  cargo-pgrx = cargo-pgrx_0_12_6;
 
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
diff --git a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
index 7f0a9f3cea2b..f00f45ccaf82 100644
--- a/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgx_ulid.nix
@@ -7,14 +7,9 @@
   postgresql,
   util-linux,
 }:
-let
-  buildPgrxExtension' = buildPgrxExtension.override {
-    # Upstream only works with a fixed minor version of cargo-pgrx for each release.
-    cargo-pgrx = cargo-pgrx_0_12_6;
-  };
-in
-buildPgrxExtension' (finalAttrs: {
+buildPgrxExtension (finalAttrs: {
   inherit postgresql;
+  cargo-pgrx = cargo-pgrx_0_12_6;
 
   pname = "pgx_ulid";
   version = "0.2.0";
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
index ebabe9c5bdf5..4670534fa26e 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb_toolkit.nix
@@ -7,8 +7,9 @@
   postgresql,
 }:
 
-(buildPgrxExtension.override { cargo-pgrx = cargo-pgrx_0_12_6; }) (finalAttrs: {
+buildPgrxExtension (finalAttrs: {
   inherit postgresql;
+  cargo-pgrx = cargo-pgrx_0_12_6;
 
   pname = "timescaledb_toolkit";
   version = "1.21.0";
diff --git a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
index 287e3933d2b3..ea71102357fc 100644
--- a/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/vectorchord/package.nix
@@ -12,12 +12,6 @@
   stdenv,
 }:
 let
-  buildPgrxExtension' = buildPgrxExtension.override {
-    # Upstream only works with a fixed version of cargo-pgrx for each release,
-    # so we're pinning it here to avoid future incompatibility.
-    cargo-pgrx = cargo-pgrx_0_14_1;
-  };
-
   # Follow upstream and use rust-jemalloc-sys on linux aarch64 and x86_64
   # Additionally, disable init exec TLS, since it causes issues with postgres.
   # https://github.com/tensorchord/VectorChord/blob/0.4.2/Cargo.toml#L43-L44
@@ -29,8 +23,9 @@ let
     })
   );
 in
-buildPgrxExtension' (finalAttrs: {
+buildPgrxExtension (finalAttrs: {
   inherit postgresql;
+  cargo-pgrx = cargo-pgrx_0_14_1;
 
   pname = "vectorchord";
   version = "0.4.2";

From 4356ab5366504d492802cca7f42a163ffa710fb4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 10:05:10 +0200
Subject: [PATCH 43/83] cargo-pgrx: 0.14.1 -> 0.15.0

Now handling the default cargo-pgrx attribute independently from pinned
versions to allow auto-update without breaking things.
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix                    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 71e415a4568d..1c52fd23bfd3 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -81,4 +81,13 @@ in
     hash = "sha256-oMToAhKkRiCyC8JYS0gmo/XX3QVcVtF5mUV0aQjd+p8=";
     cargoHash = "sha256-RawGAQGtG2QVDCMbwjmUEaH6rDeRiBvvJsGCY8wySw0=";
   };
+
+  # Default version for direct usage.
+  # Not to be used with buildPgrxExtension, where it should be pinned.
+  # When you make an extension use the latest version, *copy* this to a separate pinned attribute.
+  cargo-pgrx = generic {
+    version = "0.15.0";
+    hash = "sha256-sksRfNV6l8YbdI6fzrEtanpDVV4sh14JXLqYBydHwy0=";
+    cargoHash = "sha256-c+n1bJMO9254kT4e6exVNhlIouzkkzrRIOVzR9lZeg4=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e611c86f0fa4..ebc665d9bddc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5984,8 +5984,8 @@ with pkgs;
     cargo-pgrx_0_12_5
     cargo-pgrx_0_12_6
     cargo-pgrx_0_14_1
+    cargo-pgrx
     ;
-  cargo-pgrx = cargo-pgrx_0_14_1;
 
   buildPgrxExtension = callPackage ../development/tools/rust/cargo-pgrx/buildPgrxExtension.nix { };
   opensmalltalk-vm = callPackage ../development/compilers/opensmalltalk-vm { };

From 435e9536f0f7882820f2a5dc6840e375e6c66cbe Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:13:48 +0800
Subject: [PATCH 44/83] kikit: add updateScript

---
 pkgs/by-name/ki/kikit/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index 8f24acfff73e..b4d4565d76e4 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -20,6 +20,7 @@
   versioneer,
   shapely,
   setuptools,
+  nix-update-script,
 }:
 let
   solidpython = callPackage ./solidpython { };
@@ -95,6 +96,8 @@ buildPythonApplication rec {
     cd test/units
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Automation for KiCAD boards";
     homepage = "https://github.com/yaqwsx/KiKit/";

From 97898eb3eb23eaef263170bceaff5b6107cdfeca Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:14:55 +0800
Subject: [PATCH 45/83] kikit: avoid with lib;

---
 pkgs/by-name/ki/kikit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index b4d4565d76e4..ec14a101e9df 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -98,14 +98,14 @@ buildPythonApplication rec {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "Automation for KiCAD boards";
     homepage = "https://github.com/yaqwsx/KiKit/";
     changelog = "https://github.com/yaqwsx/KiKit/releases/tag/${src.tag}";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       jfly
       matusf
     ];
-    license = licenses.mit;
+    license = lib.licenses.mit;
   };
 }

From 014e169873b8a9700c16a593a20e015c2aa54b11 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 7 Jul 2025 16:15:20 +0800
Subject: [PATCH 46/83] kikit: add ngi team

---
 pkgs/by-name/ki/kikit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix
index ec14a101e9df..86a51a1cac54 100644
--- a/pkgs/by-name/ki/kikit/default.nix
+++ b/pkgs/by-name/ki/kikit/default.nix
@@ -106,6 +106,7 @@ buildPythonApplication rec {
       jfly
       matusf
     ];
+    teams = with lib.teams; [ ngi ];
     license = lib.licenses.mit;
   };
 }

From 4a373d13c5f77440ebed6cff4c8bd396a7019f72 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 10:06:33 +0200
Subject: [PATCH 47/83] cargo-pgrx_0_12_5: drop

Unused in nixpkgs right now.
---
 pkgs/development/tools/rust/cargo-pgrx/default.nix | 6 ------
 pkgs/top-level/all-packages.nix                    | 1 -
 2 files changed, 7 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 1c52fd23bfd3..4dddf7ee747c 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -64,12 +64,6 @@ in
     cargoHash = "sha256-zYjqE7LZLnTaVxWAPWC1ncEjCMlrhy4THtgecB7wBYY=";
   };
 
-  cargo-pgrx_0_12_5 = generic {
-    version = "0.12.5";
-    hash = "sha256-U2kF+qjQwMTaocv5f4p5y3qmPUsTzdvAp8mz9cn/COw=";
-    cargoHash = "sha256-CycwWvxYrHj7lmTiiNC1WdbFgrdlGr/M3qTN/N+7xQA=";
-  };
-
   cargo-pgrx_0_12_6 = generic {
     version = "0.12.6";
     hash = "sha256-7aQkrApALZe6EoQGVShGBj0UIATnfOy2DytFj9IWdEA=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebc665d9bddc..7ac222bbff53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5981,7 +5981,6 @@ with pkgs;
 
   inherit (callPackages ../development/tools/rust/cargo-pgrx { })
     cargo-pgrx_0_12_0_alpha_1
-    cargo-pgrx_0_12_5
     cargo-pgrx_0_12_6
     cargo-pgrx_0_14_1
     cargo-pgrx

From 86efb7f659f0fe661a6cd6344950f27c63c1658e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 7 Jul 2025 10:09:27 +0200
Subject: [PATCH 48/83] cargo-pgrx: modernize

---
 .../tools/rust/cargo-pgrx/default.nix            | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/default.nix b/pkgs/development/tools/rust/cargo-pgrx/default.nix
index 4dddf7ee747c..2dec7263f7a5 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/default.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/default.nix
@@ -1,11 +1,9 @@
 {
-  lib,
-  darwin,
   fetchCrate,
+  lib,
   openssl,
   pkg-config,
   rustPlatform,
-  stdenv,
 }:
 
 let
@@ -15,16 +13,16 @@ let
       hash,
       cargoHash,
     }:
-    rustPlatform.buildRustPackage rec {
+    rustPlatform.buildRustPackage {
       pname = "cargo-pgrx";
 
       inherit version;
 
       src = fetchCrate {
-        inherit version pname hash;
+        inherit version hash;
+        pname = "cargo-pgrx";
       };
 
-      useFetchCargoVendor = true;
       inherit cargoHash;
 
       nativeBuildInputs = [
@@ -44,12 +42,12 @@ let
         "--skip=command::schema::tests::test_parse_managed_postmasters"
       ];
 
-      meta = with lib; {
+      meta = {
         description = "Build Postgres Extensions with Rust";
         homepage = "https://github.com/pgcentralfoundation/pgrx";
         changelog = "https://github.com/pgcentralfoundation/pgrx/releases/tag/v${version}";
-        license = licenses.mit;
-        maintainers = with maintainers; [
+        license = lib.licenses.mit;
+        maintainers = with lib.maintainers; [
           happysalada
           matthiasbeyer
         ];

From c380b468354dc711633e526b88e50725455664ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 09:22:29 +0000
Subject: [PATCH 49/83] python3Packages.pynetdicom: 3.0.2 -> 3.0.3

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

diff --git a/pkgs/development/python-modules/pynetdicom/default.nix b/pkgs/development/python-modules/pynetdicom/default.nix
index 0e403b473eb5..93666e9c17da 100644
--- a/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/pkgs/development/python-modules/pynetdicom/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pynetdicom";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydicom";
     repo = "pynetdicom";
     tag = "v${version}";
-    hash = "sha256-0ylx0EMPfvXxT7kQJYK+gsAFb/bkfRPDiC7Z7s/PvTk=";
+    hash = "sha256-CiCP5H0RVbbeNQKO/GpP/hZ6nBE5Q9Wp+/b/wHehIpA=";
   };
 
   build-system = [ flit-core ];

From efba0bfd6129d1e6a6c6f72794df9acd43c80dcd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 11:30:03 +0000
Subject: [PATCH 50/83] python3Packages.millheater: 0.12.5 -> 012.2

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

diff --git a/pkgs/development/python-modules/millheater/default.nix b/pkgs/development/python-modules/millheater/default.nix
index 9be5871e551d..0a36ae615300 100644
--- a/pkgs/development/python-modules/millheater/default.nix
+++ b/pkgs/development/python-modules/millheater/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "millheater";
-  version = "0.12.5";
+  version = "012.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pymill";
     tag = version; # https://github.com/Danielhiversen/pymill/issues/87
-    hash = "sha256-DGMG6LabfKGmQ6MDm/skqeQuOhSlr1ssZ2Z7fItzOt0=";
+    hash = "sha256-tR6MZIgCazGcXRIaSXyDYIEp+kD6xyrpOXORbi8LV7E=";
   };
 
   build-system = [ setuptools ];

From 306c383644f04553c2feccc7c86cfd333b16ffca Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 16:14:39 +0800
Subject: [PATCH 51/83] re-isearch: rm unused finalAttr

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

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index ca799c160456..11f85c2a1715 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -8,7 +8,7 @@
   writableTmpDirAsHomeHook,
 }:
 
-stdenv.mkDerivation (finalAttr: {
+stdenv.mkDerivation {
   pname = "re-Isearch";
   version = "2.20220925.4.0a-unstable-2025-03-16";
 
@@ -79,4 +79,4 @@ stdenv.mkDerivation (finalAttr: {
     maintainers = [ lib.maintainers.astro ];
     teams = [ lib.teams.ngi ];
   };
-})
+}

From a5e3edddf18d234fe424f868237272ee1012cbeb Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 16:15:54 +0800
Subject: [PATCH 52/83] re-isearch: rm preInstall

---
 pkgs/by-name/re/re-isearch/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 11f85c2a1715..bf3e5d0be3a5 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -56,10 +56,6 @@ stdenv.mkDerivation {
     )
   '';
 
-  preInstall = ''
-    mkdir -p $out/{bin,lib}
-  '';
-
   installPhase = ''
     runHook preInstall
 

From 3c950e8f9b3e980c0e851202d2b2e16c822acb56 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 16:18:49 +0800
Subject: [PATCH 53/83] re-isearch: add updateScript

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

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index bf3e5d0be3a5..2fe757559448 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -6,6 +6,7 @@
   file,
   libnsl,
   writableTmpDirAsHomeHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation {
@@ -67,6 +68,10 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = {
     description = "Novel multimodal search and retrieval engine";
     homepage = "https://nlnet.nl/project/Re-iSearch/";

From 03a6840c51d8ded07ea2b11c4a82cbfe089d4169 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 5 Jul 2025 16:26:57 +0800
Subject: [PATCH 54/83] re-isearch: sha256 -> hash

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

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 2fe757559448..b0e1e1c9e810 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     owner = "re-Isearch";
     repo = "re-Isearch";
     rev = "56e0dfbe7468881b3958ca8e630f41a5354e9873";
-    sha256 = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM=";
+    hash = "sha256-tI75D02/sFEkHDQX/BpDlu24WNP6Qh9G0MIfEvs8npM=";
   };
 
   # Upstream issue: https://github.com/re-Isearch/re-Isearch/issues/11

From 30b6164dab852c430426ab206fb44add667cf287 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Thu, 3 Jul 2025 12:04:40 +0200
Subject: [PATCH 55/83] nominatim-ui: add possibility to customize
 config.theme.js file

---
 pkgs/by-name/no/nominatim-ui/package.nix | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/no/nominatim-ui/package.nix b/pkgs/by-name/no/nominatim-ui/package.nix
index c6f143419663..2563b8d8ed54 100644
--- a/pkgs/by-name/no/nominatim-ui/package.nix
+++ b/pkgs/by-name/no/nominatim-ui/package.nix
@@ -3,6 +3,12 @@
   fetchFromGitHub,
   fetchYarnDeps,
   mkYarnPackage,
+  writeText,
+
+  # Custom application configuration placed to theme/config.theme.js file
+  # For the list of available configuration options see
+  # https://github.com/osm-search/nominatim-ui/blob/master/dist/config.defaults.js
+  customConfig ? null,
 }:
 
 # Notes for the upgrade:
@@ -10,6 +16,16 @@
 # * Replace new `package.json` here.
 # * Update `version`+`hash` and rebuild.
 
+let
+  configFile =
+    if customConfig != null then
+      writeText "config.theme.js" customConfig
+    else
+      writeText "config.theme.js" ''
+        // Default configuration
+        Nominatim_Config.Nominatim_API_Endpoint='https://127.0.0.1/';
+      '';
+in
 mkYarnPackage rec {
   pname = "nominatim-ui";
   version = "3.7.1";
@@ -36,11 +52,8 @@ mkYarnPackage rec {
     runHook postBuild
   '';
 
-  # Minimal configuration
-  # See https://nominatim.org/release-docs/latest/admin/Setup-Nominatim-UI/#installing-nominatim-ui
   preInstall = ''
-    echo "Nominatim_Config.Nominatim_API_Endpoint='https://localhost/';" \
-    > deps/nominatim-ui/dist/theme/config.theme.js
+    ln --symbolic ${configFile} deps/nominatim-ui/dist/theme/config.theme.js
   '';
 
   installPhase = ''

From a5c0272928b61a2d9b9b58b1818c38e4656173b2 Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Fri, 4 Jul 2025 11:38:37 +0200
Subject: [PATCH 56/83] nominatim-ui: revert back to mkDerivation

Revert from using mkYarnPackage back to mkDerivation due to following
issues:

* couln't make it working with finalAttrs
* required local copy of package.json or did IFD
---
 pkgs/by-name/no/nominatim-ui/package.json | 48 ----------------------
 pkgs/by-name/no/nominatim-ui/package.nix  | 49 +++++++++++++++--------
 2 files changed, 33 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/by-name/no/nominatim-ui/package.json

diff --git a/pkgs/by-name/no/nominatim-ui/package.json b/pkgs/by-name/no/nominatim-ui/package.json
deleted file mode 100644
index 05d40eb226e0..000000000000
--- a/pkgs/by-name/no/nominatim-ui/package.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "name": "nominatim-ui",
-    "description": "Debug web interface for Nominatim geocoder",
-    "version": "3.7.1",
-    "license": "GPL-2.0",
-    "scripts": {
-        "build": "rollup -c",
-        "dev": "rollup -c -w",
-        "lint": "eslint --quiet *.js src/ test/",
-        "lint:fix": "eslint --fix *.js src/ test/",
-        "test": "rollup -c && mocha --recursive test/",
-        "start": "static-server dist"
-    },
-    "devDependencies": {
-        "@eslint/eslintrc": "^3.1.0",
-        "@eslint/js": "^9.12.0",
-        "@rollup/plugin-commonjs": "^28.0",
-        "@rollup/plugin-node-resolve": "^16.0",
-        "eslint": "^9.0",
-        "eslint-config-prettier": "^10.1.2",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-mocha": "^11.0",
-        "eslint-plugin-prettier": "^5.2.6",
-        "eslint-plugin-security": "^3.0.1",
-        "eslint-plugin-svelte": "^3.5.0",
-        "fs-extra": "^11.0.0",
-        "globals": "^16.0.0",
-        "http": "^0.0.1-security",
-        "http-proxy": "^1.18.1",
-        "mocha": "^11.0",
-        "puppeteer": "^24.0",
-        "rollup": "^4.22.4",
-        "rollup-plugin-css-only": "^4.3.0",
-        "rollup-plugin-livereload": "^2.0.0",
-        "rollup-plugin-svelte": "^7.0.0",
-        "rollup-plugin-terser": "^7.0.0",
-        "static-server": "^2.2.1",
-        "svelte": "^5.0.0"
-    },
-    "dependencies": {
-        "bootstrap": "^5.0.0",
-        "escape-html": "^1.0.3",
-        "leaflet": "1.9.4",
-        "leaflet-minimap": "^3.6.1",
-        "timeago.js": "^4.0.2"
-    },
-    "type": "module"
-}
diff --git a/pkgs/by-name/no/nominatim-ui/package.nix b/pkgs/by-name/no/nominatim-ui/package.nix
index 2563b8d8ed54..323be48ae2cc 100644
--- a/pkgs/by-name/no/nominatim-ui/package.nix
+++ b/pkgs/by-name/no/nominatim-ui/package.nix
@@ -1,21 +1,21 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchYarnDeps,
-  mkYarnPackage,
+  writableTmpDirAsHomeHook,
   writeText,
 
+  fixup-yarn-lock,
+  nodejs,
+  yarn,
+
   # Custom application configuration placed to theme/config.theme.js file
   # For the list of available configuration options see
   # https://github.com/osm-search/nominatim-ui/blob/master/dist/config.defaults.js
   customConfig ? null,
 }:
 
-# Notes for the upgrade:
-# * Download the tarball of the new version to use.
-# * Replace new `package.json` here.
-# * Update `version`+`hash` and rebuild.
-
 let
   configFile =
     if customConfig != null then
@@ -26,23 +26,42 @@ let
         Nominatim_Config.Nominatim_API_Endpoint='https://127.0.0.1/';
       '';
 in
-mkYarnPackage rec {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "nominatim-ui";
   version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "nominatim-ui";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-TliTWDKdIp7Z0uYw5P65i06NQAUNwNymUsSYrihVZFE=";
   };
 
   offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
+    yarnLock = "${finalAttrs.src}/yarn.lock";
     hash = "sha256-IqwsXEd9RSJhkA4BONTJT4xYMTyG9+zddIpD47v6AFc=";
   };
 
-  packageJSON = ./package.json;
+  nativeBuildInputs = [
+    writableTmpDirAsHomeHook
+
+    fixup-yarn-lock
+    nodejs
+    yarn
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    yarn config --offline set yarn-offline-mirror $offlineCache
+    fixup-yarn-lock yarn.lock
+
+    yarn install --offline --frozen-lockfile --frozen-engines --ignore-scripts
+    patchShebangs node_modules
+
+    runHook postConfigure
+  '';
 
   buildPhase = ''
     runHook preBuild
@@ -53,19 +72,17 @@ mkYarnPackage rec {
   '';
 
   preInstall = ''
-    ln --symbolic ${configFile} deps/nominatim-ui/dist/theme/config.theme.js
+    ln --symbolic ${configFile} dist/theme/config.theme.js
   '';
 
   installPhase = ''
     runHook preInstall
 
-    cp --archive deps/nominatim-ui/dist $out
+    cp --archive dist $out
 
     runHook postInstall
   '';
 
-  doDist = false;
-
   meta = {
     description = "Debugging user interface for Nominatim geocoder";
     homepage = "https://github.com/osm-search/nominatim-ui";
@@ -74,6 +91,6 @@ mkYarnPackage rec {
       geospatial
       ngi
     ];
-    changelog = "https://github.com/osm-search/nominatim-ui/releases/tag/v${version}";
+    changelog = "https://github.com/osm-search/nominatim-ui/releases/tag/v${finalAttrs.version}";
   };
-}
+})

From 0295ad1904fb12ae0406cbc46b8a023d128c0b23 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Jul 2025 19:33:29 +0200
Subject: [PATCH 57/83] nixos/all-tests: Use ? in discoverTests

Exactly equivalent
---
 nixos/tests/all-tests.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d370a4180286..0b9b4b095e9d 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -21,7 +21,7 @@ let
   discoverTests =
     val:
     if isAttrs val then
-      if hasAttr "test" val then
+      if (val ? test) then
         callTest val
       else
         mapAttrs (n: s: if n == "passthru" then s else discoverTests s) val

From 9f4ab5def9b82b945b433ad0120b8fb9a600e755 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 20:14:51 +0000
Subject: [PATCH 58/83] eclib: 20250616 -> 20250627

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

diff --git a/pkgs/by-name/ec/eclib/package.nix b/pkgs/by-name/ec/eclib/package.nix
index 45a7a319f9e6..23a8783d819a 100644
--- a/pkgs/by-name/ec/eclib/package.nix
+++ b/pkgs/by-name/ec/eclib/package.nix
@@ -17,7 +17,7 @@ assert withFlint -> flint != null;
 
 stdenv.mkDerivation rec {
   pname = "eclib";
-  version = "20250616"; # upgrade might break the sage interface
+  version = "20250627"; # upgrade might break the sage interface
   # sage tests to run:
   # src/sage/interfaces/mwrank.py
   # src/sage/libs/eclib
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561
     # for upstream's explanation of the above
     url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2";
-    hash = "sha256-WrPkrAlBhsnK/NqSFNTZNkgsL2EJzvmLASha0rI4U5s=";
+    hash = "sha256-uI1LUmEuSRxUFZRtnjXyBiyhAV7n+74LYfFY+nTLS8k=";
   };
   buildInputs =
     [

From 0e326612020a266215f96b1aaf8d5a5d97f39b2f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 7 Jul 2025 19:46:37 +0200
Subject: [PATCH 59/83] nixos/testing: Add test attribute to please
 discoverTests

---
 nixos/lib/testing/run.nix | 5 +++++
 nixos/tests/all-tests.nix | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/nixos/lib/testing/run.nix b/nixos/lib/testing/run.nix
index 752c1e911803..45ab311cfbc4 100644
--- a/nixos/lib/testing/run.nix
+++ b/nixos/lib/testing/run.nix
@@ -106,6 +106,11 @@ in
     # useful for inspection (debugging / exploration)
     passthru.config = config;
 
+    /**
+      For discoverTests only. Deprecated. Will be removed when discoverTests can be removed from NixOS all-tests.nix.
+    */
+    passthru.test = config.test;
+
     # Docs: nixos/doc/manual/development/writing-nixos-tests.section.md
     /**
       See https://nixos.org/manual/nixos/unstable#sec-override-nixos-test
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0b9b4b095e9d..4fd1c64693ac 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -18,6 +18,8 @@
 with pkgs.lib;
 
 let
+  # TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected)
+  # TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix
   discoverTests =
     val:
     if isAttrs val then

From 09b7782d3290d197ef84fe8b5cae8f167a12e81e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 7 Jul 2025 16:48:57 -0400
Subject: [PATCH 60/83] nixVersions.nix_2_24: Fix FOD hash for 2.24.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The last “upgrade” actually regressed the package to 2.24.14.
---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 1dfa74e33241..c8960e60c5e7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -179,7 +179,7 @@ lib.makeExtensible (
 
       nix_2_24 = commonAutoconf {
         version = "2.24.15";
-        hash = "sha256-SthMCsj6POjawLnJq9+lj/UzObX9skaeN1UGmMZiwTY=";
+        hash = "sha256-GHqFHLxvRID2IEPUwIfRMp8epYQMFcvG9ogLzfWRbPc=";
         self_attribute_name = "nix_2_24";
       };
 

From 4a004775e636ea0742846bc47b27fce3b6ef3608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Jul 2025 21:35:48 +0000
Subject: [PATCH 61/83] redis: 8.0.2 -> 8.0.3

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

diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index ecaaf7dd772e..fde38883f7f5 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "redis";
-  version = "8.0.2";
+  version = "8.0.3";
 
   src = fetchFromGitHub {
     owner = "redis";
     repo = "redis";
     tag = finalAttrs.version;
-    hash = "sha256-BZJEBp3M7Gw/6/fZjfaMfU777dFmMzAS4bDI06ErkSc=";
+    hash = "sha256-e6pPsPz0huZyn14XO3uFUmJhBpMxhWLfyD0VBQXsJ1s=";
   };
 
   patches = lib.optional useSystemJemalloc (fetchpatch2 {

From ecfa2edf0291d9332ca0264a2745acc3071c276f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 00:27:55 +0000
Subject: [PATCH 62/83] tdlib: 1.8.49 -> 1.8.51

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

diff --git a/pkgs/by-name/td/tdlib/package.nix b/pkgs/by-name/td/tdlib/package.nix
index 13bbdd760d6a..4232c9d7eb7c 100644
--- a/pkgs/by-name/td/tdlib/package.nix
+++ b/pkgs/by-name/td/tdlib/package.nix
@@ -38,7 +38,7 @@ in
 
 stdenv.mkDerivation {
   pname = if tde2eOnly then "tde2e" else "tdlib";
-  version = "1.8.49";
+  version = "1.8.51";
 
   src = fetchFromGitHub {
     owner = "tdlib";
@@ -47,8 +47,8 @@ stdenv.mkDerivation {
     # The tdlib authors do not set tags for minor versions, but
     # external programs depending on tdlib constrain the minor
     # version, hence we set a specific commit with a known version.
-    rev = "51743dfd01dff6179e2d8f7095729caa4e2222e9";
-    hash = "sha256-duD8a/fppkmaKrvkHnbSxRnCLS60aNVcgaYyCoHzKgE=";
+    rev = "bb474a201baa798784d696d2d9d762a9d2807f96";
+    hash = "sha256-Jd2ojDDwO/7W54QjnKLlc1ecqTfJEFPRtT50rNlukKA=";
   };
 
   buildInputs = [

From 2afbb7c1146e3d8632c492b6f8d55a14c9c2fe1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 00:34:59 +0000
Subject: [PATCH 63/83] aaaaxy: 1.6.241 -> 1.6.252

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

diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 5258601307a8..ff5bb9c7953d 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -22,17 +22,17 @@
 
 buildGoModule rec {
   pname = "aaaaxy";
-  version = "1.6.241";
+  version = "1.6.252";
 
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = "aaaaxy";
     tag = "v${version}";
-    hash = "sha256-pfvz5qaGLhFw+UD4OL6R88Qw6Ml3Pn66ZMQI3f923JA=";
+    hash = "sha256-Y8uZOW5Eh3sf9+7yj3XXmokItb/BqA8bsaQMfC2PoYE=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-ojgI4HgNp2pbFAWeucdU8n3qW7ittAvp+ptDndCQlEI=";
+  vendorHash = "sha256-iP/7WQZ+BNqtoigRADKlYGEAEZpzSKttY4lVq7v8gR8=";
 
   buildInputs = [
     alsa-lib

From 585d6757bce1a9899513a09f79ed96bdaaca1ef5 Mon Sep 17 00:00:00 2001
From: Kiran Shila <me@kiranshila.com>
Date: Mon, 9 Jun 2025 23:01:32 -0700
Subject: [PATCH 64/83] python3Packages.allantools: init at 2024.06

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

diff --git a/pkgs/development/python-modules/allantools/default.nix b/pkgs/development/python-modules/allantools/default.nix
new file mode 100644
index 000000000000..ea30c65cad47
--- /dev/null
+++ b/pkgs/development/python-modules/allantools/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  matplotlib,
+  numpy,
+  numpydoc,
+  pytest,
+  scipy,
+  pythonOlder,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "allantools";
+  version = "2024.06";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "aewallin";
+    repo = "allantools";
+    tag = version;
+    hash = "sha256-dF19aSpIioOm0BnwrLkMe/DtfgWSKFnX4c/Xs1O2Quw=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    matplotlib
+    numpy
+    numpydoc
+    pytest
+    scipy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "allantools"
+  ];
+
+  meta = {
+    description = "Allan deviation and related time & frequency statistics library in Python";
+    homepage = "https://github.com/aewallin/allantools";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ kiranshila ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1eb86b8cdcec..c26a6bd305a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -604,6 +604,8 @@ self: super: with self; {
 
   aliyun-python-sdk-sts = callPackage ../development/python-modules/aliyun-python-sdk-sts { };
 
+  allantools = callPackage ../development/python-modules/allantools { };
+
   allpairspy = callPackage ../development/python-modules/allpairspy { };
 
   allure-behave = callPackage ../development/python-modules/allure-behave { };

From c35913b63beb962ebd3c765e8756f7b78f2bbc06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 03:08:02 +0000
Subject: [PATCH 65/83] datafusion-cli: 48.0.0 -> 48.0.1

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

diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index 5a513ff6b74c..79739dcb970e 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "datafusion-cli";
-  version = "48.0.0";
+  version = "48.0.1";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     tag = finalAttrs.version;
-    hash = "sha256-DkMJKZI5rOH/PGXiAXY/GtYwYvhZ2b3zKeGeD9o2AvE=";
+    hash = "sha256-hYRv+7cqiPEpUHMbvmG+z7S1S6xdaMHEORXu6V0X+/0=";
   };
 
   useFetchCargoVendor = true;
-  cargoHash = "sha256-9uMmxP/MvFXfylKCCcZS1YEp8snF5Tds9Eh0hL6U0oE=";
+  cargoHash = "sha256-vGVpkfNgyY3d+SL03jNgNNInH0jvDgpkPmHI04l2G7c=";
 
   buildAndTestSubdir = "datafusion-cli";
 

From fbfb46ec369ac2f083fd5694b0c2faf658662967 Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 7 Jul 2025 21:50:30 -0700
Subject: [PATCH 66/83] python313Packages.pyforked-daapd: init at 0.1.14

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

diff --git a/pkgs/development/python-modules/pyforked-daapd/default.nix b/pkgs/development/python-modules/pyforked-daapd/default.nix
new file mode 100644
index 000000000000..040759dbcfe7
--- /dev/null
+++ b/pkgs/development/python-modules/pyforked-daapd/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  pythonOlder,
+  setuptools,
+  aiohttp,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyforked-daapd";
+  version = "0.1.14";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-v1NOlwP8KtBsQiqwbx1y8p8lABEuEJdNhvR2kGzLxKs=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pyforked_daapd"
+  ];
+
+  # Tests require a running forked-daapd server
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python interface for forked-daapd";
+    homepage = "https://github.com/uvjustin/pyforked-daapd";
+    changelog = "https://github.com/uvjustin/pyforked-daapd/blob/v${version}/CHANGES.txt";
+    license = licenses.mit;
+    maintainers = with maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3aa1ac9f8bfd..9e7f3e51d42d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12719,6 +12719,8 @@ self: super: with self; {
 
   pyfnip = callPackage ../development/python-modules/pyfnip { };
 
+  pyforked-daapd = callPackage ../development/python-modules/pyforked-daapd { };
+
   pyformlang = callPackage ../development/python-modules/pyformlang { };
 
   pyfreedompro = callPackage ../development/python-modules/pyfreedompro { };

From 109f57d5b77afbf45ce466a26c19071da860f11e Mon Sep 17 00:00:00 2001
From: Jamie Magee <jamie.magee@gmail.com>
Date: Mon, 7 Jul 2025 21:50:40 -0700
Subject: [PATCH 67/83] home-assistant: update component packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 487ef1d580f9..b3fe8ceb38c1 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1827,9 +1827,10 @@
       ];
     "forked_daapd" =
       ps: with ps; [
+        pyforked-daapd
         pylibrespot-java
         spotifyaio
-      ]; # missing inputs: pyforked-daapd
+      ];
     "fortios" =
       ps: with ps; [
         fortiosapi
@@ -7050,6 +7051,7 @@
     "folder_watcher"
     "foobot"
     "forecast_solar"
+    "forked_daapd"
     "foscam"
     "freebox"
     "freedns"

From f94226260f56bbe25eaa57e416cbdbef630fa859 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 04:56:19 +0000
Subject: [PATCH 68/83] fcitx5-mcbopomofo: 2.9.1 -> 2.9.2

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

diff --git a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
index 65bb8ed57b75..b61a0ce95879 100644
--- a/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
+++ b/pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-mcbopomofo";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "openvanilla";
     repo = "fcitx5-mcbopomofo";
     rev = version;
-    hash = "sha256-fHDNhZhSVgVuZLfRA3eJErm1gwhUZJw+emCXfeO5HVo=";
+    hash = "sha256-2TWJsEScC5rMz5dowJOQHA2Mjzsq+d9n2lKXdEWiELU=";
   };
 
   nativeBuildInputs = [

From e59778897eebb2cc1404340eba241b006a578622 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 05:02:42 +0000
Subject: [PATCH 69/83] libretro.ppsspp: 0-unstable-2025-06-28 ->
 0-unstable-2025-07-06

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

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 53fbe3ca335c..e69b304021bf 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-06-28";
+  version = "0-unstable-2025-07-06";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "1f2b4de6c148cfd4514f415dbf40cd684840be70";
-    hash = "sha256-QWy3PKnPj5ol52KOV/SMpNuiERnmmBHs+087qKCvM3M=";
+    rev = "32e05485c5cf48bbe393ca5ce2b356db4a73ddbf";
+    hash = "sha256-sU2bmCYpXl5VPpu2qZtXGgJJ523fPQsoQSWYhTwAkOs=";
     fetchSubmodules = true;
   };
 

From 143dfa1ac9d6d641a8283848c8ffc36280ff6e80 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 7 Jul 2025 09:26:28 +0200
Subject: [PATCH 70/83] coqPackages.mathcomp-analysis: 1.11.0 -> 1.12.0

---
 pkgs/development/coq-modules/mathcomp-analysis/default.nix | 3 ++-
 pkgs/development/coq-modules/mathcomp-infotheo/default.nix | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/coq-modules/mathcomp-analysis/default.nix b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
index 5a6ec833428f..11d0a480696f 100644
--- a/pkgs/development/coq-modules/mathcomp-analysis/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-analysis/default.nix
@@ -16,6 +16,7 @@ let
   repo = "analysis";
   owner = "math-comp";
 
+  release."1.12.0".sha256 = "sha256-PF10NlZ+aqP3PX7+UsZwgJT9PEaDwzvrS/ZGzjP64Wo=";
   release."1.11.0".sha256 = "sha256-1apbzBvaLNw/8ARLUhGGy89CyXW+/6O4ckdxKPraiVc=";
   release."1.9.0".sha256 = "sha256-zj7WSDUg8ISWxcipGpjEwvvnLp1g8nm23BZiib/15+g=";
   release."1.8.0".sha256 = "sha256-2ZafDmZAwGB7sxdUwNIE3xvwBRw1kFDk0m5Vz+onWZc=";
@@ -57,7 +58,7 @@ let
     lib.switch
       [ coq.coq-version mathcomp.version ]
       [
-        (case (range "8.20" "9.0") (range "2.1.0" "2.4.0") "1.11.0")
+        (case (range "8.20" "9.0") (range "2.1.0" "2.4.0") "1.12.0")
         (case (range "8.19" "8.20") (range "2.1.0" "2.3.0") "1.9.0")
         (case (range "8.17" "8.20") (range "2.0.0" "2.2.0") "1.1.0")
         (case (range "8.17" "8.19") (range "1.17.0" "1.19.0") "0.7.0")
diff --git a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
index c3bb32a15cc5..4ed3e501f30a 100644
--- a/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
+++ b/pkgs/development/coq-modules/mathcomp-infotheo/default.nix
@@ -32,7 +32,8 @@
     lib.switch
       [ coq.coq-version mathcomp-analysis.version ]
       [
-        (case (range "8.20" "8.20") (isGe "1.10") "0.9.3")
+        (case (range "8.20" "8.20") (isGe "1.12") "0.9.4")
+        (case (range "8.19" "8.20") (range "1.10" "1.11") "0.9.3")
         (case (range "8.19" "8.20") (isGe "1.9") "0.9.1")
         (case (range "8.19" "8.20") (isGe "1.7") "0.7.7")
         (case (range "8.19" "8.20") (isGe "1.7") "0.7.5")
@@ -44,6 +45,7 @@
         (case (range "8.15" "8.16") (range "0.5.4" "0.6.5") "0.5.1")
       ]
       null;
+  release."0.9.4".sha256 = "sha256-btHOBNMdXvlG2jxC04+4qmIjeyuaqtyugm2Ruj3lQr8=";
   release."0.9.3".sha256 = "sha256-8+cnVKNAvZ3MVV3BpS8UmCIxJphsQRBv3swek1eEBjE=";
   release."0.9.1".sha256 = "sha256-WI20HxMHr1ZUwOGPIUl+nRI8TxVUa2+F1xcGjRDHO9g=";
   release."0.7.7".sha256 = "sha256-kEbpMl7U+I2kvqi1VrjhIVFkZFO6h0tTHEUZRbHYG7E=";

From 98394f79335e1522ee2a723a4e1ca98e68030483 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 06:00:04 +0000
Subject: [PATCH 71/83] python3Packages.pycollada: 0.9 -> 0.9.2

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

diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix
index f7e174c78df2..579164407367 100644
--- a/pkgs/development/python-modules/pycollada/default.nix
+++ b/pkgs/development/python-modules/pycollada/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pycollada";
-  version = "0.9";
+  version = "0.9.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gk9ugJ5RDWSbWYSm6o5hTOXPJwyB6rb76q8K5x3mpq8=";
+    hash = "sha256-fKEiZ74KK5PkldYDbmsnQCOpRX3tZBlU6wxHDv4VPW4=";
   };
 
   build-system = [

From 12b315a76574e4a7ddb38b6cf0549d7f0c255ef7 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 7 Jul 2025 10:43:58 +0200
Subject: [PATCH 72/83] coqPackages.fcsl-pcm: init at 2.2.0

---
 .../coq-modules/fcsl-pcm/default.nix          | 45 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/coq-modules/fcsl-pcm/default.nix

diff --git a/pkgs/development/coq-modules/fcsl-pcm/default.nix b/pkgs/development/coq-modules/fcsl-pcm/default.nix
new file mode 100644
index 000000000000..98c743ad06cc
--- /dev/null
+++ b/pkgs/development/coq-modules/fcsl-pcm/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  mkCoqDerivation,
+  coq,
+  mathcomp-algebra,
+  stdlib,
+  version ? null,
+}:
+
+mkCoqDerivation {
+  pname = "fcsl-pcm";
+  owner = "imdea-software";
+  inherit version;
+
+  defaultVersion =
+    let
+      case = coq: mc: out: {
+        cases = [
+          coq
+          mc
+        ];
+        inherit out;
+      };
+    in
+    with lib.versions;
+    lib.switch
+      [ coq.coq-version mathcomp-algebra.version ]
+      [
+        (case (range "9.0" "9.0") (range "2.4.0" "2.4.0") "2.2.0")
+      ]
+      null;
+  release."2.2.0".sha256 = "sha256-VnfK+RHWiq27hxEJ9stpVp609/dMiPH6UHFhzaHdAnM=";
+  releaseRev = v: "v${v}";
+
+  propagatedBuildInputs = [
+    mathcomp-algebra
+    stdlib
+  ];
+
+  meta = with lib; {
+    description = "Coq library of Partial Commutative Monoids";
+    license = licenses.asl20;
+    maintainers = [ maintainers.proux01 ];
+  };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 83cc3bde1585..15a9552708e3 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -102,6 +102,7 @@ let
       equations = callPackage ../development/coq-modules/equations { };
       ExtLib = callPackage ../development/coq-modules/ExtLib { };
       extructures = callPackage ../development/coq-modules/extructures { };
+      fcsl-pcm = callPackage ../development/coq-modules/fcsl-pcm { };
       flocq = callPackage ../development/coq-modules/flocq { };
       fourcolor = callPackage ../development/coq-modules/fourcolor { };
       gaia = callPackage ../development/coq-modules/gaia { };

From 1681ac72dd5e1f0f7c06d0df6edc646a628fbee0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 07:25:10 +0000
Subject: [PATCH 73/83] go-errorlint: 1.5.1 -> 1.8.0

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

diff --git a/pkgs/by-name/go/go-errorlint/package.nix b/pkgs/by-name/go/go-errorlint/package.nix
index 68d6c81495b8..a369de31d911 100644
--- a/pkgs/by-name/go/go-errorlint/package.nix
+++ b/pkgs/by-name/go/go-errorlint/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "go-errorlint";
-  version = "1.5.1";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "polyfloyd";
     repo = "go-errorlint";
     rev = "v${version}";
-    hash = "sha256-xO9AC1z3JNTRVEpM/FF8x+AMfmspU64kUywvpMb2yxM=";
+    hash = "sha256-jczsgZAC90f2Kkrwpb9oeoK1HtlFDLOjqlexn9v5ojk=";
   };
 
-  vendorHash = "sha256-pSajd2wyefHgxMvhDKs+qwre4BMRBv97v/tZOjiT3LE=";
+  vendorHash = "sha256-smOu92BigepCH02qm2Im3T65nUoR/IYhWTjhnjRPppA=";
 
   ldflags = [
     "-s"

From b1990e8ac0e856d001c3bd54fa2f25922053330e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 8 Jul 2025 09:48:33 +0200
Subject: [PATCH 74/83] icestudio: Fix passthru.updateScript

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

diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix
index 88fd188cbde5..b8bfa331cc71 100644
--- a/pkgs/by-name/ic/icestudio/package.nix
+++ b/pkgs/by-name/ic/icestudio/package.nix
@@ -102,7 +102,9 @@ buildNpmPackage rec {
 
     runHook postInstall
   '';
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = unstableGitUpdater {
+    tagPrefix = "v";
+  };
 
   nativeBuildInputs = [ makeWrapper ];
 

From 76c4ca93f42236f3e386416e92f70a02072bdca7 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 5 Jul 2025 19:36:45 +0200
Subject: [PATCH 75/83] rustc: Add support for bootstrapping ppc64-elfv1

Add powerpc64-unknown-linux-gnu to the hash printing script, and add the entry to bootstrapHashes.
---
 pkgs/development/compilers/rust/1_87.nix        | 1 +
 pkgs/development/compilers/rust/print-hashes.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_87.nix b/pkgs/development/compilers/rust/1_87.nix
index 39be17c2fc72..a47f3dfca8ae 100644
--- a/pkgs/development/compilers/rust/1_87.nix
+++ b/pkgs/development/compilers/rust/1_87.nix
@@ -117,6 +117,7 @@ import ./default.nix
       aarch64-unknown-linux-musl = "6f301f0ee7d3be2fdd245432c01543a4c61413b5d0a62493e5b0d57d9756b0b6";
       x86_64-apple-darwin = "867a84a93c6ba0b468b78b52004a6307d6f5e2e5598e64f65726c6810b6f7c82";
       aarch64-apple-darwin = "249496972e6f845f052036b9d7e73f816418412de2b266ec717b9050c1810dc3";
+      powerpc64-unknown-linux-gnu = "27dd377367d7ba1757e1c768b259622d25a9cd927e126c9788dce9e880ffa925";
       powerpc64le-unknown-linux-gnu = "3f8f68d79460475396a52b5ae70eee73d6fb194fff1c4ff4286b64fbebee4429";
       riscv64gc-unknown-linux-gnu = "ea25b048bad7737188345392d1a0dfa92aa3ed6c00834b0974bdba52cb2398c4";
       s390x-unknown-linux-gnu = "198d3bda0daef12f86b8171025c62fee0a3caa59fa82c22c364d1a69305d8f46";
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 342b5c110704..42dbbc340273 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -17,6 +17,7 @@ PLATFORMS=(
   aarch64-unknown-linux-musl
   x86_64-apple-darwin
   aarch64-apple-darwin
+  powerpc64-unknown-linux-gnu
   powerpc64le-unknown-linux-gnu
   riscv64gc-unknown-linux-gnu
   s390x-unknown-linux-gnu

From e801d5894f0f6133629872e1c71e95a22f5a74ec Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Tue, 8 Jul 2025 10:33:20 +0200
Subject: [PATCH 76/83] nixos/network-interfaces-systemd: fix WoL policy
 handling

---
 nixos/modules/tasks/network-interfaces-systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 391303784969..0fcab643aad2 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -79,7 +79,7 @@ let
       links = mkIf i.wakeOnLan.enable {
         "40-${i.name}" = {
           matchConfig.name = i.name;
-          linkConfig.WakeOnLan = i.wakeOnLan.policy;
+          linkConfig.WakeOnLan = concatStringsSep " " i.wakeOnLan.policy;
         };
       };
       netdevs = mkIf i.virtual {

From 431f160d392533db0dbdd958e903ac8a7b2d8104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 8 Jul 2025 08:24:18 +0000
Subject: [PATCH 77/83] androidStudioPackages.canary: 2025.1.2.7 -> 2025.1.2.8

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 5570d1dbada2..a55966ca2ece 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-upx+qcrd+E4XVV94iaqZPN8w1RpcD8KfV37397nkznU=";
   };
   latestVersion = {
-    version = "2025.1.2.7"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 7"
-    sha256Hash = "sha256-wNBBvdofV6kL/C+JQNPz90YXzRqWYjkYaJGB4HHH6L4=";
+    version = "2025.1.2.8"; # "Android Studio Narwhal Feature Drop | 2025.1.2 Canary 8"
+    sha256Hash = "sha256-p7sIraR5MbFqr2svD1GKR71I0U1UDMkmAW4PAHjWyD4=";
   };
 in
 {

From 2fcfe280b51a589f81541b12d32da046bf69bbe6 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Tue, 8 Jul 2025 09:57:23 +0200
Subject: [PATCH 78/83] rocq-core_9_1: init at 9.1+rc1

---
 pkgs/applications/science/logic/coq/default.nix       | 1 +
 pkgs/applications/science/logic/rocq-core/default.nix | 1 +
 pkgs/development/coq-modules/bignums/default.nix      | 5 +++--
 pkgs/development/coq-modules/stdlib/default.nix       | 2 +-
 pkgs/development/rocq-modules/bignums/default.nix     | 7 ++++---
 pkgs/development/rocq-modules/stdlib/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix                       | 4 ++++
 pkgs/top-level/coq-packages.nix                       | 2 ++
 pkgs/top-level/rocq-packages.nix                      | 2 ++
 9 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index 23343942e2f2..03ca07274c51 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -77,6 +77,7 @@ let
     "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
     "8.20.1".sha256 = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.1+rc1".sha256 = "sha256-GShKHQ9EdvyNe9WlkzF6KLYybc5dPeVrh4bpkVy6pY4=";
   };
   releaseRev = v: "V${v}";
   fetched =
diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix
index 70f8ce990316..4fabbfdb921b 100644
--- a/pkgs/applications/science/logic/rocq-core/default.nix
+++ b/pkgs/applications/science/logic/rocq-core/default.nix
@@ -23,6 +23,7 @@ let
 
   release = {
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.1+rc1".sha256 = "sha256-GShKHQ9EdvyNe9WlkzF6KLYybc5dPeVrh4bpkVy6pY4=";
   };
   releaseRev = v: "V${v}";
   fetched =
diff --git a/pkgs/development/coq-modules/bignums/default.nix b/pkgs/development/coq-modules/bignums/default.nix
index 24acbd14655c..97af73c3542f 100644
--- a/pkgs/development/coq-modules/bignums/default.nix
+++ b/pkgs/development/coq-modules/bignums/default.nix
@@ -9,7 +9,7 @@
 
 (mkCoqDerivation {
   pname = "bignums";
-  owner = "coq";
+  owner = "rocq-community";
   inherit version;
   defaultVersion =
     let
@@ -17,11 +17,12 @@
     in
     with lib.versions;
     lib.switch coq.coq-version [
-      (case (range "9.0" "9.0") "9.0.0+rocq${coq.coq-version}")
+      (case (range "9.0" "9.1") "9.0.0+rocq${coq.coq-version}")
       (case (range "8.13" "8.20") "9.0.0+coq${coq.coq-version}")
       (case (range "8.6" "8.17") "${coq.coq-version}.0")
     ] null;
 
+  release."9.0.0+rocq9.1".sha256 = "sha256-MSjlfJs3JOakuShOj+isNlus0bKlZ+rkvzRoKZQK5RQ=";
   release."9.0.0+rocq9.0".sha256 = "sha256-ctnwpyNVhryEUA5YEsAImrcJsNMhtBgDSOz+z5Z4R78=";
   release."9.0.0+coq8.20".sha256 = "sha256-pkvyDaMXRalc6Uu1eBTuiqTpRauRrzu946c6TavyTKY=";
   release."9.0.0+coq8.19".sha256 = "sha256-02uL+qWbUveHe67zKfc8w3U0iN3X2DKBsvP3pKpW8KQ=";
diff --git a/pkgs/development/coq-modules/stdlib/default.nix b/pkgs/development/coq-modules/stdlib/default.nix
index 474fd188afdf..50f12e763836 100644
--- a/pkgs/development/coq-modules/stdlib/default.nix
+++ b/pkgs/development/coq-modules/stdlib/default.nix
@@ -19,7 +19,7 @@
     in
     with lib.versions;
     lib.switch coq.coq-version [
-      (case (isLe "9.0") "9.0.0")
+      (case (isLe "9.1") "9.0.0")
       # the < 9.0 above is artificial as stdlib was included in Coq before
     ] null;
   releaseRev = v: "V${v}";
diff --git a/pkgs/development/rocq-modules/bignums/default.nix b/pkgs/development/rocq-modules/bignums/default.nix
index 238e16b3f9ce..4cd0e59ab0df 100644
--- a/pkgs/development/rocq-modules/bignums/default.nix
+++ b/pkgs/development/rocq-modules/bignums/default.nix
@@ -8,7 +8,7 @@
 
 mkRocqDerivation {
   pname = "bignums";
-  owner = "coq";
+  owner = "rocq-community";
   inherit version;
   defaultVersion =
     let
@@ -16,11 +16,12 @@ mkRocqDerivation {
     in
     with lib.versions;
     lib.switch rocq-core.rocq-version [
-      (case (range "9.0" "9.0") "9.0.0+rocq${rocq-core.rocq-version}")
+      (case (range "9.0" "9.1") "9.0.0+rocq${rocq-core.rocq-version}")
     ] null;
 
   release."9.0.0+rocq9.0".sha256 = "sha256-ctnwpyNVhryEUA5YEsAImrcJsNMhtBgDSOz+z5Z4R78=";
-  releaseRev = v: "${if lib.versions.isGe "9.0" v then "v" else "V"}${v}";
+  release."9.0.0+rocq9.1".sha256 = "sha256-MSjlfJs3JOakuShOj+isNlus0bKlZ+rkvzRoKZQK5RQ=";
+  releaseRev = v: "v${v}";
 
   mlPlugin = true;
 
diff --git a/pkgs/development/rocq-modules/stdlib/default.nix b/pkgs/development/rocq-modules/stdlib/default.nix
index 595080b1f92d..b61816f94694 100644
--- a/pkgs/development/rocq-modules/stdlib/default.nix
+++ b/pkgs/development/rocq-modules/stdlib/default.nix
@@ -8,7 +8,7 @@ mkRocqDerivation {
 
   pname = "stdlib";
   repo = "stdlib";
-  owner = "coq";
+  owner = "rocq-prover";
   opam-name = "rocq-stdlib";
 
   inherit version;
@@ -18,7 +18,7 @@ mkRocqDerivation {
     in
     with lib.versions;
     lib.switch rocq-core.version [
-      (case (isEq "9.0") "9.0.0")
+      (case (range "9.0" "9.1") "9.0.0")
     ] null;
   releaseRev = v: "V${v}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7ac222bbff53..f995ab32c465 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15543,6 +15543,8 @@ with pkgs;
     coq_8_20
     coqPackages_9_0
     coq_9_0
+    coqPackages_9_1
+    coq_9_1
     coqPackages
     coq
     ;
@@ -15556,6 +15558,8 @@ with pkgs;
     mkRocqPackages
     rocqPackages_9_0
     rocq-core_9_0
+    rocqPackages_9_1
+    rocq-core_9_1
     rocqPackages
     rocq-core
     ;
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 15a9552708e3..4e0c6d690077 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -312,6 +312,7 @@ rec {
   coq_8_19 = mkCoq "8.19";
   coq_8_20 = mkCoq "8.20";
   coq_9_0 = mkCoq "9.0";
+  coq_9_1 = mkCoq "9.1";
 
   coqPackages_8_5 = mkCoqPackages coq_8_5;
   coqPackages_8_6 = mkCoqPackages coq_8_6;
@@ -330,6 +331,7 @@ rec {
   coqPackages_8_19 = mkCoqPackages coq_8_19;
   coqPackages_8_20 = mkCoqPackages coq_8_20;
   coqPackages_9_0 = mkCoqPackages coq_9_0;
+  coqPackages_9_1 = mkCoqPackages coq_9_1;
 
   coqPackages = recurseIntoAttrs coqPackages_9_0;
   coq = coqPackages.coq;
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 69a10c64bcd8..1d84b16196f1 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -88,8 +88,10 @@ rec {
     self.filterPackages (!rocq-core.dontFilter or false);
 
   rocq-core_9_0 = mkRocq "9.0";
+  rocq-core_9_1 = mkRocq "9.1";
 
   rocqPackages_9_0 = mkRocqPackages rocq-core_9_0;
+  rocqPackages_9_1 = mkRocqPackages rocq-core_9_1;
 
   rocqPackages = recurseIntoAttrs rocqPackages_9_0;
   rocq-core = rocqPackages.rocq-core;

From 6d35689a8da46f308efed2460950f00a5e04c981 Mon Sep 17 00:00:00 2001
From: June Stepp <git@junestepp.me>
Date: Mon, 7 Jul 2025 11:25:48 -0500
Subject: [PATCH 79/83] nixos/peertube: support auto transcription

`ProcSubset = "pid"` was removed, because /proc/cpuinfo needs to be
accessed.
---
 nixos/modules/services/web-apps/peertube.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index d4c9c25a9280..b2ae9d3374e1 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -20,6 +20,8 @@ let
     NPM_CONFIG_CACHE = "/var/cache/peertube/.npm";
     NPM_CONFIG_PREFIX = cfg.package;
     HOME = cfg.package;
+    # Used for auto video transcription
+    HF_HOME = "/var/cache/peertube/huggingface";
   };
 
   systemCallsList = [
@@ -36,7 +38,6 @@ let
 
   cfgService = {
     # Proc filesystem
-    ProcSubset = "pid";
     ProtectProc = "invisible";
     # Access write directories
     UMask = "0027";
@@ -420,6 +421,10 @@ in
             };
           };
         };
+        video_transcription = {
+          engine = lib.mkDefault "whisper-ctranslate2";
+          engine_path = lib.mkDefault (lib.getExe pkgs.whisper-ctranslate2);
+        };
       }
       (lib.mkIf cfg.redis.enableUnixSocket {
         redis = {

From 30c1ef051b5aaf33bf362dc9730628ac5cc26cd8 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Tue, 8 Jul 2025 11:57:40 +0200
Subject: [PATCH 80/83] nixos/ec2-data: fix eval

---
 nixos/modules/virtualisation/ec2-data.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 63fc61f12a78..0e71bde0a452 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -34,7 +34,7 @@ with lib;
         ${optionalString (config.networking.hostName == "") ''
           echo "setting host name..."
           if [ -s /etc/ec2-metadata/hostname ]; then
-              ${lib.getExe hostname-debian} -F /etc/ec2-metadata/hostname
+              ${lib.getExe pkgs.hostname-debian} -F /etc/ec2-metadata/hostname
           fi
         ''}
 

From 23232fdda84ee2afaf616542ba220f3bfbb09d81 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 8 Jul 2025 13:10:06 +0200
Subject: [PATCH 81/83] wyoming-openwakeword: fix build-system typo

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

diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
index 63ae5ea9dc49..c1db4c30ad9f 100644
--- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix
+++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU=";
   };
 
-  build-systems = with python3Packages; [
+  build-system = with python3Packages; [
     setuptools
   ];
 

From aa2e1fff170a8d60f06a194b011409c3432f1797 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 7 Jul 2025 08:33:49 +0200
Subject: [PATCH 82/83] linux_xanmod: 6.12.35 -> 6.12.36

---
 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 fcc627f23b49..15eaa924dc16 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,8 +14,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.12.35";
-      hash = "sha256-cvpt18bGeTj6hcUnGLPGAHeWdWyRNh/NmXROBoRUhqw=";
+      version = "6.12.36";
+      hash = "sha256-F/vdX8vAKf2/70Kni1UPcx/XBNF1b9tcoyzV4+q2/rY=";
     };
     main = {
       version = "6.15.4";

From 8302e1cd19561b2b35536b5255b2d4578adf1f57 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 7 Jul 2025 08:43:10 +0200
Subject: [PATCH 83/83] linux_xanmod_latest: 6.15.4 -> 6.15.5

---
 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 15eaa924dc16..d9767d286aac 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -18,8 +18,8 @@ let
       hash = "sha256-F/vdX8vAKf2/70Kni1UPcx/XBNF1b9tcoyzV4+q2/rY=";
     };
     main = {
-      version = "6.15.4";
-      hash = "sha256-6c60l4bQm6zoWhFXD9KZObnIqV6gGFRt9EdKZmBAaq8=";
+      version = "6.15.5";
+      hash = "sha256-jw5l0nd7ClDwMLI6n3LmJ+0MprcgTlsHQKpsdX6hFZs=";
     };
   };